diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-20 11:49:20 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-20 11:49:20 -0600 |
| commit | c83769bd3a6d4cc6a12510665c067b4c3e2fa28b (patch) | |
| tree | 3aca57a579cbeca90ae9e28d9eb9e60957288c39 | |
| parent | a3f2ba1b546e90bcbc863560823f62884ff5b4f7 (diff) | |
use MALLOC with GLIBC_COMPAT for all archs
Use MALLOC for uClibc/uClibc-ng 1.0.
Choice will be removed in uClibc-ng git.
| -rw-r--r-- | mk/package.mk | 3 | ||||
| -rw-r--r-- | target/arm/uclibc.config | 4 | ||||
| -rw-r--r-- | target/avr32/uclibc.config | 4 | ||||
| -rw-r--r-- | target/cris/uclibc.config | 4 | ||||
| -rw-r--r-- | target/m68k/uclibc.config | 4 | ||||
| -rw-r--r-- | target/microblaze/uclibc.config | 4 | ||||
| -rw-r--r-- | target/mips/uclibc.config | 4 | ||||
| -rw-r--r-- | target/mips64/uclibc.config | 4 | ||||
| -rw-r--r-- | target/ppc/uclibc.config | 4 | ||||
| -rw-r--r-- | target/sh/uclibc.config | 4 | ||||
| -rw-r--r-- | target/sparc/uclibc.config | 4 | ||||
| -rw-r--r-- | target/x86/uclibc.config | 4 | ||||
| -rw-r--r-- | target/x86_64/uclibc.config | 4 | ||||
| -rw-r--r-- | target/xtensa/uclibc.config | 4 |
14 files changed, 26 insertions, 29 deletions
diff --git a/mk/package.mk b/mk/package.mk index 1bd7bc557..65d9c8f9f 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -19,9 +19,6 @@ CONFIGURE_ENV+= PATH='${TARGET_PATH}' \ PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \ PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \ GCC_HONOUR_COPTS=s \ - ac_cv_func_calloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes \ - ac_cv_func_malloc_0_nonnull=yes \ cross_compiling=yes CONFIGURE_PROG?= configure diff --git a/target/arm/uclibc.config b/target/arm/uclibc.config index 604a5c502..5396a4514 100644 --- a/target/arm/uclibc.config +++ b/target/arm/uclibc.config @@ -91,9 +91,9 @@ UCLIBC_HAS_TLS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/avr32/uclibc.config b/target/avr32/uclibc.config index b0238ecc8..252a80643 100644 --- a/target/avr32/uclibc.config +++ b/target/avr32/uclibc.config @@ -88,9 +88,9 @@ UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/cris/uclibc.config b/target/cris/uclibc.config index 5bebd5263..5d952788d 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 is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/m68k/uclibc.config b/target/m68k/uclibc.config index b2da81c40..164e97c2d 100644 --- a/target/m68k/uclibc.config +++ b/target/m68k/uclibc.config @@ -90,9 +90,9 @@ UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/microblaze/uclibc.config b/target/microblaze/uclibc.config index 2062617f6..79450dac8 100644 --- a/target/microblaze/uclibc.config +++ b/target/microblaze/uclibc.config @@ -67,9 +67,9 @@ HAS_NO_THREADS=y # PTHREADS_DEBUG_SUPPORT is not set UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/mips/uclibc.config b/target/mips/uclibc.config index c07ea37be..88f6f35f6 100644 --- a/target/mips/uclibc.config +++ b/target/mips/uclibc.config @@ -97,9 +97,9 @@ UCLIBC_HAS_TLS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/mips64/uclibc.config b/target/mips64/uclibc.config index 3688679f9..08733cb93 100644 --- a/target/mips64/uclibc.config +++ b/target/mips64/uclibc.config @@ -97,9 +97,9 @@ UCLIBC_HAS_TLS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/ppc/uclibc.config b/target/ppc/uclibc.config index ab7736d47..af3810ee5 100644 --- a/target/ppc/uclibc.config +++ b/target/ppc/uclibc.config @@ -90,9 +90,9 @@ UCLIBC_HAS_TLS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/sh/uclibc.config b/target/sh/uclibc.config index bae1ea092..bb49af75b 100644 --- a/target/sh/uclibc.config +++ b/target/sh/uclibc.config @@ -92,9 +92,9 @@ UCLIBC_HAS_TLS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/sparc/uclibc.config b/target/sparc/uclibc.config index 9c6471947..7a67b880b 100644 --- a/target/sparc/uclibc.config +++ b/target/sparc/uclibc.config @@ -92,9 +92,9 @@ UCLIBC_HAS_TLS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/x86/uclibc.config b/target/x86/uclibc.config index 777138049..916f84e70 100644 --- a/target/x86/uclibc.config +++ b/target/x86/uclibc.config @@ -93,9 +93,9 @@ UCLIBC_HAS_TLS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/x86_64/uclibc.config b/target/x86_64/uclibc.config index 474a0f80c..a6e651d3f 100644 --- a/target/x86_64/uclibc.config +++ b/target/x86_64/uclibc.config @@ -89,9 +89,9 @@ UCLIBC_HAS_TLS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y diff --git a/target/xtensa/uclibc.config b/target/xtensa/uclibc.config index 026f8b1b1..f948f03c8 100644 --- a/target/xtensa/uclibc.config +++ b/target/xtensa/uclibc.config @@ -81,9 +81,9 @@ UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -# MALLOC is not set +MALLOC=y # MALLOC_SIMPLE is not set -MALLOC_STANDARD=y +# MALLOC_STANDARD is not set MALLOC_GLIBC_COMPAT=y UCLIBC_HAS_OBSTACK=y UCLIBC_DYNAMIC_ATEXIT=y |