diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-03-02 20:11:27 +0100 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2017-03-12 15:08:50 -0700 |
| commit | 32b4c41fb6d814551fa6d6e5e07ecbe2119407a7 (patch) | |
| tree | 2224626d8359cb51e9adcb213ce1a5bb1e4fc380 /Makerules | |
| parent | 23b0289cf5f7abf984f5f15f54e8feb21938eece (diff) | |
| download | glibc-32b4c41fb6d814551fa6d6e5e07ecbe2119407a7.tar.gz glibc-32b4c41fb6d814551fa6d6e5e07ecbe2119407a7.tar.xz glibc-32b4c41fb6d814551fa6d6e5e07ecbe2119407a7.zip | |
Document and fix --enable-bind-now [BZ #21015]
(cherry picked from commit 2d6ab5df3b675e96ee587ae6a8c2ce004c6b1ba9) (cherry picked from commit 69e0a87cc4c570e3b7218392fc3e743b5bddcce2)
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Makerules b/Makerules index e9194e54cf..7f0eef8096 100644 --- a/Makerules +++ b/Makerules @@ -588,7 +588,7 @@ $(LINK.o) -shared -static-libgcc -Wl,-O1 $(sysdep-LDFLAGS) \ $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \ $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \ -Wl,-soname=lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \ - $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \ + $(LDFLAGS.so) $(LDFLAGS-lib.so) $(LDFLAGS-$(@F:lib%.so=%).so) \ -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) endef @@ -686,10 +686,6 @@ LDFLAGS-c.so = -nostdlib -nostartfiles LDLIBS-c.so += $(libc.so-gnulib) # Give libc.so an entry point and make it directly runnable itself. LDFLAGS-c.so += -e __libc_main -# If lazy relocation is disabled add the -z now flag. -ifeq ($(bind-now),yes) -LDFLAGS-c.so += -Wl,-z,now -endif # Pre-link the objects of libc_pic.a so that we can locally resolve # COMMON symbols before we link against ld.so. This is because ld.so # contains some of libc_pic.a already, which will prevent the COMMONs @@ -1104,7 +1100,8 @@ $(common-objpfx)format.lds: $(..)scripts/output-format.sed \ ifneq (unknown,$(output-format)) echo > $@.new 'OUTPUT_FORMAT($(output-format))' else - $(LINK.o) -shared $(sysdep-LDFLAGS) $(rtld-LDFLAGS) $(LDFLAGS.so) \ + $(LINK.o) -shared $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \ + $(LDFLAGS.so) $(LDFLAGS-lib.so) \ -x c /dev/null -o $@.so -Wl,--verbose -v 2>&1 \ | sed -n -f $< > $@.new test -s $@.new |