gcc: armv7 support; misc tweaks.
This commit is contained in:
parent
1c71e9ea77
commit
53b9daacab
|
@ -20,9 +20,12 @@ if [ -z "$CROSS_BUILD" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
i?86) _triplet="${XBPS_TARGET_MACHINE}-pc-linux-gnu";;
|
i686) _triplet="i686-pc-linux-gnu";;
|
||||||
x86_64) _triplet="${XBPS_MACHINE}-unknown-linux-gnu";;
|
i686-musl) _triplet="i686-pc-linux-musl";;
|
||||||
armv6l) _triplet="arm-linux-gnueabihf";;
|
x86_64) _triplet="x86_64-unknown-linux-gnu";;
|
||||||
|
x86_64-musl) _triplet="x86_64-unknown-linux-musl";;
|
||||||
|
armv[678]l) _triplet="arm-linux-gnueabihf";;
|
||||||
|
armv[678]l-musl) _triplet="arm-linux-musleabi";;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
|
@ -33,19 +36,18 @@ do_configure() {
|
||||||
# Do not run fixincludes
|
# Do not run fixincludes
|
||||||
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
|
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
|
||||||
|
|
||||||
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
armv6l*) _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard";;
|
||||||
|
armv7l*) _args+=" --with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard";;
|
||||||
|
esac
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
export CC_FOR_TARGET="$CC"
|
export CC_FOR_TARGET="$CC"
|
||||||
export GCC_FOR_TARGET="$CC"
|
export GCC_FOR_TARGET="$CC"
|
||||||
export CXX_FOR_TARGET="$CXX"
|
export CXX_FOR_TARGET="$CXX"
|
||||||
|
|
||||||
_langs="c,c++,lto"
|
_langs="c,c++,lto"
|
||||||
_args="--disable-multilib"
|
_args+=" --disable-multilib --host=$XBPS_CROSS_TRIPLET"
|
||||||
if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
|
|
||||||
_args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard"
|
|
||||||
elif [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
|
|
||||||
_args+=" --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=hard"
|
|
||||||
fi
|
|
||||||
_args+=" --host=$XBPS_CROSS_TRIPLET"
|
|
||||||
else
|
else
|
||||||
_langs="c,c++,objc,obj-c++,fortran,go,lto,java"
|
_langs="c,c++,objc,obj-c++,fortran,go,lto,java"
|
||||||
_args+=" --enable-java-gc=boehm --enable-fast-character"
|
_args+=" --enable-java-gc=boehm --enable-fast-character"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user