diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-23 15:03:14 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-25 11:25:55 -0600 |
| commit | 837de2988b8b5c97e42b91ffc8c59ea84102f42a (patch) | |
| tree | c7ad5e4257f4d57f5c02c292e5346a484202d2e1 | |
| parent | ced1d8d2698cbf3a9422716d85a112bf2087cfd7 (diff) | |
another special handling for cris
malloc needs to be fixed for linuxthreads in uClibc-ng git.
| -rw-r--r-- | mk/vars.mk | 7 | ||||
| -rw-r--r-- | target/config/Config.in.cpu | 7 | ||||
| -rw-r--r-- | target/cris/uclibc.config | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 73929643c..b47ee053b 100644 --- a/mk/vars.mk +++ b/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 diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index f41204db4..d823501ba 100644 --- a/target/config/Config.in.cpu +++ b/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 diff --git a/target/cris/uclibc.config b/target/cris/uclibc.config index 5d952788d..6911ce9cc 100644 --- a/target/cris/uclibc.config +++ b/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 |