diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch b/meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch index 874cd7798d..579bd91251 100644 --- a/meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch +++ b/meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch | |||
@@ -11,16 +11,17 @@ Upstream-Status: Inappropriate [OE Reproducibility specific] | |||
11 | 11 | ||
12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com> [ported to gcc 12] | ||
14 | --- | 15 | --- |
15 | gcc/gengtype.c | 6 +++--- | 16 | gcc/gengtype.cc | 6 +++--- |
16 | gcc/genmodes.c | 32 ++++++++++++++++---------------- | 17 | gcc/genmodes.cc | 32 ++++++++++++++++---------------- |
17 | 2 files changed, 19 insertions(+), 19 deletions(-) | 18 | 2 files changed, 19 insertions(+), 19 deletions(-) |
18 | 19 | ||
19 | diff --git a/gcc/gengtype.c b/gcc/gengtype.c | 20 | diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc |
20 | index 5f50242e857..cbaca9b8cd0 100644 | 21 | index 386ae1b0506..9762e914296 100644 |
21 | --- a/gcc/gengtype.c | 22 | --- a/gcc/gengtype.cc |
22 | +++ b/gcc/gengtype.c | 23 | +++ b/gcc/gengtype.cc |
23 | @@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, | 24 | @@ -1006,7 +1006,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, |
24 | /* Create a fake field with the given type and name. NEXT is the next | 25 | /* Create a fake field with the given type and name. NEXT is the next |
25 | field in the chain. */ | 26 | field in the chain. */ |
26 | #define create_field(next,type,name) \ | 27 | #define create_field(next,type,name) \ |
@@ -29,7 +30,7 @@ index 5f50242e857..cbaca9b8cd0 100644 | |||
29 | 30 | ||
30 | /* Like create_field, but the field is only valid when condition COND | 31 | /* Like create_field, but the field is only valid when condition COND |
31 | is true. */ | 32 | is true. */ |
32 | @@ -1024,7 +1024,7 @@ create_optional_field_ (pair_p next, type_p type, const char *name, | 33 | @@ -1039,7 +1039,7 @@ create_optional_field_ (pair_p next, type_p type, const char *name, |
33 | } | 34 | } |
34 | 35 | ||
35 | #define create_optional_field(next,type,name,cond) \ | 36 | #define create_optional_field(next,type,name,cond) \ |
@@ -38,7 +39,7 @@ index 5f50242e857..cbaca9b8cd0 100644 | |||
38 | 39 | ||
39 | /* Reverse a linked list of 'struct pair's in place. */ | 40 | /* Reverse a linked list of 'struct pair's in place. */ |
40 | pair_p | 41 | pair_p |
41 | @@ -5189,7 +5189,7 @@ main (int argc, char **argv) | 42 | @@ -5238,7 +5238,7 @@ main (int argc, char **argv) |
42 | /* These types are set up with #define or else outside of where | 43 | /* These types are set up with #define or else outside of where |
43 | we can see them. We should initialize them before calling | 44 | we can see them. We should initialize them before calling |
44 | read_input_list. */ | 45 | read_input_list. */ |
@@ -47,11 +48,11 @@ index 5f50242e857..cbaca9b8cd0 100644 | |||
47 | Call;} while (0) | 48 | Call;} while (0) |
48 | POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); | 49 | POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); |
49 | POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); | 50 | POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); |
50 | diff --git a/gcc/genmodes.c b/gcc/genmodes.c | 51 | diff --git a/gcc/genmodes.cc b/gcc/genmodes.cc |
51 | index c268ebc4c6e..4361f3f1563 100644 | 52 | index 59850bb070a..e187f8542a1 100644 |
52 | --- a/gcc/genmodes.c | 53 | --- a/gcc/genmodes.cc |
53 | +++ b/gcc/genmodes.c | 54 | +++ b/gcc/genmodes.cc |
54 | @@ -438,7 +438,7 @@ complete_all_modes (void) | 55 | @@ -440,7 +440,7 @@ complete_all_modes (void) |
55 | } | 56 | } |
56 | 57 | ||
57 | /* For each mode in class CLASS, construct a corresponding complex mode. */ | 58 | /* For each mode in class CLASS, construct a corresponding complex mode. */ |
@@ -60,7 +61,7 @@ index c268ebc4c6e..4361f3f1563 100644 | |||
60 | static void | 61 | static void |
61 | make_complex_modes (enum mode_class cl, | 62 | make_complex_modes (enum mode_class cl, |
62 | const char *file, unsigned int line) | 63 | const char *file, unsigned int line) |
63 | @@ -497,7 +497,7 @@ make_complex_modes (enum mode_class cl, | 64 | @@ -499,7 +499,7 @@ make_complex_modes (enum mode_class cl, |
64 | having as many components as necessary. ORDER is the sorting order | 65 | having as many components as necessary. ORDER is the sorting order |
65 | of the mode, with smaller numbers indicating a higher priority. */ | 66 | of the mode, with smaller numbers indicating a higher priority. */ |
66 | #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W, ORDER) \ | 67 | #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W, ORDER) \ |
@@ -69,16 +70,16 @@ index c268ebc4c6e..4361f3f1563 100644 | |||
69 | #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W, 0) | 70 | #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W, 0) |
70 | static void ATTRIBUTE_UNUSED | 71 | static void ATTRIBUTE_UNUSED |
71 | make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, | 72 | make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, |
72 | @@ -549,7 +549,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, | 73 | @@ -552,7 +552,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, |
73 | /* Create a vector of booleans called NAME with COUNT elements and | ||
74 | BYTESIZE bytes in total. */ | 74 | BYTESIZE bytes in total. */ |
75 | #define VECTOR_BOOL_MODE(NAME, COUNT, BYTESIZE) \ | 75 | #define VECTOR_BOOL_MODE(NAME, COUNT, COMPONENT, BYTESIZE) \ |
76 | - make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, __LINE__) | 76 | make_vector_bool_mode (#NAME, COUNT, #COMPONENT, BYTESIZE, \ |
77 | + make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, 0) | 77 | - __FILE__, __LINE__) |
78 | + __FILE__, 0) | ||
78 | static void ATTRIBUTE_UNUSED | 79 | static void ATTRIBUTE_UNUSED |
79 | make_vector_bool_mode (const char *name, unsigned int count, | 80 | make_vector_bool_mode (const char *name, unsigned int count, |
80 | unsigned int bytesize, const char *file, | 81 | const char *component, unsigned int bytesize, |
81 | @@ -571,7 +571,7 @@ make_vector_bool_mode (const char *name, unsigned int count, | 82 | @@ -574,7 +574,7 @@ make_vector_bool_mode (const char *name, unsigned int count, |
82 | /* Input. */ | 83 | /* Input. */ |
83 | 84 | ||
84 | #define _SPECIAL_MODE(C, N) \ | 85 | #define _SPECIAL_MODE(C, N) \ |
@@ -87,7 +88,7 @@ index c268ebc4c6e..4361f3f1563 100644 | |||
87 | #define RANDOM_MODE(N) _SPECIAL_MODE (RANDOM, N) | 88 | #define RANDOM_MODE(N) _SPECIAL_MODE (RANDOM, N) |
88 | #define CC_MODE(N) _SPECIAL_MODE (CC, N) | 89 | #define CC_MODE(N) _SPECIAL_MODE (CC, N) |
89 | 90 | ||
90 | @@ -584,7 +584,7 @@ make_special_mode (enum mode_class cl, const char *name, | 91 | @@ -587,7 +587,7 @@ make_special_mode (enum mode_class cl, const char *name, |
91 | 92 | ||
92 | #define INT_MODE(N, Y) FRACTIONAL_INT_MODE (N, -1U, Y) | 93 | #define INT_MODE(N, Y) FRACTIONAL_INT_MODE (N, -1U, Y) |
93 | #define FRACTIONAL_INT_MODE(N, B, Y) \ | 94 | #define FRACTIONAL_INT_MODE(N, B, Y) \ |
@@ -96,7 +97,7 @@ index c268ebc4c6e..4361f3f1563 100644 | |||
96 | 97 | ||
97 | static void | 98 | static void |
98 | make_int_mode (const char *name, | 99 | make_int_mode (const char *name, |
99 | @@ -611,16 +611,16 @@ make_opaque_mode (const char *name, | 100 | @@ -628,16 +628,16 @@ make_opaque_mode (const char *name, |
100 | } | 101 | } |
101 | 102 | ||
102 | #define FRACT_MODE(N, Y, F) \ | 103 | #define FRACT_MODE(N, Y, F) \ |
@@ -117,7 +118,7 @@ index c268ebc4c6e..4361f3f1563 100644 | |||
117 | 118 | ||
118 | /* Create a fixed-point mode by setting CL, NAME, BYTESIZE, IBIT, FBIT, | 119 | /* Create a fixed-point mode by setting CL, NAME, BYTESIZE, IBIT, FBIT, |
119 | FILE, and LINE. */ | 120 | FILE, and LINE. */ |
120 | @@ -641,7 +641,7 @@ make_fixed_point_mode (enum mode_class cl, | 121 | @@ -658,7 +658,7 @@ make_fixed_point_mode (enum mode_class cl, |
121 | 122 | ||
122 | #define FLOAT_MODE(N, Y, F) FRACTIONAL_FLOAT_MODE (N, -1U, Y, F) | 123 | #define FLOAT_MODE(N, Y, F) FRACTIONAL_FLOAT_MODE (N, -1U, Y, F) |
123 | #define FRACTIONAL_FLOAT_MODE(N, B, Y, F) \ | 124 | #define FRACTIONAL_FLOAT_MODE(N, B, Y, F) \ |
@@ -126,7 +127,7 @@ index c268ebc4c6e..4361f3f1563 100644 | |||
126 | 127 | ||
127 | static void | 128 | static void |
128 | make_float_mode (const char *name, | 129 | make_float_mode (const char *name, |
129 | @@ -658,7 +658,7 @@ make_float_mode (const char *name, | 130 | @@ -675,7 +675,7 @@ make_float_mode (const char *name, |
130 | #define DECIMAL_FLOAT_MODE(N, Y, F) \ | 131 | #define DECIMAL_FLOAT_MODE(N, Y, F) \ |
131 | FRACTIONAL_DECIMAL_FLOAT_MODE (N, -1U, Y, F) | 132 | FRACTIONAL_DECIMAL_FLOAT_MODE (N, -1U, Y, F) |
132 | #define FRACTIONAL_DECIMAL_FLOAT_MODE(N, B, Y, F) \ | 133 | #define FRACTIONAL_DECIMAL_FLOAT_MODE(N, B, Y, F) \ |
@@ -135,7 +136,7 @@ index c268ebc4c6e..4361f3f1563 100644 | |||
135 | 136 | ||
136 | static void | 137 | static void |
137 | make_decimal_float_mode (const char *name, | 138 | make_decimal_float_mode (const char *name, |
138 | @@ -673,7 +673,7 @@ make_decimal_float_mode (const char *name, | 139 | @@ -690,7 +690,7 @@ make_decimal_float_mode (const char *name, |
139 | } | 140 | } |
140 | 141 | ||
141 | #define RESET_FLOAT_FORMAT(N, F) \ | 142 | #define RESET_FLOAT_FORMAT(N, F) \ |
@@ -144,7 +145,7 @@ index c268ebc4c6e..4361f3f1563 100644 | |||
144 | static void ATTRIBUTE_UNUSED | 145 | static void ATTRIBUTE_UNUSED |
145 | reset_float_format (const char *name, const char *format, | 146 | reset_float_format (const char *name, const char *format, |
146 | const char *file, unsigned int line) | 147 | const char *file, unsigned int line) |
147 | @@ -694,7 +694,7 @@ reset_float_format (const char *name, const char *format, | 148 | @@ -711,7 +711,7 @@ reset_float_format (const char *name, const char *format, |
148 | 149 | ||
149 | /* __intN support. */ | 150 | /* __intN support. */ |
150 | #define INT_N(M,PREC) \ | 151 | #define INT_N(M,PREC) \ |
@@ -153,7 +154,7 @@ index c268ebc4c6e..4361f3f1563 100644 | |||
153 | static void ATTRIBUTE_UNUSED | 154 | static void ATTRIBUTE_UNUSED |
154 | make_int_n (const char *m, int bitsize, | 155 | make_int_n (const char *m, int bitsize, |
155 | const char *file, unsigned int line) | 156 | const char *file, unsigned int line) |
156 | @@ -723,7 +723,7 @@ make_int_n (const char *m, int bitsize, | 157 | @@ -740,7 +740,7 @@ make_int_n (const char *m, int bitsize, |
157 | /* Partial integer modes are specified by relation to a full integer | 158 | /* Partial integer modes are specified by relation to a full integer |
158 | mode. */ | 159 | mode. */ |
159 | #define PARTIAL_INT_MODE(M,PREC,NAME) \ | 160 | #define PARTIAL_INT_MODE(M,PREC,NAME) \ |
@@ -162,16 +163,16 @@ index c268ebc4c6e..4361f3f1563 100644 | |||
162 | static void ATTRIBUTE_UNUSED | 163 | static void ATTRIBUTE_UNUSED |
163 | make_partial_integer_mode (const char *base, const char *name, | 164 | make_partial_integer_mode (const char *base, const char *name, |
164 | unsigned int precision, | 165 | unsigned int precision, |
165 | @@ -750,7 +750,7 @@ make_partial_integer_mode (const char *base, const char *name, | 166 | @@ -767,7 +767,7 @@ make_partial_integer_mode (const char *base, const char *name, |
166 | /* A single vector mode can be specified by naming its component | 167 | /* A single vector mode can be specified by naming its component |
167 | mode and the number of components. */ | 168 | mode and the number of components. */ |
168 | #define VECTOR_MODE(C, M, N) \ | 169 | #define VECTOR_MODE_WITH_PREFIX(PREFIX, C, M, N, ORDER) \ |
169 | - make_vector_mode (MODE_##C, #M, N, __FILE__, __LINE__); | 170 | - make_vector_mode (MODE_##C, #PREFIX, #M, N, ORDER, __FILE__, __LINE__); |
170 | + make_vector_mode (MODE_##C, #M, N, __FILE__, 0); | 171 | + make_vector_mode (MODE_##C, #PREFIX, #M, N, ORDER, __FILE__, 0); |
172 | #define VECTOR_MODE(C, M, N) VECTOR_MODE_WITH_PREFIX(V, C, M, N, 0); | ||
171 | static void ATTRIBUTE_UNUSED | 173 | static void ATTRIBUTE_UNUSED |
172 | make_vector_mode (enum mode_class bclass, | 174 | make_vector_mode (enum mode_class bclass, |
173 | const char *base, | 175 | @@ -814,7 +814,7 @@ make_vector_mode (enum mode_class bclass, |
174 | @@ -793,7 +793,7 @@ make_vector_mode (enum mode_class bclass, | ||
175 | 176 | ||
176 | /* Adjustability. */ | 177 | /* Adjustability. */ |
177 | #define _ADD_ADJUST(A, M, X, C1, C2) \ | 178 | #define _ADD_ADJUST(A, M, X, C1, C2) \ |