diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b1d78c8ee113b48103a9f230c75fa02aaabb9a8e..e877f19cd13c4ef7d505705ae8507ba3918f501d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2002-07-23 Neil Booth <neil@daikokuya.co.uk>
+
+ * dwarf2out.c (SECTION_ASM_OP,
+ ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL): Remove.
+ * system.h (SECTION_ASM_OP): Poison.
+ * tree.c (FILE_FUNCTION_PREFIX_LEN): Remove.
+ * config/alpha/alpha-interix.h, config/mips/linux.h
+ (ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL): Remove.
+ * config/mmix/mmix-protos.h, config/mmix/mmix.c
+ (mmix_asm_output_define_label_difference_symbol): Remove.
+ * config/mmix/mmix.h
+ (ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL): Remove.
+
Tue Jul 23 21:49:24 2002 J"orn Rennecke <joern.rennecke@superh.com>
* recog.c (asm_operand_ok): Allow float CONST_VECTORs for 'F'.
diff --git a/gcc/config/alpha/alpha-interix.h b/gcc/config/alpha/alpha-interix.h
index bb602a56afe224456ded74fc3d4947e947cb9e72..3f1580d05c65205e4da900a9b471504e9efa3e02 100644
--- a/gcc/config/alpha/alpha-interix.h
+++ b/gcc/config/alpha/alpha-interix.h
@@ -148,15 +148,3 @@ while (0)
fprintf (FILE, "\t.globl\t__fltused\n"); \
ASM_OUTPUT_SOURCE_FILENAME (FILE, main_input_filename); \
}
-
-/* The current Interix assembler (consistent with the DEC documentation)
- uses a=b NOT .set a,b; .set is for assembler options. */
-#undef ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL
-#define ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL(FILE, SY, HI, LO) \
- do { \
- assemble_name (FILE, SY); \
- fputc ('=', FILE); \
- assemble_name (FILE, HI); \
- fputc ('-', FILE); \
- assemble_name (FILE, LO); \
- } while (0)
diff --git a/gcc/config/mmix/mmix-protos.h b/gcc/config/mmix/mmix-protos.h
index f13a179e13f8f5b8f2e6f8fc97ffdd71a3c19851..693d344861b3a6c3b3d0ee2845146fe261a4d100 100644
--- a/gcc/config/mmix/mmix-protos.h
+++ b/gcc/config/mmix/mmix-protos.h
@@ -46,8 +46,6 @@ extern void mmix_asm_output_labelref PARAMS ((FILE *, const char *));
extern void mmix_asm_output_internal_label
PARAMS ((FILE *, const char *, int));
extern void mmix_asm_output_def PARAMS ((FILE *, const char *, const char *));
-extern void mmix_asm_output_define_label_difference_symbol
- PARAMS ((FILE *, const char *, const char *, const char *));
extern int mmix_print_operand_punct_valid_p PARAMS ((int));
extern void mmix_asm_output_reg_push PARAMS ((FILE *, int));
extern void mmix_asm_output_reg_pop PARAMS ((FILE *, int));
diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index f166804d271b59fe95c02499ead2043199fa9ee4..cba04f483fc4c6fbec8801206566d810f0a4a665 100644
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -1597,23 +1597,6 @@ mmix_asm_output_def (stream, name, value)
fputc ('\n', stream);
}
-/* ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL. */
-
-void
-mmix_asm_output_define_label_difference_symbol (stream, symbol, hi, lo)
- FILE *stream;
- const char *symbol;
- const char *hi;
- const char *lo;
-{
- assemble_name (stream, symbol);
- fprintf (stream, "\tIS\t");
- assemble_name (stream, hi);
- fputc ('-', stream);
- assemble_name (stream, lo);
- fprintf (stream, "\n");
-}
-
/* PRINT_OPERAND. */
void
diff --git a/gcc/config/mmix/mmix.h b/gcc/config/mmix/mmix.h
index 6eb4fafda71197574e7241702b43d519e42ad20c..31dff43236f4d1a0b4a0696344a49e8b4643b985 100644
--- a/gcc/config/mmix/mmix.h
+++ b/gcc/config/mmix/mmix.h
@@ -1010,10 +1010,6 @@ typedef struct { int regs; int lib; } CUMULATIVE_ARGS;
#define ASM_OUTPUT_DEF(STREAM, NAME, VALUE) \
mmix_asm_output_def (STREAM, NAME, VALUE)
-#define ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL(STREAM, SY, HI, LO) \
- mmix_asm_output_define_label_difference_symbol (STREAM, SY, HI, LO)
-
-
/* Node: Macros for Initialization */
/* We're compiling to ELF and linking to MMO; fundamental ELF features
that GCC depend on are there. */
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3cb8bd6b0de2df464336df4ff414802da14743e0..ba8093f13aab47bcef7e388a3bc31399f4b554b3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-23 Neil Booth <neil@daikokuya.co.uk>
+
+ * cp-tree.h (FILE_FUNCTION_PREFIX_LEN): Remove.
+
2002-07-23 Gabriel Dos Reis <gdr@nerim.net>
Fix PR/7363:
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index fa7243dc5a7217b0114c3ff75ca9391e71d06d9a..a859d497a8931d25022d103cfd536c61d43514ee 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3366,7 +3366,6 @@ extern GTY(()) varray_type local_classes;
#endif /* NO_DOLLAR_IN_LABEL */
#define THIS_NAME "this"
-#define FILE_FUNCTION_PREFIX_LEN 9
#define CTOR_NAME "__ct"
#define DTOR_NAME "__dt"
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 744f7eee6ba127a408f00ff3cfc7c6513d4edd98..7631dc4f862f76a4566d5710ddc31f2e4bcac42e 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -317,11 +317,6 @@ static void def_cfa_1 PARAMS ((const char *,
#define DW_FORM_data (DWARF_OFFSET_SIZE == 8 ? DW_FORM_data8 : DW_FORM_data4)
#define DW_FORM_ref (DWARF_OFFSET_SIZE == 8 ? DW_FORM_ref8 : DW_FORM_ref4)
-/* Pseudo-op for defining a new section. */
-#ifndef SECTION_ASM_OP
-#define SECTION_ASM_OP "\t.section\t"
-#endif
-
#ifndef DEBUG_FRAME_SECTION
#define DEBUG_FRAME_SECTION ".debug_frame"
#endif
@@ -348,26 +343,6 @@ static void def_cfa_1 PARAMS ((const char *,
#define LN_PROLOG_END_LABEL "LELTP"
#define DIE_LABEL_PREFIX "DW"
-/* Definitions of defaults for various types of primitive assembly language
- output operations. These may be overridden from within the tm.h file,
- but typically, that is unnecessary. */
-
-#ifdef SET_ASM_OP
-#ifndef ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL
-#define ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL(FILE, SY, HI, LO) \
- do \
- { \
- fprintf (FILE, "%s", SET_ASM_OP); \
- assemble_name (FILE, SY); \
- fputc (',', FILE); \
- assemble_name (FILE, HI); \
- fputc ('-', FILE); \
- assemble_name (FILE, LO); \
- } \
- while (0)
-#endif
-#endif
-
/* The DWARF 2 CFA column which tracks the return address. Normally this
is the column for PC, or the first column after all of the hard
registers. */
diff --git a/gcc/system.h b/gcc/system.h
index 47cabcf4e7f30739d9423341212c9ddec9cd9332..63408da9e3f75876efc2c38f99f1860dafbc8d5e 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -620,7 +620,8 @@ typedef char _Bool;
NO_BUILTIN_PTRDIFF_TYPE NO_BUILTIN_WCHAR_TYPE NO_BUILTIN_WINT_TYPE \
BLOCK_PROFILER BLOCK_PROFILER_CODE FUNCTION_BLOCK_PROFILER \
FUNCTION_BLOCK_PROFILER_EXIT MACHINE_STATE_SAVE \
- MACHINE_STATE_RESTORE SCCS_DIRECTIVE
+ MACHINE_STATE_RESTORE SCCS_DIRECTIVE SECTION_ASM_OP \
+ ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL
/* Hooks that are no longer used. */
#pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \
diff --git a/gcc/tree.c b/gcc/tree.c
index 1353f3288c7bbdbd2ad957a85face5755fa84ead..1ff2e98e06513f40f23fb7fa33e1dd0eda107204 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -4364,8 +4364,6 @@ dump_tree_statistics ()
(*lang_hooks.print_statistics) ();
}
-#define FILE_FUNCTION_PREFIX_LEN 9
-
#define FILE_FUNCTION_FORMAT "_GLOBAL__%s_%s"
/* Appends 6 random characters to TEMPLATE to (hopefully) avoid name