summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-08-07 16:11:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 23:01:53 +0100
commit75bad1b64bd485a50af69ed1f8663a0dadbb5f9e (patch)
tree839dd2c705d1a9447d95783c8efcfb8d5d94f80f
parent1c914a844b35ff57b1c528251a9eaa19cedbaa10 (diff)
downloadpoky-75bad1b64bd485a50af69ed1f8663a0dadbb5f9e.tar.gz
gcc: reformat 0063-nativesdk-gcc-support.patch
0063-nativesdk-gcc-support.patch can not be applied to source code due to the buggy patch command on sled11, so reformat it, nothing is changed. (From OE-Core rev: 2c8c3d9c4b65d2a5c7976d530138ebcaac2b1447) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch44
1 files changed, 19 insertions, 25 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch b/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
index ba7360cc78..f9efa4537b 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
@@ -15,15 +15,13 @@ a) Add %r into spec file markup which can be used for injected paths
15b) Add other paths which need relocation into a .gccrelocprefix section 15b) Add other paths which need relocation into a .gccrelocprefix section
16 which the relocation code will notice and adjust automatically. 16 which the relocation code will notice and adjust automatically.
17 17
18
19Upstream-Status: Inappropriate 18Upstream-Status: Inappropriate
20RP 2015/7/28 19RP 2015/7/28
21 20diff --git a/gcc/gcc.c b/gcc/gcc.c
22Index: gcc-4.9.2/gcc/gcc.c 21index 5fd3d0a..2de29aa 100644
23=================================================================== 22--- a/gcc/gcc.c
24--- gcc-4.9.2.orig/gcc/gcc.c 23+++ b/gcc/gcc.c
25+++ gcc-4.9.2/gcc/gcc.c 24@@ -120,6 +120,8 @@ static const char *target_system_root = TARGET_SYSTEM_ROOT;
26@@ -120,6 +120,8 @@ static const char *target_system_root =
27 #else 25 #else
28 static const char *target_system_root = 0; 26 static const char *target_system_root = 0;
29 #endif 27 #endif
@@ -32,7 +30,7 @@ Index: gcc-4.9.2/gcc/gcc.c
32 30
33 /* Nonzero means pass the updated target_system_root to the compiler. */ 31 /* Nonzero means pass the updated target_system_root to the compiler. */
34 32
35@@ -384,6 +386,7 @@ or with constant text in a single argume 33@@ -384,6 +386,7 @@ or with constant text in a single argument.
36 %G process LIBGCC_SPEC as a spec. 34 %G process LIBGCC_SPEC as a spec.
37 %R Output the concatenation of target_system_root and 35 %R Output the concatenation of target_system_root and
38 target_sysroot_suffix. 36 target_sysroot_suffix.
@@ -55,7 +53,7 @@ Index: gcc-4.9.2/gcc/gcc.c
55 53
56 /* For native compilers, these are well-known paths containing 54 /* For native compilers, these are well-known paths containing
57 components that may be provided by the system. For cross 55 components that may be provided by the system. For cross
58@@ -1229,9 +1232,9 @@ static const char *const standard_startf 56@@ -1229,9 +1232,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
59 static const char *md_exec_prefix = MD_EXEC_PREFIX; 57 static const char *md_exec_prefix = MD_EXEC_PREFIX;
60 static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; 58 static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
61 static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; 59 static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
@@ -67,7 +65,7 @@ Index: gcc-4.9.2/gcc/gcc.c
67 = STANDARD_STARTFILE_PREFIX_2; 65 = STANDARD_STARTFILE_PREFIX_2;
68 66
69 /* A relative path to be used in finding the location of tools 67 /* A relative path to be used in finding the location of tools
70@@ -5305,6 +5310,11 @@ do_spec_1 (const char *spec, int inswitc 68@@ -5305,6 +5308,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
71 } 69 }
72 break; 70 break;
73 71
@@ -79,10 +77,11 @@ Index: gcc-4.9.2/gcc/gcc.c
79 case 'S': 77 case 'S':
80 value = do_spec_1 (startfile_spec, 0, NULL); 78 value = do_spec_1 (startfile_spec, 0, NULL);
81 if (value != 0) 79 if (value != 0)
82Index: gcc-4.9.2/gcc/cppdefault.c 80
83=================================================================== 81diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
84--- gcc-4.9.2.orig/gcc/cppdefault.c 82index dad69e6..cf43f28 100644
85+++ gcc-4.9.2/gcc/cppdefault.c 83--- a/gcc/cppdefault.c
84+++ b/gcc/cppdefault.c
86@@ -35,6 +35,30 @@ 85@@ -35,6 +35,30 @@
87 # undef CROSS_INCLUDE_DIR 86 # undef CROSS_INCLUDE_DIR
88 #endif 87 #endif
@@ -114,7 +113,7 @@ Index: gcc-4.9.2/gcc/cppdefault.c
114 const struct default_include cpp_include_defaults[] 113 const struct default_include cpp_include_defaults[]
115 #ifdef INCLUDE_DEFAULTS 114 #ifdef INCLUDE_DEFAULTS
116 = INCLUDE_DEFAULTS; 115 = INCLUDE_DEFAULTS;
117@@ -42,38 +66,38 @@ const struct default_include cpp_include 116@@ -42,38 +66,38 @@ const struct default_include cpp_include_defaults[]
118 = { 117 = {
119 #ifdef GPLUSPLUS_INCLUDE_DIR 118 #ifdef GPLUSPLUS_INCLUDE_DIR
120 /* Pick up GNU C++ generic include files. */ 119 /* Pick up GNU C++ generic include files. */
@@ -162,7 +161,7 @@ Index: gcc-4.9.2/gcc/cppdefault.c
162 /* A multilib suffix needs adding if different multilibs use 161 /* A multilib suffix needs adding if different multilibs use
163 different headers. */ 162 different headers. */
164 #ifdef SYSROOT_HEADERS_SUFFIX_SPEC 163 #ifdef SYSROOT_HEADERS_SUFFIX_SPEC
165@@ -85,21 +109,21 @@ const struct default_include cpp_include 164@@ -85,16 +109,16 @@ const struct default_include cpp_include_defaults[]
166 #endif 165 #endif
167 #ifdef CROSS_INCLUDE_DIR 166 #ifdef CROSS_INCLUDE_DIR
168 /* One place the target system's headers might be. */ 167 /* One place the target system's headers might be. */
@@ -183,15 +182,10 @@ Index: gcc-4.9.2/gcc/cppdefault.c
183 #endif 182 #endif
184 { 0, 0, 0, 0, 0, 0 } 183 { 0, 0, 0, 0, 0, 0 }
185 }; 184 };
186 #endif /* no INCLUDE_DEFAULTS */ 185diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
187 186index 30b6fed..2ef96b7 100644
188 #ifdef GCC_INCLUDE_DIR 187--- a/gcc/cppdefault.h
189 const char cpp_GCC_INCLUDE_DIR[] = GCC_INCLUDE_DIR; 188+++ b/gcc/cppdefault.h
190 const size_t cpp_GCC_INCLUDE_DIR_len = sizeof GCC_INCLUDE_DIR - 8;
191Index: gcc-4.9.2/gcc/cppdefault.h
192===================================================================
193--- gcc-4.9.2.orig/gcc/cppdefault.h
194+++ gcc-4.9.2/gcc/cppdefault.h
195@@ -33,7 +33,8 @@ 189@@ -33,7 +33,8 @@
196 190
197 struct default_include 191 struct default_include