diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
| commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
| tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /target/mips | |
| parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
| parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) | |
fix conflict
Diffstat (limited to 'target/mips')
| -rw-r--r-- | target/mips/uclibc.config.big | 8 | ||||
| -rw-r--r-- | target/mips/uclibc.config.little | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/target/mips/uclibc.config.big b/target/mips/uclibc.config.big index 95fa5f687..f192a8f5a 100644 --- a/target/mips/uclibc.config.big +++ b/target/mips/uclibc.config.big @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Version: 0.9.32-rc1 -# Mon Dec 27 23:04:46 2010 +# Version: 0.9.32 +# Mon Aug 1 15:10:02 2011 # # TARGET_alpha is not set # TARGET_arm is not set @@ -28,6 +28,7 @@ TARGET_mips=y # TARGET_vax is not set # TARGET_x86_64 is not set # TARGET_xtensa is not set +# TARGET_c6x is not set # # Target Architecture Features and Options @@ -100,6 +101,7 @@ COMPAT_ATEXIT=y UCLIBC_SUSV3_LEGACY=y # UCLIBC_SUSV3_LEGACY_MACROS is not set UCLIBC_SUSV4_LEGACY=y +# UCLIBC_STRICT_HEADERS is not set # UCLIBC_HAS_STUBS is not set UCLIBC_HAS_SHADOW=y UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y @@ -208,6 +210,7 @@ UCLIBC_HAS_FNMATCH=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_NFTW=y UCLIBC_HAS_FTW=y +UCLIBC_HAS_FTS=y UCLIBC_HAS_GLOB=y UCLIBC_HAS_GNU_GLOB=y # UCLIBC_HAS_UTMPX is not set @@ -242,6 +245,7 @@ DOSTRIP=y # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set # UCLIBC_MALLOC_DEBUGGING is not set +# UCLIBC_HAS_BACKTRACE is not set WARNINGS="-Wall" EXTRA_WARNINGS=y # DOMULTI is not set diff --git a/target/mips/uclibc.config.little b/target/mips/uclibc.config.little index 86b227364..d5d8f1179 100644 --- a/target/mips/uclibc.config.little +++ b/target/mips/uclibc.config.little @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Version: 0.9.32-rc1 -# Fri Dec 31 11:58:18 2010 +# Version: 0.9.32 +# Mon Aug 1 15:09:09 2011 # # TARGET_alpha is not set # TARGET_arm is not set @@ -28,6 +28,7 @@ TARGET_mips=y # TARGET_vax is not set # TARGET_x86_64 is not set # TARGET_xtensa is not set +# TARGET_c6x is not set # # Target Architecture Features and Options @@ -100,6 +101,7 @@ COMPAT_ATEXIT=y UCLIBC_SUSV3_LEGACY=y # UCLIBC_SUSV3_LEGACY_MACROS is not set UCLIBC_SUSV4_LEGACY=y +# UCLIBC_STRICT_HEADERS is not set # UCLIBC_HAS_STUBS is not set UCLIBC_HAS_SHADOW=y UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y @@ -208,6 +210,7 @@ UCLIBC_HAS_FNMATCH=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_NFTW=y UCLIBC_HAS_FTW=y +UCLIBC_HAS_FTS=y UCLIBC_HAS_GLOB=y UCLIBC_HAS_GNU_GLOB=y # UCLIBC_HAS_UTMPX is not set @@ -242,6 +245,7 @@ DOSTRIP=y # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set # UCLIBC_MALLOC_DEBUGGING is not set +# UCLIBC_HAS_BACKTRACE is not set WARNINGS="-Wall" EXTRA_WARNINGS=y # DOMULTI is not set |