Browse Source

start adding architectures for uClibc without NPTL/TLS

Waldemar Brodkorb 10 years ago
parent
commit
5cdeaed94f

+ 0 - 3
target/config/Config.in.libc.choice

@@ -34,9 +34,6 @@ config ADK_TARGET_LIB_UCLIBC
 	select ADK_uclibc
 	depends on \
 		   !ADK_LINUX_AARCH64 && \
-		   !ADK_LINUX_ALPHA && \
-		   !ADK_LINUX_M68K && \
-		   !ADK_LINUX_MICROBLAZE && \
 		   !ADK_LINUX_SPARC && \
 		   !ADK_LINUX_SPARC64 && \
 		   !ADK_LINUX_PPC64 && \

+ 7 - 0
target/config/Config.in.libc.default

@@ -16,6 +16,13 @@ config ADK_TARGET_LIBC
 	default "glibc"  if ADK_glibc
 	default "musl"  if ADK_musl
 
+config ADK_TARGET_WITH_NPTL
+	boolean
+	default n if ADK_TARGET_LIB_UCLIBC && ADK_LINUX_ALPHA
+	default n if ADK_TARGET_LIB_UCLIBC && ADK_LINUX_M68K
+	default n if ADK_TARGET_LIB_UCLIBC && ADK_LINUX_MICROBLAZE
+	default y
+
 config ADK_TARGET_SUFFIX
 	string
 	default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_eabihf

+ 6 - 1
toolchain/gcc/Makefile

@@ -21,7 +21,6 @@ GCC_CONFOPTS:=		--prefix=$(TOOLCHAIN_DIR)/usr \
 			--disable-__cxa_atexit \
 			--with-gnu-ld \
 			--with-gnu-as \
-			--enable-tls \
 			--disable-libsanitizer \
 			--disable-install-libiberty \
 			--disable-libitm \
@@ -39,6 +38,12 @@ GCC_CONFOPTS:=		--prefix=$(TOOLCHAIN_DIR)/usr \
 
 GCC_FINAL_CONFOPTS:=
 
+ifneq ($(ADK_TARGET_WITH_NPTL),)
+GCC_CONFOPTS+=         --enable-tls --enable-threads --enable-libatomic
+else
+GCC_CONFOPTS+=         --disable-tls --disable-threads --disable-libatomic
+endif
+
 ifneq ($(ADK_LINUX_XTENSA),y)
 GCC_FINAL_CONFOPTS+=	--enable-cxx-flags='$(TARGET_CXXFLAGS)'
 endif