diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2010-11-02 22:03:58 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2010-11-02 22:12:02 +0100 |
commit | be10a6b1321f250b1034c7d9d0a8ef18b296eef1 (patch) | |
tree | 9249025cbfbfbee4cc430d62b27f75301dd4dfde /recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99375.patch | |
parent | 93b28937ac67ba46d65f55637e42552e224aa7e2 (diff) | |
download | meta-openembedded-be10a6b1321f250b1034c7d9d0a8ef18b296eef1.tar.gz |
angstrom-layers: meta-openembedded: replace poky gcc 4.5 sources with OE ones
This needs further investigation, but for now we can get the tested sources into the poky gcc harness
Signed-off-by: Koen Kooi <k-kooi@ti.com>
Diffstat (limited to 'recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99375.patch')
-rw-r--r-- | recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99375.patch | 146 |
1 files changed, 146 insertions, 0 deletions
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99375.patch b/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99375.patch new file mode 100644 index 0000000000..fac64b9642 --- /dev/null +++ b/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99375.patch | |||
@@ -0,0 +1,146 @@ | |||
1 | 2010-08-26 Maciej Rozycki <macro@codesourcery.com> | ||
2 | |||
3 | Merge from Sourcery G++ 4.4: | ||
4 | |||
5 | 2009-02-17 Andrew Jenner <andrew@codesourcery.com> | ||
6 | Maciej Rozycki <macro@codesourcery.com> | ||
7 | |||
8 | gcc/ | ||
9 | * unwind.inc (_Unwind_RaiseException): Use return value of | ||
10 | uw_init_context. | ||
11 | * unwind-dw2.c (uw_init_context): Make macro an expression instead of | ||
12 | a statement. | ||
13 | (uw_init_context_1): Add return value. | ||
14 | * unwind-sjlj.c (uw_init_context): Add return value. | ||
15 | |||
16 | 2010-08-26 Andrew Stubbs <ams@codesourcery.com> | ||
17 | |||
18 | Merge from Ubuntu GCC: | ||
19 | |||
20 | === modified file 'gcc/unwind-dw2.c' | ||
21 | --- old/gcc/unwind-dw2.c 2010-04-27 08:41:30 +0000 | ||
22 | +++ new/gcc/unwind-dw2.c 2010-08-26 15:38:19 +0000 | ||
23 | @@ -1414,16 +1414,12 @@ | ||
24 | /* Fill in CONTEXT for top-of-stack. The only valid registers at this | ||
25 | level will be the return address and the CFA. */ | ||
26 | |||
27 | -#define uw_init_context(CONTEXT) \ | ||
28 | - do \ | ||
29 | - { \ | ||
30 | - /* Do any necessary initialization to access arbitrary stack frames. \ | ||
31 | - On the SPARC, this means flushing the register windows. */ \ | ||
32 | - __builtin_unwind_init (); \ | ||
33 | - uw_init_context_1 (CONTEXT, __builtin_dwarf_cfa (), \ | ||
34 | - __builtin_return_address (0)); \ | ||
35 | - } \ | ||
36 | - while (0) | ||
37 | +#define uw_init_context(CONTEXT) \ | ||
38 | + /* Do any necessary initialization to access arbitrary stack frames. \ | ||
39 | + On the SPARC, this means flushing the register windows. */ \ | ||
40 | + (__builtin_unwind_init (), \ | ||
41 | + uw_init_context_1 ((CONTEXT), __builtin_dwarf_cfa (), \ | ||
42 | + __builtin_return_address (0))) | ||
43 | |||
44 | static inline void | ||
45 | init_dwarf_reg_size_table (void) | ||
46 | @@ -1431,7 +1427,7 @@ | ||
47 | __builtin_init_dwarf_reg_size_table (dwarf_reg_size_table); | ||
48 | } | ||
49 | |||
50 | -static void __attribute__((noinline)) | ||
51 | +static _Unwind_Reason_Code __attribute__((noinline)) | ||
52 | uw_init_context_1 (struct _Unwind_Context *context, | ||
53 | void *outer_cfa, void *outer_ra) | ||
54 | { | ||
55 | @@ -1445,7 +1441,8 @@ | ||
56 | context->flags = EXTENDED_CONTEXT_BIT; | ||
57 | |||
58 | code = uw_frame_state_for (context, &fs); | ||
59 | - gcc_assert (code == _URC_NO_REASON); | ||
60 | + if (code != _URC_NO_REASON) | ||
61 | + return code; | ||
62 | |||
63 | #if __GTHREADS | ||
64 | { | ||
65 | @@ -1471,6 +1468,8 @@ | ||
66 | initialization context, then we can't see it in the given | ||
67 | call frame data. So have the initialization context tell us. */ | ||
68 | context->ra = __builtin_extract_return_addr (outer_ra); | ||
69 | + | ||
70 | + return _URC_NO_REASON; | ||
71 | } | ||
72 | |||
73 | static void _Unwind_DebugHook (void *, void *) | ||
74 | |||
75 | === modified file 'gcc/unwind-sjlj.c' | ||
76 | --- old/gcc/unwind-sjlj.c 2009-04-09 14:00:19 +0000 | ||
77 | +++ new/gcc/unwind-sjlj.c 2010-08-26 15:38:19 +0000 | ||
78 | @@ -292,10 +292,11 @@ | ||
79 | uw_update_context (context, fs); | ||
80 | } | ||
81 | |||
82 | -static inline void | ||
83 | +static inline _Unwind_Reason_Code | ||
84 | uw_init_context (struct _Unwind_Context *context) | ||
85 | { | ||
86 | context->fc = _Unwind_SjLj_GetContext (); | ||
87 | + return _URC_NO_REASON; | ||
88 | } | ||
89 | |||
90 | static void __attribute__((noreturn)) | ||
91 | |||
92 | === modified file 'gcc/unwind.inc' | ||
93 | --- old/gcc/unwind.inc 2009-04-09 14:00:19 +0000 | ||
94 | +++ new/gcc/unwind.inc 2010-08-26 15:38:19 +0000 | ||
95 | @@ -85,7 +85,8 @@ | ||
96 | _Unwind_Reason_Code code; | ||
97 | |||
98 | /* Set up this_context to describe the current stack frame. */ | ||
99 | - uw_init_context (&this_context); | ||
100 | + code = uw_init_context (&this_context); | ||
101 | + gcc_assert (code == _URC_NO_REASON); | ||
102 | cur_context = this_context; | ||
103 | |||
104 | /* Phase 1: Search. Unwind the stack, calling the personality routine | ||
105 | @@ -198,7 +199,8 @@ | ||
106 | struct _Unwind_Context this_context, cur_context; | ||
107 | _Unwind_Reason_Code code; | ||
108 | |||
109 | - uw_init_context (&this_context); | ||
110 | + code = uw_init_context (&this_context); | ||
111 | + gcc_assert (code == _URC_NO_REASON); | ||
112 | cur_context = this_context; | ||
113 | |||
114 | exc->private_1 = (_Unwind_Ptr) stop; | ||
115 | @@ -221,7 +223,8 @@ | ||
116 | struct _Unwind_Context this_context, cur_context; | ||
117 | _Unwind_Reason_Code code; | ||
118 | |||
119 | - uw_init_context (&this_context); | ||
120 | + code = uw_init_context (&this_context); | ||
121 | + gcc_assert (code == _URC_NO_REASON); | ||
122 | cur_context = this_context; | ||
123 | |||
124 | /* Choose between continuing to process _Unwind_RaiseException | ||
125 | @@ -251,7 +254,8 @@ | ||
126 | if (exc->private_1 == 0) | ||
127 | return _Unwind_RaiseException (exc); | ||
128 | |||
129 | - uw_init_context (&this_context); | ||
130 | + code = uw_init_context (&this_context); | ||
131 | + gcc_assert (code == _URC_NO_REASON); | ||
132 | cur_context = this_context; | ||
133 | |||
134 | code = _Unwind_ForcedUnwind_Phase2 (exc, &cur_context); | ||
135 | @@ -280,7 +284,9 @@ | ||
136 | struct _Unwind_Context context; | ||
137 | _Unwind_Reason_Code code; | ||
138 | |||
139 | - uw_init_context (&context); | ||
140 | + code = uw_init_context (&context); | ||
141 | + if (code != _URC_NO_REASON) | ||
142 | + return _URC_FATAL_PHASE1_ERROR; | ||
143 | |||
144 | while (1) | ||
145 | { | ||
146 | |||