diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 2003-11-29 03:08:13 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 2003-11-29 03:08:13 +0000 |
| commit | 26b0ad130a5795cd760d22e27d16d14d4579a77e (patch) | |
| tree | 6a19b386d0b5d0fafab73966f59bf9d44a1a9118 /gcc/config/cris | |
| parent | 2c07f13b2bccf42a860e5d3634e77fb6a264fa54 (diff) | |
| download | gcc-26b0ad130a5795cd760d22e27d16d14d4579a77e.zip gcc-26b0ad130a5795cd760d22e27d16d14d4579a77e.tar.gz gcc-26b0ad130a5795cd760d22e27d16d14d4579a77e.tar.bz2 | |
gnu.h (HURD_TARGET_OS_CPP_BUILTINS): New.
* config/gnu.h (HURD_TARGET_OS_CPP_BUILTINS): New.
* config/linux.h (LINUX_TARGET_OS_CPP_BUILTINS): New.
* config/alpha/gnu.h, config/alpha/linux.h,
config/arm/linux-elf.h, config/cris/cris.h, config/cris/linux.h,
config/i370/linux.h, config/i386/gnu.h, config/i386/i386.h,
config/i386/linux-aout.h, config/i386/linux.h,
config/i386/linux64.h, config/ia64/linux.h, config/m68k/linux.h,
config/m68k/uclinux.h, config/mips/linux.h,
config/mn10300/linux.h, config/pa/pa-linux.h,
config/rs6000/sysv4.h, config/s390/linux.h, config/sh/linux.h,
config/sparc/linux.h, config/sparc/linux64.h,
config/xtensa/linux.h (TARGET_OS_CPP_BUILTINS): Use
HURD_TARGET_OS_CPP_BUILTINS/LINUX_TARGET_OS_CPP_BUILTINS or ensure
all necessary assertions are included.
testsuite:
* testsuite/gcc.dg/cpp/assert4.c: Update.
From-SVN: r74031
Diffstat (limited to 'gcc/config/cris')
| -rw-r--r-- | gcc/config/cris/cris.h | 2 | ||||
| -rw-r--r-- | gcc/config/cris/linux.h | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h index 288be19..9f130d6 100644 --- a/gcc/config/cris/cris.h +++ b/gcc/config/cris/cris.h @@ -251,6 +251,8 @@ extern const char *cris_elinux_stacksize_str; builtin_define_std ("CRIS"); \ builtin_define_std ("GNU_CRIS"); \ builtin_define ("__CRIS_ABI_version=2"); \ + builtin_assert ("cpu=cris"); \ + builtin_assert ("machine=cris"); \ } \ while (0) diff --git a/gcc/config/cris/linux.h b/gcc/config/cris/linux.h index 288c285..f842f94 100644 --- a/gcc/config/cris/linux.h +++ b/gcc/config/cris/linux.h @@ -48,9 +48,7 @@ Boston, MA 02111-1307, USA. */ #undef CRIS_CPP_SUBTARGET_SPEC #define CRIS_CPP_SUBTARGET_SPEC \ "%{pthread:-D_REENTRANT}\ - %{!march=*:%{!cpu=*:-D__arch_v10 -D__CRIS_arch_version=10}}\ - %{!ansi:%{!std=*:%{!undef:-Dlinux -Dunix}\ - -Asystem(unix) -Asystem(posix) -Acpu(cris) -Amachine(cris)}}" + %{!march=*:%{!cpu=*:-D__arch_v10 -D__CRIS_arch_version=10}}" #undef CRIS_CC1_SUBTARGET_SPEC #define CRIS_CC1_SUBTARGET_SPEC \ @@ -103,9 +101,7 @@ Boston, MA 02111-1307, USA. */ #define TARGET_OS_CPP_BUILTINS() \ do \ { \ - builtin_define ("__gnu_linux__"); \ - builtin_define ("__linux__"); \ - builtin_define ("__unix__"); \ + LINUX_TARGET_OS_CPP_BUILTINS(); \ if (flag_pic) \ { \ builtin_define ("__PIC__"); \ |