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

4 files changed, 7 insertions, 7 deletions

diff --git a/libc/sysdeps/linux/m68k/Makefile b/libc/sysdeps/linux/m68k/Makefile
index 751f7072c..7130c58d6 100644
--- a/libc/sysdeps/linux/m68k/Makefile
+++ b/libc/sysdeps/linux/m68k/Makefile
@@ -28,7 +28,7 @@ ASFLAGS=$(CFLAGS)
 # If you're looking for vfork(), it is defined in include/unistd.h
 
 
-ifeq ($(HAS_MMU),true)
+ifeq ($(UCLIBC_HAS_MMU),y)
 CRT0=crt0.c
 CRT0_OBJ=$(patsubst %.c,%.o, $(CRT0))
 else
@@ -54,7 +54,7 @@ ar-target: $(OBJS) $(CRT0_OBJ)
 	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
 	cp $(CRT0_OBJ) $(TOPDIR)lib/$(CRT0_OBJ)
 
-ifeq ($(HAS_MMU),true)
+ifeq ($(UCLIBC_HAS_MMU),y)
 $(CRT0_OBJ): %.o : %.c
 else
 $(CRT0_OBJ): %.o : %.S
@@ -71,7 +71,7 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 headers:
-ifeq ($(strip $(HAVE_ELF)),false)
+ifeq ($(strip $(HAVE_ELF)),n)
 	echo "Working around compiler bug in the m68k-pic-coff toolchain"
 	cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/m68k/float.h .
 endif
@@ -80,7 +80,7 @@ endif
 clean:
 	rm -f *.[oa] *~ core
 	rm -f bits/sysnum.h
-ifeq ($(strip $(HAVE_ELF)),false)
+ifeq ($(strip $(HAVE_ELF)),n)
 	rm -f $(TOPDIR)/include/float.h
 endif
 
diff --git a/libc/sysdeps/linux/m68k/clone.S b/libc/sysdeps/linux/m68k/clone.S
index d1e4fd850..731587db4 100644
--- a/libc/sysdeps/linux/m68k/clone.S
+++ b/libc/sysdeps/linux/m68k/clone.S
@@ -76,7 +76,7 @@ thread_start:
 	trap	#0
 	/*jsr    exit*/
 
-#if defined(HAVE_ELF)
+#if defined(__HAVE_ELF__)
 	.weak clone
 	clone = __clone
 #else
diff --git a/libc/sysdeps/linux/m68k/crt0.S b/libc/sysdeps/linux/m68k/crt0.S
index c09146fa5..8d7f6802d 100644
--- a/libc/sysdeps/linux/m68k/crt0.S
+++ b/libc/sysdeps/linux/m68k/crt0.S
@@ -53,7 +53,7 @@ __exit:
  */
 empty_func:
 	rts
-#if defined(HAVE_ELF)
+#if defined(__HAVE_ELF__)
 	.weak atexit
 	atexit = empty_func
 #else
diff --git a/libc/sysdeps/linux/m68k/vfork.S b/libc/sysdeps/linux/m68k/vfork.S
index 9aacf5916..5db163bf5 100644
--- a/libc/sysdeps/linux/m68k/vfork.S
+++ b/libc/sysdeps/linux/m68k/vfork.S
@@ -11,7 +11,7 @@
 	.align 2
 	.globl errno
 	.globl vfork
-#if defined HAVE_ELF
+#if defined __HAVE_ELF__
 	.type	 vfork,@function
 #endif
 vfork: