From: Nathanael Nerode Date: Sat, 10 Jan 2004 00:02:25 +0000 (+0000) Subject: backport: [multiple changes] X-Git-Tag: releases/gcc-3.3.3~115 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc339d020ffe792a4e8253a8977b6423133c9a3e;p=thirdparty%2Fgcc.git backport: [multiple changes] 2004-01-02 Nathanael Nerode PR target/13069 Backport the following from mainline: 2003-03-08 Neil Booth * config/sh/rtemself.h (TARGET_OS_CPP_BUILTINS): Use instead of CPP_PREDEFINES. * config/sh/rtems.h (TARGET_OS_CPP_BUILTINS): Use instead of CPP_PREDEFINES. 2003-09-27 Kelley Cook * config/sh/rtemself.h, config/sh/rtems.h: GNU CC -> GCC. From-SVN: r75612 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7c5ff7546925..128baf72077a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,17 @@ +2004-01-02 Nathanael Nerode + + PR target/13069 + Backport the following from mainline: + + 2003-03-08 Neil Booth + * config/sh/rtemself.h (TARGET_OS_CPP_BUILTINS): Use instead of + CPP_PREDEFINES. + * config/sh/rtems.h (TARGET_OS_CPP_BUILTINS): Use instead of + CPP_PREDEFINES. + + 2003-09-27 Kelley Cook + * config/sh/rtemself.h, config/sh/rtems.h: GNU CC -> GCC. + 2004-01-02 Roger Sayle * tree.h (integer_nonzerop): Use PARAMS macro with prototype. diff --git a/gcc/config/sh/rtems.h b/gcc/config/sh/rtems.h index b52ef7216ec1..707be7204a95 100644 --- a/gcc/config/sh/rtems.h +++ b/gcc/config/sh/rtems.h @@ -2,25 +2,26 @@ Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc. Contributed by Joel Sherrill (joel@OARcorp.com). -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify +GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU CC is distributed in the hope that it will be useful, +GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to +along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Specify predefined symbols in preprocessor. */ -#undef CPP_PREDEFINES -#define CPP_PREDEFINES "-D__sh__ -D__rtems__ \ - -Asystem=rtems -Acpu=sh -Amachine=sh" +#define TARGET_OS_CPP_BUILTINS() do { \ + builtin_define( "__rtems__" ); \ + builtin_assert( "system=rtems" ); \ +} while (0) diff --git a/gcc/config/sh/rtemself.h b/gcc/config/sh/rtemself.h index 6177c810dd14..1a846ccab46a 100644 --- a/gcc/config/sh/rtemself.h +++ b/gcc/config/sh/rtemself.h @@ -2,25 +2,26 @@ Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc. Contributed by Joel Sherrill (joel@OARcorp.com). -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify +GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -GNU CC is distributed in the hope that it will be useful, +GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to +along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Specify predefined symbols in preprocessor. */ -#undef CPP_PREDEFINES -#define CPP_PREDEFINES "-D__sh__ -D__ELF__ -D__rtems__ \ - -Asystem=rtems -Acpu=sh -Amachine=sh" +#define TARGET_OS_CPP_BUILTINS() do { \ + builtin_define( "__rtems__" ); \ + builtin_assert( "system=rtems" ); \ +} while (0)