diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-06 07:32:38 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-06 07:32:38 +0200 |
commit | 07890ba3738d662dcca127cbef2a096e0e53ed15 (patch) | |
tree | 8ce140756add39f87a87740a8e4e5ce91c0f18ff | |
parent | 888a0d2203b1d5e4865b5e30685293774cb5f001 (diff) | |
parent | 380670eb62442f965d2225f5521859c62ee2ea9e (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r-- | target/arm/systems/toolchain-arm | 1 | ||||
-rw-r--r-- | target/config/Config.in.arm.choice | 2 | ||||
-rw-r--r-- | target/config/Config.in.cpu | 1 | ||||
-rw-r--r-- | target/config/Config.in.endian.choice | 5 | ||||
-rw-r--r-- | toolchain/gcc/Makefile | 2 |
5 files changed, 8 insertions, 3 deletions
diff --git a/target/arm/systems/toolchain-arm b/target/arm/systems/toolchain-arm index 4f3e40b17..31d9f9711 100644 --- a/target/arm/systems/toolchain-arm +++ b/target/arm/systems/toolchain-arm @@ -2,7 +2,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM bool "Toolchain only" select ADK_arm select ADK_toolchain_arm - select ADK_little select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help diff --git a/target/config/Config.in.arm.choice b/target/config/Config.in.arm.choice index 79e70078b..d732b5f7a 100644 --- a/target/config/Config.in.arm.choice +++ b/target/config/Config.in.arm.choice @@ -4,7 +4,7 @@ choice ADK_TARGET_ARM_CPU_ARCH prompt "CPU architecture" depends on ADK_TARGET_TOOLCHAIN && ADK_LINUX_ARM -default ADK_CPU_ARMV7 +default ADK_CPU_ARMV7A config ADK_CPU_ARMV5TE boolean "armv5te" diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 6039c01b4..b8fb302cb 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -136,6 +136,7 @@ config ADK_TARGET_CPU_ARCH default "armv6" if ADK_LINUX_ARM && ADK_little && ADK_armv6 default "armv7a" if ADK_LINUX_ARM && ADK_little && ADK_armv7a default "arm" if ADK_LINUX_ARM && ADK_little + default "armeb" if ADK_LINUX_ARM && ADK_big default "arc" if ADK_CPU_ARC && ADK_little default "arceb" if ADK_CPU_ARC && ADK_big default "avr32" if ADK_CPU_AVR32 diff --git a/target/config/Config.in.endian.choice b/target/config/Config.in.endian.choice index 8f0ea99fc..4e866b6c5 100644 --- a/target/config/Config.in.endian.choice +++ b/target/config/Config.in.endian.choice @@ -5,9 +5,12 @@ choice ADK_TARGET_ENDIAN_MODE prompt "Target Endianess" depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM depends on ADK_LINUX_SH || ADK_LINUX_MIPS || ADK_LINUX_MICROBLAZE \ - || ADK_LINUX_MIPS64 || ADK_LINUX_ARC + || ADK_LINUX_MIPS64 || ADK_LINUX_ARC || ADK_LINUX_ARM depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 depends on !ADK_TARGET_SYSTEM_LEMOTE_YEELONG +depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI +depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 +depends on !ADK_TARGET_SYSTEM_QEMU_ARM config ADK_TARGET_LITTLE_ENDIAN boolean "Little endian" diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 39fc3efc9..dc59bfd35 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -282,9 +282,11 @@ ifeq ($(ADK_TARGET_USE_GOLD),y) (cd $(TOOLCHAIN_DIR)/usr/bin && \ ln -sf $(GNU_TARGET_NAME)-ld.gold $(GNU_TARGET_NAME)-ld) else +ifeq (ADK_TOOLCHAIN_BINUTILS_2_20_1),) (cd $(TOOLCHAIN_DIR)/usr/bin && \ ln -sf $(GNU_TARGET_NAME)-ld.bfd $(GNU_TARGET_NAME)-ld) endif +endif cd $(STAGING_TARGET_DIR)/lib && \ ln -sf libstdc++.so.6.0.$(LIBSTDCXXVER) libstdc++.so && \ ln -sf libstdc++.so.6.0.$(LIBSTDCXXVER) libstdc++.so.6 |