diff options
| author | Christopher Larson <chris_larson@mentor.com> | 2016-05-04 14:52:49 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-11 10:08:30 +0100 |
| commit | 9095742d1468477baefe69098817f38a8d2dd750 (patch) | |
| tree | e79301e79f5f1c451c416e0c54cb9d05d60aadfa /meta | |
| parent | 6ba86d847275126bf435f144e7d029d10e7ab17d (diff) | |
| download | openembedded-core-9095742d1468477baefe69098817f38a8d2dd750.tar.gz openembedded-core-9095742d1468477baefe69098817f38a8d2dd750.tar.bz2 openembedded-core-9095742d1468477baefe69098817f38a8d2dd750.zip | |
gcc: obey ldflags in the link of libgcc
Explicitly obey it, the way it should, rather than only relying on
--with-linker-hash-style.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
4 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 7e03f3121a..208e092e1d 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -90,6 +90,7 @@ SRC_URI = "\ file://0072-support-ffile-prefix-map.patch \ file://0073-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch \ file://0074-fdebug-prefix-map-support-to-remap-relative-path.patch \ + file://0075-libgcc-use-ldflags.patch \ " SRC_URI[md5sum] = "6f831b4d251872736e8e9cc09746f327" SRC_URI[sha256sum] = "2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e" diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0075-libgcc-use-ldflags.patch b/meta/recipes-devtools/gcc/gcc-4.9/0075-libgcc-use-ldflags.patch new file mode 100644 index 0000000000..325b72ab5f --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0075-libgcc-use-ldflags.patch @@ -0,0 +1,16 @@ +Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS + +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +Upstream-Status: Pending + +--- gcc-5.3.0.orig/libgcc/config/t-slibgcc ++++ gcc-5.3.0/libgcc/config/t-slibgcc +@@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_S + $(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) + + SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ +- $(SHLIB_LDFLAGS) \ ++ $(LDFLAGS) $(SHLIB_LDFLAGS) \ + -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \ + $(SHLIB_OBJS) $(SHLIB_LC) && \ + rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \ diff --git a/meta/recipes-devtools/gcc/gcc-5.3.inc b/meta/recipes-devtools/gcc/gcc-5.3.inc index 9808be1135..118ddb9dd4 100644 --- a/meta/recipes-devtools/gcc/gcc-5.3.inc +++ b/meta/recipes-devtools/gcc/gcc-5.3.inc @@ -88,6 +88,7 @@ SRC_URI = "\ file://0056-Enable-libc-provide-ssp-and-gcc_cv_target_dl_iterate.patch \ file://0057-unwind-fix-for-musl.patch \ file://0058-fdebug-prefix-map-support-to-remap-relative-path.patch \ + file://0059-libgcc-use-ldflags.patch \ " BACKPORTS = "" diff --git a/meta/recipes-devtools/gcc/gcc-5.3/0059-libgcc-use-ldflags.patch b/meta/recipes-devtools/gcc/gcc-5.3/0059-libgcc-use-ldflags.patch new file mode 100644 index 0000000000..325b72ab5f --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-5.3/0059-libgcc-use-ldflags.patch @@ -0,0 +1,16 @@ +Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS + +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +Upstream-Status: Pending + +--- gcc-5.3.0.orig/libgcc/config/t-slibgcc ++++ gcc-5.3.0/libgcc/config/t-slibgcc +@@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_S + $(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) + + SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ +- $(SHLIB_LDFLAGS) \ ++ $(LDFLAGS) $(SHLIB_LDFLAGS) \ + -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \ + $(SHLIB_OBJS) $(SHLIB_LC) && \ + rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \ |