X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/27ce01e83bf0264b9aed9595226ef84f07ca0f52..315a0ef6f9a04618adf5bd30adbd8cbfebd3ffd2:/packages/gcc/build.sh

diff --git a/packages/gcc/build.sh b/packages/gcc/build.sh
index f98e0723..1c28ef8d 100755
--- a/packages/gcc/build.sh
+++ b/packages/gcc/build.sh
@@ -1,20 +1,22 @@
 TERMUX_PKG_HOMEPAGE=http://gcc.gnu.org/
 TERMUX_PKG_DESCRIPTION="GNU C compiler"
-TERMUX_PKG_DEPENDS="binutils, libgmp, libmpfr, libmpc, ndk-sysroot, libgcc, libisl"
-TERMUX_PKG_VERSION=5.3.0
-TERMUX_PKG_BUILD_REVISION=1
-TERMUX_PKG_SRCURL=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-${TERMUX_PKG_VERSION}/gcc-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_DEPENDS="binutils, libgmp, libmpfr, libmpc, ndk-sysroot, libgcc, libisl, libgnustl"
+TERMUX_PKG_VERSION=6.1.0
+TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_SRCURL=ftp://ftp.gnu.org/gnu/gcc/gcc-${TERMUX_PKG_VERSION}/gcc-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-languages=c,c++ --with-system-zlib --disable-multilib --disable-lto"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --target=$TERMUX_HOST_PLATFORM"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-gmp=$TERMUX_PREFIX --with-mpfr=$TERMUX_PREFIX --with-mpc=$TERMUX_PREFIX"
 # To build gcc as a PIE binary:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-stage1-ldflags=\"-specs=$TERMUX_SCRIPTDIR/termux.spec\""
-# TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-isl-include=$TERMUX_PREFIX/include --with-isl-lib=$TERMUX_PREFIX/lib"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-isl-include=$TERMUX_PREFIX/include --with-isl-lib=$TERMUX_PREFIX/lib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-isl-version-check"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-tls"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-host-shared"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-default-pie"
 
-# TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --without-headers --with-local-prefix=$TERMUX_PREFIX/include" # FIXME: gcc5 trying
 if [ "$TERMUX_ARCH" = "arm" ]; then
-        TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-arch=armv7-a --with-fpu=neon --with-float=hard"
+        TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-arch=armv7-a --with-fpu=neon --with-float=softfp"
 elif [ "$TERMUX_ARCH" = "aarch64" ]; then
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-arch=armv8-a"
 elif [ "$TERMUX_ARCH" = "i686" ]; then