Browse Source

another special handling for cris

malloc needs to be fixed for linuxthreads in uClibc-ng git.
Waldemar Brodkorb 10 years ago
parent
commit
837de2988b
3 changed files with 14 additions and 4 deletions
  1. 7 0
      mk/vars.mk
  2. 5 2
      target/config/Config.in.cpu
  3. 2 2
      target/cris/uclibc.config

+ 7 - 0
mk/vars.mk

@@ -107,6 +107,7 @@ TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-O1 -Wl,-rpath -Wl,/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib
 
+# for archiectures where gcc --with-cpu matches -mcpu=
 ifneq ($(ADK_TARGET_GCC_CPU),)
 ifeq ($(ADK_CPU_ARC700),y)
 TARGET_CFLAGS+=		-mcpu=ARC700
@@ -117,11 +118,17 @@ TARGET_CXXFLAGS+=	-mcpu=$(ADK_TARGET_GCC_CPU)
 endif
 endif
 
+# for archiectures where gcc --with-arch matches -march=
 ifneq ($(ADK_TARGET_GCC_ARCH),)
 TARGET_CFLAGS+=		-march=$(ADK_TARGET_GCC_ARCH)
 TARGET_CXXFLAGS+=	-march=$(ADK_TARGET_GCC_ARCH)
 endif
 
+ifneq ($(ADK_TARGET_CPU_FLAGS),)
+TARGET_CFLAGS+=		$(ADK_TARGET_CPU_FLAGS)
+TARGET_CXXFLAGS+=	$(ADK_TARGET_CPU_FLAGS)
+endif
+
 ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
 TARGET_LDFLAGS+=	-elf2flt
 endif

+ 5 - 2
target/config/Config.in.cpu

@@ -305,8 +305,6 @@ config ADK_TARGET_GCC_CPU
 	default "powerpc" if ADK_CPU_PPC
 	default "powerpc64" if ADK_CPU_PPC64
 	default "ultrasparc" if ADK_CPU_SPARC_V9
-	default "v10" if ADK_CPU_CRIS_V10
-	default "v32" if ADK_CPU_CRIS_V32
 	default "v7.10.d" if ADK_CPU_MICROBLAZE
 	default "v8" if ADK_CPU_SPARC_V8
 	default "x86-64" if ADK_CPU_X86_64
@@ -320,6 +318,11 @@ config ADK_TARGET_GCC_ARCH
 	default "mips64" if ADK_CPU_MIPS64
 	default "mips64r2" if ADK_CPU_MIPS64R2
 
+config ADK_TARGET_CPU_FLAGS
+	string
+	default "-mcpu=v10" if ADK_CPU_CRIS_V10
+	default "-mcpu=v32" if ADK_CPU_CRIS_V32
+
 config ADK_TARGET_CPU_ARCH
 	string
 	default "aarch64" if ADK_TARGET_ARCH_AARCH64 && ADK_little

+ 2 - 2
target/cris/uclibc.config

@@ -89,9 +89,9 @@ UCLIBC_HAS_THREADS=y
 PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
-MALLOC=y
+# MALLOC=y
 # MALLOC_SIMPLE is not set
-# MALLOC_STANDARD is not set
+MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_HAS_OBSTACK=y
 UCLIBC_DYNAMIC_ATEXIT=y