summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/x86/uclibc-ng.config3
-rw-r--r--toolchain/uclibc-ng/Makefile7
2 files changed, 8 insertions, 2 deletions
diff --git a/target/x86/uclibc-ng.config b/target/x86/uclibc-ng.config
index 3a10e1b3d..c7c955bdd 100644
--- a/target/x86/uclibc-ng.config
+++ b/target/x86/uclibc-ng.config
@@ -215,7 +215,6 @@ HARDWIRED_ABSPATH=y
UCLIBC_HAS_ARC4RANDOM=y
# ARC4RANDOM_USES_NODEV is not set
# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_LD_GC=y
UCLIBC_BUILD_RELRO=y
UCLIBC_BUILD_NOW=y
UCLIBC_BUILD_NOEXECSTACK=y
@@ -225,7 +224,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
#
CROSS_COMPILER_PREFIX=""
UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
+DODEBUG=y
# DOSTRIP is not set
# DOASSERTS is not set
# SUPPORT_LD_DEBUG is not set
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index 303d97e63..e4ef665b4 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/toolchain/uclibc-ng/Makefile
@@ -40,6 +40,13 @@ ifeq ($(ADK_TARGET_ABI_EABIHF),y)
$(SED) 's/.*\(UCLIBC_HAS_SOFT_FLOAT\).*/# \1 is not set/' ${WRKBUILD}/.config
endif
endif
+ifeq ($(ADK_LINUX_X86),y)
+ $(SED) 's/.*\(CONFIG_386\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_486\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_586\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_686\).*/\1=y/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(TARGET_SUBARCH\).*/\1="i686"/' ${WRKBUILD}/.config
+endif
ifeq ($(ADK_LINUX_64),y)
$(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS64\).*/\1=y/' ${WRKBUILD}/.config
$(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\).*/# \1 is not set/' ${WRKBUILD}/.config