From patchwork Wed Jan 10 04:15:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 857930 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zGbKc0pTgz9sNV for ; Wed, 10 Jan 2018 15:16:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D9284303F1; Wed, 10 Jan 2018 04:15:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HiAKe2FsxYJo; Wed, 10 Jan 2018 04:15:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4E8A43024A; Wed, 10 Jan 2018 04:15:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 75E041C4111 for ; Wed, 10 Jan 2018 04:15:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 70FB130213 for ; Wed, 10 Jan 2018 04:15:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Czy1T34Dut3e for ; Wed, 10 Jan 2018 04:15:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from ch3vs02.rockwellcollins.com (smtpimr.rockwellcollins.com [205.175.226.29]) by silver.osuosl.org (Postfix) with ESMTPS id 4D0123022C for ; Wed, 10 Jan 2018 04:15:53 +0000 (UTC) Received: from ofwch3n02.rockwellcollins.com (HELO dtulimr01.rockwellcollins.com) ([205.175.226.14]) by ch3vs02.rockwellcollins.com with ESMTP; 09 Jan 2018 22:15:52 -0600 X-Received: from largo.rockwellcollins.com (unknown [192.168.140.76]) by dtulimr01.rockwellcollins.com (Postfix) with ESMTP id E97DD6022F; Tue, 9 Jan 2018 22:15:51 -0600 (CST) From: Matt Weber To: buildroot@buildroot.org Date: Tue, 9 Jan 2018 22:15:34 -0600 Message-Id: <1515557739-6027-3-git-send-email-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515557739-6027-1-git-send-email-matthew.weber@rockwellcollins.com> References: <1515557739-6027-1-git-send-email-matthew.weber@rockwellcollins.com> Subject: [Buildroot] [PATCH v3 3/8] valgrind: correct linker flag seq X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 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" This patch will correct the sequence of -pie and -shared options. When used together, -pie should be provided to the linker before -shared. Upstream: https://sourceforge.net/p/valgrind/mailman/message/36114834/ Signed-off-by: Matthew Weber --- ...ind-patch-to-correct-linker-flag-sequence.patch | 160 +++++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 package/valgrind/0005-valgrind-patch-to-correct-linker-flag-sequence.patch diff --git a/package/valgrind/0005-valgrind-patch-to-correct-linker-flag-sequence.patch b/package/valgrind/0005-valgrind-patch-to-correct-linker-flag-sequence.patch new file mode 100644 index 0000000..34da655 --- /dev/null +++ b/package/valgrind/0005-valgrind-patch-to-correct-linker-flag-sequence.patch @@ -0,0 +1,160 @@ +From b845cb1d2e0f0d91dae056237e00cba2e6f8377d Mon Sep 17 00:00:00 2001 +From: Yogesh Prasad +Date: Wed, 11 Oct 2017 09:14:10 -0500 +Subject: [PATCH 1/1] valgrind: patch to correct linker flag sequence + +Description + This patch will correct the sequence of -pie and -shared options. + When used together, -pie should be provided to the linker before + -shared. If -pie is provided after -shared, the linker throws an + error shown below as example. + +------------------------------------------------------------------------- +/build/valgrind-3.12.0/coregrind/vg_preloaded.c:124: + undefined reference to `_restgpr_27_x' +/host/lib/gcc/powerpc-buildroot-linux-gnu/6.4.0/../../../.. +/powerpc-buildroot-linux-gnu/bin/ld: BFD (GNU Binutils) 2.28.1 + assertion fail elf32-ppc.c:8923 +collect2: error: ld returned 1 exit status +make[5]: *** [vgpreload_core-ppc32-linux.so] Error 1 +make[4]: *** [all] Error 2 +make[3]: *** [all-recursive] Error 1 +make[2]: *** [all] Error 2 +make[1]: *** [/build/valgrind-3.12.0/.stamp_built] Error 2 +make: *** [_all] Error 2 +------------------------------------------------------------------------- + +Signed-off-by: Yogesh Prasad +--- + coregrind/Makefile.am | 6 ++++++ + drd/Makefile.am | 6 ++++++ + exp-dhat/Makefile.am | 6 ++++++ + exp-sgcheck/Makefile.am | 6 ++++++ + helgrind/Makefile.am | 6 ++++++ + massif/Makefile.am | 6 ++++++ + memcheck/Makefile.am | 7 ++++++- + 7 files changed, 42 insertions(+), 1 deletion(-) + +diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am +index d798015..ce7acad 100644 +--- a/coregrind/Makefile.am ++++ b/coregrind/Makefile.am +@@ -541,6 +541,12 @@ vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ + $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_PRI_CAPS@) + vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) ++vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LINK = $(CCLD) \ ++ $(vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS) \ ++ $(CFLAGS) \ ++ $(LDFLAGS) \ ++ $(vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS) \ ++ -o $@ + if VGCONF_HAVE_PLATFORM_SEC + vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = vg_preloaded.c + vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ +diff --git a/drd/Makefile.am b/drd/Makefile.am +index 9ba4c58..bf32229 100644 +--- a/drd/Makefile.am ++++ b/drd/Makefile.am +@@ -143,6 +143,12 @@ vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ + vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) ++vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LINK = $(CCLD) \ ++ $(vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS) \ ++ $(CFLAGS) \ ++ $(LDFLAGS) \ ++ $(vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS) \ ++ -o $@ + + if VGCONF_HAVE_PLATFORM_SEC + vgpreload_drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ +diff --git a/exp-dhat/Makefile.am b/exp-dhat/Makefile.am +index 647b72b..29619cf 100644 +--- a/exp-dhat/Makefile.am ++++ b/exp-dhat/Makefile.am +@@ -84,6 +84,12 @@ vgpreload_exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ + vgpreload_exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) ++vgpreload_exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LINK = $(CCLD) \ ++ $(vgpreload_exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS) \ ++ $(CFLAGS) \ ++ $(LDFLAGS) \ ++ $(vgpreload_exp_dhat_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS) \ ++ -o $@ + + if VGCONF_HAVE_PLATFORM_SEC + vgpreload_exp_dhat_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = +diff --git a/exp-sgcheck/Makefile.am b/exp-sgcheck/Makefile.am +index 211a5ff..ecbe89b 100644 +--- a/exp-sgcheck/Makefile.am ++++ b/exp-sgcheck/Makefile.am +@@ -92,6 +92,12 @@ vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ + vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) ++vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LINK = $(CCLD) \ ++ $(vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS) \ ++ $(CFLAGS) \ ++ $(LDFLAGS) \ ++ $(vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS) \ ++ -o $@ + + if VGCONF_HAVE_PLATFORM_SEC + vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ +diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am +index b6f1b89..a9b7ef3 100644 +--- a/helgrind/Makefile.am ++++ b/helgrind/Makefile.am +@@ -103,6 +103,12 @@ vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ + vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) ++vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LINK = $(CCLD) \ ++ $(vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS) \ ++ $(CFLAGS) \ ++ $(LDFLAGS) \ ++ $(vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS) \ ++ -o $@ + + if VGCONF_HAVE_PLATFORM_SEC + vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ +diff --git a/massif/Makefile.am b/massif/Makefile.am +index 2933403..6ccb973 100644 +--- a/massif/Makefile.am ++++ b/massif/Makefile.am +@@ -84,6 +84,12 @@ vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ + vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) ++vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LINK = $(CCLD) \ ++ $(vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS) \ ++ $(CFLAGS) \ ++ $(LDFLAGS) \ ++ $(vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS) \ ++ -o $@ + + if VGCONF_HAVE_PLATFORM_SEC + vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = +diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am +index 476bc70..ca51c64 100644 +--- a/memcheck/Makefile.am ++++ b/memcheck/Makefile.am +@@ -100,7 +100,12 @@ vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ + vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +- ++vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LINK = $(CCLD) \ ++ $(vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS) \ ++ $(CFLAGS) \ ++ $(LDFLAGS) \ ++ $(vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS) \ ++ -o $@ + if VGCONF_HAVE_PLATFORM_SEC + vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ + $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) +-- +1.9.1 +