From 18bbdd38fd2e0dbfef65033762eacbfca7d032dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1briel?= Date: Fri, 1 Apr 2016 12:32:41 +0300 Subject: [PATCH] gcc: removed not needed anymore hackery for musl --- base/gcc/gcc.conf | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/base/gcc/gcc.conf b/base/gcc/gcc.conf index 3fb8a2cf9..8f14fc0e9 100644 --- a/base/gcc/gcc.conf +++ b/base/gcc/gcc.conf @@ -72,7 +72,7 @@ EOF } hook_add preconf 5 "mkdir -p objdir; cd objdir" -#hook_add preconf 8 "musl_prep" + configscript="../configure" var_append confopt ' ' "--enable-__cxa_atexit" @@ -126,25 +126,10 @@ if [ "$SDECFG_LIBC" = 'glibc' ]; then # pass --hash-style=gnu option to the linker for all final links var_append confopt ' ' "--with-linker-hash-style=gnu" +else + var_append confopt ' ' '--disable-libssp --disable-libmudflap --disable-libsanitizer' fi -#musl_prep() { -#if [ "$SDECFG_LIBC" = 'musl' ]; then -# # some hackery for musl -# sed -i 's,-lgcc_s,--start-group -lgcc_eh -lgcc -lc --end-group,' ../gcc/gcc.c -# sed -i 's,gcc_no_link=yes,gcc_no_link=no,' ../libstdc++-v3/configure -# mv ../libstdc\+\+-v3/config/os/gnu-linux ../libstdc\+\+-v3/config/os/gnu-linux.org -# cp -r ../libstdc\+\+-v3/config/os/generic ../libstdc\+\+-v3/config/os/gnu-linux -# cp ../libstdc++-v3/config/os/gnu-linux.org/arm-eabi-extra.ver ../libstdc++-v3/config/os/gnu-linux/ -# mv ../libitm/config/linux/x86 ../libitm/config/linux/x86_glibc -# cp -r ../libitm/config/generic ../libitm/config/linux/x86 -# sed -i 's@\./fixinc\.sh@-c true@' ../gcc/Makefile.in -# sed -i 's@/lib/ld-linux.so.2@/lib/ld-musl-i386.so.1@' ../gcc/config/i386/linux.h -# sed -i 's@/lib/ld-linux.so.2@/lib/ld-musl-i386.so.1@' ../gcc/config/i386/linux64.h -# sed -i 's@/lib64/ld-linux-x86-64.so.2@/lib/ld-musl-x86_64.so.1@' ../gcc/config/i386/linux64.h -#fi -#} - if atstage toolchain; then bindir="/$prefix/crosscc" @@ -210,7 +195,6 @@ else var_append confopt " " "--disable-libunwind-exceptions" var_append confopt " " "--enable-clocale=gnu" var_append confopt " " "--disable-libstdcxx-pch" - var_append confopt " " "--disable-libssp" var_append confopt " " "--with-linker-hash-style=gnu" var_append confopt " " "--enable-gnu-indirect-function" var_append confopt " " "--disable-werror"