mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

gcc-5: Fix hang with mmusl option on cmdline

Browse Source 
When using -m32 -mmusl options in this order, gcc hangs
in parsing the options decode_cmdline_options_to_array()
the reason is that we have broken the link when adding
mmusl options, the order of specifying libc was not kept
in order as a result it was unable to contruct the array
correctly and ended in parse hang.

We fix the options to specify the order properly.

(From OE-Core rev: b6f1b26db8a1da2aae9557eeb8aae5beb7af1a06)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2016-06-30 14:09:27 -07:00
committed by Richard Purdie
parent 11ca5f99a7
commit 320dacf891
1 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/gcc/gcc-5.3/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
+36 -36
View File
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
gcc/ginclude/stddef.h | 3 ++ gcc/ginclude/stddef.h | 3 ++
6 files changed, 110 insertions(+), 13 deletions(-) 6 files changed, 110 insertions(+), 13 deletions(-)
diff --git a/gcc/config.gcc b/gcc/config.gcc Index: gcc-5.4.0/gcc/config.gcc
index 3825bd5..39ce047 100644 ===================================================================
--- a/gcc/config.gcc --- gcc-5.4.0.orig/gcc/config.gcc
+++ b/gcc/config.gcc +++ gcc-5.4.0/gcc/config.gcc
@@ -575,7 +575,7 @@ case ${target} in @@ -575,7 +575,7 @@ case ${target} in
esac esac
@@ -50,11 +50,11 @@ index 3825bd5..39ce047 100644
if test x${enable_secureplt} = xyes; then if test x${enable_secureplt} = xyes; then
tm_file="rs6000/secureplt.h ${tm_file}" tm_file="rs6000/secureplt.h ${tm_file}"
fi fi
diff --git a/gcc/config/linux.h b/gcc/config/linux.h Index: gcc-5.4.0/gcc/config/linux.h
index 22b9be5..ca9a17f 100644 ===================================================================
--- a/gcc/config/linux.h --- gcc-5.4.0.orig/gcc/config/linux.h
+++ b/gcc/config/linux.h +++ gcc-5.4.0/gcc/config/linux.h
@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTI
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
@@ -67,7 +67,7 @@ index 22b9be5..ca9a17f 100644
#endif #endif
#define GNU_USER_TARGET_OS_CPP_BUILTINS() \ #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
@@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTI
uClibc or Bionic is the default C library and whether uClibc or Bionic is the default C library and whether
-muclibc or -mglibc or -mbionic has been passed to change the default. */ -muclibc or -mglibc or -mbionic has been passed to change the default. */
@@ -97,7 +97,7 @@ index 22b9be5..ca9a17f 100644
#else #else
#error "Unsupported DEFAULT_LIBC" #error "Unsupported DEFAULT_LIBC"
#endif /* DEFAULT_LIBC */ #endif /* DEFAULT_LIBC */
@@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTI
#define GNU_USER_DYNAMIC_LINKER \ #define GNU_USER_DYNAMIC_LINKER \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
@@ -118,7 +118,7 @@ index 22b9be5..ca9a17f 100644
/* Whether we have Bionic libc runtime */ /* Whether we have Bionic libc runtime */
#undef TARGET_HAS_BIONIC #undef TARGET_HAS_BIONIC
@@ -123,3 +128,74 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -123,3 +128,74 @@ see the files COPYING3 and COPYING.RUNTI
# define TARGET_LIBC_HAS_FUNCTION linux_libc_has_function # define TARGET_LIBC_HAS_FUNCTION linux_libc_has_function
#endif #endif
@@ -193,32 +193,35 @@ index 22b9be5..ca9a17f 100644
+ { 0, 0, 0, 0, 0, 0 } \ + { 0, 0, 0, 0, 0, 0 } \
+ } + }
+#endif +#endif
diff --git a/gcc/config/linux.opt b/gcc/config/linux.opt Index: gcc-5.4.0/gcc/config/linux.opt
index c054338..9334f74 100644 ===================================================================
--- a/gcc/config/linux.opt --- gcc-5.4.0.orig/gcc/config/linux.opt
+++ b/gcc/config/linux.opt +++ gcc-5.4.0/gcc/config/linux.opt
@@ -30,3 +30,7 @@ Use GNU C library @@ -28,5 +28,9 @@ Target Report RejectNegative Var(linux_l
Use GNU C library
muclibc muclibc
Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) -Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
+Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl)
Use uClibc C library Use uClibc C library
+ +
+mmusl +mmusl
+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
+Use musl C library +Use musl C library
diff --git a/gcc/config/rs6000/secureplt.h b/gcc/config/rs6000/secureplt.h Index: gcc-5.4.0/gcc/config/rs6000/secureplt.h
index b463463..77edf2a 100644 ===================================================================
--- a/gcc/config/rs6000/secureplt.h --- gcc-5.4.0.orig/gcc/config/rs6000/secureplt.h
+++ b/gcc/config/rs6000/secureplt.h +++ gcc-5.4.0/gcc/config/rs6000/secureplt.h
@@ -18,3 +18,4 @@ along with GCC; see the file COPYING3. If not see @@ -18,3 +18,4 @@ along with GCC; see the file COPYING3.
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" +#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h Index: gcc-5.4.0/gcc/config/rs6000/sysv4.h
index c6c31dc..7cd07e0 100644 ===================================================================
--- a/gcc/config/rs6000/sysv4.h --- gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h +++ gcc-5.4.0/gcc/config/rs6000/sysv4.h
@@ -538,6 +538,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN) @@ -538,6 +538,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
#define CC1_SECURE_PLT_DEFAULT_SPEC "" #define CC1_SECURE_PLT_DEFAULT_SPEC ""
#endif #endif
@@ -237,10 +240,10 @@ index c6c31dc..7cd07e0 100644
{ "cpp_os_ads", CPP_OS_ADS_SPEC }, \ { "cpp_os_ads", CPP_OS_ADS_SPEC }, \
{ "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
{ "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h Index: gcc-5.4.0/gcc/ginclude/stddef.h
index f20a41b..eb879ef 100644 ===================================================================
--- a/gcc/ginclude/stddef.h --- gcc-5.4.0.orig/gcc/ginclude/stddef.h
+++ b/gcc/ginclude/stddef.h +++ gcc-5.4.0/gcc/ginclude/stddef.h
@@ -184,6 +184,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; @@ -184,6 +184,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
#ifndef _GCC_SIZE_T #ifndef _GCC_SIZE_T
#ifndef _SIZET_ #ifndef _SIZET_
@@ -265,6 +268,3 @@ index f20a41b..eb879ef 100644
#endif /* __size_t */ #endif /* __size_t */
#endif /* _SIZET_ */ #endif /* _SIZET_ */
#endif /* _GCC_SIZE_T */ #endif /* _GCC_SIZE_T */
--
2.6.3