change NO_UNDERSCORES to just UNDERSCORES so as to be less confusing when doing double negatives

30 files changed, 33 insertions, 39 deletions

diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 29334311d..e491aff5f 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -82,12 +82,6 @@
 # define IS_IN_libc 1
 #endif
 
-#ifdef __UCLIBC_NO_UNDERSCORES__
-# define NO_UNDERSCORES
-#else
-# undef NO_UNDERSCORES
-#endif
-
 #ifdef __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
 # define HAVE_ASM_SET_DIRECTIVE
 #else
@@ -124,7 +118,7 @@
 
 #undef C_SYMBOL_NAME
 #ifndef C_SYMBOL_NAME
-# ifdef NO_UNDERSCORES
+# ifndef __UCLIBC_UNDERSCORES__
 #  define C_SYMBOL_NAME(name) name
 # else
 #  define C_SYMBOL_NAME(name) _##name
diff --git a/ldso/include/dl-defs.h b/ldso/include/dl-defs.h
index 2c4402929..21b9c28f0 100644
--- a/ldso/include/dl-defs.h
+++ b/ldso/include/dl-defs.h
@@ -202,10 +202,10 @@ typedef struct {
 # define DL_MALLOC_ALIGN (__WORDSIZE / 8)
 #endif
 
-#ifdef __UCLIBC_NO_UNDERSCORES__
-#define __C_SYMBOL_PREFIX__ ""
+#ifdef __UCLIBC_UNDERSCORES__
+# define __C_SYMBOL_PREFIX__ "_"
 #else
-#define __C_SYMBOL_PREFIX__ "_"
+# define __C_SYMBOL_PREFIX__ ""
 #endif
 
 /* Define this if you want to modify the VALUE returned by
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index d21f8a6fd..4538d91e7 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -447,7 +447,7 @@ void *dlsym(void *vhandle, const char *name)
 	struct dyn_elf *rpnt;
 	void *ret;
 	/* Nastiness to support underscore prefixes.  */
-#ifndef __UCLIBC_NO_UNDERSCORES__
+#ifdef __UCLIBC_UNDERSCORES__
 	char tmp_buf[80];
 	char *name2 = tmp_buf;
 	size_t nlen = strlen (name) + 1;
@@ -508,7 +508,7 @@ void *dlsym(void *vhandle, const char *name)
 	if (!ret)
 		_dl_error_number = LD_NO_SYMBOL;
 out:
-#ifndef __UCLIBC_NO_UNDERSCORES__
+#ifdef __UCLIBC_UNDERSCORES__
 	if (name2 != tmp_buf)
 		free (name2);
 #endif
diff --git a/libc/sysdeps/linux/alpha/bits/uClibc_arch_features.h b/libc/sysdeps/linux/alpha/bits/uClibc_arch_features.h
index 2d10c5f7c..8ecd1823a 100644
--- a/libc/sysdeps/linux/alpha/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/alpha/bits/uClibc_arch_features.h
@@ -18,7 +18,7 @@
 #define __UCLIBC_SLIGHTLY_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #undef __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h b/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
index 93b523f0d..bb63a2ef3 100644
--- a/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
@@ -18,7 +18,7 @@
 #define __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/avr32/bits/uClibc_arch_features.h b/libc/sysdeps/linux/avr32/bits/uClibc_arch_features.h
index e95e8a5d2..993fbf821 100644
--- a/libc/sysdeps/linux/avr32/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/avr32/bits/uClibc_arch_features.h
@@ -22,7 +22,7 @@
 #undef __UCLIBC_HANDLE_OLDER_RLIMIT__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/bfin/bits/uClibc_arch_features.h b/libc/sysdeps/linux/bfin/bits/uClibc_arch_features.h
index a9140ee7e..eb622766a 100644
--- a/libc/sysdeps/linux/bfin/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/bfin/bits/uClibc_arch_features.h
@@ -19,7 +19,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#undef __UCLIBC_NO_UNDERSCORES__
+#define __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/common/bits/uClibc_arch_features.h b/libc/sysdeps/linux/common/bits/uClibc_arch_features.h
index 7b666e175..a671b4262 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_arch_features.h
@@ -24,7 +24,7 @@
 #undef __UCLIBC_HANDLE_OLDER_RLIMIT__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/cris/bits/uClibc_arch_features.h b/libc/sysdeps/linux/cris/bits/uClibc_arch_features.h
index 98548e0bd..98c1d0dbe 100644
--- a/libc/sysdeps/linux/cris/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/cris/bits/uClibc_arch_features.h
@@ -19,7 +19,7 @@
 #define __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/e1/bits/uClibc_arch_features.h b/libc/sysdeps/linux/e1/bits/uClibc_arch_features.h
index ff0e20fad..6bf166fb2 100644
--- a/libc/sysdeps/linux/e1/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/e1/bits/uClibc_arch_features.h
@@ -19,7 +19,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/frv/bits/uClibc_arch_features.h b/libc/sysdeps/linux/frv/bits/uClibc_arch_features.h
index ff0e20fad..6bf166fb2 100644
--- a/libc/sysdeps/linux/frv/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/frv/bits/uClibc_arch_features.h
@@ -19,7 +19,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/h8300/bits/uClibc_arch_features.h b/libc/sysdeps/linux/h8300/bits/uClibc_arch_features.h
index c424d9bb6..701790f7a 100644
--- a/libc/sysdeps/linux/h8300/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/h8300/bits/uClibc_arch_features.h
@@ -19,7 +19,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#undef __UCLIBC_NO_UNDERSCORES__
+#define __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/hppa/bits/uClibc_arch_features.h b/libc/sysdeps/linux/hppa/bits/uClibc_arch_features.h
index 5eea002c7..aade0083c 100644
--- a/libc/sysdeps/linux/hppa/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/hppa/bits/uClibc_arch_features.h
@@ -18,7 +18,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h b/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h
index 1744a902f..fdc6232b2 100644
--- a/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h
@@ -22,7 +22,7 @@
 #undef __UCLIBC_HANDLE_OLDER_RLIMIT__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/i960/README b/libc/sysdeps/linux/i960/README
index 185fe2572..8c81f8a2e 100644
--- a/libc/sysdeps/linux/i960/README
+++ b/libc/sysdeps/linux/i960/README
@@ -16,7 +16,7 @@ prepended underscore
 --------------------
 
 As the i960 compiler prepends an underscore to symbols, it is critical that
-bits/uClibc_arch_features.h undefines __UCLIBC_NO_UNDERSCORES__
+bits/uClibc_arch_features.h defines __UCLIBC_UNDERSCORES__
 to make sure that underscores are applied to symbol names when needed.
 
 
diff --git a/libc/sysdeps/linux/i960/bits/uClibc_arch_features.h b/libc/sysdeps/linux/i960/bits/uClibc_arch_features.h
index eef651eeb..317bc0d6c 100644
--- a/libc/sysdeps/linux/i960/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/i960/bits/uClibc_arch_features.h
@@ -19,7 +19,7 @@
 #define __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#undef __UCLIBC_NO_UNDERSCORES__
+#define __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/ia64/bits/uClibc_arch_features.h b/libc/sysdeps/linux/ia64/bits/uClibc_arch_features.h
index ebfabce90..da3347be0 100644
--- a/libc/sysdeps/linux/ia64/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/ia64/bits/uClibc_arch_features.h
@@ -18,7 +18,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/m68k/bits/uClibc_arch_features.h b/libc/sysdeps/linux/m68k/bits/uClibc_arch_features.h
index a94803749..f04a06d8f 100644
--- a/libc/sysdeps/linux/m68k/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/m68k/bits/uClibc_arch_features.h
@@ -25,7 +25,7 @@
 #define __UCLIBC_HANDLE_OLDER_RLIMIT__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/microblaze/bits/uClibc_arch_features.h b/libc/sysdeps/linux/microblaze/bits/uClibc_arch_features.h
index 1b40e32a2..172f6c1e2 100644
--- a/libc/sysdeps/linux/microblaze/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/microblaze/bits/uClibc_arch_features.h
@@ -19,7 +19,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#undef __UCLIBC_NO_UNDERSCORES__
+#define __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/mips/bits/uClibc_arch_features.h b/libc/sysdeps/linux/mips/bits/uClibc_arch_features.h
index f8d954e3d..eb926fcc0 100644
--- a/libc/sysdeps/linux/mips/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/mips/bits/uClibc_arch_features.h
@@ -18,7 +18,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #undef __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/nios/bits/uClibc_arch_features.h b/libc/sysdeps/linux/nios/bits/uClibc_arch_features.h
index ff0e20fad..6bf166fb2 100644
--- a/libc/sysdeps/linux/nios/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/nios/bits/uClibc_arch_features.h
@@ -19,7 +19,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/nios2/bits/uClibc_arch_features.h b/libc/sysdeps/linux/nios2/bits/uClibc_arch_features.h
index ff0e20fad..6bf166fb2 100644
--- a/libc/sysdeps/linux/nios2/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/nios2/bits/uClibc_arch_features.h
@@ -19,7 +19,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h b/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h
index 7efa8c40f..53adc5cc7 100644
--- a/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h
@@ -22,7 +22,7 @@
 #undef __UCLIBC_HANDLE_OLDER_RLIMIT__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h b/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h
index e2b480e75..9cf3d0dc2 100644
--- a/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h
@@ -25,7 +25,7 @@
 #define __UCLIBC_HANDLE_OLDER_RLIMIT__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/sh64/bits/uClibc_arch_features.h b/libc/sysdeps/linux/sh64/bits/uClibc_arch_features.h
index 55cd44c1f..8d2fca254 100644
--- a/libc/sysdeps/linux/sh64/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/sh64/bits/uClibc_arch_features.h
@@ -18,7 +18,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/sparc/bits/uClibc_arch_features.h b/libc/sysdeps/linux/sparc/bits/uClibc_arch_features.h
index 2cf505256..62d13ffe5 100644
--- a/libc/sysdeps/linux/sparc/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/sparc/bits/uClibc_arch_features.h
@@ -18,7 +18,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/v850/bits/uClibc_arch_features.h b/libc/sysdeps/linux/v850/bits/uClibc_arch_features.h
index 1b40e32a2..172f6c1e2 100644
--- a/libc/sysdeps/linux/v850/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/v850/bits/uClibc_arch_features.h
@@ -19,7 +19,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#undef __UCLIBC_NO_UNDERSCORES__
+#define __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/vax/bits/uClibc_arch_features.h b/libc/sysdeps/linux/vax/bits/uClibc_arch_features.h
index 0099b24d6..9b8cd592c 100644
--- a/libc/sysdeps/linux/vax/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/vax/bits/uClibc_arch_features.h
@@ -18,7 +18,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/x86_64/bits/uClibc_arch_features.h b/libc/sysdeps/linux/x86_64/bits/uClibc_arch_features.h
index 03d8125e0..b71d7ab69 100644
--- a/libc/sysdeps/linux/x86_64/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/x86_64/bits/uClibc_arch_features.h
@@ -18,7 +18,7 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__
diff --git a/libc/sysdeps/linux/xtensa/bits/uClibc_arch_features.h b/libc/sysdeps/linux/xtensa/bits/uClibc_arch_features.h
index 7abd0cefc..d01e77f5f 100644
--- a/libc/sysdeps/linux/xtensa/bits/uClibc_arch_features.h
+++ b/libc/sysdeps/linux/xtensa/bits/uClibc_arch_features.h
@@ -21,7 +21,7 @@
 #undef __UCLIBC_HANDLE_OLDER_RLIMIT__
 
 /* does your target prefix all symbols with an _ ? */
-#define __UCLIBC_NO_UNDERSCORES__
+#undef __UCLIBC_UNDERSCORES__
 
 /* does your target have an asm .set ? */
 #define __UCLIBC_HAVE_ASM_SET_DIRECTIVE__