diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2021-08-05 17:32:06 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2021-08-05 17:32:06 +0200 |
| commit | 02e5ffd5db0e27f4113d25ab28afa27e4e32c79e (patch) | |
| tree | 6fb9a052bea3db9a2a73d7c33c5103d936852556 /libgcc | |
| parent | 0bac793ed6bad2c0c13cd1e93a1aa5808467afc8 (diff) | |
| download | gcc-02e5ffd5db0e27f4113d25ab28afa27e4e32c79e.zip gcc-02e5ffd5db0e27f4113d25ab28afa27e4e32c79e.tar.gz gcc-02e5ffd5db0e27f4113d25ab28afa27e4e32c79e.tar.bz2 | |
libgcc: Honor LDFLAGS_FOR_TARGET when linking libgcc_s
When building gcc with some specific LDFLAGS_FOR_TARGET, e.g.
LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now
those flags propagate info linking of target shared libraries,
e.g. lib{ubsan,tsan,stdc++,quadmath,objc,lsan,itm,gphobos,gdruntime,gomp,go,gfortran,atomic,asan}.so.*
but there is one important exception, libgcc_s.so.* linking ignores it.
The following patch fixes that.
Bootstrapped/regtested on x86_64-linux with LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now
and verified that libgcc_s.so.* is BIND_NOW when it previously wasn't, and
without any LDFLAGS_FOR_TARGET on x86_64-linux and i686-linux.
There on x86_64-linux I've verified that the libgcc_s.so.1 linking command
line for -m64 is identical except for whitespace to one without the patch,
and for -m32 multilib $(LDFLAGS) actually do supply there an extra -m32
that also repeats later in the @multilib_flags@, which should be harmless.
2021-08-04 Jakub Jelinek <jakub@redhat.com>
* config/t-slibgcc (SHLIB_LINK): Add $(LDFLAGS).
* config/t-slibgcc-darwin (SHLIB_LINK): Likewise.
* config/t-slibgcc-vms (SHLIB_LINK): Likewise.
* config/t-slibgcc-fuchsia (SHLIB_LDFLAGS): Remove $(LDFLAGS).
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/config/t-slibgcc | 2 | ||||
| -rw-r--r-- | libgcc/config/t-slibgcc-darwin | 2 | ||||
| -rw-r--r-- | libgcc/config/t-slibgcc-fuchsia | 3 | ||||
| -rw-r--r-- | libgcc/config/t-slibgcc-vms | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/libgcc/config/t-slibgcc b/libgcc/config/t-slibgcc index c59b43b..50f13c2 100644 --- a/libgcc/config/t-slibgcc +++ b/libgcc/config/t-slibgcc @@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \ $(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ - $(SHLIB_LDFLAGS) \ + $(SHLIB_LDFLAGS) $(LDFLAGS) \ -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \ $(SHLIB_OBJS) $(SHLIB_LC) && \ rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \ diff --git a/libgcc/config/t-slibgcc-darwin b/libgcc/config/t-slibgcc-darwin index 9970d00..a6ada45 100644 --- a/libgcc/config/t-slibgcc-darwin +++ b/libgcc/config/t-slibgcc-darwin @@ -15,7 +15,7 @@ SHLIB_LC = -lc # Note that this version is used for the loader, not the linker; the linker # uses the stub versions named by the versioned members of $(INSTALL_FILES). -SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -dynamiclib -nodefaultlibs \ +SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) $(LDFLAGS) -dynamiclib -nodefaultlibs \ -install_name @shlib_slibdir@/$(SHLIB_INSTALL_NAME) \ -single_module -o $(SHLIB_DIR)/$(SHLIB_SONAME) \ -Wl,-exported_symbols_list,$(SHLIB_MAP) \ diff --git a/libgcc/config/t-slibgcc-fuchsia b/libgcc/config/t-slibgcc-fuchsia index 35b0017..97f1803 100644 --- a/libgcc/config/t-slibgcc-fuchsia +++ b/libgcc/config/t-slibgcc-fuchsia @@ -18,5 +18,4 @@ # Fuchsia-specific shared library overrides. -SHLIB_LDFLAGS = -Wl,--soname=$(SHLIB_SONAME) \ - $(LDFLAGS) +SHLIB_LDFLAGS = -Wl,--soname=$(SHLIB_SONAME) diff --git a/libgcc/config/t-slibgcc-vms b/libgcc/config/t-slibgcc-vms index d01c343..c305975 100644 --- a/libgcc/config/t-slibgcc-vms +++ b/libgcc/config/t-slibgcc-vms @@ -22,7 +22,7 @@ SHLIB_LINK = \ objdump --syms $(SHLIB_OBJS) | \ $(SHLIB_SYMVEC) >> SYMVEC_$$$$.opt ; \ echo "case_sensitive=NO" >> SYMVEC_$$$$.opt; \ - $(CC) $(LIBGCC2_CFLAGS) -nodefaultlibs \ + $(CC) $(LIBGCC2_CFLAGS) $(LDFLAGS) -nodefaultlibs \ -shared --for-linker=/noinform -o $(SHLIB_NAME) $(SHLIB_OBJS) \ --for-linker=SYMVEC_$$$$.opt \ --for-linker=gsmatch=equal,$(shlib_version) |