|
 |
4bc2c8 |
libgcc: Honor LDFLAGS_FOR_TARGET when linking libgcc_s
|
|
|
4bc2c8 |
|
|
|
4bc2c8 |
When building gcc with some specific LDFLAGS_FOR_TARGET, e.g.
|
|
|
4bc2c8 |
LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now
|
|
|
4bc2c8 |
those flags propagate info linking of target shared libraries,
|
|
|
4bc2c8 |
e.g. lib{ubsan,tsan,stdc++,quadmath,objc,lsan,itm,gphobos,gdruntime,gomp,go,gfortran,atomic,asan}.so.*
|
|
|
4bc2c8 |
but there is one important exception, libgcc_s.so.* linking ignores it.
|
|
|
4bc2c8 |
|
|
|
4bc2c8 |
The following patch fixes that.
|
|
|
4bc2c8 |
|
|
|
4bc2c8 |
Bootstrapped/regtested on x86_64-linux with LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now
|
|
|
4bc2c8 |
and verified that libgcc_s.so.* is BIND_NOW when it previously wasn't, and
|
|
|
4bc2c8 |
without any LDFLAGS_FOR_TARGET on x86_64-linux and i686-linux.
|
|
|
4bc2c8 |
There on x86_64-linux I've verified that the libgcc_s.so.1 linking command
|
|
|
4bc2c8 |
line for -m64 is identical except for whitespace to one without the patch,
|
|
|
4bc2c8 |
and for -m32 multilib $(LDFLAGS) actually do supply there an extra -m32
|
|
|
4bc2c8 |
that also repeats later in the @multilib_flags@, which should be harmless.
|
|
|
4bc2c8 |
|
|
|
4bc2c8 |
2021-08-04 Jakub Jelinek <jakub@redhat.com>
|
|
|
4bc2c8 |
|
|
|
4bc2c8 |
* config/t-slibgcc (SHLIB_LINK): Add $(LDFLAGS).
|
|
|
4bc2c8 |
* config/t-slibgcc-darwin (SHLIB_LINK): Likewise.
|
|
|
4bc2c8 |
* config/t-slibgcc-vms (SHLIB_LINK): Likewise.
|
|
|
4bc2c8 |
|
|
|
4bc2c8 |
--- libgcc/config/t-slibgcc
|
|
|
4bc2c8 |
+++ libgcc/config/t-slibgcc
|
|
|
4bc2c8 |
@@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
|
|
|
4bc2c8 |
$(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
|
|
|
4bc2c8 |
|
|
|
4bc2c8 |
SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
|
|
|
4bc2c8 |
- $(SHLIB_LDFLAGS) \
|
|
|
4bc2c8 |
+ $(SHLIB_LDFLAGS) $(LDFLAGS) \
|
|
|
4bc2c8 |
-o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \
|
|
|
4bc2c8 |
$(SHLIB_OBJS) $(SHLIB_LC) && \
|
|
|
4bc2c8 |
rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \
|
|
|
4bc2c8 |
--- libgcc/config/t-slibgcc-darwin
|
|
|
4bc2c8 |
+++ libgcc/config/t-slibgcc-darwin
|
|
|
4bc2c8 |
@@ -15,7 +15,7 @@ SHLIB_LC = -lc
|
|
|
4bc2c8 |
# Note that this version is used for the loader, not the linker; the linker
|
|
|
4bc2c8 |
# uses the stub versions named by the versioned members of $(INSTALL_FILES).
|
|
|
4bc2c8 |
|
|
|
4bc2c8 |
-SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -dynamiclib -nodefaultlibs \
|
|
|
4bc2c8 |
+SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) $(LDFLAGS) -dynamiclib -nodefaultlibs \
|
|
|
4bc2c8 |
-install_name @shlib_slibdir@/$(SHLIB_INSTALL_NAME) \
|
|
|
4bc2c8 |
-single_module -o $(SHLIB_DIR)/$(SHLIB_SONAME) \
|
|
|
4bc2c8 |
-Wl,-exported_symbols_list,$(SHLIB_MAP) \
|
|
|
4bc2c8 |
--- libgcc/config/t-slibgcc-vms
|
|
|
4bc2c8 |
+++ libgcc/config/t-slibgcc-vms
|
|
|
4bc2c8 |
@@ -22,7 +22,7 @@ SHLIB_LINK = \
|
|
|
4bc2c8 |
objdump --syms $(SHLIB_OBJS) | \
|
|
|
4bc2c8 |
$(SHLIB_SYMVEC) >> SYMVEC_$$$$.opt ; \
|
|
|
4bc2c8 |
echo "case_sensitive=NO" >> SYMVEC_$$$$.opt; \
|
|
|
4bc2c8 |
- $(CC) $(LIBGCC2_CFLAGS) -nodefaultlibs \
|
|
|
4bc2c8 |
+ $(CC) $(LIBGCC2_CFLAGS) $(LDFLAGS) -nodefaultlibs \
|
|
|
4bc2c8 |
-shared --for-linker=/noinform -o $(SHLIB_NAME) $(SHLIB_OBJS) \
|
|
|
4bc2c8 |
--for-linker=SYMVEC_$$$$.opt \
|
|
|
4bc2c8 |
--for-linker=gsmatch=equal,$(shlib_version)
|