summaryrefslogtreecommitdiff
path: root/target/x86_64
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-08-06 17:05:09 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-08-06 17:05:09 +0200
commit208807cc63754f699107bbad24687b3ae1d326fe (patch)
tree749ada25a27d3659f1b24ae245fe6a416eeb7dae /target/x86_64
parentf0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff)
parentb03ac31608c2ee5349a5d098980105957a4a6bca (diff)
fix conflict
Diffstat (limited to 'target/x86_64')
-rw-r--r--target/x86_64/uclibc.config8
1 files changed, 6 insertions, 2 deletions
diff --git a/target/x86_64/uclibc.config b/target/x86_64/uclibc.config
index cc02e030d..301220414 100644
--- a/target/x86_64/uclibc.config
+++ b/target/x86_64/uclibc.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Version: 0.9.32-rc1
-# Mon Dec 27 23:00:03 2010
+# Version: 0.9.32
+# Thu Aug 4 13:48:45 2011
#
# TARGET_alpha is not set
# TARGET_arm is not set
@@ -28,6 +28,7 @@
# TARGET_vax is not set
TARGET_x86_64=y
# TARGET_xtensa is not set
+# TARGET_c6x is not set
#
# Target Architecture Features and Options
@@ -92,6 +93,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
@@ -200,6 +202,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
@@ -233,6 +236,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