Merge pull request #773 from stilor/fix-bionic-32bit

Fix ARM32 name for android

8 files changed, 5 insertions, 7 deletions

diff --git a/.travis.yml b/.travis.yml
index bb8d94a..1be7a57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ install:
 env:
     - CT_SAMPLE=arm-unknown-eabi
     - CT_SAMPLE=arm-unknown-linux-musleabi
-    - CT_SAMPLE=aarch64-unknown-linux-gnueabi
+    - CT_SAMPLE=aarch64-unknown-linux-gnu
     - CT_SAMPLE=mips64el-multilib-linux-uclibc
     - CT_SAMPLE=powerpc-e500v2-linux-gnuspe
     - CT_SAMPLE=x86_64-unknown-linux-uclibc
diff --git a/samples/aarch64-rpi3-linux-gnueabi/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config
index 6d51c12..01605ac 100644
--- a/samples/aarch64-rpi3-linux-gnueabi/crosstool.config
+++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config
@@ -7,6 +7,5 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_gdb=y
diff --git a/samples/aarch64-rpi3-linux-gnueabi/reported.by b/samples/aarch64-rpi3-linux-gnu/reported.by
index 0b99105..a7cdf73 100644
--- a/samples/aarch64-rpi3-linux-gnueabi/reported.by
+++ b/samples/aarch64-rpi3-linux-gnu/reported.by
@@ -1,3 +1,3 @@
 reporter_name="Bryan Hundven"
-reporter_url="https://github.com/crosstool-ng/crosstool-ng/issues"
+reporter_url=""
 reporter_comment="Raspberry PI 3 aarch64"
diff --git a/samples/aarch64-unknown-linux-gnueabi/crosstool.config b/samples/aarch64-unknown-linux-gnu/crosstool.config
index 8ff183c..e3a393a 100644
--- a/samples/aarch64-unknown-linux-gnueabi/crosstool.config
+++ b/samples/aarch64-unknown-linux-gnu/crosstool.config
@@ -6,6 +6,5 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_gdb=y
diff --git a/samples/aarch64-unknown-linux-gnueabi/reported.by b/samples/aarch64-unknown-linux-gnu/reported.by
index 37668de..224868b 100644
--- a/samples/aarch64-unknown-linux-gnueabi/reported.by
+++ b/samples/aarch64-unknown-linux-gnu/reported.by
@@ -1,3 +1,3 @@
 reporter_name="Bryan Hundven"
-reporter_url="https://github.com/crosstool-ng/crosstool-ng/issues"
+reporter_url=""
 reporter_comment="Generic aarch64 toolchain"
diff --git a/samples/aarch64-unknown-linux-uclibcgnueabi/crosstool.config b/samples/aarch64-unknown-linux-uclibc/crosstool.config
index ebc0524..ebc0524 100644
--- a/samples/aarch64-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/aarch64-unknown-linux-uclibc/crosstool.config
diff --git a/samples/aarch64-unknown-linux-uclibcgnueabi/reported.by b/samples/aarch64-unknown-linux-uclibc/reported.by
index d4dfbc2..d4dfbc2 100644
--- a/samples/aarch64-unknown-linux-uclibcgnueabi/reported.by
+++ b/samples/aarch64-unknown-linux-uclibc/reported.by
diff --git a/scripts/build/arch/arm.sh b/scripts/build/arch/arm.sh
index 8733ac3..7433c92 100644
--- a/scripts/build/arch/arm.sh
+++ b/scripts/build/arch/arm.sh
@@ -15,10 +15,10 @@ CT_DoArchTupleValues() {
 
     # The system part of the tuple:
     case "${CT_LIBC},${CT_ARCH_ARM_EABI}" in
-        *glibc,y)   CT_TARGET_SYS=gnueabi;;
+        glibc,y)    CT_TARGET_SYS=gnueabi;;
         uClibc,y)   CT_TARGET_SYS=uclibc${CT_LIBC_UCLIBC_USE_GNU_SUFFIX:+gnu}eabi;;
         musl,y)     CT_TARGET_SYS=musleabi;;
-        bionic,y)   CT_TARGET_SYS=android;;
+        bionic,y)   CT_TARGET_SYS=androideabi;;
         *,y)        CT_TARGET_SYS=eabi;;
     esac