Adjust naming for __FORCE_GLIBC__ to __FORCE_GLIBC and add

support for __FORCE_NOGLIBC per Brian Stafford
<brian.stafford@office-logic.com>

README

@@ -44,7 +44,21 @@ To compile programs with uClibc,
 
 and then just ./configure and make as usual.
 
-Note: You may also want to look at extra/gcc-uclibc/gcc-uclibc.c for
-      additional information concerning what options and environment
-      variables the gcc wrapper handles.
-
+Note: 
+
+	You may also want to look at extra/gcc-uclibc/gcc-uclibc.c for
+	additional information concerning what options and environment
+	variables the gcc wrapper handles.
+
+Note2: 
+
+	There is an unwholesomely huge amount of code out there that
+	depends on the presence of GNU libc header files.  We have GNU
+	libc header files.  So we have committed a horrible sin in
+	uClibc.  We _lie_ and claim to be GNU libc in order to force
+	many applications to work as their developers intended.  This
+	is IMHO, pardonable, since these defines are not really
+	intended to check for the presence of a particular library, but
+	rather are used to define an _interface_.  Some programs (such
+	as GNU binutils) are especially chummy with glibc, and need
+	this behavior disabled by adding CFLAGS+=-D__FORCE_NOGLIBC

include/features.h

@@ -263,7 +263,7 @@
  *  their developers intended.  This is IMHO, pardonable, since these defines
  *  are not really intended to check for the presence of a particular library,
  *  but rather are used to define an _interface_.  */
-#if !defined _LIBC || defined __FORCE_GLIBC__ 
+#if !defined __FORCE_NOGLIBC && (!defined _LIBC || defined __FORCE_GLIBC)
 #   define __GNU_LIBRARY__ 6
 #   define __GLIBC__       2
 #   define __GLIBC_MINOR__ 2

libc/inet/addr.c

@@ -12,7 +12,7 @@
  * inet_ntoa in half (from 190 bytes down to 94).
  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <string.h>
 #include <ctype.h>

libc/inet/getnetbyad.c

@@ -15,7 +15,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <netdb.h>
 

libc/inet/getnetbynm.c

@@ -15,7 +15,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <netdb.h>
 #include <string.h>

libc/inet/getnetent.c

@@ -15,7 +15,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <stdio.h>
 #include <netdb.h>

libc/inet/getproto.c

@@ -51,7 +51,7 @@
 ** SUCH DAMAGE.
 */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <sys/types.h>
 #include <sys/socket.h>

libc/inet/getservice.c

@@ -52,7 +52,7 @@
 */
 
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <sys/types.h>
 #include <sys/socket.h>

libc/inet/herror.c

@@ -17,7 +17,7 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <stdio.h>
 #include <string.h>

libc/inet/hostid.c

@@ -1,4 +1,4 @@
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <stdio.h>
 #include <string.h>

libc/inet/inet_net.c

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <ctype.h>
 #include <netinet/in.h>

libc/inet/ntop.c

@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <sys/param.h>
 #include <sys/types.h>

libc/inet/resolv.c

@@ -43,7 +43,7 @@
  *   defined ip6addr_any and in6addr_loopback)
  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <string.h>
 #include <stdio.h>

libc/inet/rpc/auth_none.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/auth_unix.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/authunix_prot.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/bindresvport.c

@@ -31,7 +31,7 @@
  * Copyright (c) 1987 by Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <unistd.h>
 #include <string.h>

libc/inet/rpc/clnt_generic.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 /*
  * Copyright (C) 1987, Sun Microsystems, Inc.

libc/inet/rpc/clnt_perror.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/clnt_raw.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/clnt_simple.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /* 

libc/inet/rpc/clnt_tcp.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/clnt_udp.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/get_myaddress.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/getrpcent.c

@@ -1,5 +1,5 @@
 /* @(#)getrpcent.c	2.2 88/07/29 4.0 RPCSRC */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/getrpcport.c

@@ -1,5 +1,5 @@
 /* @(#)getrpcport.c	2.1 88/07/29 4.0 RPCSRC */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for

libc/inet/rpc/pmap_clnt.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/pmap_getmaps.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/pmap_getport.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/pmap_prot.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/pmap_prot2.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/pmap_rmt.c

@@ -36,7 +36,7 @@
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <unistd.h>
 #include <string.h>

libc/inet/rpc/rpc_callmsg.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/rpc_commondata.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <rpc/rpc.h>
 /*

libc/inet/rpc/rpc_dtablesize.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 #include <rpc/clnt.h>

libc/inet/rpc/rpc_prot.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/svc.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/svc_auth.c

@@ -1,4 +1,4 @@
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for

libc/inet/rpc/svc_auth_unix.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/svc_raw.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/svc_run.c

@@ -1,5 +1,5 @@
 /* @(#)svc_run.c	2.1 88/07/29 4.0 RPCSRC */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/svc_simple.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /* 

libc/inet/rpc/svc_tcp.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/svc_udp.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/xdr.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/xdr_array.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/xdr_float.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/xdr_mem.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/xdr_rec.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/xdr_reference.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/rpc/xdr_stdio.c

@@ -27,7 +27,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 
 /*

libc/inet/socketcalls.c

@@ -1,4 +1,4 @@
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <errno.h>
 #include <syscall.h>

libc/misc/syslog/syslog.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 /*
  * SYSLOG -- print message on log file

libc/sysdeps/linux/common/cmsg_nxthdr.c

@@ -17,7 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#define __FORCE_GLIBC__
+#define __FORCE_GLIBC
 #include <features.h>
 #include <sys/socket.h>