diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2012-11-20 21:32:40 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2012-11-20 21:32:40 +0000 |
| commit | ba32a2ebfd3aaa4f63b9f92362fcddeab5881664 (patch) | |
| tree | a6a8d88cb2ae2bd65fd9613da3237ed3bedbbe5a /gnu | |
| parent | b1f8db923750108b9600bab07d786c77d55c4bb5 (diff) | |
Convert to new world order by defining TARGET_OS_CPP_BUILTINS instead of
CPP_PREDEFINES; try to deuglify CPP_SPEC whenever possible as well.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/config/m68k/openbsd.h | 12 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h | 34 |
2 files changed, 30 insertions, 16 deletions
diff --git a/gnu/usr.bin/gcc/gcc/config/m68k/openbsd.h b/gnu/usr.bin/gcc/gcc/config/m68k/openbsd.h index 857ed0ce6f3..3c5ec45775e 100644 --- a/gnu/usr.bin/gcc/gcc/config/m68k/openbsd.h +++ b/gnu/usr.bin/gcc/gcc/config/m68k/openbsd.h @@ -31,10 +31,18 @@ Boston, MA 02111-1307, USA. */ /* Define __HAVE_68881__ in preprocessor, unless -msoft-float is specified. This will control the use of inline 68881 insns in certain macros. */ #undef CPP_SPEC -#define CPP_SPEC "%{!msoft-float:-D__HAVE_68881__ -D__HAVE_FPU__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" +#define CPP_SPEC "%{!msoft-float:-D__HAVE_68881__ -D__HAVE_FPU__} " OBSD_CPP_SPEC /* Run-time target specifications. */ -#define CPP_PREDEFINES "-D__unix__ -D__m68k__ -D__mc68000__ -D__mc68020__ -D__OpenBSD__ -Asystem=unix -Asystem=OpenBSD -Acpu=m68k -Amachine=m68k" +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + OPENBSD_OS_CPP_BUILTINS_COMMON(); \ + builtin_define ("__m68k__"); \ + builtin_define ("__mc68000__"); \ + builtin_define ("__mc68020__"); \ + } \ + while (0) /* m68k as needs to know about the processor subtype. */ #undef ASM_SPEC diff --git a/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h b/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h index dc737c46f6c..f2ea0cd2d63 100644 --- a/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h +++ b/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h @@ -38,20 +38,26 @@ Boston, MA 02111-1307, USA. */ #include <openbsd.h> -/* Macros to be automatically defined. */ -#define CPP_PREDEFINES \ - "-D__m88k__ -D__unix__ -D__OpenBSD__ -Asystem(unix) -Asystem(OpenBSD) -Acpu(m88k) -Amachine(m88k)" - -/* If -m88000 is in effect, add -Dmc88000; similarly for -m88100 and -m88110. - However, reproduce the effect of -Dmc88100 previously in CPP_PREDEFINES. - Here, the CPU_DEFAULT is assumed to be -m88100. */ -#undef CPP_SPEC -#define CPP_SPEC "%{m88000:-D__mc88000__} \ - %{!m88000:%{m88100:%{m88110:-D__mc88000__}}} \ - %{!m88000:%{!m88100:%{m88110:-D__mc88110__}}} \ - %{!m88000:%{!m88110:-D__mc88100__ -D__mc88100}} \ - %{posix:-D_POSIX_SOURCE} \ - %{pthread:-D_REENTRANT}" +/* Run-time target specifications. */ +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + OPENBSD_OS_CPP_BUILTINS_COMMON(); \ + builtin_define ("__m88k"); \ + builtin_define ("__m88k__"); \ + builtin_assert ("cpu=m88k"); \ + builtin_assert ("machine=m88k"); \ + if (TARGET_88000) \ + builtin_define ("__mc88000__"); \ + else \ + { \ + if (TARGET_88100) \ + builtin_define ("__mc88100__"); \ + if (TARGET_88110) \ + builtin_define ("__mc88110__"); \ + } \ + } \ + while (0) /* Layout of source language data types. */ |