From 1029dcf91ae791545add83caf45db9b191487773 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 7 Jul 2017 12:38:32 -0700 Subject: [PATCH 1/2] Fix ARM32 name for android Must have eabi suffix for GCC to accept it. Also: - We only have one glibc now, no need to account for eglibc. - Rename aarch64 samples, eabi suffix does not apply to them (and ct-ng saveconfig was saving them into a different directory). Fixes #772. Signed-off-by: Alexey Neyman --- .../crosstool.config | 1 - .../reported.by | 2 +- .../crosstool.config | 1 - .../reported.by | 2 +- .../crosstool.config | 0 .../reported.by | 0 scripts/build/arch/arm.sh | 4 ++-- 7 files changed, 4 insertions(+), 6 deletions(-) rename samples/{aarch64-rpi3-linux-gnueabi => aarch64-rpi3-linux-gnu}/crosstool.config (93%) rename samples/{aarch64-rpi3-linux-gnueabi => aarch64-rpi3-linux-gnu}/reported.by (51%) rename samples/{aarch64-unknown-linux-gnueabi => aarch64-unknown-linux-gnu}/crosstool.config (92%) rename samples/{aarch64-unknown-linux-gnueabi => aarch64-unknown-linux-gnu}/reported.by (52%) rename samples/{aarch64-unknown-linux-uclibcgnueabi => aarch64-unknown-linux-uclibc}/crosstool.config (100%) rename samples/{aarch64-unknown-linux-uclibcgnueabi => aarch64-unknown-linux-uclibc}/reported.by (100%) diff --git a/samples/aarch64-rpi3-linux-gnueabi/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config similarity index 93% rename from samples/aarch64-rpi3-linux-gnueabi/crosstool.config rename to samples/aarch64-rpi3-linux-gnu/crosstool.config index 6d51c12e..01605ac1 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 similarity index 51% rename from samples/aarch64-rpi3-linux-gnueabi/reported.by rename to samples/aarch64-rpi3-linux-gnu/reported.by index 0b99105e..a7cdf732 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 similarity index 92% rename from samples/aarch64-unknown-linux-gnueabi/crosstool.config rename to samples/aarch64-unknown-linux-gnu/crosstool.config index 8ff183c4..e3a393af 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 similarity index 52% rename from samples/aarch64-unknown-linux-gnueabi/reported.by rename to samples/aarch64-unknown-linux-gnu/reported.by index 37668de8..224868bf 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 similarity index 100% rename from samples/aarch64-unknown-linux-uclibcgnueabi/crosstool.config rename to 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 similarity index 100% rename from samples/aarch64-unknown-linux-uclibcgnueabi/reported.by rename to samples/aarch64-unknown-linux-uclibc/reported.by diff --git a/scripts/build/arch/arm.sh b/scripts/build/arch/arm.sh index 8733ac3a..7433c926 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 From 6b813786ac15fc782033dd21b424b84126739fb2 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 7 Jul 2017 12:42:08 -0700 Subject: [PATCH 2/2] Also rename the sample in Travis CI Signed-off-by: Alexey Neyman --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bb8d94a4..1be7a570 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