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:33:42 +0100 |
commit | 33330021a1849318fb3e190fb753e007fd8098f9 (patch) | |
tree | 379a9f54feb1184dd21b91d08ab470e936084dfb /meta | |
parent | 47c994fff0444c984659e31cf7136b036f2e33f0 (diff) | |
download | poky-33330021a1849318fb3e190fb753e007fd8098f9.tar.gz |
gcc: obey ldflags in the link of libgcc
Explicitly obey it, the way it should, rather than only relying on
--with-linker-hash-style.
(From OE-Core rev: 9095742d1468477baefe69098817f38a8d2dd750)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 = "\ | |||
90 | file://0072-support-ffile-prefix-map.patch \ | 90 | file://0072-support-ffile-prefix-map.patch \ |
91 | file://0073-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch \ | 91 | file://0073-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch \ |
92 | file://0074-fdebug-prefix-map-support-to-remap-relative-path.patch \ | 92 | file://0074-fdebug-prefix-map-support-to-remap-relative-path.patch \ |
93 | file://0075-libgcc-use-ldflags.patch \ | ||
93 | " | 94 | " |
94 | SRC_URI[md5sum] = "6f831b4d251872736e8e9cc09746f327" | 95 | SRC_URI[md5sum] = "6f831b4d251872736e8e9cc09746f327" |
95 | SRC_URI[sha256sum] = "2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e" | 96 | 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 @@ | |||
1 | Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS | ||
2 | |||
3 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
4 | Upstream-Status: Pending | ||
5 | |||
6 | --- gcc-5.3.0.orig/libgcc/config/t-slibgcc | ||
7 | +++ gcc-5.3.0/libgcc/config/t-slibgcc | ||
8 | @@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_S | ||
9 | $(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) | ||
10 | |||
11 | SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ | ||
12 | - $(SHLIB_LDFLAGS) \ | ||
13 | + $(LDFLAGS) $(SHLIB_LDFLAGS) \ | ||
14 | -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \ | ||
15 | $(SHLIB_OBJS) $(SHLIB_LC) && \ | ||
16 | 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 = "\ | |||
88 | file://0056-Enable-libc-provide-ssp-and-gcc_cv_target_dl_iterate.patch \ | 88 | file://0056-Enable-libc-provide-ssp-and-gcc_cv_target_dl_iterate.patch \ |
89 | file://0057-unwind-fix-for-musl.patch \ | 89 | file://0057-unwind-fix-for-musl.patch \ |
90 | file://0058-fdebug-prefix-map-support-to-remap-relative-path.patch \ | 90 | file://0058-fdebug-prefix-map-support-to-remap-relative-path.patch \ |
91 | file://0059-libgcc-use-ldflags.patch \ | ||
91 | " | 92 | " |
92 | 93 | ||
93 | BACKPORTS = "" | 94 | 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 @@ | |||
1 | Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS | ||
2 | |||
3 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
4 | Upstream-Status: Pending | ||
5 | |||
6 | --- gcc-5.3.0.orig/libgcc/config/t-slibgcc | ||
7 | +++ gcc-5.3.0/libgcc/config/t-slibgcc | ||
8 | @@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_S | ||
9 | $(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) | ||
10 | |||
11 | SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ | ||
12 | - $(SHLIB_LDFLAGS) \ | ||
13 | + $(LDFLAGS) $(SHLIB_LDFLAGS) \ | ||
14 | -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \ | ||
15 | $(SHLIB_OBJS) $(SHLIB_LC) && \ | ||
16 | rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \ | ||