[PATCH 1/2] Revert "x86/vdso: Pass --eh-frame-hdr to the linker"

alex.murray at canonical.com alex.murray at canonical.com
Wed Jun 26 15:59:34 UTC 2019


From: Alex Murray <alex.murray at canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1834315

This reverts commit e8a650034bb0a03b3a899d5f82b131a1f86df292 which was
commit cd01544a268ad8ee5b1dfe42c4393f1095f86879 upstream.

This commit, along with the commit it purports to
fix (3f8c4bc302724923ff50076431ab2857b70bdb44 aka
379d98ddf41344273d9718556f761420f4dc80b3 upstream), still cause glibc to
FTBFS on eoan as noted in
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1830890/comments/7
so revert both commits.
---
 arch/x86/entry/vdso/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 15ed35f5097d..297dda4d5947 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -159,8 +159,7 @@ quiet_cmd_vdso = VDSO    $@
 		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
 
 VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \
-	$(call ld-option, --build-id) $(call ld-option, --eh-frame-hdr) \
-	-Bsymbolic
+	$(call ld-option, --build-id) -Bsymbolic
 GCOV_PROFILE := n
 
 #
-- 
2.17.1




More information about the kernel-team mailing list