From d7c408c9ff9388e8f2b8cfdd0ddc03aedc1311c9 Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Tue, 4 Aug 2015 17:32:23 +0200 Subject: [PATCH 01/13] gcc 4.9 changes --- build-toolchain-arm.sh | 12 ------------ build-toolchain-x86.sh | 11 ----------- build-toolchains.sh | 16 ++++++++++++++++ download-toolchain.sh | 11 ----------- ndk-prebuilt | 2 +- platform/development | 2 +- platform/ndk | 2 +- .../gcc/linux-x86/host/i686-linux-glibc2.7-4.6 | 1 - 8 files changed, 19 insertions(+), 38 deletions(-) delete mode 100755 build-toolchain-arm.sh delete mode 100755 build-toolchain-x86.sh create mode 100755 build-toolchains.sh delete mode 100755 download-toolchain.sh delete mode 160000 platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6 diff --git a/build-toolchain-arm.sh b/build-toolchain-arm.sh deleted file mode 100755 index f1fc9c5..0000000 --- a/build-toolchain-arm.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -e - -SCRIPTDIR=$(dirname $0) -TOP=$(cd $SCRIPTDIR; pwd) -NDK=$TOP/platform/ndk -NDK_LOGFILE=/tmp/ndk-build.log -export NDK NDK_LOGFILE NUM_JOBS -rm -f $NDK_LOGFILE -$NDK/build/tools/rebuild-all-prebuilt.sh --arch="arm" --systems=androidx86static --package-dir=$TOP/ndk-prebuilt $TOP/toolchain-sources/ -$NDK/build/tools/rebuild-all-prebuilt.sh --systems=androidarmstatic --arch=arm --package-dir=$TOP/ndk-prebuilt $TOP/toolchain-sources/ diff --git a/build-toolchain-x86.sh b/build-toolchain-x86.sh deleted file mode 100755 index 5534071..0000000 --- a/build-toolchain-x86.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -e - -SCRIPTDIR=$(dirname $0) -TOP=$(cd $SCRIPTDIR; pwd) -NDK=$TOP/platform/ndk -NDK_LOGFILE=/tmp/ndk-build.log -export NDK NDK_LOGFILE NUM_JOBS -rm -f $NDK_LOGFILE -$NDK/build/tools/rebuild-all-prebuilt.sh --arch="arm x86" --systems=androidx86static --package-dir=$TOP/ndk-prebuilt $TOP/toolchain-sources/ diff --git a/build-toolchains.sh b/build-toolchains.sh new file mode 100755 index 0000000..37f2a91 --- /dev/null +++ b/build-toolchains.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e + +SCRIPTDIR=$(dirname $0) +TOP=$(cd $SCRIPTDIR; pwd) +ANDROID_BUILD_TOP=$TOP +NDK=$TOP/platform/ndk +NDK_LOGFILE=/tmp/ndk-build.log +export NDK NDK_LOGFILE ANDROID_BUILD_TOP +rm -f $NDK_LOGFILE +rm -f $TOP/ndk-prebuilts/* + +$NDK/build/tools/rebuild-all-prebuilt.sh --arch="arm x86" --systems=androidx86static --gcc-version-list=4.9 --llvm-version-list= --package-dir=$TOP/ndk-prebuilt $TOP/toolchain/ + +$NDK/build/tools/rebuild-all-prebuilt.sh --arch="arm x86" --systems=androidarmstatic --gcc-version-list=4.9 --llvm-version-list= --no-gen-platforms --package-dir=$TOP/ndk-prebuilt $TOP/toolchain/ diff --git a/download-toolchain.sh b/download-toolchain.sh deleted file mode 100755 index c492c9f..0000000 --- a/download-toolchain.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -e - -SCRIPTDIR=$(dirname $0) -TOP=$(cd $SCRIPTDIR; pwd) -NDK=$TOP/platform/ndk -NDK_LOGFILE=/tmp/ndk-build.log -export NDK NDK_LOGFILE -mkdir -p $TOP/toolchain-sources -$NDK/build/tools/download-toolchain-sources.sh --git-date=2013-04-10 $TOP/toolchain-sources diff --git a/ndk-prebuilt b/ndk-prebuilt index 8b1ca72..c149d44 160000 --- a/ndk-prebuilt +++ b/ndk-prebuilt @@ -1 +1 @@ -Subproject commit 8b1ca7236b3b9952fc9b1a0fa89c880efe9f1cea +Subproject commit c149d445a9d627ec9d9c659285ae8d90eb58785a diff --git a/platform/development b/platform/development index 13dfb24..f6b91cf 160000 --- a/platform/development +++ b/platform/development @@ -1 +1 @@ -Subproject commit 13dfb24d107a0e211ac04ca63cac685a48eebb4f +Subproject commit f6b91cf39b54e0a6f59e53f4de968b0745350d7e diff --git a/platform/ndk b/platform/ndk index b888ebb..245710c 160000 --- a/platform/ndk +++ b/platform/ndk @@ -1 +1 @@ -Subproject commit b888ebb7485872dcdb9e4cb7132ad05a6dda4797 +Subproject commit 245710cc73c963a73eefc943f6ef916b65eea6ea diff --git a/platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6 b/platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6 deleted file mode 160000 index f99fb92..0000000 --- a/platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f99fb92539526871d430750455886db1ab182241 From 832a312b8078f6f484c2ca569d84a255da72a49b Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Tue, 4 Aug 2015 17:51:29 +0200 Subject: [PATCH 02/13] add new git submodules --- .gitmodules | 48 +++++++++++++++++++ platform/bionic | 1 + .../linux-x86/host/x86_64-linux-glibc2.11-4.8 | 1 + toolchain/binutils | 1 + toolchain/build | 1 + toolchain/cloog | 1 + toolchain/expat | 1 + toolchain/gcc | 1 + toolchain/gdb | 1 + toolchain/gmp | 1 + toolchain/isl | 1 + toolchain/mpc | 1 + toolchain/mpfr | 1 + toolchain/ppl | 1 + toolchain/sed | 1 + toolchain/yasm | 1 + 16 files changed, 63 insertions(+) create mode 160000 platform/bionic create mode 160000 platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8 create mode 160000 toolchain/binutils create mode 160000 toolchain/build create mode 160000 toolchain/cloog create mode 160000 toolchain/expat create mode 160000 toolchain/gcc create mode 160000 toolchain/gdb create mode 160000 toolchain/gmp create mode 160000 toolchain/isl create mode 160000 toolchain/mpc create mode 160000 toolchain/mpfr create mode 160000 toolchain/ppl create mode 160000 toolchain/sed create mode 160000 toolchain/yasm diff --git a/.gitmodules b/.gitmodules index 3e0593a..aeca418 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,51 @@ [submodule "busybox"] path = busybox url = git@github.com:android-ide/busybox.git +[submodule "toolchain/build"] + path = toolchain/build + url = git@github.com:android-ide/toolchain-build.git + branch = aide-ndk-gcc-4.9 +[submodule "toolchain/gcc"] + path = toolchain/gcc + url = git@github.com:android-ide/toolchain-gcc.git + branch = ndk-patches +[submodule "toolchain/binutils"] + path = toolchain/binutils + url = git@github.com:android-ide/toolchain-binutils.git + branch = ndk-patches +[submodule "toolchain/cloog"] + path = toolchain/cloog + url = git@github.com:android-ide/toolchain-cloog.git +[submodule "toolchain/expat"] + path = toolchain/expat + url = git@github.com:android-ide/toolchain-expat.git +[submodule "toolchain/gdb"] + path = toolchain/gdb + url = git@github.com:android-ide/toolchain-gdb.git +[submodule "toolchain/gmp"] + path = toolchain/gmp + url = git@github.com:android-ide/toolchain-gmp.git +[submodule "toolchain/isl"] + path = toolchain/isl + url = git@github.com:android-ide/toolchain-isl.git +[submodule "toolchain/mpc"] + path = toolchain/mpc + url = git@github.com:android-ide/toolchain-mpc.git +[submodule "toolchain/mpfr"] + path = toolchain/mpfr + url = git@github.com:android-ide/toolchain-mpfr.git +[submodule "toolchain/ppl"] + path = toolchain/ppl + url = git@github.com:android-ide/toolchain-ppl.git +[submodule "toolchain/sed"] + path = toolchain/sed + url = git@github.com:android-ide/toolchain-sed.git +[submodule "toolchain/yasm"] + path = toolchain/yasm + url = git@github.com:android-ide/toolchain-yasm.git +[submodule "platform/bionic"] + path = platform/bionic + url = git@github.com:android-ide/platform_bionic.git +[submodule "platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8"] + path = platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8 + url = git@github.com:android-ide/platform-prebuilts-gcc-linux-x86-host-x86_64-linux-glibc2.11-4.8.git diff --git a/platform/bionic b/platform/bionic new file mode 160000 index 0000000..7e919da --- /dev/null +++ b/platform/bionic @@ -0,0 +1 @@ +Subproject commit 7e919daeaad62515ebbbf7b06badc77625a14d90 diff --git a/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8 b/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8 new file mode 160000 index 0000000..63b209f --- /dev/null +++ b/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8 @@ -0,0 +1 @@ +Subproject commit 63b209feac0b045f5fc68810fd2e65bf1ca51e2f diff --git a/toolchain/binutils b/toolchain/binutils new file mode 160000 index 0000000..4575348 --- /dev/null +++ b/toolchain/binutils @@ -0,0 +1 @@ +Subproject commit 45753485c13ac9139daf924ff6f5b3952ad02e5c diff --git a/toolchain/build b/toolchain/build new file mode 160000 index 0000000..f11d645 --- /dev/null +++ b/toolchain/build @@ -0,0 +1 @@ +Subproject commit f11d6453a8beb83b45eccf109e338d924ae062db diff --git a/toolchain/cloog b/toolchain/cloog new file mode 160000 index 0000000..604793e --- /dev/null +++ b/toolchain/cloog @@ -0,0 +1 @@ +Subproject commit 604793eab97d360aef729f064674569ee6dbf3e1 diff --git a/toolchain/expat b/toolchain/expat new file mode 160000 index 0000000..40172a0 --- /dev/null +++ b/toolchain/expat @@ -0,0 +1 @@ +Subproject commit 40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5 diff --git a/toolchain/gcc b/toolchain/gcc new file mode 160000 index 0000000..89984ca --- /dev/null +++ b/toolchain/gcc @@ -0,0 +1 @@ +Subproject commit 89984ca6839205d223a9f5d06d651e3642e41cfb diff --git a/toolchain/gdb b/toolchain/gdb new file mode 160000 index 0000000..46a114a --- /dev/null +++ b/toolchain/gdb @@ -0,0 +1 @@ +Subproject commit 46a114a3609f0626208607946e58135e48e41c55 diff --git a/toolchain/gmp b/toolchain/gmp new file mode 160000 index 0000000..b2acd5d --- /dev/null +++ b/toolchain/gmp @@ -0,0 +1 @@ +Subproject commit b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810 diff --git a/toolchain/isl b/toolchain/isl new file mode 160000 index 0000000..b05d457 --- /dev/null +++ b/toolchain/isl @@ -0,0 +1 @@ +Subproject commit b05d4572958c5d497da793f3317084bab90c3033 diff --git a/toolchain/mpc b/toolchain/mpc new file mode 160000 index 0000000..835d16e --- /dev/null +++ b/toolchain/mpc @@ -0,0 +1 @@ +Subproject commit 835d16e92eed875638a8b5d552034c3b1aae045b diff --git a/toolchain/mpfr b/toolchain/mpfr new file mode 160000 index 0000000..de979fc --- /dev/null +++ b/toolchain/mpfr @@ -0,0 +1 @@ +Subproject commit de979fc377db766591e7feaf052f0de59be46e76 diff --git a/toolchain/ppl b/toolchain/ppl new file mode 160000 index 0000000..979062d --- /dev/null +++ b/toolchain/ppl @@ -0,0 +1 @@ +Subproject commit 979062d362bc5a1c00804237b408b19b4618fb24 diff --git a/toolchain/sed b/toolchain/sed new file mode 160000 index 0000000..45df23d --- /dev/null +++ b/toolchain/sed @@ -0,0 +1 @@ +Subproject commit 45df23d6dc8b51ea5cd903d023c10fd7d72415b9 diff --git a/toolchain/yasm b/toolchain/yasm new file mode 160000 index 0000000..d4d816b --- /dev/null +++ b/toolchain/yasm @@ -0,0 +1 @@ +Subproject commit d4d816b443cb5798f0f41e0c3f05f6c2dd1d87b5 From 764e8ff3414a754e6c06d45fe66b5eeb0244391f Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Wed, 5 Aug 2015 08:20:18 +0200 Subject: [PATCH 03/13] update packaging scripts for gcc 4.9 --- package-ndk-aide-release-arm.sh | 2 +- package-ndk-aide-release-x86.sh | 2 +- package-ndk-release-arm.sh | 2 +- package-ndk-release-x86.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-ndk-aide-release-arm.sh b/package-ndk-aide-release-arm.sh index d30dd31..e2871e9 100755 --- a/package-ndk-aide-release-arm.sh +++ b/package-ndk-aide-release-arm.sh @@ -11,7 +11,7 @@ tar xjf $TOP/ndk-release/android-ndk-aide-linux-arm.tar.bz2 rm -rf android-ndk-aide/{samples,docs,tests} for toolchain in android-ndk-aide/toolchains/* do - if [ "${toolchain}" != "android-ndk-aide/toolchains/arm-linux-androideabi-4.6" ] + if [ "${toolchain}" != "android-ndk-aide/toolchains/arm-linux-androideabi-4.9" -a "${toolchain}" != "android-ndk-aide/toolchains/x86-4.9" ] then rm -r ${toolchain} fi diff --git a/package-ndk-aide-release-x86.sh b/package-ndk-aide-release-x86.sh index c14feb9..eca57d4 100755 --- a/package-ndk-aide-release-x86.sh +++ b/package-ndk-aide-release-x86.sh @@ -11,7 +11,7 @@ tar xjf $TOP/ndk-release/android-ndk-aide-linux-x86.tar.bz2 rm -rf android-ndk-aide/{samples,docs,tests} for toolchain in android-ndk-aide/toolchains/* do - if [ "${toolchain}" != "android-ndk-aide/toolchains/x86-4.6" ] + if [ "${toolchain}" != "android-ndk-aide/toolchains/arm-linux-androideabi-4.9" -a "${toolchain}" != "android-ndk-aide/toolchains/x86-4.9" ] then rm -r ${toolchain} fi diff --git a/package-ndk-release-arm.sh b/package-ndk-release-arm.sh index aed0528..0d701f3 100755 --- a/package-ndk-release-arm.sh +++ b/package-ndk-release-arm.sh @@ -6,4 +6,4 @@ NDK=$TOP/platform/ndk NDK_LOGFILE=/tmp/ndk-build.log export NDK NDK_LOGFILE NUM_JOBS rm $NDK_LOGFILE -$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-arm --arch=arm --toolchains=arm-linux-androideabi-4.6 --out-dir=$TOP/ndk-release +$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-arm --arch=arm,x86 --llvm-version-list= --toolchains=arm-linux-androideabi-4.9,x86-4.9 --out-dir=$TOP/ndk-release diff --git a/package-ndk-release-x86.sh b/package-ndk-release-x86.sh index 0620d4c..8b36ba0 100755 --- a/package-ndk-release-x86.sh +++ b/package-ndk-release-x86.sh @@ -6,4 +6,4 @@ NDK=$TOP/platform/ndk NDK_LOGFILE=/tmp/ndk-build.log export NDK NDK_LOGFILE NUM_JOBS rm $NDK_LOGFILE -$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-x86 --arch=x86 --toolchains=x86-4.6 --out-dir=$TOP/ndk-release +$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-x86 --arch=x86,arm --llvm-version-list= --toolchains=arm-linux-androideabi-4.9,x86-4.9 --out-dir=$TOP/ndk-release From 61b55f2e1570700e9b4656b57c831811f1d94689 Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Wed, 5 Aug 2015 08:50:48 +0200 Subject: [PATCH 04/13] don't use hard links in tar archives as Android M does not support hard links at this time. --- package-ndk-aide-release-arm.sh | 2 +- package-ndk-aide-release-x86.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-ndk-aide-release-arm.sh b/package-ndk-aide-release-arm.sh index e2871e9..74167b8 100755 --- a/package-ndk-aide-release-arm.sh +++ b/package-ndk-aide-release-arm.sh @@ -16,6 +16,6 @@ do rm -r ${toolchain} fi done -tar cjf $TOP/ndk-aide-release/android-ndk-aide-linux-arm-$RELEASE.tar.bz2 android-ndk-aide/ +tar cjf $TOP/ndk-aide-release/android-ndk-aide-linux-arm-$RELEASE.tar.bz2 --hard-dereference android-ndk-aide/ cp $TOP/busybox/busybox $TOP/ndk-aide-release/busybox-arm-$RELEASE cp $TOP/ndkinstall.sh $TOP/ndk-aide-release/ndkinstall.sh-$RELEASE diff --git a/package-ndk-aide-release-x86.sh b/package-ndk-aide-release-x86.sh index eca57d4..787f3b2 100755 --- a/package-ndk-aide-release-x86.sh +++ b/package-ndk-aide-release-x86.sh @@ -16,6 +16,6 @@ do rm -r ${toolchain} fi done -tar cjf $TOP/ndk-aide-release/android-ndk-aide-linux-x86-$RELEASE.tar.bz2 android-ndk-aide/ +tar cjf $TOP/ndk-aide-release/android-ndk-aide-linux-x86-$RELEASE.tar.bz2 --hard-dereference android-ndk-aide/ cp $TOP/busybox/busybox $TOP/ndk-aide-release/busybox-x86-$RELEASE cp $TOP/ndkinstall.sh $TOP/ndk-aide-release/ndkinstall.sh-$RELEASE From 118f35c61ee1919ac3aabf4ccfdcf6b1e02cefae Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Wed, 5 Aug 2015 08:52:57 +0200 Subject: [PATCH 05/13] include only a reduced set of files for the AIDE NDK --- package-ndk-release-arm.sh | 2 +- package-ndk-release-x86.sh | 2 +- platform/ndk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-ndk-release-arm.sh b/package-ndk-release-arm.sh index 0d701f3..38f1d75 100755 --- a/package-ndk-release-arm.sh +++ b/package-ndk-release-arm.sh @@ -6,4 +6,4 @@ NDK=$TOP/platform/ndk NDK_LOGFILE=/tmp/ndk-build.log export NDK NDK_LOGFILE NUM_JOBS rm $NDK_LOGFILE -$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-arm --arch=arm,x86 --llvm-version-list= --toolchains=arm-linux-androideabi-4.9,x86-4.9 --out-dir=$TOP/ndk-release +$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-arm --arch=arm,x86 --llvm-version-list= --toolchains=arm-linux-androideabi-4.9,x86-4.9 --reduced --out-dir=$TOP/ndk-release diff --git a/package-ndk-release-x86.sh b/package-ndk-release-x86.sh index 8b36ba0..9e37391 100755 --- a/package-ndk-release-x86.sh +++ b/package-ndk-release-x86.sh @@ -6,4 +6,4 @@ NDK=$TOP/platform/ndk NDK_LOGFILE=/tmp/ndk-build.log export NDK NDK_LOGFILE NUM_JOBS rm $NDK_LOGFILE -$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-x86 --arch=x86,arm --llvm-version-list= --toolchains=arm-linux-androideabi-4.9,x86-4.9 --out-dir=$TOP/ndk-release +$NDK/build/tools/package-release.sh --prebuilt-dir=$TOP/ndk-prebuilt --release=aide --systems=linux-x86 --arch=x86,arm --llvm-version-list= --toolchains=arm-linux-androideabi-4.9,x86-4.9 --reduced --out-dir=$TOP/ndk-release diff --git a/platform/ndk b/platform/ndk index 245710c..c0af348 160000 --- a/platform/ndk +++ b/platform/ndk @@ -1 +1 @@ -Subproject commit 245710cc73c963a73eefc943f6ef916b65eea6ea +Subproject commit c0af3482274c23867be6dd53d48f775e7180904b From c9b4f067975cb62c6ff085657faf3adc06744d62 Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Wed, 5 Aug 2015 14:23:16 +0200 Subject: [PATCH 06/13] build 32-bit busybox on x86_64 machines --- build-busybox-x86.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-busybox-x86.sh b/build-busybox-x86.sh index 7f719e3..93713a8 100755 --- a/build-busybox-x86.sh +++ b/build-busybox-x86.sh @@ -6,4 +6,4 @@ SCRIPTDIR=$(dirname $0) TOP=$(cd $SCRIPTDIR; pwd) cd $TOP/busybox make aide_defconfig -LDFLAGS="--static" make -j 4 +CFLAGS="-m32" LDFLAGS="-m32 --static" make -j 4 From 104d5ac410fea5120ea41a6242f9ea2024eb6918 Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Thu, 21 Jan 2016 13:54:20 +0100 Subject: [PATCH 07/13] platform/nkd: fix: newer Android versions return armv8l from uname -m for ARM64 CPUs. --- platform/ndk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/ndk b/platform/ndk index c0af348..4bb8909 160000 --- a/platform/ndk +++ b/platform/ndk @@ -1 +1 @@ -Subproject commit c0af3482274c23867be6dd53d48f775e7180904b +Subproject commit 4bb8909056e0f2bd4ac631728db23b6702f5f0e2 From a2773cd900e1f722af63b69b6a6fa94d8d068120 Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Mon, 7 Aug 2017 16:40:05 +0200 Subject: [PATCH 08/13] compile busybox with clang and NDK r15 for Android O --- build-busybox-arm.sh | 5 ++++- build-busybox-x86.sh | 5 ++++- busybox | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build-busybox-arm.sh b/build-busybox-arm.sh index 97a9564..8b82429 100755 --- a/build-busybox-arm.sh +++ b/build-busybox-arm.sh @@ -5,5 +5,8 @@ set -e SCRIPTDIR=$(dirname $0) TOP=$(cd $SCRIPTDIR; pwd) cd $TOP/busybox +$ANDROID_NDK/build/tools/make_standalone_toolchain.py --arch arm --api 14 --install-dir /tmp/my-android-toolchain --force +export PATH=/tmp/my-android-toolchain/bin:$PATH +git clean -fdx make aide_defconfig -LDFLAGS="--static" make -j 4 CROSS_COMPILE=arm-linux-gnueabi- +make EXTRA_CFLAGS="-O0 -D__NDK_MAJOR__=15 -Wno-ignored-optimization-argument -Wno-unused-command-line-argument" CROSS_COMPILE=arm-linux-androideabi- CC=arm-linux-androideabi-clang diff --git a/build-busybox-x86.sh b/build-busybox-x86.sh index 93713a8..6b8666e 100755 --- a/build-busybox-x86.sh +++ b/build-busybox-x86.sh @@ -5,5 +5,8 @@ set -e SCRIPTDIR=$(dirname $0) TOP=$(cd $SCRIPTDIR; pwd) cd $TOP/busybox +$ANDROID_NDK/build/tools/make_standalone_toolchain.py --arch x86 --api 14 --install-dir /tmp/my-android-toolchain --force +export PATH=/tmp/my-android-toolchain/bin:$PATH +git clean -fdx make aide_defconfig -CFLAGS="-m32" LDFLAGS="-m32 --static" make -j 4 +make EXTRA_CFLAGS="-DFAST_FUNC= -D__NDK_MAJOR__=15 -Wno-ignored-optimization-argument -Wno-unused-command-line-argument" CROSS_COMPILE=i686-linux-android- CC=i686-linux-android-clang diff --git a/busybox b/busybox index 5837297..a05a290 160000 --- a/busybox +++ b/busybox @@ -1 +1 @@ -Subproject commit 583729775d8d01796eb530afe9bf99f4dc3e67e2 +Subproject commit a05a290f7d9fc44640b73e4dc37c90649b685aab From fc66be8fb9dadba6cc11cfcc6992e5c35489b51e Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Mon, 7 Aug 2017 16:59:34 +0200 Subject: [PATCH 09/13] force UNIX-style line endings for scripts --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..50ca329 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sh eol=lf From 4dfe131300cd76aeea6cac975d4f2dfebaa051ef Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Thu, 10 Aug 2017 15:20:26 +0200 Subject: [PATCH 10/13] fix and consolidate busybox build scripts --- build-busybox-arm.sh | 12 ------------ build-busybox-x86.sh | 12 ------------ build-busybox.sh | 32 ++++++++++++++++++++++++++++++++ busybox | 2 +- 4 files changed, 33 insertions(+), 25 deletions(-) delete mode 100755 build-busybox-arm.sh delete mode 100755 build-busybox-x86.sh create mode 100644 build-busybox.sh diff --git a/build-busybox-arm.sh b/build-busybox-arm.sh deleted file mode 100755 index 8b82429..0000000 --- a/build-busybox-arm.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -e - -SCRIPTDIR=$(dirname $0) -TOP=$(cd $SCRIPTDIR; pwd) -cd $TOP/busybox -$ANDROID_NDK/build/tools/make_standalone_toolchain.py --arch arm --api 14 --install-dir /tmp/my-android-toolchain --force -export PATH=/tmp/my-android-toolchain/bin:$PATH -git clean -fdx -make aide_defconfig -make EXTRA_CFLAGS="-O0 -D__NDK_MAJOR__=15 -Wno-ignored-optimization-argument -Wno-unused-command-line-argument" CROSS_COMPILE=arm-linux-androideabi- CC=arm-linux-androideabi-clang diff --git a/build-busybox-x86.sh b/build-busybox-x86.sh deleted file mode 100755 index 6b8666e..0000000 --- a/build-busybox-x86.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -e - -SCRIPTDIR=$(dirname $0) -TOP=$(cd $SCRIPTDIR; pwd) -cd $TOP/busybox -$ANDROID_NDK/build/tools/make_standalone_toolchain.py --arch x86 --api 14 --install-dir /tmp/my-android-toolchain --force -export PATH=/tmp/my-android-toolchain/bin:$PATH -git clean -fdx -make aide_defconfig -make EXTRA_CFLAGS="-DFAST_FUNC= -D__NDK_MAJOR__=15 -Wno-ignored-optimization-argument -Wno-unused-command-line-argument" CROSS_COMPILE=i686-linux-android- CC=i686-linux-android-clang diff --git a/build-busybox.sh b/build-busybox.sh new file mode 100644 index 0000000..46c87be --- /dev/null +++ b/build-busybox.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +set -e + +SCRIPTDIR=$(dirname $0) +TOP=$(cd $SCRIPTDIR; pwd) +API_LEVEL=14 + +case "$1" in + arm) + ARCH=arm + ARCH_CROSS_COMPILE_PREFIX=arm-linux-androideabi- + ARCH_CFLAGS="-march=armv7-a -mthumb -mfloat-abi=softfp -mfpu=vfpv3-d16" + ARCH_LDFLAGS="-march=armv7-a -Wl,--fix-cortex-a8" + ;; + x86) + ARCH=x86 + ARCH_CROSS_COMPILE_PREFIX=i686-linux-android- + ARCH_CFLAGS= + ARCH_LDFLAGS= + ;; + *) + echo "First argument must be arm or x86." + exit + ;; +esac +$ANDROID_NDK/build/tools/make_standalone_toolchain.py --arch $ARCH --api $API_LEVEL --install-dir /tmp/my-android-toolchain --force +cd $TOP/busybox +export PATH=/tmp/my-android-toolchain/bin:$PATH +git clean -fdx +make aide_defconfig +make EXTRA_CFLAGS="-D__NDK_MAJOR__=15 -D__ANDROID_API__=$API_LEVEL $ARCH_CFLAGS" EXTRA_LDFLAGS="$ARCH_LDFLAGS" CROSS_COMPILE="$ARCH_CROSS_COMPILE_PREFIX" diff --git a/busybox b/busybox index a05a290..82d9d0b 160000 --- a/busybox +++ b/busybox @@ -1 +1 @@ -Subproject commit a05a290f7d9fc44640b73e4dc37c90649b685aab +Subproject commit 82d9d0be269593ecf78602a45f55d4d62e5fd293 From 93e8dbaee2344d2f0e0b46545bf974fb92e2d261 Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Mon, 14 Aug 2017 22:19:59 +0200 Subject: [PATCH 11/13] remove .gitattributes (not needed) --- .gitattributes | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 50ca329..0000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.sh eol=lf From c20d067a1376627226d08a44b52d0b71587837c9 Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Mon, 14 Aug 2017 22:20:52 +0200 Subject: [PATCH 12/13] remove prerequisites for cross compilation --- install-prerequisites-ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-prerequisites-ubuntu.sh b/install-prerequisites-ubuntu.sh index 58ad83c..140fe99 100755 --- a/install-prerequisites-ubuntu.sh +++ b/install-prerequisites-ubuntu.sh @@ -4,4 +4,4 @@ SCRIPTDIR=$(dirname $0) TOP=$(cd $SCRIPTDIR; pwd) aptitude install git build-essential rsync bison flex curl texinfo libtinfo-dev \ -libncurses5-dev gcc-arm-linux-gnueabi g++-arm-linux-gnueabi xapt +libncurses5-dev From 7b6b151a51c5e70d595ec27bd5ac60f4692b0341 Mon Sep 17 00:00:00 2001 From: Hans Kratz Date: Sun, 3 Sep 2017 14:35:20 +0200 Subject: [PATCH 13/13] remove unneeded .gitattributes --- busybox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/busybox b/busybox index 82d9d0b..063c977 160000 --- a/busybox +++ b/busybox @@ -1 +1 @@ -Subproject commit 82d9d0be269593ecf78602a45f55d4d62e5fd293 +Subproject commit 063c977ce2d06094034c6bcf077c5677b4678c8c