diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2018-01-08 00:08:03 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2018-01-08 00:08:03 +0100 |
| commit | 662e918e93567199b6fb566cc4901df9a502c25c (patch) | |
| tree | 879e10168b2b24273488aa6a9daad86fdf35dfab | |
| parent | b5b72b1e8cc2267e69af149f48b755b97627e74e (diff) | |
cosmetic changes for ABI selection
| -rw-r--r-- | package/gcc/Makefile | 13 | ||||
| -rw-r--r-- | rules.mk | 3 | ||||
| -rw-r--r-- | target/config/Config.in.abi | 2 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 4 |
4 files changed, 9 insertions, 13 deletions
diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 4d99e214a..d7b2d072a 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -31,7 +31,7 @@ TARGET_CFLAGS:= TARGET_CXXFLAGS:= TARGET_LDFLAGS:= -ifeq ($(ADK_TARGET_LINUX_ARCH_XTENSA),y) +ifeq ($(ADK_TARGET_ARCH_XTENSA),y) GCC_EXTRA_CFLAGS:= -mtext-section-literals GCC_EXTRA_CXXFLAGS:= -mtext-section-literals endif @@ -40,14 +40,8 @@ endif CONFIGURE_ENV+= CC="${TARGET_CC} ${GCC_EXTRA_CFLAGS}" CONFIGURE_ENV+= CXX="${TARGET_CXX} ${GCC_EXTRA_CXXFLAGS}" -ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) -CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_MIPS_ABI) -endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS64),y) -CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_MIPS_ABI) -endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS64EL),y) -CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_MIPS_ABI) +ifeq ($(ADK_TARGET_ARCH_MIPS64),y) +CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_ABI_MIPS64) endif ifneq ($(ADK_PACKAGE_GXX),) @@ -55,6 +49,7 @@ CONFIGURE_ARGS+= --enable-languages=c,c++ else CONFIGURE_ARGS+= --enable-languages=c endif + ifeq ($(ADK_TARGET_LINUX_ARCH_PPC),y) CONFIGURE_ARGS+= --disable-target-optspace --with-long-double-64 --enable-secureplt else @@ -48,7 +48,8 @@ ADK_TARGET_CPU_FLAGS:= $(strip $(subst ",, $(ADK_TARGET_CPU_FLAGS))) ADK_TARGET_CFLAGS_OPT:= $(strip $(subst ",, $(ADK_TARGET_CFLAGS_OPT))) ADK_TARGET_ABI_CFLAGS:= $(strip $(subst ",, $(ADK_TARGET_ABI_CFLAGS))) ADK_TARGET_ABI:= $(strip $(subst ",, $(ADK_TARGET_ABI))) -ADK_TARGET_MIPS_ABI:= $(strip $(subst ",, $(ADK_TARGET_MIPS_ABI))) +ADK_TARGET_ABI_MIPS64:= $(strip $(subst ",, $(ADK_TARGET_ABI_MIPS64))) +ADK_TARGET_ABI_RISCV:= $(strip $(subst ",, $(ADK_TARGET_ABI_RISCV))) ADK_TARGET_IP:= $(strip $(subst ",, $(ADK_TARGET_IP))) ADK_TARGET_SUFFIX:= $(strip $(subst ",, $(ADK_TARGET_SUFFIX))) ADK_TARGET_CMDLINE:= $(strip $(subst ",, $(ADK_TARGET_CMDLINE))) diff --git a/target/config/Config.in.abi b/target/config/Config.in.abi index 67eacf274..19a4855e9 100644 --- a/target/config/Config.in.abi +++ b/target/config/Config.in.abi @@ -73,7 +73,7 @@ config ADK_TARGET_ABI_RISCV default "ilp32d" if ADK_TARGET_ABI_ILP64D default "ilp32f" if ADK_TARGET_ABI_ILP64F -config ADK_TARGET_MIPS_ABI +config ADK_TARGET_ABI_MIPS64 depends on ADK_TARGET_ARCH_MIPS64 string default "32" if ADK_TARGET_ABI_O32 diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index eb21fc4fd..aefc945a8 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -211,8 +211,8 @@ GCC_CONFOPTS+= --without-long-double-128 --with-abi=elfv2 endif endif -ifneq ($(ADK_TARGET_MIPS_ABI),) -GCC_CONFOPTS+= --with-abi=${ADK_TARGET_MIPS_ABI} +ifneq ($(ADK_TARGET_ABI_MIPS64),) +GCC_CONFOPTS+= --with-abi=${ADK_TARGET_ABI_MIPS64} endif ifneq ($(ADK_TARGET_ABI_RISCV),) |