From 7f4b070df424fc1ca8cea977dddb9b23742246c2 Mon Sep 17 00:00:00 2001 From: obrien Date: Thu, 20 May 1999 08:30:48 +0000 Subject: Consistantly protect "#define FOO ..." with "#undef FOO". --- contrib/gcc/config/alpha/freebsd4.h | 38 ++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'contrib/gcc') diff --git a/contrib/gcc/config/alpha/freebsd4.h b/contrib/gcc/config/alpha/freebsd4.h index b693893..d4d9b72 100644 --- a/contrib/gcc/config/alpha/freebsd4.h +++ b/contrib/gcc/config/alpha/freebsd4.h @@ -38,6 +38,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* This is the char to use for continuation (in case we need to turn continuation back on). */ +#undef DBX_CONTIN_CHAR #define DBX_CONTIN_CHAR '?' #undef ASM_FINAL_SPEC @@ -71,6 +72,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #undef WCHAR_TYPE #define WCHAR_TYPE "int" +#undef WCHAR_UNSIGNED +#define WCHAR_UNSIGNED 0 + #undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE 32 @@ -105,6 +109,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ fprintf (FILE, "\t.set noat\n"); \ } +#undef ASM_OUTPUT_SOURCE_LINE #define ASM_OUTPUT_SOURCE_LINE(STREAM, LINE) \ alpha_output_lineno (STREAM, LINE) extern void alpha_output_lineno (); @@ -116,14 +121,18 @@ extern void output_file_directive (); .ident string is patterned after the ones produced by native svr4 C compilers. */ +#undef IDENT_ASM_OP #define IDENT_ASM_OP ".ident" #ifdef IDENTIFY_WITH_IDENT +#undef ASM_IDENTIFY_GCC #define ASM_IDENTIFY_GCC(FILE) /* nothing */ +#undef ASM_IDENTIFY_LANGUAGE #define ASM_IDENTIFY_LANGUAGE(FILE) \ fprintf(FILE, "\t%s \"GCC (%s) %s\"\n", IDENT_ASM_OP, \ lang_identify(), version_string) #else +#undef ASM_FILE_END #define ASM_FILE_END(FILE) \ do { \ fprintf ((FILE), "\t%s\t\"GCC: (GNU) %s\"\n", \ @@ -137,12 +146,14 @@ do { \ /* Output #ident as a .ident. */ +#undef ASM_OUTPUT_IDENT #define ASM_OUTPUT_IDENT(FILE, NAME) \ fprintf (FILE, "\t%s\t\"%s\"\n", IDENT_ASM_OP, NAME); /* This is how to allocate empty space in some section. The .zero pseudo-op is used for this on most svr4 assemblers. */ +#undef SKIP_ASM_OP #define SKIP_ASM_OP ".zero" #undef ASM_OUTPUT_SKIP @@ -157,6 +168,7 @@ do { \ make sure that the location counter for the .rodata section gets pro- perly re-aligned prior to the actual beginning of the jump table. */ +#undef ALIGN_ASM_OP #define ALIGN_ASM_OP ".align" #ifndef ASM_OUTPUT_BEFORE_CASE_LABEL @@ -175,6 +187,7 @@ do { \ library routines (e.g. .udiv) be explicitly declared as .globl in each assembly file where they are referenced. */ +#undef ASM_OUTPUT_EXTERNAL_LIBCALL #define ASM_OUTPUT_EXTERNAL_LIBCALL(FILE, FUN) \ ASM_GLOBALIZE_LABEL (FILE, XSTR (FUN, 0)) @@ -183,6 +196,7 @@ do { \ the linker seems to want the alignment of data objects to depend on their types. We do exactly that here. */ +#undef COMMON_ASM_OP #define COMMON_ASM_OP ".comm" #undef ASM_OUTPUT_ALIGNED_COMMON @@ -198,6 +212,7 @@ do { \ the linker seems to want the alignment of data objects to depend on their types. We do exactly that here. */ +#undef LOCAL_ASM_OP #define LOCAL_ASM_OP ".local" #undef ASM_OUTPUT_ALIGNED_LOCAL @@ -212,6 +227,7 @@ do { \ /* This is the pseudo-op used to generate a 64-bit word of data with a specific value in some section. */ +#undef INT_ASM_OP #define INT_ASM_OP ".quad" /* This is the pseudo-op used to generate a contiguous sequence of byte @@ -229,8 +245,10 @@ do { \ EXTRA_SECTIONS, EXTRA_SECTION_FUNCTIONS, SELECT_SECTION, and SELECT_RTX_SECTION. We do both here just to be on the safe side. */ +#undef USE_CONST_SECTION #define USE_CONST_SECTION 1 +#undef CONST_SECTION_ASM_OP #define CONST_SECTION_ASM_OP ".section\t.rodata" /* Define the pseudo-ops used to switch to the .ctors and .dtors sections. @@ -248,7 +266,9 @@ do { \ errors unless the .ctors and .dtors sections are marked as writable via the SHF_WRITE attribute.) */ +#undef CTORS_SECTION_ASM_OP #define CTORS_SECTION_ASM_OP ".section\t.ctors,\"aw\"" +#undef DTORS_SECTION_ASM_OP #define DTORS_SECTION_ASM_OP ".section\t.dtors,\"aw\"" /* On svr4, we *do* have support for the .init and .fini sections, and we @@ -257,7 +277,9 @@ do { \ The definitions say how to change sections to the .init and .fini sections. This is the same for all known svr4 assemblers. */ +#undef INIT_SECTION_ASM_OP #define INIT_SECTION_ASM_OP ".section\t.init" +#undef FINI_SECTION_ASM_OP #define FINI_SECTION_ASM_OP ".section\t.fini" /* A default list of other sections which we might be "in" at any given @@ -283,6 +305,7 @@ do { \ extern void text_section (); +#undef CONST_SECTION_FUNCTION #define CONST_SECTION_FUNCTION \ void \ const_section () \ @@ -296,6 +319,7 @@ const_section () \ } \ } +#undef CTORS_SECTION_FUNCTION #define CTORS_SECTION_FUNCTION \ void \ ctors_section () \ @@ -307,6 +331,7 @@ ctors_section () \ } \ } +#undef DTORS_SECTION_FUNCTION #define DTORS_SECTION_FUNCTION \ void \ dtors_section () \ @@ -323,6 +348,7 @@ dtors_section () \ We make the section read-only and executable for a function decl, read-only for a const data decl, and writable for a non-const data decl. */ +#undef ASM_OUTPUT_SECTION_NAME #define ASM_OUTPUT_SECTION_NAME(FILE, DECL, NAME, RELOC) \ fprintf (FILE, ".section\t%s,\"%s\",@progbits\n", NAME, \ (DECL) && TREE_CODE (DECL) == FUNCTION_DECL ? "ax" : \ @@ -331,6 +357,7 @@ dtors_section () \ /* A C statement (sans semicolon) to output an element in the table of global constructors. */ +#undef ASM_OUTPUT_CONSTRUCTOR #define ASM_OUTPUT_CONSTRUCTOR(FILE,NAME) \ do { \ ctors_section (); \ @@ -341,6 +368,7 @@ dtors_section () \ /* A C statement (sans semicolon) to output an element in the table of global destructors. */ +#undef ASM_OUTPUT_DESTRUCTOR #define ASM_OUTPUT_DESTRUCTOR(FILE,NAME) \ do { \ dtors_section (); \ @@ -354,6 +382,7 @@ dtors_section () \ or a constant of some sort. RELOC indicates whether forming the initial value of DECL requires link-time relocations. */ +#undef SELECT_SECTION #define SELECT_SECTION(DECL,RELOC) \ { \ if (TREE_CODE (DECL) == STRING_CST) \ @@ -393,12 +422,16 @@ dtors_section () \ different pseudo-op names for these, they may be overridden in the file which includes this one. */ +#undef TYPE_ASM_OP #define TYPE_ASM_OP ".type" +#undef SIZE_ASM_OP #define SIZE_ASM_OP ".size" +#unset SET_ASM_OP #define SET_ASM_OP ".set" /* This is how we tell the assembler that two symbols have the same value. */ +#undef ASM_OUTPUT_DEF #define ASM_OUTPUT_DEF(FILE,NAME1,NAME2) \ do { assemble_name(FILE, NAME1); \ fputs(" = ", FILE); \ @@ -419,6 +452,7 @@ dtors_section () \ the i386) don't know about that. Also, we don't use \v since some versions of gas, such as 2.2 did not accept it. */ +#undef ESCAPES #define ESCAPES \ "\1\1\1\1\1\1\1\1btn\1fr\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\ \0\0\"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\ @@ -441,15 +475,17 @@ dtors_section () \ should define this to zero. */ +#undef STRING_LIMIT #define STRING_LIMIT ((unsigned) 256) +#undef STRING_ASM_OP #define STRING_ASM_OP ".string" /* * We always use gas here, so we don't worry about ECOFF assembler problems. */ #undef TARGET_GAS -#define TARGET_GAS (1) +#define TARGET_GAS 1 #undef PREFERRED_DEBUGGING_TYPE #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG -- cgit v1.1