summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-26 18:34:51 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-26 18:34:51 +0100
commit181e796c9beb08534f9e3f50c881bb8feaf78c5c (patch)
tree3bbd80f9cd0ad2a3572fe3135056f24a89728029 /toolchain
parentd8b9dfc2b0e223f4d63850f173775a8bd0931d84 (diff)
rework arm support, add qemu arm model vexpress for cortex-a9 emulation (hard float)
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/eglibc/Makefile4
-rw-r--r--toolchain/gcc/Makefile23
-rw-r--r--toolchain/glibc/Makefile4
-rw-r--r--toolchain/uClibc/Makefile3
4 files changed, 13 insertions, 21 deletions
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index dbccb8866..5ac8e493d 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -21,10 +21,6 @@ TARGET_CFLAGS_LIBC:= $(filter-out -fstack-protector,$(TARGET_CFLAGS_LIBC))
include Makefile.inc
include ${TOPDIR}/mk/buildhlp.mk
-ifeq ($(ADK_TARGET_NO_FPU),y)
-EGLIBC_CONFOPTS+= --without-fp
-endif
-
EGLIBC_BUILD_DIR_INITIAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
EGLIBC_BUILD_DIR_FINAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 32710c9bd..5c81f9fd2 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -81,24 +81,21 @@ else
GCC_CONFOPTS+= --enable-target-optspace
endif
-ifeq ($(ARCH),mips)
-ifeq ($(ADK_TARGET_NO_FPU),y)
-GCC_CONFOPTS+= --with-float=soft
-else
-GCC_CONFOPTS+= --with-float=hard
-endif
+ifeq ($(ARCH),arm)
+GCC_CONFOPTS+= --with-float=$(ADK_TARGET_FLOAT)
+GCC_CONFOPTS+= --with-mode=$(ADK_TARGET_ARM_MODE)
endif
-ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-GCC_CONFOPTS+= --with-arch=armv6 --with-tune=arm1176jzf-s --with-fpu=vfp --with-float=hard
+ifeq ($(ADK_CPU_ARM926EJ_S),y)
+GCC_CONFOPTS+= --with-arch=armv5te --with-tune=arm1176jzf-s
endif
-ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y)
-ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
-GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard --with-mode=thumb
-else
-GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard --with-mode=arm
+ifeq ($(ADK_CPU_ARM1176JZF_S),y)
+GCC_CONFOPTS+= --with-arch=armv6 --with-tune=arm1176jzf-s --with-fpu=vfp
endif
+
+ifeq ($(ADK_CPU_CORTEX_A9),y)
+GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon
endif
ifneq ($(ADK_TARGET_ABI),)
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 0905f2f61..2fc0015d7 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -16,10 +16,6 @@ TARGET_CFLAGS_LIBC:= $(filter-out -fstack-protector,$(TARGET_CFLAGS_LIBC))
include Makefile.inc
include ${TOPDIR}/mk/buildhlp.mk
-ifeq ($(ADK_TARGET_NO_FPU),y)
-GLIBC_CONFOPTS+= --without-fp
-endif
-
GLIBC_MAKEOPTS+= cross-compiling=yes
ifeq (${ADK_MAKE_PARALLEL},y)
GLIBC_MAKEOPTS+= PARALLELMFLAGS="-j1"
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 2a263974f..47084994e 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -56,6 +56,9 @@ endif
ifneq ($(ADK_PACKAGE_GDB),)
$(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config
endif
+ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
+ $(SED) 's/.*\(COMPILE_IN_THUMB_MODE\).*/\1=y/' ${WRKBUILD}/.config
+endif
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
$(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config
echo "UCLIBC_HAS_SSP_COMPAT=n" >> ${WRKBUILD}/.config