diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-12-21 19:24:34 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-12-21 19:24:34 -0600 |
| commit | 943264b9cbeda10c3fd356b89fa64d31bf1b823c (patch) | |
| tree | 47707d719ee4cb725046a1085407020787e275c0 | |
| parent | 1713a8b18a5af3f3901beb00082163a99231f26e (diff) | |
| download | packages-exp/newstrap.tar.gz packages-exp/newstrap.tar.bz2 packages-exp/newstrap.tar.xz packages-exp/newstrap.zip | |
system/gcc: Bootstrap improvementsexp/newstrap
Needs more testing.
| -rw-r--r-- | system/gcc/APKBUILD | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/system/gcc/APKBUILD b/system/gcc/APKBUILD index ecdfeb48a..4cd579bea 100644 --- a/system/gcc/APKBUILD +++ b/system/gcc/APKBUILD @@ -20,7 +20,7 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev subpackages=" " [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target gcc-lang$_target" replaces="libstdc++ binutils" -options="$options !check !dbg strip toolchain" +options="$options !check !dbg toolchain" : ${LANG_CXX:=true} : ${LANG_OBJC:=true} @@ -35,6 +35,7 @@ LIBITM=true LIBSANITIZER=true if [ "$CHOST" != "$CTARGET" ]; then + options="$options !strip" # usr/$CTARGET/lib/*.so confuses strip if [ "$BOOTSTRAP" = nolibc ]; then LANG_CXX=false LANG_ADA=false @@ -218,6 +219,10 @@ prepare() { return 1 fi + if [ "${BOOTSTRAP}x" = "nolibcx" ]; then + patch -R -p1 -F3 -i "$srcdir"/gcc-6.1-musl-libssp.patch + fi + echo ${pkgver} > gcc/BASE-VER } @@ -236,7 +241,7 @@ build() { armv5-*-*-*eabi) _arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";; armv6-*-*-*eabihf) _arch_configure="--with-arch=armv6zk --with-tune=arm1176jzf-s --with-fpu=vfp --with-float=hard --with-abi=aapcs-linux";; armv7-*-*-*eabihf) _arch_configure="--with-arch=armv7-a --with-tune=generic-armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-abi=aapcs-linux --with-mode=thumb";; - m68k-*-*-*) _arch_configure="--with-arch=68020 --with-tune=68020-40";; + m68k-*-*-*) _arch_configure="--with-cpu=68020";; mipsel-*-*-*) _arch_configure="--with-arch-32=mips2 --with-tune-32=mips32 --with-fp-32=32 --with-mips-plt --with-float=hard --with-abi=32";; mips-*-*-*) _arch_configure="--with-arch=mips3 --with-mips-plt --with-abi=32"; _hash_style="sysv";; mips32el-*-*-*) _arch_configure="--with-arch=mips32 --with-mips-plt --with-abi=32"; _hash_style="sysv";; @@ -262,7 +267,7 @@ build() { case "$BOOTSTRAP" in nolibc) _bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;; - *) _bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;; + *) _bootstrap_configure="--enable-shared --enable-threads --enable-tls --enable-default-ssp" ;; esac $LIBGOMP || _bootstrap_configure="$_bootstrap_configure --disable-libgomp" @@ -307,7 +312,6 @@ build() { $_symvers \ --enable-__cxa_atexit \ --enable-default-pie \ - --enable-default-ssp \ --enable-cloog-backend \ --enable-languages=$_languages \ --enable-linker-build-id \ |