diff options
| -rw-r--r-- | mk/os.mk | 11 | ||||
| -rw-r--r-- | target/config/Config.in.cpu | 11 | ||||
| -rw-r--r-- | target/config/Config.in.fpu.default | 6 | ||||
| -rw-r--r-- | target/config/Config.in.qemu | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 4 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 7 |
6 files changed, 27 insertions, 14 deletions
diff --git a/mk/os.mk b/mk/os.mk new file mode 100644 index 000000000..38a2e53f3 --- /dev/null +++ b/mk/os.mk @@ -0,0 +1,11 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +# operating system quirks +ifeq (${OStype},Darwin) +HOST_CC:=clang -fbracket-depth=1024 +HOST_CXX:=clang++ -fbracket-depth=1024 +else +HOST_CC:=${CC} +HOST_CXX:=${CXX} +endif diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index dc0cc5478..748f72b96 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -81,13 +81,13 @@ config ADK_CPU_CORTEX_A7 bool select ADK_TARGET_WITH_NPTL select ADK_TARGET_WITH_MMU - select ADK_TARGET_CPU_WITH_FPU_VFP4 + select ADK_TARGET_CPU_WITH_FPU_VFPV4 config ADK_CPU_CORTEX_A9 bool select ADK_TARGET_WITH_NPTL select ADK_TARGET_WITH_MMU - select ADK_TARGET_CPU_WITH_FPU_VFP3 + select ADK_TARGET_CPU_WITH_FPU_VFPV3 config ADK_CPU_CORTEX_A53 bool @@ -228,17 +228,14 @@ config ADK_TARGET_CPU_WITH_FPU config ADK_TARGET_CPU_WITH_FPU_VFP bool select ADK_TARGET_CPU_WITH_FPU - select ADK_fpu_vfp -config ADK_TARGET_CPU_WITH_FPU_VFP3 +config ADK_TARGET_CPU_WITH_FPU_VFPV3 bool select ADK_TARGET_CPU_WITH_FPU - select ADK_fpu_vfp3 -config ADK_TARGET_CPU_WITH_FPU_VFP4 +config ADK_TARGET_CPU_WITH_FPU_VFPV4 bool select ADK_TARGET_CPU_WITH_FPU - select ADK_fpu_vfp4 config ADK_TARGET_CPU_WITH_VT bool diff --git a/target/config/Config.in.fpu.default b/target/config/Config.in.fpu.default index 0fd8f616c..c55b0a602 100644 --- a/target/config/Config.in.fpu.default +++ b/target/config/Config.in.fpu.default @@ -4,7 +4,7 @@ config ADK_TARGET_FPU string depends on ADK_TARGET_ARCH_ARM - default "vfp" if ADK_TARGET_CPU_WITH_FPU_VFP - default "vfp3" if ADK_TARGET_CPU_WITH_FPU_VFP3 - default "vfp4" if ADK_TARGET_CPU_WITH_FPU_VFP4 default "neon" if ADK_TARGET_CPU_WITH_NEON + default "vfp" if ADK_TARGET_CPU_WITH_FPU_VFP + default "vfpv3" if ADK_TARGET_CPU_WITH_FPU_VFPV3 + default "vfpv4" if ADK_TARGET_CPU_WITH_FPU_VFPV4 diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu index e7b15818c..2e16341ba 100644 --- a/target/config/Config.in.qemu +++ b/target/config/Config.in.qemu @@ -35,8 +35,6 @@ depends on ADK_TARGET_SYSTEM_QEMU_ARM config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 bool "ARM Ltd. Versatile Express with Cortex-A9" select ADK_CPU_CORTEX_A9 - select ADK_TARGET_CPU_WITH_FPU - select ADK_TARGET_CPU_WITH_FPU_NEON config ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3 bool "Stellaris LM3S6965EVB with Cortex-M3" diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 68dfae242..5bd0b647b 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -184,11 +184,11 @@ config ADK_KERNEL_VFP config ADK_KERNEL_VFPv3 bool - default y if ADK_TARGET_CPU_WITH_FPU_VFP3 + default y if ADK_TARGET_CPU_WITH_FPU_VFPV3 config ADK_KERNEL_VFPv4 bool - default y if ADK_TARGET_CPU_WITH_FPU_VFP4 + default y if ADK_TARGET_CPU_WITH_FPU_VFPV4 config ADK_KERNEL_NEON bool diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index f38ba051a..65899a334 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -4,6 +4,7 @@ include $(ADK_TOPDIR)/rules.mk include ../rules.mk include Makefile.inc +include $(ADK_TOPDIR)/mk/os.mk # disable SSP for libstdc++ ifeq ($(ADK_TARGET_LIB_MUSL),y) @@ -182,6 +183,8 @@ endif $(SED) '/k prot/agcc_cv_libc_provides_ssp=yes' $(WRKBUILD)/gcc/configure cd $(GCC_BUILD_DIR_MINIMAL); \ PATH='$(TARGET_PATH)' \ + CC='$(HOST_CC)' \ + CXX='$(HOST_CXX)' \ CFLAGS="-O0 -g0 -fomit-frame-pointer" \ CXXFLAGS="-O0 -g0 -fomit-frame-pointer" \ $(WRKBUILD)/configure \ @@ -204,6 +207,8 @@ $(GCC_BUILD_DIR_INITIAL)/.configured: mkdir -p $(GCC_BUILD_DIR_INITIAL) cd $(GCC_BUILD_DIR_INITIAL); \ PATH='$(TARGET_PATH)' \ + CC='$(HOST_CC)' \ + CXX='$(HOST_CXX)' \ CFLAGS="-O0 -g0 -fomit-frame-pointer" \ CXXFLAGS="-O0 -g0 -fomit-frame-pointer" \ $(WRKBUILD)/configure \ @@ -227,6 +232,8 @@ $(GCC_BUILD_DIR_FINAL)/.configured: mkdir -p $(GCC_BUILD_DIR_FINAL) cd $(GCC_BUILD_DIR_FINAL); \ PATH='$(TARGET_PATH)' \ + CC='$(HOST_CC)' \ + CXX='$(HOST_CXX)' \ CFLAGS_FOR_TARGET='$(TARGET_CFLAGS)' \ CXXFLAGS_FOR_TARGET='$(TARGET_CXXFLAGS)' \ $(WRKBUILD)/configure \ |