summaryrefslogtreecommitdiff
path: root/extra/gcc-uClibc
diff options
context:
space:
mode:
Diffstat (limited to 'extra/gcc-uClibc')
-rw-r--r--extra/gcc-uClibc/Makefile12
-rw-r--r--extra/gcc-uClibc/gcc-uClibc.c2
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;