summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-10-31 18:20:21 +0000
committerEric Andersen <andersen@codepoet.org>2002-10-31 18:20:21 +0000
commit6737908f74ff566748864548cf35bb1da8e64af6 (patch)
tree6eeafda4548f49d960e1b597c880a810a08a66f0 /include
parentc734e7ca57f520e55236b21eaef16ac40099a378 (diff)
Ok, this commit is _huge_ and its gonna change the world. I've
been working on a new config system on and off for about 6 months now, but I've never been fully satisfied. Well, I'm finally am happy with the new config system, so here it is. This completely removes the old uClibc configuration system, and replaces it with an entirely new system based on LinuxKernelConf, from http://www.xs4all.nl/~zippel/lc/ As it turns out, Linus has just merged LinuxKernelConf into Linux 2.5.45, so it looks like I made the right choice. I have thus far updated only x86. I'll be updating the other architectures shortly. -Erik
Diffstat (limited to 'include')
-rw-r--r--include/features.h10
-rw-r--r--include/sys/cdefs.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/include/features.h b/include/features.h
index ca3641688..f5fd52163 100644
--- a/include/features.h
+++ b/include/features.h
@@ -337,7 +337,7 @@
#undef __need_uClibc_config_h
/* Make sure users large file options agree with uClibc's configuration. */
-#ifndef __UCLIBC_HAVE_LFS__
+#ifndef __UCLIBC_HAS_LFS__
/* If uClibc was built without large file support, output an error if
* and 64-bit file offsets were requested, output an error.
@@ -371,7 +371,7 @@ uClibc was built without large file support enabled.
/* Some nice features only work properly with ELF */
#if defined _LIBC
-#if defined HAVE_ELF
+#if defined __HAVE_ELF__
/* Define ALIASNAME as a weak alias for NAME. */
# define weak_alias(name, aliasname) _weak_alias (name, aliasname)
# define _weak_alias(name, aliasname) \
@@ -390,12 +390,12 @@ uClibc was built without large file support enabled.
asm (".section " ".gnu.warning." #symbol "\n\t.previous"); \
static const char __evoke_link_warning_##symbol[] \
__attribute__ ((section (".gnu.warning." #symbol "\n\t#"))) = msg;
-#else /* !defined HAVE_ELF */
+#else /* !defined __HAVE_ELF__ */
# define strong_alias(name, aliasname) _strong_alias (name, aliasname)
# define weak_alias(name, aliasname) _strong_alias (name, aliasname)
# define _strong_alias(name, aliasname) \
- __asm__(".global " C_SYMBOL_PREFIX #aliasname "\n" \
- ".set " C_SYMBOL_PREFIX #aliasname "," C_SYMBOL_PREFIX #name);
+ __asm__(".global " __C_SYMBOL_PREFIX__ #aliasname "\n" \
+ ".set " __C_SYMBOL_PREFIX__ #aliasname "," __C_SYMBOL_PREFIX__ #name);
# define link_warning(symbol, msg) \
asm (".stabs \"" msg "\",30,0,0,0\n\t" \
".stabs \"" #symbol "\",1,0,0,0\n");
diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
index e1d732529..3ae52c7a8 100644
--- a/include/sys/cdefs.h
+++ b/include/sys/cdefs.h
@@ -124,7 +124,7 @@
#if defined __GNUC__ && __GNUC__ >= 2
# define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias))
-# define __ASMNAME(cname) C_SYMBOL_PREFIX cname
+# define __ASMNAME(cname) __C_SYMBOL_PREFIX__ cname
/*
#elif __SOME_OTHER_COMPILER__