summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/config/Config.in.toolchain2
-rw-r--r--toolchain/gcc/Makefile14
2 files changed, 8 insertions, 8 deletions
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index d52b591ab..2bd3bdee5 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -56,7 +56,7 @@ menu "Compiler language support"
config ADK_TOOLCHAIN_WITH_CXX
bool "enable C++"
default y if ADK_TARGET_OS_LINUX \
- && !(ADK_TARGET_ARCH_H8300 || ADK_TARGET_ARCH_ALPHA)
+ && !ADK_TARGET_ARCH_H8300
default n
config ADK_TOOLCHAIN_WITH_OBJC
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index c4b711a0a..8a4024220 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -15,17 +15,17 @@ endif
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_CXXFLAGS:= $(filter-out -flto,$(TARGET_CXXFLAGS))
-ifeq ($(ADK_TARGET_ARCH_XTENSA),y)
-TARGET_CFLAGS:= $(filter-out -mtext-section-literals,$(TARGET_CFLAGS))
-TARGET_CXXFLAGS:= $(filter-out -mtext-section-literals,$(TARGET_CXXFLAGS))
-endif
-
# for uClinux, we need to filter out some flags
ifeq ($(ADK_TARGET_UCLINUX),y)
TARGET_CFLAGS:= $(filter-out -msep-data,$(TARGET_CFLAGS))
TARGET_CXXFLAGS:= $(filter-out -msep-data,$(TARGET_CXXFLAGS))
endif
+ifeq ($(ADK_TOOLCHAIN_WITH_GO),y)
+TARGET_CFLAGS+= -lpthread
+TARGET_CXXFLAGS+= -lpthread
+endif
+
GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \
--with-bugurl="http://www.openadk.org/" \
--build=$(GNU_HOST_NAME) \
@@ -284,8 +284,8 @@ $(WRKBUILD)/.compiled:
PATH='$(TARGET_PATH)' \
CC='$(HOST_CC)' \
CXX='$(HOST_CXX)' \
- CFLAGS_FOR_TARGET='$(TARGET_CFLAGS) -lpthread' \
- CXXFLAGS_FOR_TARGET='$(TARGET_CXXFLAGS) -lpthread' \
+ CFLAGS_FOR_TARGET='$(TARGET_CFLAGS)' \
+ CXXFLAGS_FOR_TARGET='$(TARGET_CXXFLAGS)' \
$(WRKBUILD)/configure \
${GCC_CONFOPTS} \
${GCC_FINAL_CONFOPTS} \