summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.4/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch72
1 files changed, 36 insertions, 36 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-5.4/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch b/meta/recipes-devtools/gcc/gcc-5.4/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
index b91c02d0b4..26aa96cad9 100644
--- a/meta/recipes-devtools/gcc/gcc-5.4/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.4/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 gcc/ginclude/stddef.h | 3 ++ 15 gcc/ginclude/stddef.h | 3 ++
16 6 files changed, 110 insertions(+), 13 deletions(-) 16 6 files changed, 110 insertions(+), 13 deletions(-)
17 17
18diff --git a/gcc/config.gcc b/gcc/config.gcc 18Index: gcc-5.4.0/gcc/config.gcc
19index 3825bd5..39ce047 100644 19===================================================================
20--- a/gcc/config.gcc 20--- gcc-5.4.0.orig/gcc/config.gcc
21+++ b/gcc/config.gcc 21+++ gcc-5.4.0/gcc/config.gcc
22@@ -575,7 +575,7 @@ case ${target} in 22@@ -575,7 +575,7 @@ case ${target} in
23 esac 23 esac
24 24
@@ -50,11 +50,11 @@ index 3825bd5..39ce047 100644
50 if test x${enable_secureplt} = xyes; then 50 if test x${enable_secureplt} = xyes; then
51 tm_file="rs6000/secureplt.h ${tm_file}" 51 tm_file="rs6000/secureplt.h ${tm_file}"
52 fi 52 fi
53diff --git a/gcc/config/linux.h b/gcc/config/linux.h 53Index: gcc-5.4.0/gcc/config/linux.h
54index 22b9be5..ca9a17f 100644 54===================================================================
55--- a/gcc/config/linux.h 55--- gcc-5.4.0.orig/gcc/config/linux.h
56+++ b/gcc/config/linux.h 56+++ gcc-5.4.0/gcc/config/linux.h
57@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 57@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTI
58 #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) 58 #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
59 #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) 59 #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
60 #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) 60 #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
@@ -67,7 +67,7 @@ index 22b9be5..ca9a17f 100644
67 #endif 67 #endif
68 68
69 #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ 69 #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
70@@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 70@@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTI
71 uClibc or Bionic is the default C library and whether 71 uClibc or Bionic is the default C library and whether
72 -muclibc or -mglibc or -mbionic has been passed to change the default. */ 72 -muclibc or -mglibc or -mbionic has been passed to change the default. */
73 73
@@ -97,7 +97,7 @@ index 22b9be5..ca9a17f 100644
97 #else 97 #else
98 #error "Unsupported DEFAULT_LIBC" 98 #error "Unsupported DEFAULT_LIBC"
99 #endif /* DEFAULT_LIBC */ 99 #endif /* DEFAULT_LIBC */
100@@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 100@@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTI
101 101
102 #define GNU_USER_DYNAMIC_LINKER \ 102 #define GNU_USER_DYNAMIC_LINKER \
103 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ 103 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
@@ -118,7 +118,7 @@ index 22b9be5..ca9a17f 100644
118 118
119 /* Whether we have Bionic libc runtime */ 119 /* Whether we have Bionic libc runtime */
120 #undef TARGET_HAS_BIONIC 120 #undef TARGET_HAS_BIONIC
121@@ -123,3 +128,74 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 121@@ -123,3 +128,74 @@ see the files COPYING3 and COPYING.RUNTI
122 # define TARGET_LIBC_HAS_FUNCTION linux_libc_has_function 122 # define TARGET_LIBC_HAS_FUNCTION linux_libc_has_function
123 123
124 #endif 124 #endif
@@ -193,32 +193,35 @@ index 22b9be5..ca9a17f 100644
193+ { 0, 0, 0, 0, 0, 0 } \ 193+ { 0, 0, 0, 0, 0, 0 } \
194+ } 194+ }
195+#endif 195+#endif
196diff --git a/gcc/config/linux.opt b/gcc/config/linux.opt 196Index: gcc-5.4.0/gcc/config/linux.opt
197index c054338..9334f74 100644 197===================================================================
198--- a/gcc/config/linux.opt 198--- gcc-5.4.0.orig/gcc/config/linux.opt
199+++ b/gcc/config/linux.opt 199+++ gcc-5.4.0/gcc/config/linux.opt
200@@ -30,3 +30,7 @@ Use GNU C library 200@@ -28,5 +28,9 @@ Target Report RejectNegative Var(linux_l
201 Use GNU C library
202
201 muclibc 203 muclibc
202 Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) 204-Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
205+Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl)
203 Use uClibc C library 206 Use uClibc C library
204+ 207+
205+mmusl 208+mmusl
206+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) 209+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
207+Use musl C library 210+Use musl C library
208diff --git a/gcc/config/rs6000/secureplt.h b/gcc/config/rs6000/secureplt.h 211Index: gcc-5.4.0/gcc/config/rs6000/secureplt.h
209index b463463..77edf2a 100644 212===================================================================
210--- a/gcc/config/rs6000/secureplt.h 213--- gcc-5.4.0.orig/gcc/config/rs6000/secureplt.h
211+++ b/gcc/config/rs6000/secureplt.h 214+++ gcc-5.4.0/gcc/config/rs6000/secureplt.h
212@@ -18,3 +18,4 @@ along with GCC; see the file COPYING3. If not see 215@@ -18,3 +18,4 @@ along with GCC; see the file COPYING3.
213 <http://www.gnu.org/licenses/>. */ 216 <http://www.gnu.org/licenses/>. */
214 217
215 #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" 218 #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
216+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" 219+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
217diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h 220Index: gcc-5.4.0/gcc/config/rs6000/sysv4.h
218index c6c31dc..7cd07e0 100644 221===================================================================
219--- a/gcc/config/rs6000/sysv4.h 222--- gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h
220+++ b/gcc/config/rs6000/sysv4.h 223+++ gcc-5.4.0/gcc/config/rs6000/sysv4.h
221@@ -538,6 +538,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN) 224@@ -538,6 +538,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
222 #define CC1_SECURE_PLT_DEFAULT_SPEC "" 225 #define CC1_SECURE_PLT_DEFAULT_SPEC ""
223 #endif 226 #endif
224 227
@@ -237,10 +240,10 @@ index c6c31dc..7cd07e0 100644
237 { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ 240 { "cpp_os_ads", CPP_OS_ADS_SPEC }, \
238 { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ 241 { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
239 { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ 242 { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
240diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h 243Index: gcc-5.4.0/gcc/ginclude/stddef.h
241index f20a41b..eb879ef 100644 244===================================================================
242--- a/gcc/ginclude/stddef.h 245--- gcc-5.4.0.orig/gcc/ginclude/stddef.h
243+++ b/gcc/ginclude/stddef.h 246+++ gcc-5.4.0/gcc/ginclude/stddef.h
244@@ -184,6 +184,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; 247@@ -184,6 +184,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
245 #ifndef _GCC_SIZE_T 248 #ifndef _GCC_SIZE_T
246 #ifndef _SIZET_ 249 #ifndef _SIZET_
@@ -265,6 +268,3 @@ index f20a41b..eb879ef 100644
265 #endif /* __size_t */ 268 #endif /* __size_t */
266 #endif /* _SIZET_ */ 269 #endif /* _SIZET_ */
267 #endif /* _GCC_SIZE_T */ 270 #endif /* _GCC_SIZE_T */
268--
2692.6.3
270