From 1029dcf91ae791545add83caf45db9b191487773 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 7 Jul 2017 12:38:32 -0700 Subject: 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 diff --git a/samples/aarch64-rpi3-linux-gnu/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config new file mode 100644 index 0000000..01605ac --- /dev/null +++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config @@ -0,0 +1,11 @@ +CT_ARCH_arm=y +CT_ARCH_64=y +CT_ARCH_CPU="cortex-a53" +CT_TARGET_VENDOR="rpi3" +CT_KERNEL_linux=y +CT_BINUTILS_LINKER_LD_GOLD=y +CT_BINUTILS_GOLD_THREADS=y +CT_BINUTILS_LD_WRAPPER=y +CT_BINUTILS_PLUGINS=y +CT_CC_LANG_CXX=y +CT_DEBUG_gdb=y diff --git a/samples/aarch64-rpi3-linux-gnu/reported.by b/samples/aarch64-rpi3-linux-gnu/reported.by new file mode 100644 index 0000000..a7cdf73 --- /dev/null +++ b/samples/aarch64-rpi3-linux-gnu/reported.by @@ -0,0 +1,3 @@ +reporter_name="Bryan Hundven" +reporter_url="" +reporter_comment="Raspberry PI 3 aarch64" diff --git a/samples/aarch64-rpi3-linux-gnueabi/crosstool.config b/samples/aarch64-rpi3-linux-gnueabi/crosstool.config deleted file mode 100644 index 6d51c12..0000000 --- a/samples/aarch64-rpi3-linux-gnueabi/crosstool.config +++ /dev/null @@ -1,12 +0,0 @@ -CT_ARCH_arm=y -CT_ARCH_64=y -CT_ARCH_CPU="cortex-a53" -CT_TARGET_VENDOR="rpi3" -CT_KERNEL_linux=y -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-gnueabi/reported.by deleted file mode 100644 index 0b99105..0000000 --- a/samples/aarch64-rpi3-linux-gnueabi/reported.by +++ /dev/null @@ -1,3 +0,0 @@ -reporter_name="Bryan Hundven" -reporter_url="https://github.com/crosstool-ng/crosstool-ng/issues" -reporter_comment="Raspberry PI 3 aarch64" diff --git a/samples/aarch64-unknown-linux-gnu/crosstool.config b/samples/aarch64-unknown-linux-gnu/crosstool.config new file mode 100644 index 0000000..e3a393a --- /dev/null +++ b/samples/aarch64-unknown-linux-gnu/crosstool.config @@ -0,0 +1,10 @@ +CT_ARCH_arm=y +CT_ARCH_64=y +CT_TARGET_VENDOR="" +CT_KERNEL_linux=y +CT_BINUTILS_LINKER_LD_GOLD=y +CT_BINUTILS_GOLD_THREADS=y +CT_BINUTILS_LD_WRAPPER=y +CT_BINUTILS_PLUGINS=y +CT_CC_LANG_CXX=y +CT_DEBUG_gdb=y diff --git a/samples/aarch64-unknown-linux-gnu/reported.by b/samples/aarch64-unknown-linux-gnu/reported.by new file mode 100644 index 0000000..224868b --- /dev/null +++ b/samples/aarch64-unknown-linux-gnu/reported.by @@ -0,0 +1,3 @@ +reporter_name="Bryan Hundven" +reporter_url="" +reporter_comment="Generic aarch64 toolchain" diff --git a/samples/aarch64-unknown-linux-gnueabi/crosstool.config b/samples/aarch64-unknown-linux-gnueabi/crosstool.config deleted file mode 100644 index 8ff183c..0000000 --- a/samples/aarch64-unknown-linux-gnueabi/crosstool.config +++ /dev/null @@ -1,11 +0,0 @@ -CT_ARCH_arm=y -CT_ARCH_64=y -CT_TARGET_VENDOR="" -CT_KERNEL_linux=y -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-gnueabi/reported.by deleted file mode 100644 index 37668de..0000000 --- a/samples/aarch64-unknown-linux-gnueabi/reported.by +++ /dev/null @@ -1,3 +0,0 @@ -reporter_name="Bryan Hundven" -reporter_url="https://github.com/crosstool-ng/crosstool-ng/issues" -reporter_comment="Generic aarch64 toolchain" diff --git a/samples/aarch64-unknown-linux-uclibc/crosstool.config b/samples/aarch64-unknown-linux-uclibc/crosstool.config new file mode 100644 index 0000000..ebc0524 --- /dev/null +++ b/samples/aarch64-unknown-linux-uclibc/crosstool.config @@ -0,0 +1,14 @@ +CT_ARCH_arm=y +CT_ARCH_64=y +CT_TARGET_VENDOR="" +CT_KERNEL_linux=y +CT_BINUTILS_LINKER_LD_GOLD=y +CT_BINUTILS_GOLD_THREADS=y +CT_BINUTILS_LD_WRAPPER=y +CT_BINUTILS_PLUGINS=y +CT_LIBC_uClibc=y +CT_CC_LANG_CXX=y +CT_DEBUG_gdb=y +CT_GDB_NATIVE=y +CT_DEBUG_strace=y +CT_GETTEXT=y diff --git a/samples/aarch64-unknown-linux-uclibc/reported.by b/samples/aarch64-unknown-linux-uclibc/reported.by new file mode 100644 index 0000000..d4dfbc2 --- /dev/null +++ b/samples/aarch64-unknown-linux-uclibc/reported.by @@ -0,0 +1,3 @@ +reporter_name="Alexey Neyman" +reporter_url="" +reporter_comment="Sample AArch64/uClibc-ng configuration." diff --git a/samples/aarch64-unknown-linux-uclibcgnueabi/crosstool.config b/samples/aarch64-unknown-linux-uclibcgnueabi/crosstool.config deleted file mode 100644 index ebc0524..0000000 --- a/samples/aarch64-unknown-linux-uclibcgnueabi/crosstool.config +++ /dev/null @@ -1,14 +0,0 @@ -CT_ARCH_arm=y -CT_ARCH_64=y -CT_TARGET_VENDOR="" -CT_KERNEL_linux=y -CT_BINUTILS_LINKER_LD_GOLD=y -CT_BINUTILS_GOLD_THREADS=y -CT_BINUTILS_LD_WRAPPER=y -CT_BINUTILS_PLUGINS=y -CT_LIBC_uClibc=y -CT_CC_LANG_CXX=y -CT_DEBUG_gdb=y -CT_GDB_NATIVE=y -CT_DEBUG_strace=y -CT_GETTEXT=y diff --git a/samples/aarch64-unknown-linux-uclibcgnueabi/reported.by b/samples/aarch64-unknown-linux-uclibcgnueabi/reported.by deleted file mode 100644 index d4dfbc2..0000000 --- a/samples/aarch64-unknown-linux-uclibcgnueabi/reported.by +++ /dev/null @@ -1,3 +0,0 @@ -reporter_name="Alexey Neyman" -reporter_url="" -reporter_comment="Sample AArch64/uClibc-ng configuration." 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 -- cgit v0.10.2-6-g49f6 From 6b813786ac15fc782033dd21b424b84126739fb2 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 7 Jul 2017 12:42:08 -0700 Subject: Also rename the sample in Travis CI Signed-off-by: Alexey Neyman 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 -- cgit v0.10.2-6-g49f6