diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-04-06 17:36:37 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-08 10:53:31 +0100 |
commit | 3ed754b37566ea52016d0297cc3c0865d5fe3eb6 (patch) | |
tree | 685ff37ffd9458e266310d3a89635fc1a24bcf95 /meta/recipes-devtools | |
parent | ca6b43cd8d5fb69f07b75f1de92f46e8767f9c99 (diff) | |
download | poky-3ed754b37566ea52016d0297cc3c0865d5fe3eb6.tar.gz |
gcc-4.8: Upgrade 4.8.2 -> 4.8.4
Drop already applied patches
This fixes random ICE seen on mips with large c++ files ( webkit )
Then there are several backports
Change-Id: Ie1c3acda2fda1b6cbd356416c860938f6cbd758e
(From OE-Core rev: ca228b117abe3dc40c996a006c9cbea91c17ccea)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
10 files changed, 164 insertions, 384 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc index 06e6982d93..476aaf9914 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8.inc +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc | |||
@@ -2,11 +2,11 @@ require gcc-common.inc | |||
2 | 2 | ||
3 | # Third digit in PV should be incremented after a minor release | 3 | # Third digit in PV should be incremented after a minor release |
4 | 4 | ||
5 | PV = "4.8.2" | 5 | PV = "4.8.4" |
6 | 6 | ||
7 | # BINV should be incremented to a revision after a minor gcc release | 7 | # BINV should be incremented to a revision after a minor gcc release |
8 | 8 | ||
9 | BINV = "4.8.2" | 9 | BINV = "4.8.4" |
10 | 10 | ||
11 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-4.8:" | 11 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-4.8:" |
12 | 12 | ||
@@ -60,23 +60,18 @@ SRC_URI = "\ | |||
60 | file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ | 60 | file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ |
61 | file://0035-wcast-qual-PR-55383.patch \ | 61 | file://0035-wcast-qual-PR-55383.patch \ |
62 | file://0038-gcc-4.8-build-args.patch \ | 62 | file://0038-gcc-4.8-build-args.patch \ |
63 | file://0039-gcc-4.8-PR57717.patch \ | ||
64 | file://0040-fix-g++-sysroot.patch \ | 63 | file://0040-fix-g++-sysroot.patch \ |
65 | file://0041-libtool-avoid-libdir.patch \ | 64 | file://0041-libtool-avoid-libdir.patch \ |
66 | file://0042-pr57748.patch \ | 65 | file://0042-pr57748.patch \ |
67 | file://0043-cpp.patch \ | 66 | file://0043-cpp.patch \ |
68 | file://0044-gengtypes.patch \ | 67 | file://0044-gengtypes.patch \ |
69 | file://0045-gcc-4.8-PR57717-PowerPC-E500v2.patch \ | ||
70 | file://0046-libatomic-deptracking.patch \ | 68 | file://0046-libatomic-deptracking.patch \ |
71 | file://0047-repomembug.patch \ | 69 | file://0047-repomembug.patch \ |
72 | file://0048-PR58854_fix_arm_apcs_epilogue.patch \ | ||
73 | file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \ | 70 | file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \ |
74 | file://0050-PR-target-58595.patch \ | ||
75 | file://0052-PR-rtl-optimization-61801.patch \ | ||
76 | file://target-gcc-includedir.patch \ | 71 | file://target-gcc-includedir.patch \ |
77 | " | 72 | " |
78 | SRC_URI[md5sum] = "a3d7d63b9cb6b6ea049469a0c4a43c9d" | 73 | SRC_URI[md5sum] = "5a84a30839b2aca22a2d723de2a626ec" |
79 | SRC_URI[sha256sum] = "09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8" | 74 | SRC_URI[sha256sum] = "4a80aa23798b8e9b5793494b8c976b39b8d9aa2e53cd5ed5534aff662a7f8695" |
80 | 75 | ||
81 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" | 76 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" |
82 | B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" | 77 | B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" |
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0016-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-4.8/0016-gcc-poison-system-directories.patch index 1e2a9e1009..c955e49205 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8/0016-gcc-poison-system-directories.patch +++ b/meta/recipes-devtools/gcc/gcc-4.8/0016-gcc-poison-system-directories.patch | |||
@@ -17,11 +17,11 @@ Upstream-Status: Inappropriate [distribution: codesourcery] | |||
17 | gcc/incpath.c | 19 +++++++++++++++++++ | 17 | gcc/incpath.c | 19 +++++++++++++++++++ |
18 | 8 files changed, 69 insertions(+), 3 deletions(-) | 18 | 8 files changed, 69 insertions(+), 3 deletions(-) |
19 | 19 | ||
20 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in | 20 | Index: gcc-4.8.4/gcc/Makefile.in |
21 | index 54ea04f..90a2bba 100644 | 21 | =================================================================== |
22 | --- a/gcc/Makefile.in | 22 | --- gcc-4.8.4.orig/gcc/Makefile.in |
23 | +++ b/gcc/Makefile.in | 23 | +++ gcc-4.8.4/gcc/Makefile.in |
24 | @@ -2018,7 +2018,7 @@ attribs.o : attribs.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ | 24 | @@ -2019,7 +2019,7 @@ attribs.o : attribs.c $(CONFIG_H) $(SYST |
25 | 25 | ||
26 | incpath.o: incpath.c incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \ | 26 | incpath.o: incpath.c incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \ |
27 | intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \ | 27 | intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \ |
@@ -30,10 +30,10 @@ index 54ea04f..90a2bba 100644 | |||
30 | 30 | ||
31 | CFLAGS-prefix.o += -DPREFIX=\"$(prefix)\" -DBASEVER=$(BASEVER_s) | 31 | CFLAGS-prefix.o += -DPREFIX=\"$(prefix)\" -DBASEVER=$(BASEVER_s) |
32 | prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h prefix.h \ | 32 | prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h prefix.h \ |
33 | diff --git a/gcc/common.opt b/gcc/common.opt | 33 | Index: gcc-4.8.4/gcc/common.opt |
34 | index bdbd3b6..ab86b00 100644 | 34 | =================================================================== |
35 | --- a/gcc/common.opt | 35 | --- gcc-4.8.4.orig/gcc/common.opt |
36 | +++ b/gcc/common.opt | 36 | +++ gcc-4.8.4/gcc/common.opt |
37 | @@ -595,6 +595,10 @@ Wpedantic | 37 | @@ -595,6 +595,10 @@ Wpedantic |
38 | Common Var(pedantic) Warning | 38 | Common Var(pedantic) Warning |
39 | Issue warnings needed for strict compliance to the standard | 39 | Issue warnings needed for strict compliance to the standard |
@@ -45,10 +45,10 @@ index bdbd3b6..ab86b00 100644 | |||
45 | Wshadow | 45 | Wshadow |
46 | Common Var(warn_shadow) Warning | 46 | Common Var(warn_shadow) Warning |
47 | Warn when one local variable shadows another | 47 | Warn when one local variable shadows another |
48 | diff --git a/gcc/config.in b/gcc/config.in | 48 | Index: gcc-4.8.4/gcc/config.in |
49 | index d80fb9f..0524af7 100644 | 49 | =================================================================== |
50 | --- a/gcc/config.in | 50 | --- gcc-4.8.4.orig/gcc/config.in |
51 | +++ b/gcc/config.in | 51 | +++ gcc-4.8.4/gcc/config.in |
52 | @@ -138,6 +138,12 @@ | 52 | @@ -138,6 +138,12 @@ |
53 | #endif | 53 | #endif |
54 | 54 | ||
@@ -62,11 +62,11 @@ index d80fb9f..0524af7 100644 | |||
62 | /* Define if you want all operations on RTL (the basic data structure of the | 62 | /* Define if you want all operations on RTL (the basic data structure of the |
63 | optimizer and back end) to be checked for dynamic type safety at runtime. | 63 | optimizer and back end) to be checked for dynamic type safety at runtime. |
64 | This is quite expensive. */ | 64 | This is quite expensive. */ |
65 | diff --git a/gcc/configure b/gcc/configure | 65 | Index: gcc-4.8.4/gcc/configure |
66 | index 135bbf5..b65d21d 100755 | 66 | =================================================================== |
67 | --- a/gcc/configure | 67 | --- gcc-4.8.4.orig/gcc/configure |
68 | +++ b/gcc/configure | 68 | +++ gcc-4.8.4/gcc/configure |
69 | @@ -917,6 +917,7 @@ with_gc | 69 | @@ -918,6 +918,7 @@ with_gc |
70 | with_system_zlib | 70 | with_system_zlib |
71 | enable_maintainer_mode | 71 | enable_maintainer_mode |
72 | enable_version_specific_runtime_libs | 72 | enable_version_specific_runtime_libs |
@@ -74,7 +74,7 @@ index 135bbf5..b65d21d 100755 | |||
74 | enable_plugin | 74 | enable_plugin |
75 | enable_libquadmath_support | 75 | enable_libquadmath_support |
76 | with_linker_hash_style | 76 | with_linker_hash_style |
77 | @@ -1630,6 +1631,8 @@ Optional Features: | 77 | @@ -1639,6 +1640,8 @@ Optional Features: |
78 | --enable-version-specific-runtime-libs | 78 | --enable-version-specific-runtime-libs |
79 | specify that runtime libraries should be installed | 79 | specify that runtime libraries should be installed |
80 | in a compiler-specific directory | 80 | in a compiler-specific directory |
@@ -83,25 +83,25 @@ index 135bbf5..b65d21d 100755 | |||
83 | --enable-plugin enable plugin support | 83 | --enable-plugin enable plugin support |
84 | --disable-libquadmath-support | 84 | --disable-libquadmath-support |
85 | disable libquadmath support for Fortran | 85 | disable libquadmath support for Fortran |
86 | @@ -17828,7 +17831,7 @@ else | 86 | @@ -17847,7 +17850,7 @@ else |
87 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 87 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
88 | lt_status=$lt_dlunknown | 88 | lt_status=$lt_dlunknown |
89 | cat > conftest.$ac_ext <<_LT_EOF | 89 | cat > conftest.$ac_ext <<_LT_EOF |
90 | -#line 17831 "configure" | 90 | -#line 17850 "configure" |
91 | +#line 17834 "configure" | 91 | +#line 17853 "configure" |
92 | #include "confdefs.h" | 92 | #include "confdefs.h" |
93 | 93 | ||
94 | #if HAVE_DLFCN_H | 94 | #if HAVE_DLFCN_H |
95 | @@ -17934,7 +17937,7 @@ else | 95 | @@ -17953,7 +17956,7 @@ else |
96 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 96 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
97 | lt_status=$lt_dlunknown | 97 | lt_status=$lt_dlunknown |
98 | cat > conftest.$ac_ext <<_LT_EOF | 98 | cat > conftest.$ac_ext <<_LT_EOF |
99 | -#line 17937 "configure" | 99 | -#line 17956 "configure" |
100 | +#line 17940 "configure" | 100 | +#line 17959 "configure" |
101 | #include "confdefs.h" | 101 | #include "confdefs.h" |
102 | 102 | ||
103 | #if HAVE_DLFCN_H | 103 | #if HAVE_DLFCN_H |
104 | @@ -27103,6 +27106,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : | 104 | @@ -27219,6 +27222,19 @@ if test "${enable_version_specific_runti |
105 | fi | 105 | fi |
106 | 106 | ||
107 | 107 | ||
@@ -121,11 +121,11 @@ index 135bbf5..b65d21d 100755 | |||
121 | # Substitute configuration variables | 121 | # Substitute configuration variables |
122 | 122 | ||
123 | 123 | ||
124 | diff --git a/gcc/configure.ac b/gcc/configure.ac | 124 | Index: gcc-4.8.4/gcc/configure.ac |
125 | index 6363a21..e226b85 100644 | 125 | =================================================================== |
126 | --- a/gcc/configure.ac | 126 | --- gcc-4.8.4.orig/gcc/configure.ac |
127 | +++ b/gcc/configure.ac | 127 | +++ gcc-4.8.4/gcc/configure.ac |
128 | @@ -5063,6 +5063,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs, | 128 | @@ -5120,6 +5120,16 @@ AC_ARG_ENABLE(version-specific-runtime-l |
129 | [specify that runtime libraries should be | 129 | [specify that runtime libraries should be |
130 | installed in a compiler-specific directory])]) | 130 | installed in a compiler-specific directory])]) |
131 | 131 | ||
@@ -142,10 +142,10 @@ index 6363a21..e226b85 100644 | |||
142 | # Substitute configuration variables | 142 | # Substitute configuration variables |
143 | AC_SUBST(subdirs) | 143 | AC_SUBST(subdirs) |
144 | AC_SUBST(srcdir) | 144 | AC_SUBST(srcdir) |
145 | diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi | 145 | Index: gcc-4.8.4/gcc/doc/invoke.texi |
146 | index 9273d7d..a022622 100644 | 146 | =================================================================== |
147 | --- a/gcc/doc/invoke.texi | 147 | --- gcc-4.8.4.orig/gcc/doc/invoke.texi |
148 | +++ b/gcc/doc/invoke.texi | 148 | +++ gcc-4.8.4/gcc/doc/invoke.texi |
149 | @@ -258,6 +258,7 @@ Objective-C and Objective-C++ Dialects}. | 149 | @@ -258,6 +258,7 @@ Objective-C and Objective-C++ Dialects}. |
150 | -Woverlength-strings -Wpacked -Wpacked-bitfield-compat -Wpadded @gol | 150 | -Woverlength-strings -Wpacked -Wpacked-bitfield-compat -Wpadded @gol |
151 | -Wparentheses -Wpedantic-ms-format -Wno-pedantic-ms-format @gol | 151 | -Wparentheses -Wpedantic-ms-format -Wno-pedantic-ms-format @gol |
@@ -154,7 +154,7 @@ index 9273d7d..a022622 100644 | |||
154 | -Wredundant-decls -Wno-return-local-addr @gol | 154 | -Wredundant-decls -Wno-return-local-addr @gol |
155 | -Wreturn-type -Wsequence-point -Wshadow @gol | 155 | -Wreturn-type -Wsequence-point -Wshadow @gol |
156 | -Wsign-compare -Wsign-conversion -Wsizeof-pointer-memaccess @gol | 156 | -Wsign-compare -Wsign-conversion -Wsizeof-pointer-memaccess @gol |
157 | @@ -4007,6 +4008,14 @@ headers---for that, @option{-Wunknown-pragmas} must also be used. | 157 | @@ -4022,6 +4023,14 @@ headers---for that, @option{-Wunknown-pr |
158 | for most targets, it is made up of code and thus requires the stack | 158 | for most targets, it is made up of code and thus requires the stack |
159 | to be made executable in order for the program to work properly. | 159 | to be made executable in order for the program to work properly. |
160 | 160 | ||
@@ -169,11 +169,11 @@ index 9273d7d..a022622 100644 | |||
169 | @item -Wfloat-equal | 169 | @item -Wfloat-equal |
170 | @opindex Wfloat-equal | 170 | @opindex Wfloat-equal |
171 | @opindex Wno-float-equal | 171 | @opindex Wno-float-equal |
172 | diff --git a/gcc/gcc.c b/gcc/gcc.c | 172 | Index: gcc-4.8.4/gcc/gcc.c |
173 | index 86077f8..efdb625 100644 | 173 | =================================================================== |
174 | --- a/gcc/gcc.c | 174 | --- gcc-4.8.4.orig/gcc/gcc.c |
175 | +++ b/gcc/gcc.c | 175 | +++ gcc-4.8.4/gcc/gcc.c |
176 | @@ -740,6 +740,8 @@ proper position among the other output files. */ | 176 | @@ -741,6 +741,8 @@ proper position among the other output f |
177 | "%{fuse-ld=*:-fuse-ld=%*}\ | 177 | "%{fuse-ld=*:-fuse-ld=%*}\ |
178 | %X %{o*} %{e*} %{N} %{n} %{r}\ | 178 | %X %{o*} %{e*} %{N} %{n} %{r}\ |
179 | %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}}\ | 179 | %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}}\ |
@@ -182,10 +182,10 @@ index 86077f8..efdb625 100644 | |||
182 | %{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\ | 182 | %{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\ |
183 | %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\ | 183 | %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\ |
184 | %{fgnu-tm:%:include(libitm.spec)%(link_itm)}\ | 184 | %{fgnu-tm:%:include(libitm.spec)%(link_itm)}\ |
185 | diff --git a/gcc/incpath.c b/gcc/incpath.c | 185 | Index: gcc-4.8.4/gcc/incpath.c |
186 | index 018da98..cd41c78 100644 | 186 | =================================================================== |
187 | --- a/gcc/incpath.c | 187 | --- gcc-4.8.4.orig/gcc/incpath.c |
188 | +++ b/gcc/incpath.c | 188 | +++ gcc-4.8.4/gcc/incpath.c |
189 | @@ -28,6 +28,7 @@ | 189 | @@ -28,6 +28,7 @@ |
190 | #include "intl.h" | 190 | #include "intl.h" |
191 | #include "incpath.h" | 191 | #include "incpath.h" |
@@ -194,7 +194,7 @@ index 018da98..cd41c78 100644 | |||
194 | 194 | ||
195 | /* Microsoft Windows does not natively support inodes. | 195 | /* Microsoft Windows does not natively support inodes. |
196 | VMS has non-numeric inodes. */ | 196 | VMS has non-numeric inodes. */ |
197 | @@ -382,6 +383,24 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) | 197 | @@ -382,6 +383,24 @@ merge_include_chains (const char *sysroo |
198 | } | 198 | } |
199 | fprintf (stderr, _("End of search list.\n")); | 199 | fprintf (stderr, _("End of search list.\n")); |
200 | } | 200 | } |
@@ -219,6 +219,3 @@ index 018da98..cd41c78 100644 | |||
219 | } | 219 | } |
220 | 220 | ||
221 | /* Use given -I paths for #include "..." but not #include <...>, and | 221 | /* Use given -I paths for #include "..." but not #include <...>, and |
222 | -- | ||
223 | 1.7.10.4 | ||
224 | |||
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch index 51f4dba396..a975cfb130 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch +++ b/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch | |||
@@ -31,10 +31,10 @@ Upstream-Status: Pending | |||
31 | gcc/config/rs6000/t-linux64 | 5 ++--- | 31 | gcc/config/rs6000/t-linux64 | 5 ++--- |
32 | 3 files changed, 7 insertions(+), 14 deletions(-) | 32 | 3 files changed, 7 insertions(+), 14 deletions(-) |
33 | 33 | ||
34 | diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 | 34 | Index: gcc-4.8.4/gcc/config/i386/t-linux64 |
35 | index bcea0c6..eb004d7 100644 | 35 | =================================================================== |
36 | --- a/gcc/config/i386/t-linux64 | 36 | --- gcc-4.8.4.orig/gcc/config/i386/t-linux64 |
37 | +++ b/gcc/config/i386/t-linux64 | 37 | +++ gcc-4.8.4/gcc/config/i386/t-linux64 |
38 | @@ -32,7 +32,5 @@ | 38 | @@ -32,7 +32,5 @@ |
39 | # | 39 | # |
40 | comma=, | 40 | comma=, |
@@ -45,10 +45,10 @@ index bcea0c6..eb004d7 100644 | |||
45 | -MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) | 45 | -MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) |
46 | +MULTILIB_DIRNAMES = . . | 46 | +MULTILIB_DIRNAMES = . . |
47 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | 47 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) |
48 | diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 | 48 | Index: gcc-4.8.4/gcc/config/mips/t-linux64 |
49 | index bdbbd4f..16a6366 100644 | 49 | =================================================================== |
50 | --- a/gcc/config/mips/t-linux64 | 50 | --- gcc-4.8.4.orig/gcc/config/mips/t-linux64 |
51 | +++ b/gcc/config/mips/t-linux64 | 51 | +++ gcc-4.8.4/gcc/config/mips/t-linux64 |
52 | @@ -17,10 +17,6 @@ | 52 | @@ -17,10 +17,6 @@ |
53 | # <http://www.gnu.org/licenses/>. | 53 | # <http://www.gnu.org/licenses/>. |
54 | 54 | ||
@@ -63,20 +63,17 @@ index bdbbd4f..16a6366 100644 | |||
63 | +MULTILIB_DIRNAMES = . . . | 63 | +MULTILIB_DIRNAMES = . . . |
64 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | 64 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) |
65 | + | 65 | + |
66 | diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 | 66 | Index: gcc-4.8.4/gcc/config/rs6000/t-linux64 |
67 | index 9175de2..3971019 100644 | 67 | =================================================================== |
68 | --- a/gcc/config/rs6000/t-linux64 | 68 | --- gcc-4.8.4.orig/gcc/config/rs6000/t-linux64 |
69 | +++ b/gcc/config/rs6000/t-linux64 | 69 | +++ gcc-4.8.4/gcc/config/rs6000/t-linux64 |
70 | @@ -26,7 +26,6 @@ | 70 | @@ -26,7 +26,6 @@ |
71 | # MULTILIB_OSDIRNAMES according to what is found on the target. | 71 | # MULTILIB_OSDIRNAMES according to what is found on the target. |
72 | 72 | ||
73 | MULTILIB_OPTIONS = m64/m32 | 73 | MULTILIB_OPTIONS := m64/m32 |
74 | -MULTILIB_DIRNAMES = 64 32 | 74 | -MULTILIB_DIRNAMES := 64 32 |
75 | +MULTILIB_DIRNAMES = . . | 75 | +MULTILIB_DIRNAMES := . . |
76 | MULTILIB_EXTRA_OPTS = fPIC | 76 | MULTILIB_EXTRA_OPTS := |
77 | -MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:powerpc64-linux-gnu) | 77 | -MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) |
78 | -MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) | 78 | -MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) |
79 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | 79 | +MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) |
80 | -- | ||
81 | 1.7.10.4 | ||
82 | |||
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index 5755da8254..0aa6d926ba 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | |||
@@ -29,11 +29,11 @@ Upstream-Status: Inappropriate [OE configuration] | |||
29 | gcc/config/sparc/linux64.h | 4 ++-- | 29 | gcc/config/sparc/linux64.h | 4 ++-- |
30 | 11 files changed, 22 insertions(+), 22 deletions(-) | 30 | 11 files changed, 22 insertions(+), 22 deletions(-) |
31 | 31 | ||
32 | Index: gcc-4.8.2/gcc/config/alpha/linux-elf.h | 32 | Index: gcc-4.8.4/gcc/config/alpha/linux-elf.h |
33 | =================================================================== | 33 | =================================================================== |
34 | --- gcc-4.8.2.orig/gcc/config/alpha/linux-elf.h 2014-05-06 10:34:51.081657377 +0000 | 34 | --- gcc-4.8.4.orig/gcc/config/alpha/linux-elf.h |
35 | +++ gcc-4.8.2/gcc/config/alpha/linux-elf.h 2014-05-06 10:34:51.073657377 +0000 | 35 | +++ gcc-4.8.4/gcc/config/alpha/linux-elf.h |
36 | @@ -23,8 +23,8 @@ | 36 | @@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. |
37 | #define EXTRA_SPECS \ | 37 | #define EXTRA_SPECS \ |
38 | { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, | 38 | { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, |
39 | 39 | ||
@@ -44,10 +44,10 @@ Index: gcc-4.8.2/gcc/config/alpha/linux-elf.h | |||
44 | #if DEFAULT_LIBC == LIBC_UCLIBC | 44 | #if DEFAULT_LIBC == LIBC_UCLIBC |
45 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" | 45 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" |
46 | #elif DEFAULT_LIBC == LIBC_GLIBC | 46 | #elif DEFAULT_LIBC == LIBC_GLIBC |
47 | Index: gcc-4.8.2/gcc/config/arm/linux-eabi.h | 47 | Index: gcc-4.8.4/gcc/config/arm/linux-eabi.h |
48 | =================================================================== | 48 | =================================================================== |
49 | --- gcc-4.8.2.orig/gcc/config/arm/linux-eabi.h 2014-05-06 10:34:51.081657377 +0000 | 49 | --- gcc-4.8.4.orig/gcc/config/arm/linux-eabi.h |
50 | +++ gcc-4.8.2/gcc/config/arm/linux-eabi.h 2014-05-06 10:34:51.077657377 +0000 | 50 | +++ gcc-4.8.4/gcc/config/arm/linux-eabi.h |
51 | @@ -68,8 +68,8 @@ | 51 | @@ -68,8 +68,8 @@ |
52 | GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ | 52 | GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ |
53 | 53 | ||
@@ -59,10 +59,10 @@ Index: gcc-4.8.2/gcc/config/arm/linux-eabi.h | |||
59 | #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT | 59 | #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT |
60 | 60 | ||
61 | #define GLIBC_DYNAMIC_LINKER \ | 61 | #define GLIBC_DYNAMIC_LINKER \ |
62 | Index: gcc-4.8.2/gcc/config/arm/linux-elf.h | 62 | Index: gcc-4.8.4/gcc/config/arm/linux-elf.h |
63 | =================================================================== | 63 | =================================================================== |
64 | --- gcc-4.8.2.orig/gcc/config/arm/linux-elf.h 2014-05-06 10:34:51.081657377 +0000 | 64 | --- gcc-4.8.4.orig/gcc/config/arm/linux-elf.h |
65 | +++ gcc-4.8.2/gcc/config/arm/linux-elf.h 2014-05-06 10:34:51.077657377 +0000 | 65 | +++ gcc-4.8.4/gcc/config/arm/linux-elf.h |
66 | @@ -57,7 +57,7 @@ | 66 | @@ -57,7 +57,7 @@ |
67 | 67 | ||
68 | #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" | 68 | #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" |
@@ -72,21 +72,21 @@ Index: gcc-4.8.2/gcc/config/arm/linux-elf.h | |||
72 | 72 | ||
73 | #define LINUX_TARGET_LINK_SPEC "%{h*} \ | 73 | #define LINUX_TARGET_LINK_SPEC "%{h*} \ |
74 | %{static:-Bstatic} \ | 74 | %{static:-Bstatic} \ |
75 | Index: gcc-4.8.2/gcc/config/i386/linux.h | 75 | Index: gcc-4.8.4/gcc/config/i386/linux.h |
76 | =================================================================== | 76 | =================================================================== |
77 | --- gcc-4.8.2.orig/gcc/config/i386/linux.h 2014-05-06 10:34:51.081657377 +0000 | 77 | --- gcc-4.8.4.orig/gcc/config/i386/linux.h |
78 | +++ gcc-4.8.2/gcc/config/i386/linux.h 2014-05-06 10:34:51.077657377 +0000 | 78 | +++ gcc-4.8.4/gcc/config/i386/linux.h |
79 | @@ -20,4 +20,4 @@ | 79 | @@ -20,4 +20,4 @@ along with GCC; see the file COPYING3. |
80 | <http://www.gnu.org/licenses/>. */ | 80 | <http://www.gnu.org/licenses/>. */ |
81 | 81 | ||
82 | #define GNU_USER_LINK_EMULATION "elf_i386" | 82 | #define GNU_USER_LINK_EMULATION "elf_i386" |
83 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | 83 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" |
84 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" | 84 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" |
85 | Index: gcc-4.8.2/gcc/config/i386/linux64.h | 85 | Index: gcc-4.8.4/gcc/config/i386/linux64.h |
86 | =================================================================== | 86 | =================================================================== |
87 | --- gcc-4.8.2.orig/gcc/config/i386/linux64.h 2014-05-06 10:34:51.081657377 +0000 | 87 | --- gcc-4.8.4.orig/gcc/config/i386/linux64.h |
88 | +++ gcc-4.8.2/gcc/config/i386/linux64.h 2014-05-06 10:34:51.077657377 +0000 | 88 | +++ gcc-4.8.4/gcc/config/i386/linux64.h |
89 | @@ -27,6 +27,6 @@ | 89 | @@ -27,6 +27,6 @@ see the files COPYING3 and COPYING.RUNTI |
90 | #define GNU_USER_LINK_EMULATION64 "elf_x86_64" | 90 | #define GNU_USER_LINK_EMULATION64 "elf_x86_64" |
91 | #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" | 91 | #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" |
92 | 92 | ||
@@ -96,21 +96,21 @@ Index: gcc-4.8.2/gcc/config/i386/linux64.h | |||
96 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" | 96 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" |
97 | +#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" | 97 | +#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" |
98 | +#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2" | 98 | +#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2" |
99 | Index: gcc-4.8.2/gcc/config/mips/linux.h | 99 | Index: gcc-4.8.4/gcc/config/mips/linux.h |
100 | =================================================================== | 100 | =================================================================== |
101 | --- gcc-4.8.2.orig/gcc/config/mips/linux.h 2014-05-06 10:34:51.081657377 +0000 | 101 | --- gcc-4.8.4.orig/gcc/config/mips/linux.h |
102 | +++ gcc-4.8.2/gcc/config/mips/linux.h 2014-05-06 10:34:51.077657377 +0000 | 102 | +++ gcc-4.8.4/gcc/config/mips/linux.h |
103 | @@ -17,4 +17,4 @@ | 103 | @@ -17,4 +17,4 @@ You should have received a copy of the G |
104 | along with GCC; see the file COPYING3. If not see | 104 | along with GCC; see the file COPYING3. If not see |
105 | <http://www.gnu.org/licenses/>. */ | 105 | <http://www.gnu.org/licenses/>. */ |
106 | 106 | ||
107 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | 107 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" |
108 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld.so.1" | 108 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld.so.1" |
109 | Index: gcc-4.8.2/gcc/config/mips/linux64.h | 109 | Index: gcc-4.8.4/gcc/config/mips/linux64.h |
110 | =================================================================== | 110 | =================================================================== |
111 | --- gcc-4.8.2.orig/gcc/config/mips/linux64.h 2014-05-06 10:34:51.081657377 +0000 | 111 | --- gcc-4.8.4.orig/gcc/config/mips/linux64.h |
112 | +++ gcc-4.8.2/gcc/config/mips/linux64.h 2014-05-06 10:34:51.077657377 +0000 | 112 | +++ gcc-4.8.4/gcc/config/mips/linux64.h |
113 | @@ -22,10 +22,10 @@ | 113 | @@ -22,10 +22,10 @@ along with GCC; see the file COPYING3. |
114 | #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip" | 114 | #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip" |
115 | #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" | 115 | #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" |
116 | 116 | ||
@@ -125,30 +125,33 @@ Index: gcc-4.8.2/gcc/config/mips/linux64.h | |||
125 | #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" | 125 | #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" |
126 | #define GNU_USER_DYNAMIC_LINKERN32 \ | 126 | #define GNU_USER_DYNAMIC_LINKERN32 \ |
127 | CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ | 127 | CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ |
128 | Index: gcc-4.8.2/gcc/config/rs6000/linux64.h | 128 | Index: gcc-4.8.4/gcc/config/rs6000/linux64.h |
129 | =================================================================== | 129 | =================================================================== |
130 | --- gcc-4.8.2.orig/gcc/config/rs6000/linux64.h 2014-05-06 10:34:51.081657377 +0000 | 130 | --- gcc-4.8.4.orig/gcc/config/rs6000/linux64.h |
131 | +++ gcc-4.8.2/gcc/config/rs6000/linux64.h 2014-05-06 10:34:51.077657377 +0000 | 131 | +++ gcc-4.8.4/gcc/config/rs6000/linux64.h |
132 | @@ -350,10 +350,10 @@ | 132 | @@ -366,14 +366,14 @@ extern int dot_symbols; |
133 | #undef LINK_OS_DEFAULT_SPEC | 133 | #undef LINK_OS_DEFAULT_SPEC |
134 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" | 134 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" |
135 | 135 | ||
136 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" | 136 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" |
137 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" | 137 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1" |
138 | #ifdef LINUX64_DEFAULT_ABI_ELFv2 | ||
139 | #define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib64/ld64.so.1;:/lib64/ld64.so.2}" | ||
140 | #else | ||
141 | #define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}" | ||
142 | #endif | ||
138 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" | 143 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" |
139 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" | 144 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" |
140 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1" | ||
141 | +#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64.so.1" | ||
142 | +#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" | 145 | +#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" |
143 | +#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" | 146 | +#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" |
144 | #if DEFAULT_LIBC == LIBC_UCLIBC | 147 | #if DEFAULT_LIBC == LIBC_UCLIBC |
145 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" | 148 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" |
146 | #elif DEFAULT_LIBC == LIBC_GLIBC | 149 | #elif DEFAULT_LIBC == LIBC_GLIBC |
147 | Index: gcc-4.8.2/gcc/config/sh/linux.h | 150 | Index: gcc-4.8.4/gcc/config/sh/linux.h |
148 | =================================================================== | 151 | =================================================================== |
149 | --- gcc-4.8.2.orig/gcc/config/sh/linux.h 2014-05-06 10:34:51.081657377 +0000 | 152 | --- gcc-4.8.4.orig/gcc/config/sh/linux.h |
150 | +++ gcc-4.8.2/gcc/config/sh/linux.h 2014-05-06 10:34:51.077657377 +0000 | 153 | +++ gcc-4.8.4/gcc/config/sh/linux.h |
151 | @@ -43,7 +43,7 @@ | 154 | @@ -43,7 +43,7 @@ along with GCC; see the file COPYING3. |
152 | 155 | ||
153 | #define TARGET_ASM_FILE_END file_end_indicate_exec_stack | 156 | #define TARGET_ASM_FILE_END file_end_indicate_exec_stack |
154 | 157 | ||
@@ -157,11 +160,11 @@ Index: gcc-4.8.2/gcc/config/sh/linux.h | |||
157 | 160 | ||
158 | #undef SUBTARGET_LINK_EMUL_SUFFIX | 161 | #undef SUBTARGET_LINK_EMUL_SUFFIX |
159 | #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" | 162 | #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" |
160 | Index: gcc-4.8.2/gcc/config/sparc/linux.h | 163 | Index: gcc-4.8.4/gcc/config/sparc/linux.h |
161 | =================================================================== | 164 | =================================================================== |
162 | --- gcc-4.8.2.orig/gcc/config/sparc/linux.h 2014-05-06 10:34:51.081657377 +0000 | 165 | --- gcc-4.8.4.orig/gcc/config/sparc/linux.h |
163 | +++ gcc-4.8.2/gcc/config/sparc/linux.h 2014-05-06 10:34:51.077657377 +0000 | 166 | +++ gcc-4.8.4/gcc/config/sparc/linux.h |
164 | @@ -83,7 +83,7 @@ | 167 | @@ -83,7 +83,7 @@ extern const char *host_detect_local_cpu |
165 | When the -shared link option is used a final link is not being | 168 | When the -shared link option is used a final link is not being |
166 | done. */ | 169 | done. */ |
167 | 170 | ||
@@ -170,11 +173,11 @@ Index: gcc-4.8.2/gcc/config/sparc/linux.h | |||
170 | 173 | ||
171 | #undef LINK_SPEC | 174 | #undef LINK_SPEC |
172 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ | 175 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ |
173 | Index: gcc-4.8.2/gcc/config/sparc/linux64.h | 176 | Index: gcc-4.8.4/gcc/config/sparc/linux64.h |
174 | =================================================================== | 177 | =================================================================== |
175 | --- gcc-4.8.2.orig/gcc/config/sparc/linux64.h 2014-05-06 10:34:51.081657377 +0000 | 178 | --- gcc-4.8.4.orig/gcc/config/sparc/linux64.h |
176 | +++ gcc-4.8.2/gcc/config/sparc/linux64.h 2014-05-06 10:34:51.077657377 +0000 | 179 | +++ gcc-4.8.4/gcc/config/sparc/linux64.h |
177 | @@ -92,8 +92,8 @@ | 180 | @@ -92,8 +92,8 @@ along with GCC; see the file COPYING3. |
178 | When the -shared link option is used a final link is not being | 181 | When the -shared link option is used a final link is not being |
179 | done. */ | 182 | done. */ |
180 | 183 | ||
@@ -185,11 +188,11 @@ Index: gcc-4.8.2/gcc/config/sparc/linux64.h | |||
185 | 188 | ||
186 | #ifdef SPARC_BI_ARCH | 189 | #ifdef SPARC_BI_ARCH |
187 | 190 | ||
188 | Index: gcc-4.8.2/gcc/config/linux.h | 191 | Index: gcc-4.8.4/gcc/config/linux.h |
189 | =================================================================== | 192 | =================================================================== |
190 | --- gcc-4.8.2.orig/gcc/config/linux.h 2013-01-10 20:38:27.000000000 +0000 | 193 | --- gcc-4.8.4.orig/gcc/config/linux.h |
191 | +++ gcc-4.8.2/gcc/config/linux.h 2014-05-06 10:36:26.549656893 +0000 | 194 | +++ gcc-4.8.4/gcc/config/linux.h |
192 | @@ -73,10 +73,10 @@ | 195 | @@ -73,10 +73,10 @@ see the files COPYING3 and COPYING.RUNTI |
193 | GLIBC_DYNAMIC_LINKER must be defined for each target using them, or | 196 | GLIBC_DYNAMIC_LINKER must be defined for each target using them, or |
194 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets | 197 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets |
195 | supporting both 32-bit and 64-bit compilation. */ | 198 | supporting both 32-bit and 64-bit compilation. */ |
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0038-gcc-4.8-build-args.patch b/meta/recipes-devtools/gcc/gcc-4.8/0038-gcc-4.8-build-args.patch index c27e009619..7c8290f715 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8/0038-gcc-4.8-build-args.patch +++ b/meta/recipes-devtools/gcc/gcc-4.8/0038-gcc-4.8-build-args.patch | |||
@@ -15,27 +15,50 @@ Upstream-Status: Pending | |||
15 | 15 | ||
16 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 16 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
17 | 17 | ||
18 | Index: gcc-4.8.0/gcc/configure | 18 | Index: gcc-4.8.4/gcc/configure |
19 | =================================================================== | 19 | =================================================================== |
20 | --- gcc-4.8.0.orig/gcc/configure | 20 | --- gcc-4.8.4.orig/gcc/configure |
21 | +++ gcc-4.8.0/gcc/configure | 21 | +++ gcc-4.8.4/gcc/configure |
22 | @@ -11720,6 +10581,7 @@ STMP_FIXINC=stmp-fixinc | 22 | @@ -17864,7 +17864,7 @@ else |
23 | if test x$build != x$host || test "x$coverage_flags" != x | 23 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
24 | then | 24 | lt_status=$lt_dlunknown |
25 | BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' | 25 | cat > conftest.$ac_ext <<_LT_EOF |
26 | + BUILD_CXXFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' | 26 | -#line 17853 "configure" |
27 | BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)' | 27 | +#line 17867 "configure" |
28 | fi | 28 | #include "confdefs.h" |
29 | 29 | ||
30 | Index: gcc-4.8.0/gcc/configure.ac | 30 | #if HAVE_DLFCN_H |
31 | =================================================================== | 31 | @@ -17970,7 +17970,7 @@ else |
32 | --- gcc-4.8.0.orig/gcc/configure.ac | 32 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
33 | +++ gcc-4.8.0/gcc/configure.ac | 33 | lt_status=$lt_dlunknown |
34 | @@ -1901,6 +1901,7 @@ STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_F | 34 | cat > conftest.$ac_ext <<_LT_EOF |
35 | if test x$build != x$host || test "x$coverage_flags" != x | 35 | -#line 17959 "configure" |
36 | then | 36 | +#line 17973 "configure" |
37 | BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' | 37 | #include "confdefs.h" |
38 | + BUILD_CXXFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' | 38 | |
39 | BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)' | 39 | #if HAVE_DLFCN_H |
40 | @@ -26918,18 +26918,15 @@ $as_echo "#define TARGET_LIBC_PROVIDES_S | ||
40 | fi | 41 | fi |
41 | 42 | ||
43 | # Test for <sys/sdt.h> on the target. | ||
44 | - | ||
45 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 | ||
46 | -$as_echo_n "checking sys/sdt.h in the target C library... " >&6; } | ||
47 | -have_sys_sdt_h=no | ||
48 | +#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H]) | ||
49 | +#AC_MSG_CHECKING(sys/sdt.h in the target C library) | ||
50 | +#have_sys_sdt_h=no | ||
51 | #if test -f $target_header_dir/sys/sdt.h; then | ||
52 | # have_sys_sdt_h=yes | ||
53 | -# | ||
54 | -#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h | ||
55 | -# | ||
56 | +# AC_DEFINE(HAVE_SYS_SDT_H, 1, | ||
57 | +# [Define if your target C library provides sys/sdt.h]) | ||
58 | #fi | ||
59 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5 | ||
60 | -$as_echo "$have_sys_sdt_h" >&6; } | ||
61 | +#AC_MSG_RESULT($have_sys_sdt_h) | ||
62 | |||
63 | # Check if TFmode long double should be used by default or not. | ||
64 | # Some glibc targets used DFmode long double, but with glibc 2.4 | ||
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0039-gcc-4.8-PR57717.patch b/meta/recipes-devtools/gcc/gcc-4.8/0039-gcc-4.8-PR57717.patch deleted file mode 100644 index f983f70d02..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.8/0039-gcc-4.8-PR57717.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | This backports fix from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57717 | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | Index: gcc-4.8.1/gcc/config/rs6000/rs6000.c | ||
7 | =================================================================== | ||
8 | --- gcc-4.8.1.orig/gcc/config/rs6000/rs6000.c 2013-05-09 18:54:06.000000000 -0700 | ||
9 | +++ gcc-4.8.1/gcc/config/rs6000/rs6000.c 2013-06-27 08:22:40.459021366 -0700 | ||
10 | @@ -5431,11 +5431,12 @@ | ||
11 | |||
12 | case TFmode: | ||
13 | case TDmode: | ||
14 | - case TImode: | ||
15 | if (TARGET_E500_DOUBLE) | ||
16 | return (SPE_CONST_OFFSET_OK (offset) | ||
17 | && SPE_CONST_OFFSET_OK (offset + 8)); | ||
18 | + /* Fall through. */ | ||
19 | |||
20 | + case TImode: | ||
21 | extra = 8; | ||
22 | if (!worst_case) | ||
23 | break; | ||
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0045-gcc-4.8-PR57717-PowerPC-E500v2.patch b/meta/recipes-devtools/gcc/gcc-4.8/0045-gcc-4.8-PR57717-PowerPC-E500v2.patch deleted file mode 100644 index 96fa1da073..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.8/0045-gcc-4.8-PR57717-PowerPC-E500v2.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | This backports fix from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57717 | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | Signed-off-by: Julian Brown <Julian_Brown@mentor.com> | ||
5 | |||
6 | fix for PR57717 (PowerPC E500v2) | ||
7 | http://gcc.gnu.org/ml/gcc-patches/2013-08/msg00668.html | ||
8 | |||
9 | --- a/gcc/config/rs6000/rs6000.c 2013-05-09 20:54:06.000000000 -0500 | ||
10 | +++ b/gcc/config/rs6000/rs6000.c 2013-08-28 01:25:24.865218744 -0500 | ||
11 | @@ -6337,9 +6337,7 @@ | ||
12 | && GET_CODE (XEXP (x, 1)) == CONST_INT | ||
13 | && reg_offset_p | ||
14 | && !SPE_VECTOR_MODE (mode) | ||
15 | - && !(TARGET_E500_DOUBLE && (mode == DFmode || mode == TFmode | ||
16 | - || mode == DDmode || mode == TDmode | ||
17 | - || mode == DImode)) | ||
18 | + && !(TARGET_E500_DOUBLE && GET_MODE_SIZE (mode) > UNITS_PER_WORD) | ||
19 | && VECTOR_MEM_NONE_P (mode)) | ||
20 | { | ||
21 | HOST_WIDE_INT val = INTVAL (XEXP (x, 1)); | ||
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0048-PR58854_fix_arm_apcs_epilogue.patch b/meta/recipes-devtools/gcc/gcc-4.8/0048-PR58854_fix_arm_apcs_epilogue.patch deleted file mode 100644 index 0ef245a17f..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.8/0048-PR58854_fix_arm_apcs_epilogue.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Backport fix for PR target/58854 | ||
2 | |||
3 | 2013-11-11 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> | ||
4 | |||
5 | Backported from mainline | ||
6 | 2013-10-30 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> | ||
7 | |||
8 | PR target/58854 | ||
9 | * config/arm/arm.c (arm_expand_epilogue_apcs_frame): Emit blockage | ||
10 | |||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | --- gcc-4_8-branch/gcc/config/arm/arm.c 2013/11/11 08:00:45 204664 | ||
15 | +++ gcc-4_8-branch/gcc/config/arm/arm.c 2013/11/11 09:38:14 204665 | ||
16 | @@ -23555,6 +23555,7 @@ | ||
17 | num_regs = bit_count (saved_regs_mask); | ||
18 | if ((offsets->outgoing_args != (1 + num_regs)) || cfun->calls_alloca) | ||
19 | { | ||
20 | + emit_insn (gen_blockage ()); | ||
21 | /* Unwind the stack to just below the saved registers. */ | ||
22 | emit_insn (gen_addsi3 (stack_pointer_rtx, | ||
23 | hard_frame_pointer_rtx, | ||
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0050-PR-target-58595.patch b/meta/recipes-devtools/gcc/gcc-4.8/0050-PR-target-58595.patch deleted file mode 100644 index 4470596527..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.8/0050-PR-target-58595.patch +++ /dev/null | |||
@@ -1,132 +0,0 @@ | |||
1 | Backport fix for PR target/58595 | ||
2 | |||
3 | From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | ||
4 | Date: Thu, 6 Mar 2014 12:07:07 +0000 | ||
5 | Subject: [PATCH] PR target/58595 * config/arm/arm.c | ||
6 | (arm_tls_symbol_p): Remove. (arm_legitimize_address): Call | ||
7 | legitimize_tls_address for any arm_tls_referenced_p expression, | ||
8 | handle constant addend. Call it before testing for !TARGET_ARM. | ||
9 | (thumb_legitimize_address): Don't handle arm_tls_symbol_p here. | ||
10 | |||
11 | * gcc.dg/tls/pr58595.c: New test. | ||
12 | |||
13 | |||
14 | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208380 138bc75d-0d04-0410-961f-82ee72b054a4 | ||
15 | |||
16 | Index: gcc-4.8.2/gcc/ChangeLog | ||
17 | =================================================================== | ||
18 | --- gcc-4.8.2.orig/gcc/ChangeLog | ||
19 | +++ gcc-4.8.2/gcc/ChangeLog | ||
20 | @@ -1,3 +1,13 @@ | ||
21 | +2014-03-06 Jakub Jelinek <jakub@redhat.com> | ||
22 | + Meador Inge <meadori@codesourcery.com> | ||
23 | + | ||
24 | + PR target/58595 | ||
25 | + * config/arm/arm.c (arm_tls_symbol_p): Remove. | ||
26 | + (arm_legitimize_address): Call legitimize_tls_address for any | ||
27 | + arm_tls_referenced_p expression, handle constant addend. Call it | ||
28 | + before testing for !TARGET_ARM. | ||
29 | + (thumb_legitimize_address): Don't handle arm_tls_symbol_p here. | ||
30 | + | ||
31 | 2013-10-16 Release Manager | ||
32 | |||
33 | * GCC 4.8.2 released. | ||
34 | Index: gcc-4.8.2/gcc/config/arm/arm.c | ||
35 | =================================================================== | ||
36 | --- gcc-4.8.2.orig/gcc/config/arm/arm.c | ||
37 | +++ gcc-4.8.2/gcc/config/arm/arm.c | ||
38 | @@ -230,7 +230,6 @@ static tree arm_gimplify_va_arg_expr (tr | ||
39 | static void arm_option_override (void); | ||
40 | static unsigned HOST_WIDE_INT arm_shift_truncation_mask (enum machine_mode); | ||
41 | static bool arm_cannot_copy_insn_p (rtx); | ||
42 | -static bool arm_tls_symbol_p (rtx x); | ||
43 | static int arm_issue_rate (void); | ||
44 | static void arm_output_dwarf_dtprel (FILE *, int, rtx) ATTRIBUTE_UNUSED; | ||
45 | static bool arm_output_addr_const_extra (FILE *, rtx); | ||
46 | @@ -6573,6 +6572,32 @@ legitimize_tls_address (rtx x, rtx reg) | ||
47 | rtx | ||
48 | arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode) | ||
49 | { | ||
50 | + if (arm_tls_referenced_p (x)) | ||
51 | + { | ||
52 | + rtx addend = NULL; | ||
53 | + | ||
54 | + if (GET_CODE (x) == CONST && GET_CODE (XEXP (x, 0)) == PLUS) | ||
55 | + { | ||
56 | + addend = XEXP (XEXP (x, 0), 1); | ||
57 | + x = XEXP (XEXP (x, 0), 0); | ||
58 | + } | ||
59 | + | ||
60 | + if (GET_CODE (x) != SYMBOL_REF) | ||
61 | + return x; | ||
62 | + | ||
63 | + gcc_assert (SYMBOL_REF_TLS_MODEL (x) != 0); | ||
64 | + | ||
65 | + x = legitimize_tls_address (x, NULL_RTX); | ||
66 | + | ||
67 | + if (addend) | ||
68 | + { | ||
69 | + x = gen_rtx_PLUS (SImode, x, addend); | ||
70 | + orig_x = x; | ||
71 | + } | ||
72 | + else | ||
73 | + return x; | ||
74 | + } | ||
75 | + | ||
76 | if (!TARGET_ARM) | ||
77 | { | ||
78 | /* TODO: legitimize_address for Thumb2. */ | ||
79 | @@ -6581,9 +6606,6 @@ arm_legitimize_address (rtx x, rtx orig_ | ||
80 | return thumb_legitimize_address (x, orig_x, mode); | ||
81 | } | ||
82 | |||
83 | - if (arm_tls_symbol_p (x)) | ||
84 | - return legitimize_tls_address (x, NULL_RTX); | ||
85 | - | ||
86 | if (GET_CODE (x) == PLUS) | ||
87 | { | ||
88 | rtx xop0 = XEXP (x, 0); | ||
89 | @@ -6695,9 +6717,6 @@ arm_legitimize_address (rtx x, rtx orig_ | ||
90 | rtx | ||
91 | thumb_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode) | ||
92 | { | ||
93 | - if (arm_tls_symbol_p (x)) | ||
94 | - return legitimize_tls_address (x, NULL_RTX); | ||
95 | - | ||
96 | if (GET_CODE (x) == PLUS | ||
97 | && CONST_INT_P (XEXP (x, 1)) | ||
98 | && (INTVAL (XEXP (x, 1)) >= 32 * GET_MODE_SIZE (mode) | ||
99 | @@ -6988,20 +7007,6 @@ thumb_legitimize_reload_address (rtx *x_ | ||
100 | |||
101 | /* Test for various thread-local symbols. */ | ||
102 | |||
103 | -/* Return TRUE if X is a thread-local symbol. */ | ||
104 | - | ||
105 | -static bool | ||
106 | -arm_tls_symbol_p (rtx x) | ||
107 | -{ | ||
108 | - if (! TARGET_HAVE_TLS) | ||
109 | - return false; | ||
110 | - | ||
111 | - if (GET_CODE (x) != SYMBOL_REF) | ||
112 | - return false; | ||
113 | - | ||
114 | - return SYMBOL_REF_TLS_MODEL (x) != 0; | ||
115 | -} | ||
116 | - | ||
117 | /* Helper for arm_tls_referenced_p. */ | ||
118 | |||
119 | static int | ||
120 | Index: gcc-4.8.2/gcc/testsuite/ChangeLog | ||
121 | =================================================================== | ||
122 | --- gcc-4.8.2.orig/gcc/testsuite/ChangeLog | ||
123 | +++ gcc-4.8.2/gcc/testsuite/ChangeLog | ||
124 | @@ -1,3 +1,8 @@ | ||
125 | +2014-03-06 Jakub Jelinek <jakub@redhat.com> | ||
126 | + | ||
127 | + PR target/58595 | ||
128 | + * gcc.dg/tls/pr58595.c: New test. | ||
129 | + | ||
130 | 2013-10-16 Release Manager | ||
131 | |||
132 | * GCC 4.8.2 released. | ||
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0052-PR-rtl-optimization-61801.patch b/meta/recipes-devtools/gcc/gcc-4.8/0052-PR-rtl-optimization-61801.patch deleted file mode 100644 index 300b2042b2..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.8/0052-PR-rtl-optimization-61801.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 8dfe30973ab03f0480f1e249f320e78f210dc230 Mon Sep 17 00:00:00 2001 | ||
2 | From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | ||
3 | Date: Thu, 17 Jul 2014 07:49:44 +0000 | ||
4 | Subject: [PATCH] 2014-07-17 Richard Biener <rguenther@suse.de> | ||
5 | |||
6 | PR rtl-optimization/61801 | ||
7 | * sched-deps.c (sched_analyze_2): For ASM_OPERANDS and | ||
8 | ASM_INPUT don't set reg_pending_barrier if it appears in a | ||
9 | debug-insn. | ||
10 | |||
11 | |||
12 | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@212740 138bc75d-0d04-0410-961f-82ee72b054a4 | ||
13 | |||
14 | Upstream-Status: Backport [https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61801] | ||
15 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> | ||
16 | |||
17 | --- | ||
18 | gcc/sched-deps.c | 3 ++- | ||
19 | |||
20 | diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c | ||
21 | index 07857f2..4ac2542 100644 | ||
22 | --- a/gcc/sched-deps.c | ||
23 | +++ b/gcc/sched-deps.c | ||
24 | @@ -2744,7 +2744,8 @@ sched_analyze_2 (struct deps_desc *deps, rtx x, rtx insn) | ||
25 | Consider for instance a volatile asm that changes the fpu rounding | ||
26 | mode. An insn should not be moved across this even if it only uses | ||
27 | pseudo-regs because it might give an incorrectly rounded result. */ | ||
28 | - if (code != ASM_OPERANDS || MEM_VOLATILE_P (x)) | ||
29 | + if ((code != ASM_OPERANDS || MEM_VOLATILE_P (x)) | ||
30 | + && !DEBUG_INSN_P (insn)) | ||
31 | reg_pending_barrier = TRUE_BARRIER; | ||
32 | |||
33 | /* For all ASM_OPERANDS, we must traverse the vector of input operands. | ||
34 | -- | ||
35 | 1.8.5.5 | ||
36 | |||