summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--toolchain/gcc/Makefile4
-rw-r--r--toolchain/uclibc-ng/Makefile2
2 files changed, 4 insertions, 2 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 6af157934..e8316ac2a 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -68,7 +68,7 @@ GCC_FINAL_CONFOPTS:= --disable-tls --disable-threads --disable-libatomic
GCC_TLS_CONFOPTS:= --disable-tls
endif
-ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY)$(ADK_TARGET_BINFMT_DSBT),y)
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y)
GCC_FINAL_CONFOPTS+= --disable-shared
else
GCC_FINAL_CONFOPTS+= --enable-shared --enable-cxx-flags='-fPIC'
@@ -141,7 +141,9 @@ else
GCC_CONFOPTS+= --with-endian=big
endif
ifeq ($(ADK_TARGET_CPU_SH_J2),y)
+ifeq ($(ADK_TARGET_BINFMT_FDPIC),y)
GCC_CONFOPTS+= --enable-fdpic
+endif
GCC_FINAL_CONFOPTS+= --with-multilib-list=mj2
endif
ifeq ($(ADK_TARGET_CPU_SH_SH2),y)
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index 1b5c45ff1..a79ff8987 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/toolchain/uclibc-ng/Makefile
@@ -210,7 +210,7 @@ ifeq ($(ADK_TARGET_CPU_SH_SH3),y)
$(SED) 's/.*\(CONFIG_SH4A\).*/# \1 is not set/' ${WRKBUILD}/.config
$(SED) 's/.*\(CONFIG_SH3\).*/\1=y/' ${WRKBUILD}/.config
endif
-ifeq ($(ADK_TARGET_CPU_SH_SH2),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH2)$(ADK_TARGET_CPU_SH_J2),y)
$(SED) 's/.*\(UCLIBC_HAS_FPU\).*/# \1 is not set/' ${WRKBUILD}/.config
$(SED) 's/.*\(CONFIG_SH2A\).*/# \1 is not set/' ${WRKBUILD}/.config
$(SED) 's/.*\(CONFIG_SH3\).*/# \1 is not set/' ${WRKBUILD}/.config