diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-06-17 17:11:43 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-23 11:50:07 +0100 |
commit | 0faa5f72999fea82fadda8bab70abea2303216c7 (patch) | |
tree | 05a8c18d2f67d883f94d2bd6f060ab0f4ac7f156 /meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch | |
parent | c2007ba4cdb64fa9e308d3dae395c03ef4cc9161 (diff) | |
download | poky-0faa5f72999fea82fadda8bab70abea2303216c7.tar.gz |
gcc-4.6: Switch to using svn SRC_URI for recipe
We call the recipes 4.6
Remove the backport patches
(From OE-Core rev: 68b545f4ff719f2b6e57d68b002dc9845c7a14ae)
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/gcc-4.6/optional_libstdc.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch b/meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch new file mode 100644 index 0000000000..fe157a892d --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch | |||
@@ -0,0 +1,86 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++ | ||
4 | will not run correctly since by default the linker will try to link against libstdc++ | ||
5 | which shouldn't exist yet. We need an option to disable -lstdc++ | ||
6 | option whilst leaving -lc, -lgcc and other automatic library dependencies added by gcc | ||
7 | driver. This patch adds such an option which only disables the -lstdc++. | ||
8 | |||
9 | A "standard" gcc build uses xgcc and hence avoids this. We should ask upstream how to | ||
10 | do this officially, the likely answer is don't build libstdc++ separately. | ||
11 | |||
12 | RP 29/6/10 | ||
13 | |||
14 | Index: gcc-4.6.0/gcc/cp/g++spec.c | ||
15 | =================================================================== | ||
16 | --- gcc-4.6.0.orig/gcc/cp/g++spec.c | ||
17 | +++ gcc-4.6.0/gcc/cp/g++spec.c | ||
18 | @@ -127,6 +127,7 @@ lang_specific_driver (struct cl_decoded_ | ||
19 | switch (decoded_options[i].opt_index) | ||
20 | { | ||
21 | case OPT_nostdlib: | ||
22 | + case OPT_nostdlib__: | ||
23 | case OPT_nodefaultlibs: | ||
24 | library = -1; | ||
25 | break; | ||
26 | Index: gcc-4.6.0/gcc/doc/invoke.texi | ||
27 | =================================================================== | ||
28 | --- gcc-4.6.0.orig/gcc/doc/invoke.texi | ||
29 | +++ gcc-4.6.0/gcc/doc/invoke.texi | ||
30 | @@ -193,7 +193,7 @@ in the following sections. | ||
31 | -fno-pretty-templates @gol | ||
32 | -frepo -fno-rtti -fstats -ftemplate-depth=@var{n} @gol | ||
33 | -fno-threadsafe-statics -fuse-cxa-atexit -fno-weak -nostdinc++ @gol | ||
34 | --fno-default-inline -fvisibility-inlines-hidden @gol | ||
35 | +-nostdlib++ -fno-default-inline -fvisibility-inlines-hidden @gol | ||
36 | -fvisibility-ms-compat @gol | ||
37 | -Wabi -Wconversion-null -Wctor-dtor-privacy @gol | ||
38 | -Wnoexcept -Wnon-virtual-dtor -Wreorder @gol | ||
39 | @@ -431,7 +431,7 @@ Objective-C and Objective-C++ Dialects}. | ||
40 | @gccoptlist{@var{object-file-name} -l@var{library} @gol | ||
41 | -nostartfiles -nodefaultlibs -nostdlib -pie -rdynamic @gol | ||
42 | -s -static -static-libgcc -static-libstdc++ -shared @gol | ||
43 | --shared-libgcc -symbolic @gol | ||
44 | +-shared-libgcc -symbolic -nostdlib++ @gol | ||
45 | -T @var{script} -Wl,@var{option} -Xlinker @var{option} @gol | ||
46 | -u @var{symbol}} | ||
47 | |||
48 | @@ -9069,6 +9069,11 @@ These entries are usually resolved by en | ||
49 | libc. These entry points should be supplied through some other | ||
50 | mechanism when this option is specified. | ||
51 | |||
52 | +@item -nostdlib++ | ||
53 | +@opindex nostdlib++ | ||
54 | +Do not use the standard system C++ runtime libraries when linking. | ||
55 | +Only the libraries you specify will be passed to the linker. | ||
56 | + | ||
57 | @cindex @option{-lgcc}, use with @option{-nostdlib} | ||
58 | @cindex @option{-nostdlib} and unresolved references | ||
59 | @cindex unresolved references and @option{-nostdlib} | ||
60 | Index: gcc-4.6.0/gcc/c-family/c.opt | ||
61 | =================================================================== | ||
62 | --- gcc-4.6.0.orig/gcc/c-family/c.opt | ||
63 | +++ gcc-4.6.0/gcc/c-family/c.opt | ||
64 | @@ -1111,6 +1111,10 @@ nostdinc++ | ||
65 | C++ ObjC++ | ||
66 | Do not search standard system include directories for C++ | ||
67 | |||
68 | +nostdlib++ | ||
69 | +Driver | ||
70 | +Do not link standard C++ runtime library | ||
71 | + | ||
72 | o | ||
73 | C ObjC C++ ObjC++ Joined Separate | ||
74 | ; Documented in common.opt | ||
75 | Index: gcc-4.6.0/gcc/gcc.c | ||
76 | =================================================================== | ||
77 | --- gcc-4.6.0.orig/gcc/gcc.c | ||
78 | +++ gcc-4.6.0/gcc/gcc.c | ||
79 | @@ -666,6 +666,7 @@ proper position among the other output f | ||
80 | %(mflib) " STACK_SPLIT_SPEC "\ | ||
81 | %{fprofile-arcs|fprofile-generate*|coverage:-lgcov}\ | ||
82 | %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}\ | ||
83 | + %{!nostdlib++:}\ | ||
84 | %{!nostdlib:%{!nostartfiles:%E}} %{T*} }}}}}}" | ||
85 | #endif | ||
86 | |||