diff options
| author | Geoffrey Keating <geoffk@redhat.com> | 2002-06-04 07:11:05 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2002-06-04 07:11:05 +0000 |
| commit | e2500fedef1a1c5b9e818fd1e2c281adff80df4a (patch) | |
| tree | 720630adca0f6b357e05c4feb8cbe33d556925ce /gcc/system.h | |
| parent | c2ae66169b8326bbf9b1dfa63083d2560fea7ddf (diff) | |
| download | gcc-e2500fedef1a1c5b9e818fd1e2c281adff80df4a.zip gcc-e2500fedef1a1c5b9e818fd1e2c281adff80df4a.tar.gz gcc-e2500fedef1a1c5b9e818fd1e2c281adff80df4a.tar.bz2 | |
Merge from pch-branch up to tag pch-commit-20020603.
From-SVN: r54232
Diffstat (limited to 'gcc/system.h')
| -rw-r--r-- | gcc/system.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/gcc/system.h b/gcc/system.h index d7be2e8..e028df1 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -579,11 +579,19 @@ typedef char _Bool; compiling gcc, so that the autoconf declaration tests for malloc etc don't spuriously fail. */ #ifdef IN_GCC -#undef malloc -#undef realloc #undef calloc #undef strdup - #pragma GCC poison malloc realloc calloc strdup + #pragma GCC poison calloc strdup + +#if defined(FLEX_SCANNER) || defined (YYBISON) +/* Flex and bison use malloc and realloc. Yuk. */ +#define malloc xmalloc +#define realloc xrealloc +#else +#undef malloc +#undef realloc + #pragma GCC poison malloc realloc +#endif /* Old target macros that have moved to the target hooks structure. */ #pragma GCC poison ASM_OPEN_PAREN ASM_CLOSE_PAREN \ @@ -598,7 +606,7 @@ typedef char _Bool; WCHAR_UNSIGNED UNIQUE_SECTION SELECT_SECTION SELECT_RTX_SECTION \ ENCODE_SECTION_INFO STRIP_NAME_ENCODING -/* And other obsolete target macros, or macros that used to be in target +/* Other obsolete target macros, or macros that used to be in target headers and were not used, and may be obsolete or may never have been used. */ #pragma GCC poison INT_ASM_OP ASM_OUTPUT_EH_REGION_BEG \ @@ -614,6 +622,10 @@ typedef char _Bool; FUNCTION_BLOCK_PROFILER_EXIT MACHINE_STATE_SAVE \ MACHINE_STATE_RESTORE +/* Hooks that are no longer used. */ + #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \ + LANG_HOOKS_MARK_TREE + #endif /* IN_GCC */ /* Note: not all uses of the `index' token (e.g. variable names and |