diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/avr/avr.h | 2 | ||||
| -rw-r--r-- | gcc/config/darwin.h | 2 | ||||
| -rw-r--r-- | gcc/coretypes.h | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8e8d310..386dcac 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2005-12-07 Richard Sandiford <richard@codesourcery.com> + * coretypes.h: Revert previous change. + * config/darwin.h: Revert previous reversion. + * config/avr/avr.h (progmem_section): Guard with #ifndef IN_LIBGCC2. + +2005-12-07 Richard Sandiford <richard@codesourcery.com> + * coretypes.h (section): Provide dummy definition for target files. * config/darwin.h: Revert previous change. diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h index d69e67b..6fe4601 100644 --- a/gcc/config/avr/avr.h +++ b/gcc/config/avr/avr.h @@ -47,7 +47,9 @@ extern const char *avr_extra_arch_macro; extern int avr_mega_p; extern int avr_enhanced_p; extern int avr_asm_only_p; +#ifndef IN_LIBGCC2 extern GTY(()) section *progmem_section; +#endif #define AVR_MEGA (avr_mega_p && !TARGET_SHORT_CALLS) #define AVR_ENHANCED (avr_enhanced_p) diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 8afae45..ff220a2 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -610,9 +610,11 @@ Boston, MA 02110-1301, USA. */ #define MAX_OFILE_ALIGNMENT 0x8000 /* Declare the section variables. */ +#ifndef IN_LIBGCC2 #define DEF_SECTION(NAME, FLAGS, DIRECTIVE, OBJC) extern section *NAME; #include "darwin-sections.def" #undef DEF_SECTION +#endif #undef TARGET_ASM_SELECT_SECTION #define TARGET_ASM_SELECT_SECTION machopic_select_section diff --git a/gcc/coretypes.h b/gcc/coretypes.h index f060733..7942459 100644 --- a/gcc/coretypes.h +++ b/gcc/coretypes.h @@ -68,11 +68,9 @@ enum tls_model { struct _dont_use_rtx_here_; struct _dont_use_rtvec_here_; union _dont_use_tree_here_; -union _dont_use_section_here_; #define rtx struct _dont_use_rtx_here_ * #define rtvec struct _dont_use_rtvec_here * #define tree union _dont_use_tree_here_ * -#define section union _dont_use_section_here_ #endif |