about summary refs log tree commit diff
path: root/Makeconfig
diff options
context:
space:
mode:
authorPaul E. Murphy <murphyp@linux.vnet.ibm.com>2020-02-07 14:08:01 -0600
committerPaul E. Murphy <murphyp@linux.vnet.ibm.com>2020-03-25 14:34:23 -0500
commit3618e5fecefde1ff4f383fdd349e64deb472df4e (patch)
treefec1cc101c1e91ef89ebdea98f611c20a5aa521a /Makeconfig
parent076d06e8494319c1405129ed505fc67f17c0487d (diff)
downloadglibc-3618e5fecefde1ff4f383fdd349e64deb472df4e.tar.gz
glibc-3618e5fecefde1ff4f383fdd349e64deb472df4e.tar.xz
glibc-3618e5fecefde1ff4f383fdd349e64deb472df4e.zip
Makeconfig: sandwich gnulib-tests between libc/ld linking of tests
This better resembles the default linking process with the gnulibs,
and also resolves the increasingly difficult to maintain
f128-loader-link usage on powerpc64le as some libgcc symbols are
dependent on those found in the loader (ld).
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makeconfig b/Makeconfig
index f252842979..ac567caddc 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -564,13 +564,13 @@ else
 link-libc-tests-rpath-link = $(link-libc-rpath-link)
 endif  # build-hardcoded-path-in-tests
 
-link-libc-before-gnulib = $(common-objpfx)libc.so$(libc.so-version) \
-			  $(common-objpfx)$(patsubst %,$(libtype.oS),c) \
-			  -Wl,--as-needed $(elf-objpfx)ld.so \
-			  -Wl,--no-as-needed
-link-libc = $(link-libc-before-gnulib) $(gnulib)
+link-libc-between-gnulib = $(common-objpfx)libc.so$(libc.so-version) \
+			   $(common-objpfx)$(patsubst %,$(libtype.oS),c) \
+			   -Wl,--as-needed $(elf-objpfx)ld.so \
+			   -Wl,--no-as-needed
+link-libc = $(link-libc-between-gnulib) $(gnulib)
 
-link-libc-tests-after-rpath-link = $(link-libc-before-gnulib) $(gnulib-tests)
+link-libc-tests-after-rpath-link = $(gnulib-tests) $(link-libc-between-gnulib) $(gnulib-tests)
 link-libc-tests = $(link-libc-tests-rpath-link) \
 		  $(link-libc-tests-after-rpath-link)
 # Pretty printer test programs always require rpath instead of rpath-link.