diff options
| -rw-r--r-- | target/config/Config.in.cpu | 3 | ||||
| -rw-r--r-- | target/config/Config.in.libc.choice | 1 | ||||
| -rw-r--r-- | target/microblaze/uclibc-ng.config | 4 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 3b943783c..5371e9b54 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -465,9 +465,8 @@ config ADK_CPU_MIPS64R2 config ADK_CPU_MICROBLAZE bool - select ADK_TARGET_WITH_LT if ADK_TARGET_LIBC_UCLIBC_NG select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX - select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIBC_GLIBC || ADK_TARGET_LIBC_MUSL config ADK_CPU_NIOS2 bool diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice index 28675ccf2..5e18b392b 100644 --- a/target/config/Config.in.libc.choice +++ b/target/config/Config.in.libc.choice @@ -10,7 +10,6 @@ config ADK_TARGET_LIB_UCLIBC_NG !ADK_TARGET_ARCH_AARCH64 && \ !ADK_TARGET_ARCH_ALPHA && \ !ADK_TARGET_ARCH_HPPA && \ - !ADK_TARGET_ARCH_MICROBLAZE && \ !ADK_TARGET_ARCH_NIOS2 && \ !ADK_TARGET_ARCH_SPARC64 && \ !ADK_TARGET_ARCH_PPC64 && \ diff --git a/target/microblaze/uclibc-ng.config b/target/microblaze/uclibc-ng.config index 7ec0d13c8..f3e903a19 100644 --- a/target/microblaze/uclibc-ng.config +++ b/target/microblaze/uclibc-ng.config @@ -75,9 +75,7 @@ HAS_NO_THREADS=y # UCLIBC_HAS_LINUXTHREADS is not set UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set -# MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +MALLOC=y MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 0ed8f077c..cbbc41e6b 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -62,6 +62,10 @@ GCC_CONFOPTS+= --disable-tls --disable-threads --disable-libatomic endif endif +ifeq ($(ADK_TARGET_WITH_LT),y) +GCC_CONFOPTS+= --disable-tls --disable-threads --disable-libatomic +endif + ifeq ($(ADK_TARGET_UCLINUX)$(ADK_TARGET_USE_STATIC_LIBS),y) GCC_FINAL_CONFOPTS+= --disable-shared else |