diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 1999-02-01 06:49:19 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 1999-02-01 06:49:19 +0000 |
| commit | ab7c205e79d2198c0318b639cf4272044049d3ba (patch) | |
| tree | 210badf5e829e5596cfb528d9db20ef0a91a9014 /gcc | |
| parent | 5ae38e867860a28a3020a222b4cc080c388916a3 (diff) | |
| download | gcc-ab7c205e79d2198c0318b639cf4272044049d3ba.zip gcc-ab7c205e79d2198c0318b639cf4272044049d3ba.tar.gz gcc-ab7c205e79d2198c0318b639cf4272044049d3ba.tar.bz2 | |
system.h (inline, const): Handle these for stage2 (and later) gcc.
* system.h (inline, const): Handle these for stage2 (and later) gcc.
* dwarf2out.c (inline): Don't define.
* dwarfout.c (inline): Likewise.
From-SVN: r24950
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/dwarf2out.c | 4 | ||||
| -rw-r--r-- | gcc/dwarfout.c | 4 | ||||
| -rw-r--r-- | gcc/system.h | 13 |
4 files changed, 20 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 28ac1cd..8abe3ab 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 1 09:40:25 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * system.h (inline, const): Handle these for stage2 (and later) gcc. + + * dwarf2out.c (inline): Don't define. + + * dwarfout.c (inline): Likewise. + Sun Jan 31 22:04:37 1999 Richard Henderson <rth@cygnus.com> * loop.c (recombine_givs): Dump recombination and derivation data. diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index ba0caa3..16e5bc3 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -72,10 +72,6 @@ dwarf2out_do_frame () #if defined (DWARF2_DEBUGGING_INFO) || defined (DWARF2_UNWIND_INFO) -#ifndef __GNUC__ -#define inline -#endif - /* How to start an assembler comment. */ #ifndef ASM_COMMENT_START #define ASM_COMMENT_START ";#" diff --git a/gcc/dwarfout.c b/gcc/dwarfout.c index 1a59ac7..dd4ff1d 100644 --- a/gcc/dwarfout.c +++ b/gcc/dwarfout.c @@ -63,10 +63,6 @@ extern char *getpwd PROTO((void)); /* Note that the implementation of C++ support herein is (as yet) unfinished. If you want to try to complete it, more power to you. */ -#if !defined(__GNUC__) || (NDEBUG != 1) -#define inline -#endif - /* How to start an assembler comment. */ #ifndef ASM_COMMENT_START #define ASM_COMMENT_START ";#" diff --git a/gcc/system.h b/gcc/system.h index 7390974..0de7133 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -22,6 +22,18 @@ Boston, MA 02111-1307, USA. */ #ifndef __GCC_SYSTEM_H__ #define __GCC_SYSTEM_H__ +/* Autoconf will possibly define the `inline' or `const' keywords as + macros, however this is only valid for the stage1 compiler. If we + detect a modern version of gcc, unconditionally reset the values. + This makes sure the right thing happens in stage2 and later. We + need to do this before any header files in case they use these + keywords or conflicts might occur. */ +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# undef const +# undef inline +# define inline __inline__ /* Modern gcc can use `__inline__' freely. */ +#endif /* GCC >= 2.7 */ + /* We must include stdarg.h/varargs.h before stdio.h. */ #ifdef ANSI_PROTOTYPES #include <stdarg.h> @@ -392,7 +404,6 @@ extern void abort (); # endif #endif /* ! STRINGIFY */ - /* These macros are here in preparation for the use of gettext in egcs. */ #define _(String) String #define N_(String) String |