diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /target/mips64el/uclibc.config | |
parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
parent | 34592482701199604242848b80c39bd07b6c7716 (diff) |
resolve merge conflict
Diffstat (limited to 'target/mips64el/uclibc.config')
-rw-r--r-- | target/mips64el/uclibc.config | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/target/mips64el/uclibc.config b/target/mips64el/uclibc.config index 181450937..bd393fac5 100644 --- a/target/mips64el/uclibc.config +++ b/target/mips64el/uclibc.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Version: 0.9.32-rc1 -# Mon Dec 27 23:08:26 2010 +# Sat Jan 1 13:10:17 2011 # # TARGET_alpha is not set # TARGET_arm is not set @@ -83,12 +83,11 @@ LDSO_SEARCH_INTERP_PATH=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -# LINUXTHREADS_OLD is not set +LINUXTHREADS_OLD=y # LINUXTHREADS_NEW is not set -UCLIBC_HAS_THREADS_NATIVE=y +# UCLIBC_HAS_THREADS_NATIVE is not set UCLIBC_HAS_THREADS=y -UCLIBC_HAS_TLS=y -# PTHREADS_DEBUG_SUPPORT is not set +PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set @@ -195,7 +194,6 @@ UCLIBC_HAS_ERRNO_MESSAGES=y UCLIBC_HAS_SIGNUM_MESSAGES=y # UCLIBC_HAS_SYS_SIGLIST is not set UCLIBC_HAS_GNU_GETOPT=y -UCLIBC_HAS_STDIO_FUTEXES=y UCLIBC_HAS_GNU_GETSUBOPT=y # @@ -237,6 +235,7 @@ UCLIBC_BUILD_NOEXECSTACK=y CROSS_COMPILER_PREFIX="" UCLIBC_EXTRA_CFLAGS="" # DODEBUG is not set +# DODEBUG_PT is not set DOSTRIP=y # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set |