summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-03-06 17:03:12 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-08 19:55:36 (GMT)
commit8ed044e4999175f8b5e2e3f33a81d2411d5e9e04 (patch)
treebd3954e1bce28d6a0ff8284c062a961324304a06 /meta/recipes-devtools/gcc
parentd7663ff7ab2e5ef5c913befad5e0adfbd6cc22a2 (diff)
downloadpoky-8ed044e4999175f8b5e2e3f33a81d2411d5e9e04.tar.gz
gcc: Upgrade to 4.6.3 release
core-image-sato/core-image-minimal builds and boots on all qemu machines (From OE-Core rev: 40d7a4b70d342f75e13de7872fb62e2b9d6d40bf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6.inc9
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch32
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch97
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch80
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch36
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6/volatile_access_backport.patch28
6 files changed, 131 insertions, 151 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index edc2a58..99c30a6 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
1require gcc-common.inc 1require gcc-common.inc
2 2
3PR = "r22" 3PR = "r23"
4 4
5# Third digit in PV should be incremented after a minor release 5# Third digit in PV should be incremented after a minor release
6# happens from this branch on gcc e.g. currently its 4.6.0 6# happens from this branch on gcc e.g. currently its 4.6.0
@@ -8,7 +8,7 @@ PR = "r22"
8# on branch then PV should be incremented to 4.6.1+svnr${SRCPV} 8# on branch then PV should be incremented to 4.6.1+svnr${SRCPV}
9# to reflect that change 9# to reflect that change
10 10
11PV = "4.6.2+svnr${SRCPV}" 11PV = "4.6.3+svnr${SRCPV}"
12 12
13# BINV should be incremented after updating to a revision 13# BINV should be incremented after updating to a revision
14# after a minor gcc release (e.g. 4.6.1 or 4.6.2) has been made 14# after a minor gcc release (e.g. 4.6.1 or 4.6.2) has been made
@@ -16,9 +16,9 @@ PV = "4.6.2+svnr${SRCPV}"
16# 4.6.1 then the value below will have 2 which will mean 4.6.2 16# 4.6.1 then the value below will have 2 which will mean 4.6.2
17# which will be next minor release and so on. 17# which will be next minor release and so on.
18 18
19BINV = "4.6.3" 19BINV = "4.6.4"
20 20
21SRCREV = "181430" 21SRCREV = "184847"
22BRANCH = "gcc-4_6-branch" 22BRANCH = "gcc-4_6-branch"
23FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}" 23FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}"
24 24
@@ -63,7 +63,6 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
63 file://optional_libstdc.patch \ 63 file://optional_libstdc.patch \
64 file://disable_relax_pic_calls_flag.patch \ 64 file://disable_relax_pic_calls_flag.patch \
65 file://COLLECT_GCC_OPTIONS.patch \ 65 file://COLLECT_GCC_OPTIONS.patch \
66 file://volatile_access_backport.patch \
67 file://use-defaults.h-and-t-oe-in-B.patch \ 66 file://use-defaults.h-and-t-oe-in-B.patch \
68 file://powerpc-e5500.patch \ 67 file://powerpc-e5500.patch \
69 file://fix-for-ice-50099.patch \ 68 file://fix-for-ice-50099.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch b/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
index 6ccbeea..575e0e4 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
@@ -58,8 +58,8 @@ from the sysroot, one of the paths *does* need to be relocated in this way.
58=========================== 58===========================
59Index: gcc-4_6-branch/gcc/Makefile.in 59Index: gcc-4_6-branch/gcc/Makefile.in
60=================================================================== 60===================================================================
61--- gcc-4_6-branch.orig/gcc/Makefile.in 2011-12-13 22:52:15.000000000 -0800 61--- gcc-4_6-branch.orig/gcc/Makefile.in 2012-03-04 09:33:36.000000000 -0800
62+++ gcc-4_6-branch/gcc/Makefile.in 2011-12-13 22:52:21.933635767 -0800 62+++ gcc-4_6-branch/gcc/Makefile.in 2012-03-04 09:41:06.858672113 -0800
63@@ -587,6 +587,7 @@ 63@@ -587,6 +587,7 @@
64 build_tooldir = $(exec_prefix)/$(target_noncanonical) 64 build_tooldir = $(exec_prefix)/$(target_noncanonical)
65 # Directory in which the compiler finds target-independent g++ includes. 65 # Directory in which the compiler finds target-independent g++ includes.
@@ -78,8 +78,8 @@ Index: gcc-4_6-branch/gcc/Makefile.in
78 -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ 78 -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
79Index: gcc-4_6-branch/gcc/configure.ac 79Index: gcc-4_6-branch/gcc/configure.ac
80=================================================================== 80===================================================================
81--- gcc-4_6-branch.orig/gcc/configure.ac 2011-12-13 22:52:15.000000000 -0800 81--- gcc-4_6-branch.orig/gcc/configure.ac 2012-03-04 09:33:36.000000000 -0800
82+++ gcc-4_6-branch/gcc/configure.ac 2011-12-13 22:52:21.937635526 -0800 82+++ gcc-4_6-branch/gcc/configure.ac 2012-03-04 09:41:06.862671939 -0800
83@@ -144,6 +144,15 @@ 83@@ -144,6 +144,15 @@
84 fi 84 fi
85 fi 85 fi
@@ -96,7 +96,7 @@ Index: gcc-4_6-branch/gcc/configure.ac
96 AC_ARG_WITH(cpp_install_dir, 96 AC_ARG_WITH(cpp_install_dir,
97 [ --with-cpp-install-dir=DIR 97 [ --with-cpp-install-dir=DIR
98 install the user visible C preprocessor in DIR 98 install the user visible C preprocessor in DIR
99@@ -4737,6 +4746,7 @@ 99@@ -4727,6 +4736,7 @@
100 AC_SUBST(float_h_file) 100 AC_SUBST(float_h_file)
101 AC_SUBST(gcc_config_arguments) 101 AC_SUBST(gcc_config_arguments)
102 AC_SUBST(gcc_gxx_include_dir) 102 AC_SUBST(gcc_gxx_include_dir)
@@ -106,8 +106,8 @@ Index: gcc-4_6-branch/gcc/configure.ac
106 AC_SUBST(host_xm_include_list) 106 AC_SUBST(host_xm_include_list)
107Index: gcc-4_6-branch/gcc/cppdefault.c 107Index: gcc-4_6-branch/gcc/cppdefault.c
108=================================================================== 108===================================================================
109--- gcc-4_6-branch.orig/gcc/cppdefault.c 2011-12-13 22:51:28.000000000 -0800 109--- gcc-4_6-branch.orig/gcc/cppdefault.c 2012-03-03 01:03:17.000000000 -0800
110+++ gcc-4_6-branch/gcc/cppdefault.c 2011-12-13 22:52:21.937635526 -0800 110+++ gcc-4_6-branch/gcc/cppdefault.c 2012-03-04 09:41:06.862671939 -0800
111@@ -48,15 +48,18 @@ 111@@ -48,15 +48,18 @@
112 = { 112 = {
113 #ifdef GPLUSPLUS_INCLUDE_DIR 113 #ifdef GPLUSPLUS_INCLUDE_DIR
@@ -132,8 +132,8 @@ Index: gcc-4_6-branch/gcc/cppdefault.c
132 /* This is the dir for gcc's private headers. */ 132 /* This is the dir for gcc's private headers. */
133Index: gcc-4_6-branch/gcc/configure 133Index: gcc-4_6-branch/gcc/configure
134=================================================================== 134===================================================================
135--- gcc-4_6-branch.orig/gcc/configure 2011-12-13 22:52:15.000000000 -0800 135--- gcc-4_6-branch.orig/gcc/configure 2012-03-04 09:33:36.000000000 -0800
136+++ gcc-4_6-branch/gcc/configure 2011-12-13 22:52:33.185690436 -0800 136+++ gcc-4_6-branch/gcc/configure 2012-03-04 09:41:12.462671816 -0800
137@@ -636,6 +636,7 @@ 137@@ -636,6 +636,7 @@
138 host_xm_include_list 138 host_xm_include_list
139 host_xm_file_list 139 host_xm_file_list
@@ -158,25 +158,25 @@ Index: gcc-4_6-branch/gcc/configure
158 158
159 # Check whether --with-cpp_install_dir was given. 159 # Check whether --with-cpp_install_dir was given.
160 if test "${with_cpp_install_dir+set}" = set; then : 160 if test "${with_cpp_install_dir+set}" = set; then :
161@@ -17514,7 +17524,7 @@ 161@@ -17504,7 +17514,7 @@
162 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 162 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
163 lt_status=$lt_dlunknown 163 lt_status=$lt_dlunknown
164 cat > conftest.$ac_ext <<_LT_EOF 164 cat > conftest.$ac_ext <<_LT_EOF
165-#line 17517 "configure" 165-#line 17507 "configure"
166+#line 17527 "configure" 166+#line 17517 "configure"
167 #include "confdefs.h" 167 #include "confdefs.h"
168 168
169 #if HAVE_DLFCN_H 169 #if HAVE_DLFCN_H
170@@ -17620,7 +17630,7 @@ 170@@ -17610,7 +17620,7 @@
171 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 171 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
172 lt_status=$lt_dlunknown 172 lt_status=$lt_dlunknown
173 cat > conftest.$ac_ext <<_LT_EOF 173 cat > conftest.$ac_ext <<_LT_EOF
174-#line 17623 "configure" 174-#line 17613 "configure"
175+#line 17633 "configure" 175+#line 17623 "configure"
176 #include "confdefs.h" 176 #include "confdefs.h"
177 177
178 #if HAVE_DLFCN_H 178 #if HAVE_DLFCN_H
179@@ -26151,6 +26161,7 @@ 179@@ -26141,6 +26151,7 @@
180 180
181 181
182 182
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch
index 9cba50d..5eaeb05 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch
@@ -1,10 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Index: gcc-4.6.0/Makefile.def 3Index: gcc-4_6-branch/Makefile.def
4=================================================================== 4===================================================================
5--- gcc-4.6.0.orig/Makefile.def 5--- gcc-4_6-branch.orig/Makefile.def 2012-03-03 01:08:03.000000000 -0800
6+++ gcc-4.6.0/Makefile.def 6+++ gcc-4_6-branch/Makefile.def 2012-03-04 09:19:02.430607447 -0800
7@@ -243,6 +243,7 @@ flags_to_pass = { flag= AWK ; }; 7@@ -242,6 +242,7 @@
8 flags_to_pass = { flag= BISON ; }; 8 flags_to_pass = { flag= BISON ; };
9 flags_to_pass = { flag= CC_FOR_BUILD ; }; 9 flags_to_pass = { flag= CC_FOR_BUILD ; };
10 flags_to_pass = { flag= CFLAGS_FOR_BUILD ; }; 10 flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
@@ -12,11 +12,11 @@ Index: gcc-4.6.0/Makefile.def
12 flags_to_pass = { flag= CXX_FOR_BUILD ; }; 12 flags_to_pass = { flag= CXX_FOR_BUILD ; };
13 flags_to_pass = { flag= EXPECT ; }; 13 flags_to_pass = { flag= EXPECT ; };
14 flags_to_pass = { flag= FLEX ; }; 14 flags_to_pass = { flag= FLEX ; };
15Index: gcc-4.6.0/gcc/Makefile.in 15Index: gcc-4_6-branch/gcc/Makefile.in
16=================================================================== 16===================================================================
17--- gcc-4.6.0.orig/gcc/Makefile.in 17--- gcc-4_6-branch.orig/gcc/Makefile.in 2012-03-03 01:03:17.000000000 -0800
18+++ gcc-4.6.0/gcc/Makefile.in 18+++ gcc-4_6-branch/gcc/Makefile.in 2012-03-04 09:19:02.430607447 -0800
19@@ -770,7 +770,7 @@ BUILD_LINKERFLAGS = $(BUILD_CFLAGS) 19@@ -770,7 +770,7 @@
20 20
21 # Native linker and preprocessor flags. For x-fragment overrides. 21 # Native linker and preprocessor flags. For x-fragment overrides.
22 BUILD_LDFLAGS=@BUILD_LDFLAGS@ 22 BUILD_LDFLAGS=@BUILD_LDFLAGS@
@@ -25,11 +25,11 @@ Index: gcc-4.6.0/gcc/Makefile.in
25 25
26 # Actual name to use when installing a native compiler. 26 # Actual name to use when installing a native compiler.
27 GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)') 27 GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
28Index: gcc-4.6.0/gcc/configure.ac 28Index: gcc-4_6-branch/gcc/configure.ac
29=================================================================== 29===================================================================
30--- gcc-4.6.0.orig/gcc/configure.ac 30--- gcc-4_6-branch.orig/gcc/configure.ac 2012-03-03 01:17:45.000000000 -0800
31+++ gcc-4.6.0/gcc/configure.ac 31+++ gcc-4_6-branch/gcc/configure.ac 2012-03-04 09:19:02.430607447 -0800
32@@ -1784,16 +1784,18 @@ AC_SUBST(inhibit_libc) 32@@ -1774,16 +1774,18 @@
33 # Also, we cannot run fixincludes. 33 # Also, we cannot run fixincludes.
34 34
35 # These are the normal (build=host) settings: 35 # These are the normal (build=host) settings:
@@ -52,11 +52,11 @@ Index: gcc-4.6.0/gcc/configure.ac
52 fi 52 fi
53 53
54 # Expand extra_headers to include complete path. 54 # Expand extra_headers to include complete path.
55Index: gcc-4.6.0/Makefile.in 55Index: gcc-4_6-branch/Makefile.in
56=================================================================== 56===================================================================
57--- gcc-4.6.0.orig/Makefile.in 57--- gcc-4_6-branch.orig/Makefile.in 2012-03-03 01:08:03.000000000 -0800
58+++ gcc-4.6.0/Makefile.in 58+++ gcc-4_6-branch/Makefile.in 2012-03-04 09:19:02.446607448 -0800
59@@ -338,6 +338,7 @@ AR_FOR_BUILD = @AR_FOR_BUILD@ 59@@ -338,6 +338,7 @@
60 AS_FOR_BUILD = @AS_FOR_BUILD@ 60 AS_FOR_BUILD = @AS_FOR_BUILD@
61 CC_FOR_BUILD = @CC_FOR_BUILD@ 61 CC_FOR_BUILD = @CC_FOR_BUILD@
62 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ 62 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
@@ -64,7 +64,7 @@ Index: gcc-4.6.0/Makefile.in
64 CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ 64 CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
65 CXX_FOR_BUILD = @CXX_FOR_BUILD@ 65 CXX_FOR_BUILD = @CXX_FOR_BUILD@
66 DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ 66 DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
67@@ -691,6 +692,7 @@ BASE_FLAGS_TO_PASS = \ 67@@ -691,6 +692,7 @@
68 "BISON=$(BISON)" \ 68 "BISON=$(BISON)" \
69 "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ 69 "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
70 "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ 70 "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
@@ -72,11 +72,11 @@ Index: gcc-4.6.0/Makefile.in
72 "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ 72 "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
73 "EXPECT=$(EXPECT)" \ 73 "EXPECT=$(EXPECT)" \
74 "FLEX=$(FLEX)" \ 74 "FLEX=$(FLEX)" \
75Index: gcc-4.6.0/gcc/configure 75Index: gcc-4_6-branch/gcc/configure
76=================================================================== 76===================================================================
77--- gcc-4.6.0.orig/gcc/configure 77--- gcc-4_6-branch.orig/gcc/configure 2012-03-03 01:17:45.000000000 -0800
78+++ gcc-4.6.0/gcc/configure 78+++ gcc-4_6-branch/gcc/configure 2012-03-04 09:19:15.638608087 -0800
79@@ -703,6 +703,7 @@ SED 79@@ -703,6 +703,7 @@
80 LIBTOOL 80 LIBTOOL
81 collect2 81 collect2
82 STMP_FIXINC 82 STMP_FIXINC
@@ -84,7 +84,16 @@ Index: gcc-4.6.0/gcc/configure
84 BUILD_LDFLAGS 84 BUILD_LDFLAGS
85 BUILD_CFLAGS 85 BUILD_CFLAGS
86 CC_FOR_BUILD 86 CC_FOR_BUILD
87@@ -11382,6 +11383,7 @@ fi 87@@ -4842,7 +4843,7 @@
88 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_cc_gcc_supports_ada" >&5
89 $as_echo "$acx_cv_cc_gcc_supports_ada" >&6; }
90
91-if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
92+if test "x$GNATBIND" != xno && test "x$GNATMAKE" != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
93 have_gnat=yes
94 else
95 have_gnat=no
96@@ -11372,6 +11373,7 @@
88 CC_FOR_BUILD='$(CC)' 97 CC_FOR_BUILD='$(CC)'
89 BUILD_CFLAGS='$(ALL_CFLAGS)' 98 BUILD_CFLAGS='$(ALL_CFLAGS)'
90 BUILD_LDFLAGS='$(LDFLAGS)' 99 BUILD_LDFLAGS='$(LDFLAGS)'
@@ -92,7 +101,7 @@ Index: gcc-4.6.0/gcc/configure
92 STMP_FIXINC=stmp-fixinc 101 STMP_FIXINC=stmp-fixinc
93 102
94 # And these apply if build != host, or we are generating coverage data 103 # And these apply if build != host, or we are generating coverage data
95@@ -11389,6 +11391,7 @@ if test x$build != x$host || test "x$cov 104@@ -11379,6 +11381,7 @@
96 then 105 then
97 BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' 106 BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
98 BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)' 107 BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
@@ -100,29 +109,29 @@ Index: gcc-4.6.0/gcc/configure
100 fi 109 fi
101 110
102 # Expand extra_headers to include complete path. 111 # Expand extra_headers to include complete path.
103@@ -17505,7 +17508,7 @@ else 112@@ -17495,7 +17498,7 @@
104 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 113 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
105 lt_status=$lt_dlunknown 114 lt_status=$lt_dlunknown
106 cat > conftest.$ac_ext <<_LT_EOF 115 cat > conftest.$ac_ext <<_LT_EOF
107-#line 17508 "configure" 116-#line 17498 "configure"
108+#line 17511 "configure" 117+#line 17501 "configure"
109 #include "confdefs.h" 118 #include "confdefs.h"
110 119
111 #if HAVE_DLFCN_H 120 #if HAVE_DLFCN_H
112@@ -17611,7 +17614,7 @@ else 121@@ -17601,7 +17604,7 @@
113 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 122 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
114 lt_status=$lt_dlunknown 123 lt_status=$lt_dlunknown
115 cat > conftest.$ac_ext <<_LT_EOF 124 cat > conftest.$ac_ext <<_LT_EOF
116-#line 17614 "configure" 125-#line 17604 "configure"
117+#line 17617 "configure" 126+#line 17607 "configure"
118 #include "confdefs.h" 127 #include "confdefs.h"
119 128
120 #if HAVE_DLFCN_H 129 #if HAVE_DLFCN_H
121Index: gcc-4.6.0/Makefile.tpl 130Index: gcc-4_6-branch/Makefile.tpl
122=================================================================== 131===================================================================
123--- gcc-4.6.0.orig/Makefile.tpl 132--- gcc-4_6-branch.orig/Makefile.tpl 2012-03-03 01:08:03.000000000 -0800
124+++ gcc-4.6.0/Makefile.tpl 133+++ gcc-4_6-branch/Makefile.tpl 2012-03-04 09:19:02.454607448 -0800
125@@ -341,6 +341,7 @@ AR_FOR_BUILD = @AR_FOR_BUILD@ 134@@ -341,6 +341,7 @@
126 AS_FOR_BUILD = @AS_FOR_BUILD@ 135 AS_FOR_BUILD = @AS_FOR_BUILD@
127 CC_FOR_BUILD = @CC_FOR_BUILD@ 136 CC_FOR_BUILD = @CC_FOR_BUILD@
128 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ 137 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
@@ -130,11 +139,11 @@ Index: gcc-4.6.0/Makefile.tpl
130 CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ 139 CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
131 CXX_FOR_BUILD = @CXX_FOR_BUILD@ 140 CXX_FOR_BUILD = @CXX_FOR_BUILD@
132 DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ 141 DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
133Index: gcc-4.6.0/configure.ac 142Index: gcc-4_6-branch/configure.ac
134=================================================================== 143===================================================================
135--- gcc-4.6.0.orig/configure.ac 144--- gcc-4_6-branch.orig/configure.ac 2012-03-03 01:17:45.000000000 -0800
136+++ gcc-4.6.0/configure.ac 145+++ gcc-4_6-branch/configure.ac 2012-03-04 09:19:02.454607448 -0800
137@@ -3154,6 +3154,7 @@ esac 146@@ -3123,6 +3123,7 @@
138 # our build compiler if desired. 147 # our build compiler if desired.
139 if test x"${build}" = x"${host}" ; then 148 if test x"${build}" = x"${host}" ; then
140 CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} 149 CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
@@ -142,7 +151,7 @@ Index: gcc-4.6.0/configure.ac
142 CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} 151 CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
143 LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} 152 LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
144 fi 153 fi
145@@ -3220,6 +3221,7 @@ AC_SUBST(AR_FOR_BUILD) 154@@ -3189,6 +3190,7 @@
146 AC_SUBST(AS_FOR_BUILD) 155 AC_SUBST(AS_FOR_BUILD)
147 AC_SUBST(CC_FOR_BUILD) 156 AC_SUBST(CC_FOR_BUILD)
148 AC_SUBST(CFLAGS_FOR_BUILD) 157 AC_SUBST(CFLAGS_FOR_BUILD)
@@ -150,11 +159,11 @@ Index: gcc-4.6.0/configure.ac
150 AC_SUBST(CXXFLAGS_FOR_BUILD) 159 AC_SUBST(CXXFLAGS_FOR_BUILD)
151 AC_SUBST(CXX_FOR_BUILD) 160 AC_SUBST(CXX_FOR_BUILD)
152 AC_SUBST(DLLTOOL_FOR_BUILD) 161 AC_SUBST(DLLTOOL_FOR_BUILD)
153Index: gcc-4.6.0/configure 162Index: gcc-4_6-branch/configure
154=================================================================== 163===================================================================
155--- gcc-4.6.0.orig/configure 164--- gcc-4_6-branch.orig/configure 2012-03-03 01:17:45.000000000 -0800
156+++ gcc-4.6.0/configure 165+++ gcc-4_6-branch/configure 2012-03-04 09:19:02.458607448 -0800
157@@ -617,6 +617,7 @@ GCJ_FOR_BUILD 166@@ -617,6 +617,7 @@
158 DLLTOOL_FOR_BUILD 167 DLLTOOL_FOR_BUILD
159 CXX_FOR_BUILD 168 CXX_FOR_BUILD
160 CXXFLAGS_FOR_BUILD 169 CXXFLAGS_FOR_BUILD
@@ -162,7 +171,7 @@ Index: gcc-4.6.0/configure
162 CFLAGS_FOR_BUILD 171 CFLAGS_FOR_BUILD
163 CC_FOR_BUILD 172 CC_FOR_BUILD
164 AS_FOR_BUILD 173 AS_FOR_BUILD
165@@ -7675,6 +7676,7 @@ esac 174@@ -7644,6 +7645,7 @@
166 # our build compiler if desired. 175 # our build compiler if desired.
167 if test x"${build}" = x"${host}" ; then 176 if test x"${build}" = x"${host}" ; then
168 CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} 177 CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
@@ -170,7 +179,7 @@ Index: gcc-4.6.0/configure
170 CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} 179 CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
171 LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} 180 LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
172 fi 181 fi
173@@ -7740,6 +7742,7 @@ done 182@@ -7709,6 +7711,7 @@
174 183
175 184
176 185
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch
index 3902a35..a44e86c 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch
@@ -27,11 +27,11 @@ Upstream-Status: Inappropriate [distribution: codesourcery]
27 ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of 27 ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of
28 /usr/include, /usr/local/include or /usr/X11R6/include. 28 /usr/include, /usr/local/include or /usr/X11R6/include.
29 29
30Index: gcc-4.6.0/gcc/common.opt 30Index: gcc-4_6-branch/gcc/common.opt
31=================================================================== 31===================================================================
32--- gcc-4.6.0.orig/gcc/common.opt 32--- gcc-4_6-branch.orig/gcc/common.opt 2012-03-03 01:03:17.000000000 -0800
33+++ gcc-4.6.0/gcc/common.opt 33+++ gcc-4_6-branch/gcc/common.opt 2012-03-04 09:24:54.410624483 -0800
34@@ -558,6 +558,10 @@ Wpadded 34@@ -567,6 +567,10 @@
35 Common Var(warn_padded) Warning 35 Common Var(warn_padded) Warning
36 Warn when padding is required to align structure members 36 Warn when padding is required to align structure members
37 37
@@ -42,10 +42,10 @@ Index: gcc-4.6.0/gcc/common.opt
42 Wshadow 42 Wshadow
43 Common Var(warn_shadow) Warning 43 Common Var(warn_shadow) Warning
44 Warn when one local variable shadows another 44 Warn when one local variable shadows another
45Index: gcc-4.6.0/gcc/config.in 45Index: gcc-4_6-branch/gcc/config.in
46=================================================================== 46===================================================================
47--- gcc-4.6.0.orig/gcc/config.in 47--- gcc-4_6-branch.orig/gcc/config.in 2012-03-03 01:03:17.000000000 -0800
48+++ gcc-4.6.0/gcc/config.in 48+++ gcc-4_6-branch/gcc/config.in 2012-03-04 09:24:54.410624483 -0800
49@@ -144,6 +144,12 @@ 49@@ -144,6 +144,12 @@
50 #endif 50 #endif
51 51
@@ -59,11 +59,11 @@ Index: gcc-4.6.0/gcc/config.in
59 /* Define if you want all operations on RTL (the basic data structure of the 59 /* Define if you want all operations on RTL (the basic data structure of the
60 optimizer and back end) to be checked for dynamic type safety at runtime. 60 optimizer and back end) to be checked for dynamic type safety at runtime.
61 This is quite expensive. */ 61 This is quite expensive. */
62Index: gcc-4.6.0/gcc/configure.ac 62Index: gcc-4_6-branch/gcc/configure.ac
63=================================================================== 63===================================================================
64--- gcc-4.6.0.orig/gcc/configure.ac 64--- gcc-4_6-branch.orig/gcc/configure.ac 2012-03-04 09:22:07.000000000 -0800
65+++ gcc-4.6.0/gcc/configure.ac 65+++ gcc-4_6-branch/gcc/configure.ac 2012-03-04 09:24:54.410624483 -0800
66@@ -4694,6 +4694,16 @@ else 66@@ -4692,6 +4692,16 @@
67 fi) 67 fi)
68 AC_SUBST(slibdir) 68 AC_SUBST(slibdir)
69 69
@@ -80,11 +80,11 @@ Index: gcc-4.6.0/gcc/configure.ac
80 # Substitute configuration variables 80 # Substitute configuration variables
81 AC_SUBST(subdirs) 81 AC_SUBST(subdirs)
82 AC_SUBST(srcdir) 82 AC_SUBST(srcdir)
83Index: gcc-4.6.0/gcc/doc/invoke.texi 83Index: gcc-4_6-branch/gcc/doc/invoke.texi
84=================================================================== 84===================================================================
85--- gcc-4.6.0.orig/gcc/doc/invoke.texi 85--- gcc-4_6-branch.orig/gcc/doc/invoke.texi 2012-03-03 00:46:39.000000000 -0800
86+++ gcc-4.6.0/gcc/doc/invoke.texi 86+++ gcc-4_6-branch/gcc/doc/invoke.texi 2012-03-04 09:24:54.414624482 -0800
87@@ -257,6 +257,7 @@ Objective-C and Objective-C++ Dialects}. 87@@ -257,6 +257,7 @@
88 -Woverlength-strings -Wpacked -Wpacked-bitfield-compat -Wpadded @gol 88 -Woverlength-strings -Wpacked -Wpacked-bitfield-compat -Wpadded @gol
89 -Wparentheses -Wpedantic-ms-format -Wno-pedantic-ms-format @gol 89 -Wparentheses -Wpedantic-ms-format -Wno-pedantic-ms-format @gol
90 -Wpointer-arith -Wno-pointer-to-int-cast @gol 90 -Wpointer-arith -Wno-pointer-to-int-cast @gol
@@ -92,7 +92,7 @@ Index: gcc-4.6.0/gcc/doc/invoke.texi
92 -Wredundant-decls @gol 92 -Wredundant-decls @gol
93 -Wreturn-type -Wsequence-point -Wshadow @gol 93 -Wreturn-type -Wsequence-point -Wshadow @gol
94 -Wsign-compare -Wsign-conversion -Wstack-protector @gol 94 -Wsign-compare -Wsign-conversion -Wstack-protector @gol
95@@ -3773,6 +3774,14 @@ headers---for that, @option{-Wunknown-pr 95@@ -3782,6 +3783,14 @@
96 for most targets, it is made up of code and thus requires the stack 96 for most targets, it is made up of code and thus requires the stack
97 to be made executable in order for the program to work properly. 97 to be made executable in order for the program to work properly.
98 98
@@ -107,11 +107,11 @@ Index: gcc-4.6.0/gcc/doc/invoke.texi
107 @item -Wfloat-equal 107 @item -Wfloat-equal
108 @opindex Wfloat-equal 108 @opindex Wfloat-equal
109 @opindex Wno-float-equal 109 @opindex Wno-float-equal
110Index: gcc-4.6.0/gcc/gcc.c 110Index: gcc-4_6-branch/gcc/gcc.c
111=================================================================== 111===================================================================
112--- gcc-4.6.0.orig/gcc/gcc.c 112--- gcc-4_6-branch.orig/gcc/gcc.c 2012-03-03 01:03:17.000000000 -0800
113+++ gcc-4.6.0/gcc/gcc.c 113+++ gcc-4_6-branch/gcc/gcc.c 2012-03-04 09:24:54.418624482 -0800
114@@ -659,6 +659,8 @@ proper position among the other output f 114@@ -659,6 +659,8 @@
115 %{flto} %{flto=*} %l " LINK_PIE_SPEC \ 115 %{flto} %{flto=*} %l " LINK_PIE_SPEC \
116 "%X %{o*} %{e*} %{N} %{n} %{r}\ 116 "%X %{o*} %{e*} %{N} %{n} %{r}\
117 %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}}\ 117 %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}}\
@@ -120,11 +120,11 @@ Index: gcc-4.6.0/gcc/gcc.c
120 %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\ 120 %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\
121 %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\ 121 %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\
122 %(mflib) " STACK_SPLIT_SPEC "\ 122 %(mflib) " STACK_SPLIT_SPEC "\
123Index: gcc-4.6.0/gcc/incpath.c 123Index: gcc-4_6-branch/gcc/incpath.c
124=================================================================== 124===================================================================
125--- gcc-4.6.0.orig/gcc/incpath.c 125--- gcc-4_6-branch.orig/gcc/incpath.c 2012-03-03 01:03:17.000000000 -0800
126+++ gcc-4.6.0/gcc/incpath.c 126+++ gcc-4_6-branch/gcc/incpath.c 2012-03-04 09:24:54.418624482 -0800
127@@ -353,6 +353,24 @@ merge_include_chains (const char *sysroo 127@@ -353,6 +353,24 @@
128 } 128 }
129 fprintf (stderr, _("End of search list.\n")); 129 fprintf (stderr, _("End of search list.\n"));
130 } 130 }
@@ -149,11 +149,11 @@ Index: gcc-4.6.0/gcc/incpath.c
149 } 149 }
150 150
151 /* Use given -I paths for #include "..." but not #include <...>, and 151 /* Use given -I paths for #include "..." but not #include <...>, and
152Index: gcc-4.6.0/gcc/Makefile.in 152Index: gcc-4_6-branch/gcc/Makefile.in
153=================================================================== 153===================================================================
154--- gcc-4.6.0.orig/gcc/Makefile.in 154--- gcc-4_6-branch.orig/gcc/Makefile.in 2012-03-04 09:22:05.000000000 -0800
155+++ gcc-4.6.0/gcc/Makefile.in 155+++ gcc-4_6-branch/gcc/Makefile.in 2012-03-04 09:24:54.418624482 -0800
156@@ -2179,7 +2179,7 @@ attribs.o : attribs.c $(CONFIG_H) $(SYST 156@@ -2179,7 +2179,7 @@
157 157
158 incpath.o: incpath.c incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \ 158 incpath.o: incpath.c incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \
159 intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \ 159 intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \
@@ -162,11 +162,11 @@ Index: gcc-4.6.0/gcc/Makefile.in
162 162
163 prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) prefix.h \ 163 prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) prefix.h \
164 Makefile $(BASEVER) 164 Makefile $(BASEVER)
165Index: gcc-4.6.0/gcc/configure 165Index: gcc-4_6-branch/gcc/configure
166=================================================================== 166===================================================================
167--- gcc-4.6.0.orig/gcc/configure 167--- gcc-4_6-branch.orig/gcc/configure 2012-03-04 09:22:07.000000000 -0800
168+++ gcc-4.6.0/gcc/configure 168+++ gcc-4_6-branch/gcc/configure 2012-03-04 09:25:31.502626277 -0800
169@@ -912,6 +912,7 @@ with_system_zlib 169@@ -912,6 +912,7 @@
170 enable_maintainer_mode 170 enable_maintainer_mode
171 enable_version_specific_runtime_libs 171 enable_version_specific_runtime_libs
172 with_slibdir 172 with_slibdir
@@ -174,7 +174,7 @@ Index: gcc-4.6.0/gcc/configure
174 enable_plugin 174 enable_plugin
175 enable_libquadmath_support 175 enable_libquadmath_support
176 ' 176 '
177@@ -1623,6 +1624,8 @@ Optional Features: 177@@ -1623,6 +1624,8 @@
178 --enable-version-specific-runtime-libs 178 --enable-version-specific-runtime-libs
179 specify that runtime libraries should be 179 specify that runtime libraries should be
180 installed in a compiler-specific directory 180 installed in a compiler-specific directory
@@ -183,25 +183,25 @@ Index: gcc-4.6.0/gcc/configure
183 --enable-plugin enable plugin support 183 --enable-plugin enable plugin support
184 --disable-libquadmath-support 184 --disable-libquadmath-support
185 disable libquadmath support for Fortran 185 disable libquadmath support for Fortran
186@@ -17508,7 +17511,7 @@ else 186@@ -17498,7 +17501,7 @@
187 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 187 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
188 lt_status=$lt_dlunknown 188 lt_status=$lt_dlunknown
189 cat > conftest.$ac_ext <<_LT_EOF 189 cat > conftest.$ac_ext <<_LT_EOF
190-#line 17511 "configure" 190-#line 17501 "configure"
191+#line 17514 "configure" 191+#line 17504 "configure"
192 #include "confdefs.h" 192 #include "confdefs.h"
193 193
194 #if HAVE_DLFCN_H 194 #if HAVE_DLFCN_H
195@@ -17614,7 +17617,7 @@ else 195@@ -17604,7 +17607,7 @@
196 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 196 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
197 lt_status=$lt_dlunknown 197 lt_status=$lt_dlunknown
198 cat > conftest.$ac_ext <<_LT_EOF 198 cat > conftest.$ac_ext <<_LT_EOF
199-#line 17617 "configure" 199-#line 17607 "configure"
200+#line 17620 "configure" 200+#line 17610 "configure"
201 #include "confdefs.h" 201 #include "confdefs.h"
202 202
203 #if HAVE_DLFCN_H 203 #if HAVE_DLFCN_H
204@@ -26127,6 +26130,19 @@ fi 204@@ -26125,6 +26128,19 @@
205 205
206 206
207 207
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
index 4fa3cbe..94b61cd 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
@@ -21,8 +21,8 @@ Date: Wed May 11 18:28:14 2011 +0000
21 21
22Index: gcc-4_6-branch/gcc/config.in 22Index: gcc-4_6-branch/gcc/config.in
23=================================================================== 23===================================================================
24--- gcc-4_6-branch.orig/gcc/config.in 2011-09-09 08:26:10.000000000 -0700 24--- gcc-4_6-branch.orig/gcc/config.in 2012-03-04 09:30:04.000000000 -0800
25+++ gcc-4_6-branch/gcc/config.in 2011-09-09 08:27:14.142981164 -0700 25+++ gcc-4_6-branch/gcc/config.in 2012-03-04 09:32:30.878646575 -0800
26@@ -1583,6 +1583,12 @@ 26@@ -1583,6 +1583,12 @@
27 #endif 27 #endif
28 28
@@ -38,8 +38,8 @@ Index: gcc-4_6-branch/gcc/config.in
38 #ifndef USED_FOR_TARGET 38 #ifndef USED_FOR_TARGET
39Index: gcc-4_6-branch/gcc/configure 39Index: gcc-4_6-branch/gcc/configure
40=================================================================== 40===================================================================
41--- gcc-4_6-branch.orig/gcc/configure 2011-09-09 08:26:15.000000000 -0700 41--- gcc-4_6-branch.orig/gcc/configure 2012-03-04 09:30:05.000000000 -0800
42+++ gcc-4_6-branch/gcc/configure 2011-09-09 08:27:42.793023181 -0700 42+++ gcc-4_6-branch/gcc/configure 2012-03-04 09:32:39.918647011 -0800
43@@ -915,6 +915,7 @@ 43@@ -915,6 +915,7 @@
44 enable_poison_system_directories 44 enable_poison_system_directories
45 enable_plugin 45 enable_plugin
@@ -57,25 +57,25 @@ Index: gcc-4_6-branch/gcc/configure
57 57
58 Some influential environment variables: 58 Some influential environment variables:
59 CC C compiler command 59 CC C compiler command
60@@ -17511,7 +17514,7 @@ 60@@ -17501,7 +17504,7 @@
61 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 61 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
62 lt_status=$lt_dlunknown 62 lt_status=$lt_dlunknown
63 cat > conftest.$ac_ext <<_LT_EOF 63 cat > conftest.$ac_ext <<_LT_EOF
64-#line 17514 "configure" 64-#line 17504 "configure"
65+#line 17517 "configure" 65+#line 17507 "configure"
66 #include "confdefs.h" 66 #include "confdefs.h"
67 67
68 #if HAVE_DLFCN_H 68 #if HAVE_DLFCN_H
69@@ -17617,7 +17620,7 @@ 69@@ -17607,7 +17610,7 @@
70 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 70 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
71 lt_status=$lt_dlunknown 71 lt_status=$lt_dlunknown
72 cat > conftest.$ac_ext <<_LT_EOF 72 cat > conftest.$ac_ext <<_LT_EOF
73-#line 17620 "configure" 73-#line 17610 "configure"
74+#line 17623 "configure" 74+#line 17613 "configure"
75 #include "confdefs.h" 75 #include "confdefs.h"
76 76
77 #if HAVE_DLFCN_H 77 #if HAVE_DLFCN_H
78@@ -26434,6 +26437,36 @@ 78@@ -26432,6 +26435,36 @@
79 fi 79 fi
80 80
81 81
@@ -114,9 +114,9 @@ Index: gcc-4_6-branch/gcc/configure
114 114
115Index: gcc-4_6-branch/gcc/configure.ac 115Index: gcc-4_6-branch/gcc/configure.ac
116=================================================================== 116===================================================================
117--- gcc-4_6-branch.orig/gcc/configure.ac 2011-09-09 08:26:15.000000000 -0700 117--- gcc-4_6-branch.orig/gcc/configure.ac 2012-03-04 09:30:05.000000000 -0800
118+++ gcc-4_6-branch/gcc/configure.ac 2011-09-09 08:27:14.162981193 -0700 118+++ gcc-4_6-branch/gcc/configure.ac 2012-03-04 09:32:30.890646574 -0800
119@@ -4907,6 +4907,30 @@ 119@@ -4905,6 +4905,30 @@
120 fi 120 fi
121 121
122 122
@@ -149,8 +149,8 @@ Index: gcc-4_6-branch/gcc/configure.ac
149 149
150Index: gcc-4_6-branch/gcc/doc/install.texi 150Index: gcc-4_6-branch/gcc/doc/install.texi
151=================================================================== 151===================================================================
152--- gcc-4_6-branch.orig/gcc/doc/install.texi 2011-06-24 08:13:00.000000000 -0700 152--- gcc-4_6-branch.orig/gcc/doc/install.texi 2012-03-03 00:46:39.000000000 -0800
153+++ gcc-4_6-branch/gcc/doc/install.texi 2011-09-09 08:27:14.172981215 -0700 153+++ gcc-4_6-branch/gcc/doc/install.texi 2012-03-04 09:32:30.894646574 -0800
154@@ -1665,6 +1665,11 @@ 154@@ -1665,6 +1665,11 @@
155 support @option{--build-id} option, a warning is issued and the 155 support @option{--build-id} option, a warning is issued and the
156 @option{--enable-linker-build-id} option is ignored. The default is off. 156 @option{--enable-linker-build-id} option is ignored. The default is off.
@@ -165,8 +165,8 @@ Index: gcc-4_6-branch/gcc/doc/install.texi
165 Tells GCC to use the gnu_unique_object relocation for C++ template 165 Tells GCC to use the gnu_unique_object relocation for C++ template
166Index: gcc-4_6-branch/gcc/gcc.c 166Index: gcc-4_6-branch/gcc/gcc.c
167=================================================================== 167===================================================================
168--- gcc-4_6-branch.orig/gcc/gcc.c 2011-09-09 08:26:14.000000000 -0700 168--- gcc-4_6-branch.orig/gcc/gcc.c 2012-03-04 09:30:04.000000000 -0800
169+++ gcc-4_6-branch/gcc/gcc.c 2011-09-09 08:27:14.172981215 -0700 169+++ gcc-4_6-branch/gcc/gcc.c 2012-03-04 09:32:30.894646574 -0800
170@@ -1427,7 +1427,8 @@ 170@@ -1427,7 +1427,8 @@
171 } 171 }
172 #endif 172 #endif
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/volatile_access_backport.patch b/meta/recipes-devtools/gcc/gcc-4.6/volatile_access_backport.patch
deleted file mode 100644
index 9c86817..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/volatile_access_backport.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Pulled from http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
2
3Upstream-Status: Backport
4
5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6
7 gcc/
8 * expr.c (expand_expr_real_1): Only use BLKmode for volatile
9 accesses which are not naturally aligned.
10
11Index: gcc-4.6.0/gcc/expr.c
12===================================================================
13--- gcc-4.6.0.orig/gcc/expr.c 2011-06-01 15:28:55.000000000 -0700
14+++ gcc-4.6.0/gcc/expr.c 2011-06-01 15:41:17.154848182 -0700
15@@ -9178,8 +9178,11 @@
16 && modifier != EXPAND_CONST_ADDRESS
17 && modifier != EXPAND_INITIALIZER)
18 /* If the field is volatile, we always want an aligned
19- access. */
20- || (volatilep && flag_strict_volatile_bitfields > 0)
21+ access. Only do this if the access is not already naturally
22+ aligned, otherwise "normal" (non-bitfield) volatile fields
23+ become non-addressable. */
24+ || (volatilep && flag_strict_volatile_bitfields > 0
25+ && (bitpos % GET_MODE_ALIGNMENT (mode) != 0))
26 /* If the field isn't aligned enough to fetch as a memref,
27 fetch it as a bit field. */
28 || (mode1 != BLKmode