diff options
| author | Eric Andersen <andersen@codepoet.org> | 2002-10-31 18:20:21 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2002-10-31 18:20:21 +0000 |
| commit | 6737908f74ff566748864548cf35bb1da8e64af6 (patch) | |
| tree | 6eeafda4548f49d960e1b597c880a810a08a66f0 /extra/gcc-uClibc | |
| parent | c734e7ca57f520e55236b21eaef16ac40099a378 (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 'extra/gcc-uClibc')
| -rw-r--r-- | extra/gcc-uClibc/Makefile | 12 | ||||
| -rw-r--r-- | extra/gcc-uClibc/gcc-uClibc.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile index 19d9a4dbd..d5113bd7c 100644 --- a/extra/gcc-uClibc/Makefile +++ b/extra/gcc-uClibc/Makefile @@ -27,15 +27,15 @@ gcc-uClibc.h: $(TOPDIR)/Config @echo "#define TARGET_ARCH " \"$(TARGET_ARCH)\" >> gcc-uClibc.h @echo "#define DYNAMIC_LINKER " \"$(DYNAMIC_LINKER)\" >> gcc-uClibc.h @echo "#define BUILD_DYNAMIC_LINKER " \"$(UCLIBC_DIR)/lib/$(UCLIBC_LDSO)\" >> gcc-uClibc.h -ifeq ($(strip $(HAS_MMU)),true) - @echo "#define HAS_MMU 1" >> gcc-uClibc.h +ifeq ($(strip $(UCLIBC_HAS_MMU)),y) + @echo "#define __UCLIBC_HAS_MMU__ 1" >> gcc-uClibc.h else - @echo "#undef HAS_MMU" >> gcc-uClibc.h + @echo "#undef __UCLIBC_HAS_MMU__" >> gcc-uClibc.h endif -ifeq ($(strip $(HAS_ELF)),true) - @echo "#define HAS_ELF 1" >> gcc-uClibc.h +ifeq ($(strip $(HAS_ELF)),y) + @echo "#define __HAS_ELF__ 1" >> gcc-uClibc.h else - @echo "#undef HAS_ELF" >> gcc-uClibc.h + @echo "#undef __HAS_ELF__" >> gcc-uClibc.h endif gcc-uClibc: gcc-uClibc.h gcc-uClibc.c diff --git a/extra/gcc-uClibc/gcc-uClibc.c b/extra/gcc-uClibc/gcc-uClibc.c index 24f49d216..1974cc150 100644 --- a/extra/gcc-uClibc/gcc-uClibc.c +++ b/extra/gcc-uClibc/gcc-uClibc.c @@ -337,7 +337,7 @@ int main(int argc, char **argv) } if (linking && source_count) { -#if defined HAVE_ELF && ! defined HAS_MMU +#if defined __HAVE_ELF__ && ! defined __UCLIBC_HAS_MMU__ gcc_argv[i++] = "-Wl,-elf2flt"; #endif gcc_argv[i++] = nostdlib; |