From patchwork Fri Dec 25 22:28:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Prado X-Patchwork-Id: 561065 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id C94F4140C63 for ; Sat, 26 Dec 2015 09:29:15 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=e-labworks-com.20150623.gappssmtp.com header.i=@e-labworks-com.20150623.gappssmtp.com header.b=mdmRjv51; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 46E0095935; Fri, 25 Dec 2015 22:29:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SVH2XWRR3bbE; Fri, 25 Dec 2015 22:29:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8192895918; Fri, 25 Dec 2015 22:29:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id ED3B71C1562 for ; Fri, 25 Dec 2015 22:29:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E706C95918 for ; Fri, 25 Dec 2015 22:29:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E5PvaiX2bpmp for ; Fri, 25 Dec 2015 22:29:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk0-f171.google.com (mail-qk0-f171.google.com [209.85.220.171]) by hemlock.osuosl.org (Postfix) with ESMTPS id DA6CC958DF for ; Fri, 25 Dec 2015 22:29:09 +0000 (UTC) Received: by mail-qk0-f171.google.com with SMTP id n135so59628485qka.2 for ; Fri, 25 Dec 2015 14:29:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=e-labworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=uZy/+8EmPr6ArdimuSnEtTq7OTWLubex8c+KsNaDP2Y=; b=mdmRjv51xuc83zwBfeUj3BMA2xptzYiA2CidMq3QBvmGSfZuhbm2kyBNH9LLjGXywi ayXlFUDdFlTJa7gyzuRVStsF3NqeVUJwyrop/eCC55/PZphBPGqDc8838Y7+vUw/hCeK xqJ0af14utXLQUYc8sXEa4uU0D2akaRjiAEsTa9JEXeNucDEbPmx4E3raNAzrQRo5PBK GZvuHwS43V7CrIk8BJFQKArFAIYQX1MxVX4uMgW8/wkxjk2AB/jwEGB0VqKa/QMSW/bN xHucEwiH9mI85pEs24QaSxxugwxcldDyO3l1ONO1eWn+nlX9jSZdIbSePcLhcDXJ/gac B2Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uZy/+8EmPr6ArdimuSnEtTq7OTWLubex8c+KsNaDP2Y=; b=auve9TTm+KoSHv9G6eR3Iryaa+/bX1fH7HYNnwyZ9suX59Zf98+9swoKcyDj6tKLgw 2h+BLPt7GglJPLeG1wAA8E2zXmPOP5rCLRIIzNoC1zKBaFroGCBHnl50Kh+RwOBgfgl5 W2Os7uSkyOk9Q2f1woiMWmkiov8G3zI6ZoN2fi2619hsxVp85ywFi2md+yeyUF5PNRT7 PQW8CYShO/JAdkV4f1r3q+mytPUV9sOdpmU0X4mI+eEDoFgeYNB9RPTyclf1sEkmnfx4 i3qlPA7tcWuRKiqmzQ8EWyEuKdvGbqjlb9BYgeg35AmcHT2KqRHcc2YFfJJVVpiM5rlv R7qg== X-Gm-Message-State: ALoCoQkjmIQFdmKFLjnIjKBADBozB1UfNmUdUw7Wf1kQ7B9ceI9naAYPmMCZXYANQ88dExdlMPNqrKbwMMAG034RYBCQwWYzPw== X-Received: by 10.55.73.133 with SMTP id w127mr56369705qka.53.1451082548929; Fri, 25 Dec 2015 14:29:08 -0800 (PST) Received: from localhost.localdomain ([177.32.224.147]) by smtp.gmail.com with ESMTPSA id q18sm22788952qkq.47.2015.12.25.14.29.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Dec 2015 14:29:08 -0800 (PST) From: Sergio Prado To: buildroot@buildroot.org Date: Fri, 25 Dec 2015 20:28:34 -0200 Message-Id: <1451082514-2730-1-git-send-email-sergio.prado@e-labworks.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH] trousers: remove inline for read_data/write_data X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" read_data and write_data functions are declared with inline, but their definition is not in a .h file. This is causing errors when linking: tcsps.c:(.text+0x4ac): undefined reference to `read_data' tcsps.c:(.text+0x1888): undefined reference to `write_data' ... Patch already applied upstream. Fixes: http://autobuild.buildroot.net/results/1a53d929bcec840cd18185e54b1a6da8aa849269/ http://autobuild.buildroot.net/results/fad66e88b5a97004b21658d413f4d3a6d0d8838b/ http://autobuild.buildroot.net/results/c7e23b8ec2c69798482868e18311ebf2c01b65e0/ ... Signed-off-by: Sergio Prado --- ...emove-inline-for-read_data-and-write_data.patch | 91 ++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch diff --git a/package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch b/package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch new file mode 100644 index 000000000000..3bbccb676c95 --- /dev/null +++ b/package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch @@ -0,0 +1,91 @@ +From f03c7987c234a81f7e4274b26bab07318357a2a5 Mon Sep 17 00:00:00 2001 +From: Sergio Prado +Date: Fri, 25 Dec 2015 20:09:21 -0200 +Subject: [PATCH] Remove inline for read_data and write_data + +read_data and write_data functions are declared with inline, but +their definition is not in a .h file. This is causing errors when +linking: + +tcsps.c:(.text+0x4ac): undefined reference to `read_data' +tcsps.c:(.text+0x1888): undefined reference to `write_data' +... + +Signed-off-by: Sergio Prado +--- + src/include/tcsps.h | 5 ----- + src/tcs/ps/ps_utils.c | 8 -------- + src/tspi/ps/ps_utils.c | 4 ++-- + 3 files changed, 2 insertions(+), 15 deletions(-) + +diff --git a/src/include/tcsps.h b/src/include/tcsps.h +index 87542965877d..dcd5db469822 100644 +--- a/src/include/tcsps.h ++++ b/src/include/tcsps.h +@@ -23,13 +23,8 @@ int get_file(); + int put_file(int); + void close_file(int); + void ps_destroy(); +-#ifdef SOLARIS + TSS_RESULT read_data(int, void *, UINT32); + TSS_RESULT write_data(int, void *, UINT32); +-#else +-inline TSS_RESULT read_data(int, void *, UINT32); +-inline TSS_RESULT write_data(int, void *, UINT32); +-#endif + int write_key_init(int, UINT32, UINT32, UINT32); + TSS_RESULT cache_key(UINT32, UINT16, TSS_UUID *, TSS_UUID *, UINT16, UINT32, UINT32); + TSS_RESULT UnloadBlob_KEY_PS(UINT16 *, BYTE *, TSS_KEY *); +diff --git a/src/tcs/ps/ps_utils.c b/src/tcs/ps/ps_utils.c +index 2e7f502b9599..35ac89f8fc12 100644 +--- a/src/tcs/ps/ps_utils.c ++++ b/src/tcs/ps/ps_utils.c +@@ -42,11 +42,7 @@ + struct key_disk_cache *key_disk_cache_head = NULL; + + +-#ifdef SOLARIS + TSS_RESULT +-#else +-inline TSS_RESULT +-#endif + read_data(int fd, void *data, UINT32 size) + { + int rc; +@@ -64,11 +60,7 @@ read_data(int fd, void *data, UINT32 size) + } + + +-#ifdef SOLARIS + TSS_RESULT +-#else +-inline TSS_RESULT +-#endif + write_data(int fd, void *data, UINT32 size) + { + int rc; +diff --git a/src/tspi/ps/ps_utils.c b/src/tspi/ps/ps_utils.c +index aac40a147314..83259141d375 100644 +--- a/src/tspi/ps/ps_utils.c ++++ b/src/tspi/ps/ps_utils.c +@@ -22,7 +22,7 @@ + #include "tspps.h" + #include "tsplog.h" + +-inline TSS_RESULT ++TSS_RESULT + read_data(int fd, void *data, UINT32 size) + { + int rc; +@@ -39,7 +39,7 @@ read_data(int fd, void *data, UINT32 size) + return TSS_SUCCESS; + } + +-inline TSS_RESULT ++TSS_RESULT + write_data(int fd, void *data, UINT32 size) + { + int rc; +-- +1.9.1 +