From e2f6ebd3f2969753e4ffc337ce5fb6cdf9d74775 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 19 Mar 2001 06:24:20 +0000 Subject: Fix up breakage resulting from flipping the sense of some defines. Change from defining things to "0" in the disabled case to outright undefining them, lest code that does an "#ifdef FOO" get inadvertantly triggered. Remove now unneeded lines from Rules.mak which makes the command line smaller and avoids redundancy (since this stuff is now pulled in via features.h). -Erik --- Makefile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7791f66cc..a9c40cd5c 100644 --- a/Makefile +++ b/Makefile @@ -150,23 +150,36 @@ uClibc_config.h: Config @if [ "$(HAS_MMU)" = "true" ] ; then \ echo "#define __UCLIBC_HAS_MMU__ 1" >> uClibc_config.h ; \ else \ - echo "#define __UCLIBC_HAS_MMU__ 0" >> uClibc_config.h ; \ + echo "#undef __UCLIBC_HAS_MMU__" >> uClibc_config.h ; \ fi @if [ "$(HAS_FLOATS)" = "true" ] ; then \ echo "#define __UCLIBC_HAS_FLOATS__ 1" >> uClibc_config.h ; \ else \ - echo "#define __UCLIBC_HAS_FLOATS__ 0" >> uClibc_config.h ; \ + echo "#undef __UCLIBC_HAS_FLOATS__" >> uClibc_config.h ; \ fi @if [ "$(HAS_LONG_LONG)" = "true" ] ; then \ echo "#define __UCLIBC_HAS_LONG_LONG__ 1" >> uClibc_config.h ; \ else \ - echo "#define __UCLIBC_HAS_LONG_LONG__ 0" >> uClibc_config.h ; \ + echo "#undef __UCLIBC_HAS_LONG_LONG__" >> uClibc_config.h ; \ fi @if [ "$(HAS_LOCALE)" = "true" ] ; then \ echo "#define __UCLIBC_HAS_LOCALE__ 1" >> uClibc_config.h ; \ echo "#define __UCLIBC_LOCALE_DIR \""$(LOCALE_DIR)"\"" >> uClibc_config.h ; \ else \ - echo "#define __UCLIBC_HAS_LOCALE__ 0" >> uClibc_config.h ; \ + echo "#undef __UCLIBC_HAS_LOCALE__" >> uClibc_config.h ; \ + fi + @if [ "$(TARGET_ARCH)" = "m68k" ] ; then \ + echo "#define __VFORK_MACRO__ 1" >> uClibc_config.h ; \ + echo "#define const" >> uClibc_config.h ; \ + echo "#define __const" >> uClibc_config.h ; \ + echo "#define __extension" >> uClibc_config.h ; \ + else \ + echo "#undef __VFORK_MACRO__" >> uClibc_config.h ; \ + fi + @if [ "$(TARGET_ARCH)" = "sh" ] ; then \ + echo "#define NO_UNDERSCORES 1" >> uClibc_config.h ; \ + else \ + echo "#undef NO_UNDERSCORES" >> uClibc_config.h ; \ fi .PHONY: dummy -- cgit v1.2.3