This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[gcc-3_4-basic-improvements-branch] delete ASM_OUTPUT_INTERNAL_LABEL uses
- From: "Kaveh R. Ghazi" <ghazi at caip dot rutgers dot edu>
- To: gcc-patches at gcc dot gnu dot org
- Date: Sat, 31 Aug 2002 12:46:01 -0400 (EDT)
- Subject: [gcc-3_4-basic-improvements-branch] delete ASM_OUTPUT_INTERNAL_LABEL uses
Now that my two previous patches for turning ASM_OUTPUT_INTERNAL_LABEL
into a hook are installed on the branch, this final patch changes all
macro uses to explicit calls to the target hook. I also updated the
documentation and poisoned the macro.
Tested via bootstrap on sparc-sun-solaris2.7 and "make info".
Ok to install on the gcc-3_4-basic-improvements-branch?
Thanks,
--Kaveh
2002-08-31 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* config/alpha/alpha.c config/alpha/alpha.h config/alpha/alpha.md
config/alpha/elf.h config/alpha/unicosmk.h config/alpha/vms.h
config/arc/arc.c config/arc/arc.h config/arm/aout.h
config/arm/arm.c config/arm/arm.h config/arm/arm.md
config/avr/avr.h config/d30v/d30v.h config/dbxcoff.h
config/dbxelf.h config/elfos.h config/fr30/fr30.h config/frv/frv.h
config/i386/i386.c config/i386/i386.md config/i386/sco5.h
config/ia64/ia64.h config/ip2k/ip2k.h config/m68hc11/m68hc11.md
config/m68k/hp320.h config/m68k/m68k.c config/m68k/m68k.md
config/m68k/mot3300.h config/m68k/sgs.h config/m68k/tower-as.h
config/m88k/m88k.c config/m88k/m88k.h config/mcore/mcore-pe.h
config/mcore/mcore.c config/mips/mips.c config/mips/mips.h
config/ns32k/ns32k.md config/pa/pa-linux.h config/pa/pa.c
config/pa/pa.h config/pa/pa.md config/romp/romp.h
config/rs6000/linux64.h config/rs6000/lynx.h
config/rs6000/rs6000.c config/rs6000/sysv4.h config/rs6000/xcoff.h
config/s390/s390.c config/s390/s390.md config/sh/sh.c
config/sparc/sparc.c config/sparc/sysv4.h
config/stormy16/stormy16.h dbxout.c defaults.h dwarf2out.c
dwarfout.c except.c final.c varasm.c vmsdbgout.c: Replace
ASM_OUTPUT_INTERNAL_LABEL macro with a call to the target hook.
* doc/tm.texi: Update docs.
* default.h (ASM_OUTPUT_INTERNAL_LABEL): Don't define.
* system.h (ASM_OUTPUT_INTERNAL_LABEL): Poison.
diff -rup orig/egcc-bib-CVS20020831/gcc/config/alpha/alpha.c egcc-bib-CVS20020831/gcc/config/alpha/alpha.c
--- orig/egcc-bib-CVS20020831/gcc/config/alpha/alpha.c Wed Aug 21 19:24:11 2002
+++ egcc-bib-CVS20020831/gcc/config/alpha/alpha.c Sat Aug 31 10:20:13 2002
@@ -9708,7 +9708,7 @@ unicosmk_output_addr_vec (file, vec)
int vlen = XVECLEN (body, 0);
int idx;
- ASM_OUTPUT_INTERNAL_LABEL (file, "L", CODE_LABEL_NUMBER (lab));
+ (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (lab));
for (idx = 0; idx < vlen; idx++)
{
diff -rup orig/egcc-bib-CVS20020831/gcc/config/alpha/alpha.h egcc-bib-CVS20020831/gcc/config/alpha/alpha.h
--- orig/egcc-bib-CVS20020831/gcc/config/alpha/alpha.h Sat Aug 31 09:50:53 2002
+++ egcc-bib-CVS20020831/gcc/config/alpha/alpha.h Sat Aug 31 10:20:13 2002
@@ -1750,11 +1750,11 @@ do { \
#define USER_LABEL_PREFIX ""
/* This is how to output a label for a jump table. Arguments are the same as
- for ASM_OUTPUT_INTERNAL_LABEL, except the insn for the jump table is
+ for (*targetm.asm_out.internal_label), except the insn for the jump table is
passed. */
#define ASM_OUTPUT_CASE_LABEL(FILE,PREFIX,NUM,TABLEINSN) \
-{ ASM_OUTPUT_ALIGN (FILE, 2); ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM); }
+{ ASM_OUTPUT_ALIGN (FILE, 2); (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM); }
/* This is how to store into the string LABEL
the symbol_ref name of an internal numbered label where
diff -rup orig/egcc-bib-CVS20020831/gcc/config/alpha/alpha.md egcc-bib-CVS20020831/gcc/config/alpha/alpha.md
--- orig/egcc-bib-CVS20020831/gcc/config/alpha/alpha.md Thu Aug 15 01:04:26 2002
+++ egcc-bib-CVS20020831/gcc/config/alpha/alpha.md Sat Aug 31 10:20:13 2002
@@ -6571,7 +6571,7 @@ fadd,fmul,fcpys,fdiv,fsqrt,misc,mvi,ftoi
""
{
operands[2] = gen_label_rtx ();
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (operands[2]));
return "stq $31,-8192(%1)\;subq %0,1,%0\;lda %1,-8192(%1)\;bne %0,%l2";
diff -rup orig/egcc-bib-CVS20020831/gcc/config/alpha/elf.h egcc-bib-CVS20020831/gcc/config/alpha/elf.h
--- orig/egcc-bib-CVS20020831/gcc/config/alpha/elf.h Tue Aug 20 22:41:45 2002
+++ egcc-bib-CVS20020831/gcc/config/alpha/elf.h Sat Aug 31 10:20:13 2002
@@ -103,7 +103,7 @@ do { \
#define ASM_OUTPUT_CASE_LABEL(FILE, PREFIX, NUM, JUMPTABLE) \
do { \
ASM_OUTPUT_BEFORE_CASE_LABEL (FILE, PREFIX, NUM, JUMPTABLE) \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM); \
+ (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM); \
} while (0)
/* The standard SVR4 assembler seems to require that certain builtin
diff -rup orig/egcc-bib-CVS20020831/gcc/config/alpha/unicosmk.h egcc-bib-CVS20020831/gcc/config/alpha/unicosmk.h
--- orig/egcc-bib-CVS20020831/gcc/config/alpha/unicosmk.h Tue Aug 20 22:41:45 2002
+++ egcc-bib-CVS20020831/gcc/config/alpha/unicosmk.h Sat Aug 31 10:20:13 2002
@@ -350,12 +350,12 @@ ssib_section () \
#undef ASM_OUTPUT_SOURCE_FILENAME
/* This is how to output a label for a jump table. Arguments are the same as
- for ASM_OUTPUT_INTERNAL_LABEL, except the insn for the jump table is
+ for (*targetm.asm_out.internal_label), except the insn for the jump table is
passed. */
#undef ASM_OUTPUT_CASE_LABEL
#define ASM_OUTPUT_CASE_LABEL(FILE,PREFIX,NUM,TABLEINSN) \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM)
+ (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM)
/* CAM has some restrictions with respect to string literals. It won't
accept lines with more that 256 characters which means that we have
diff -rup orig/egcc-bib-CVS20020831/gcc/config/alpha/vms.h egcc-bib-CVS20020831/gcc/config/alpha/vms.h
--- orig/egcc-bib-CVS20020831/gcc/config/alpha/vms.h Thu Aug 15 01:04:27 2002
+++ egcc-bib-CVS20020831/gcc/config/alpha/vms.h Sat Aug 31 10:20:13 2002
@@ -306,7 +306,7 @@ extern void literals_section PARAMS ((vo
#undef ASM_OUTPUT_CASE_LABEL
#define ASM_OUTPUT_CASE_LABEL(FILE,PREFIX,NUM,TABLEINSN) \
-{ ASM_OUTPUT_ALIGN (FILE, 3); ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM); }
+{ ASM_OUTPUT_ALIGN (FILE, 3); (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM); }
/* This says how to output assembler code to declare an
uninitialized external linkage data object. */
diff -rup orig/egcc-bib-CVS20020831/gcc/config/arc/arc.c egcc-bib-CVS20020831/gcc/config/arc/arc.c
--- orig/egcc-bib-CVS20020831/gcc/config/arc/arc.c Sat Aug 31 09:55:13 2002
+++ egcc-bib-CVS20020831/gcc/config/arc/arc.c Sat Aug 31 10:20:13 2002
@@ -1926,7 +1926,7 @@ record_cc_ref (insn)
0 -> 2 final_prescan_insn, if the `target' is an unconditional branch
1 -> 3 branch patterns, after having not output the conditional branch
2 -> 4 branch patterns, after having not output the conditional branch
- 3 -> 0 ASM_OUTPUT_INTERNAL_LABEL, if the `target' label is reached
+ 3 -> 0 (*targetm.asm_out.internal_label), if the `target' label is reached
(the target label has CODE_LABEL_NUMBER equal to
arc_ccfsm_target_label).
4 -> 0 final_prescan_insn, if `target' unconditional branch is reached
@@ -2222,7 +2222,7 @@ arc_final_prescan_insn (insn, opvec, nop
/* Record that we are currently outputting label NUM with prefix PREFIX.
It it's the label we're looking for, reset the ccfsm machinery.
- Called from ASM_OUTPUT_INTERNAL_LABEL. */
+ Called from (*targetm.asm_out.internal_label). */
void
arc_ccfsm_at_label (prefix, num)
diff -rup orig/egcc-bib-CVS20020831/gcc/config/arc/arc.h egcc-bib-CVS20020831/gcc/config/arc/arc.h
--- orig/egcc-bib-CVS20020831/gcc/config/arc/arc.h Sat Aug 31 09:55:13 2002
+++ egcc-bib-CVS20020831/gcc/config/arc/arc.h Sat Aug 31 10:20:13 2002
@@ -1202,7 +1202,7 @@ do { \
compiled for different cpus. */
/* We work around a dwarfout.c deficiency by watching for labels from it and
not adding the '_' prefix nor the cpu suffix. There is a comment in
- dwarfout.c that says it should be using ASM_OUTPUT_INTERNAL_LABEL. */
+ dwarfout.c that says it should be using (*targetm.asm_out.internal_label). */
extern const char *arc_mangle_cpu;
#define ASM_OUTPUT_LABELREF(FILE, NAME) \
do { \
diff -rup orig/egcc-bib-CVS20020831/gcc/config/arm/aout.h egcc-bib-CVS20020831/gcc/config/arm/aout.h
--- orig/egcc-bib-CVS20020831/gcc/config/arm/aout.h Tue Jul 30 22:13:28 2002
+++ egcc-bib-CVS20020831/gcc/config/arm/aout.h Sat Aug 31 10:20:13 2002
@@ -129,7 +129,7 @@ Boston, MA 02111-1307, USA. */
output_quoted_string (STREAM, NAME); \
fprintf (STREAM, ",%d,0,315,%s\n", N_SO, <ext_label_name[1]); \
text_section (); \
- ASM_OUTPUT_INTERNAL_LABEL (STREAM, "Ltext", 0); \
+ (*targetm.asm_out.internal_label) (STREAM, "Ltext", 0); \
} \
while (0)
diff -rup orig/egcc-bib-CVS20020831/gcc/config/arm/arm.c egcc-bib-CVS20020831/gcc/config/arm/arm.c
--- orig/egcc-bib-CVS20020831/gcc/config/arm/arm.c Sat Aug 31 09:55:13 2002
+++ egcc-bib-CVS20020831/gcc/config/arm/arm.c Sat Aug 31 10:20:13 2002
@@ -8679,7 +8679,7 @@ arm_assemble_integer (x, size, aligned_p
0 -> 2 final_prescan_insn if the `target' is an unconditional branch
1 -> 3 ASM_OUTPUT_OPCODE after not having output the conditional branch
2 -> 4 ASM_OUTPUT_OPCODE after not having output the conditional branch
- 3 -> 0 ASM_OUTPUT_INTERNAL_LABEL if the `target' label is reached
+ 3 -> 0 (*targetm.asm_out.internal_label) if the `target' label is reached
(the target label has CODE_LABEL_NUMBER equal to arm_target_label).
4 -> 0 final_prescan_insn if the `target' unconditional branch is reached
(the target insn is arm_target_insn).
diff -rup orig/egcc-bib-CVS20020831/gcc/config/arm/arm.h egcc-bib-CVS20020831/gcc/config/arm/arm.h
--- orig/egcc-bib-CVS20020831/gcc/config/arm/arm.h Sat Aug 31 09:55:13 2002
+++ egcc-bib-CVS20020831/gcc/config/arm/arm.h Sat Aug 31 10:20:13 2002
@@ -2482,7 +2482,7 @@ extern int making_const_table;
{ \
if (TARGET_THUMB) \
ASM_OUTPUT_ALIGN (FILE, 2); \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM); \
+ (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM); \
} \
while (0)
diff -rup orig/egcc-bib-CVS20020831/gcc/config/arm/arm.md egcc-bib-CVS20020831/gcc/config/arm/arm.md
--- orig/egcc-bib-CVS20020831/gcc/config/arm/arm.md Mon Jul 29 08:41:46 2002
+++ egcc-bib-CVS20020831/gcc/config/arm/arm.md Sat Aug 31 10:20:13 2002
@@ -4204,7 +4204,7 @@
(use (label_ref (match_operand 1 "" "")))]
"TARGET_THUMB && flag_pic"
"*
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (operands[1]));
return \"add\\t%0, %|pc\";
"
@@ -4217,7 +4217,7 @@
(use (label_ref (match_operand 1 "" "")))]
"TARGET_ARM && flag_pic"
"*
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (operands[1]));
return \"add%?\\t%0, %|pc, %0\";
"
diff -rup orig/egcc-bib-CVS20020831/gcc/config/avr/avr.h egcc-bib-CVS20020831/gcc/config/avr/avr.h
--- orig/egcc-bib-CVS20020831/gcc/config/avr/avr.h Sat Aug 31 09:50:53 2002
+++ egcc-bib-CVS20020831/gcc/config/avr/avr.h Sat Aug 31 10:20:13 2002
@@ -2109,7 +2109,7 @@ sprintf (STRING, "*.%s%d", PREFIX, NUM)
is made from the string PREFIX and the number NUM.
This string, when output subsequently by `assemble_name', should
- produce the output that `ASM_OUTPUT_INTERNAL_LABEL' would produce
+ produce the output that `(*targetm.asm_out.internal_label)' would produce
with the same PREFIX and NUM.
If the string begins with `*', then `assemble_name' will output
@@ -2285,18 +2285,18 @@ sprintf (STRING, "*.%s%d", PREFIX, NUM)
The definition should be a C statement to output to the stdio
stream STREAM an assembler pseudo-instruction to generate a
reference to a label. VALUE is the number of an internal label
- whose definition is output using `ASM_OUTPUT_INTERNAL_LABEL'. For
+ whose definition is output using `(*targetm.asm_out.internal_label)'. For
example,
fprintf (STREAM, "\t.word L%d\n", VALUE) */
#define ASM_OUTPUT_CASE_LABEL(STREAM, PREFIX, NUM, TABLE) \
- progmem_section (), ASM_OUTPUT_INTERNAL_LABEL (STREAM, PREFIX, NUM)
+ progmem_section (), (*targetm.asm_out.internal_label) (STREAM, PREFIX, NUM)
/* `ASM_OUTPUT_CASE_LABEL (STREAM, PREFIX, NUM, TABLE)'
Define this if the label before a jump-table needs to be output
specially. The first three arguments are the same as for
- `ASM_OUTPUT_INTERNAL_LABEL'; the fourth argument is the jump-table
+ `(*targetm.asm_out.internal_label)'; the fourth argument is the jump-table
which follows (a `jump_insn' containing an `addr_vec' or
`addr_diff_vec').
@@ -2304,7 +2304,7 @@ sprintf (STRING, "*.%s%d", PREFIX, NUM)
the table.
If this macro is not defined, these labels are output with
- `ASM_OUTPUT_INTERNAL_LABEL'. */
+ `(*targetm.asm_out.internal_label)'. */
/* `ASM_OUTPUT_CASE_END (STREAM, NUM, TABLE)'
Define this if something special must be output at the end of a
diff -rup orig/egcc-bib-CVS20020831/gcc/config/d30v/d30v.h egcc-bib-CVS20020831/gcc/config/d30v/d30v.h
--- orig/egcc-bib-CVS20020831/gcc/config/d30v/d30v.h Sat Aug 31 09:50:53 2002
+++ egcc-bib-CVS20020831/gcc/config/d30v/d30v.h Sat Aug 31 10:20:13 2002
@@ -2853,7 +2853,7 @@ extern const char *d30v_branch_cost_stri
outputting the label definition at the proper place. Here is how to do
this:
- ASM_OUTPUT_INTERNAL_LABEL (FILE, "LC", LABELNO);
+ (*targetm.asm_out.internal_label) (FILE, "LC", LABELNO);
When you output a pool entry specially, you should end with a `goto' to the
label JUMPTO. This will prevent the same pool entry from being output a
@@ -3113,7 +3113,7 @@ extern const char *d30v_branch_cost_stri
from the string PREFIX and the number NUM.
This string, when output subsequently by `assemble_name', should produce the
- output that `ASM_OUTPUT_INTERNAL_LABEL' would produce with the same PREFIX
+ output that `(*targetm.asm_out.internal_label)' would produce with the same PREFIX
and NUM.
If the string begins with `*', then `assemble_name' will output the rest of
@@ -3509,7 +3509,7 @@ do { \
The definition should be a C statement to output to the stdio stream STREAM
an assembler pseudo-instruction to generate a difference between two labels.
VALUE and REL are the numbers of two internal labels. The definitions of
- these labels are output using `ASM_OUTPUT_INTERNAL_LABEL', and they must be
+ these labels are output using `(*targetm.asm_out.internal_label)', and they must be
printed in the same way here. For example,
fprintf (STREAM, "\t.word L%d-L%d\n", VALUE, REL) */
@@ -3523,7 +3523,7 @@ fprintf (STREAM, "\t.word .L%d-.L%d\n",
The definition should be a C statement to output to the stdio stream STREAM
an assembler pseudo-instruction to generate a reference to a label. VALUE
is the number of an internal label whose definition is output using
- `ASM_OUTPUT_INTERNAL_LABEL'. For example,
+ `(*targetm.asm_out.internal_label)'. For example,
fprintf (STREAM, "\t.word L%d\n", VALUE) */
@@ -3531,7 +3531,7 @@ fprintf (STREAM, "\t.word .L%d-.L%d\n",
fprintf (STREAM, "\t.word .L%d\n", VALUE)
/* Define this if the label before a jump-table needs to be output specially.
- The first three arguments are the same as for `ASM_OUTPUT_INTERNAL_LABEL';
+ The first three arguments are the same as for `(*targetm.asm_out.internal_label)';
the fourth argument is the jump-table which follows (a `jump_insn'
containing an `addr_vec' or `addr_diff_vec').
@@ -3539,7 +3539,7 @@ fprintf (STREAM, "\t.word .L%d\n", VALUE
table.
If this macro is not defined, these labels are output with
- `ASM_OUTPUT_INTERNAL_LABEL'.
+ `(*targetm.asm_out.internal_label)'.
Defined in svr4.h. */
/* #define ASM_OUTPUT_CASE_LABEL(STREAM, PREFIX, NUM, TABLE) */
diff -rup orig/egcc-bib-CVS20020831/gcc/config/dbxcoff.h egcc-bib-CVS20020831/gcc/config/dbxcoff.h
--- orig/egcc-bib-CVS20020831/gcc/config/dbxcoff.h Wed May 19 21:54:27 1999
+++ egcc-bib-CVS20020831/gcc/config/dbxcoff.h Sat Aug 31 10:20:13 2002
@@ -71,7 +71,7 @@ Boston, MA 02111-1307, USA. */
assemble_name (FILE, \
XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \
putc ('\n', FILE); \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, "LM", sym_lineno); \
+ (*targetm.asm_out.internal_label) (FILE, "LM", sym_lineno); \
sym_lineno++; \
} }
diff -rup orig/egcc-bib-CVS20020831/gcc/config/dbxelf.h egcc-bib-CVS20020831/gcc/config/dbxelf.h
--- orig/egcc-bib-CVS20020831/gcc/config/dbxelf.h Fri May 25 21:31:36 2001
+++ egcc-bib-CVS20020831/gcc/config/dbxelf.h Sat Aug 31 10:20:13 2002
@@ -70,7 +70,7 @@ do \
assemble_name (FILE, \
XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0));\
putc ('\n', FILE); \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, "LM", sym_lineno); \
+ (*targetm.asm_out.internal_label) (FILE, "LM", sym_lineno); \
sym_lineno += 1; \
} \
while (0)
diff -rup orig/egcc-bib-CVS20020831/gcc/config/elfos.h egcc-bib-CVS20020831/gcc/config/elfos.h
--- orig/egcc-bib-CVS20020831/gcc/config/elfos.h Sat Aug 31 09:50:53 2002
+++ egcc-bib-CVS20020831/gcc/config/elfos.h Sat Aug 31 10:20:13 2002
@@ -149,7 +149,7 @@ Boston, MA 02111-1307, USA. */
do \
{ \
ASM_OUTPUT_BEFORE_CASE_LABEL (FILE, PREFIX, NUM, JUMPTABLE) \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM); \
+ (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM); \
} \
while (0)
diff -rup orig/egcc-bib-CVS20020831/gcc/config/fr30/fr30.h egcc-bib-CVS20020831/gcc/config/fr30/fr30.h
--- orig/egcc-bib-CVS20020831/gcc/config/fr30/fr30.h Wed Aug 21 19:24:12 2002
+++ egcc-bib-CVS20020831/gcc/config/fr30/fr30.h Sat Aug 31 10:20:13 2002
@@ -1245,7 +1245,7 @@ do \
The definition should be a C statement to output to the stdio stream STREAM
an assembler pseudo-instruction to generate a difference between two labels.
VALUE and REL are the numbers of two internal labels. The definitions of
- these labels are output using `ASM_OUTPUT_INTERNAL_LABEL', and they must be
+ these labels are output using `(*targetm.asm_out.internal_label)', and they must be
printed in the same way here. For example,
fprintf (STREAM, "\t.word L%d-L%d\n", VALUE, REL) */
@@ -1258,7 +1258,7 @@ fprintf (STREAM, "\t.word .L%d-.L%d\n",
The definition should be a C statement to output to the stdio stream STREAM
an assembler pseudo-instruction to generate a reference to a label. VALUE
is the number of an internal label whose definition is output using
- `ASM_OUTPUT_INTERNAL_LABEL'. For example,
+ `(*targetm.asm_out.internal_label)'. For example,
fprintf (STREAM, "\t.word L%d\n", VALUE) */
#define ASM_OUTPUT_ADDR_VEC_ELT(STREAM, VALUE) \
diff -rup orig/egcc-bib-CVS20020831/gcc/config/frv/frv.h egcc-bib-CVS20020831/gcc/config/frv/frv.h
--- orig/egcc-bib-CVS20020831/gcc/config/frv/frv.h Tue Aug 20 22:41:47 2002
+++ egcc-bib-CVS20020831/gcc/config/frv/frv.h Sat Aug 31 10:20:13 2002
@@ -3017,7 +3017,7 @@ do { \
from the string PREFIX and the number NUM.
This string, when output subsequently by `assemble_name', should produce the
- output that `ASM_OUTPUT_INTERNAL_LABEL' would produce with the same PREFIX
+ output that `(*targetm.asm_out.internal_label)' would produce with the same PREFIX
and NUM.
If the string begins with `*', then `assemble_name' will output the rest of
@@ -3244,7 +3244,7 @@ do { \
The definition should be a C statement to output to the stdio stream STREAM
an assembler pseudo-instruction to generate a difference between two labels.
VALUE and REL are the numbers of two internal labels. The definitions of
- these labels are output using `ASM_OUTPUT_INTERNAL_LABEL', and they must be
+ these labels are output using `(*targetm.asm_out.internal_label)', and they must be
printed in the same way here. For example,
fprintf (STREAM, "\t.word L%d-L%d\n", VALUE, REL) */
@@ -3257,14 +3257,14 @@ fprintf (STREAM, "\t.word .L%d-.L%d\n",
The definition should be a C statement to output to the stdio stream STREAM
an assembler pseudo-instruction to generate a reference to a label. VALUE
is the number of an internal label whose definition is output using
- `ASM_OUTPUT_INTERNAL_LABEL'. For example,
+ `(*targetm.asm_out.internal_label)'. For example,
fprintf (STREAM, "\t.word L%d\n", VALUE) */
#define ASM_OUTPUT_ADDR_VEC_ELT(STREAM, VALUE) \
fprintf (STREAM, "\t.word .L%d\n", VALUE)
/* Define this if the label before a jump-table needs to be output specially.
- The first three arguments are the same as for `ASM_OUTPUT_INTERNAL_LABEL';
+ The first three arguments are the same as for `(*targetm.asm_out.internal_label)';
the fourth argument is the jump-table which follows (a `jump_insn'
containing an `addr_vec' or `addr_diff_vec').
@@ -3272,7 +3272,7 @@ fprintf (STREAM, "\t.word .L%d\n", VALUE
table.
If this macro is not defined, these labels are output with
- `ASM_OUTPUT_INTERNAL_LABEL'.
+ `(*targetm.asm_out.internal_label)'.
Defined in svr4.h. */
/* When generating embedded PIC or mips16 code we want to put the jump
@@ -3287,7 +3287,7 @@ fprintf (STREAM, "\t.word .L%d\n", VALUE
do { \
if (flag_pic) \
function_section (current_function_decl); \
- ASM_OUTPUT_INTERNAL_LABEL (STREAM, PREFIX, NUM); \
+ (*targetm.asm_out.internal_label) (STREAM, PREFIX, NUM); \
} while (0)
/* Define this to determine whether case statement labels are relative to
diff -rup orig/egcc-bib-CVS20020831/gcc/config/i386/i386.c egcc-bib-CVS20020831/gcc/config/i386/i386.c
--- orig/egcc-bib-CVS20020831/gcc/config/i386/i386.c Tue Aug 20 22:41:47 2002
+++ egcc-bib-CVS20020831/gcc/config/i386/i386.c Sat Aug 31 10:20:13 2002
@@ -3975,7 +3975,7 @@ output_set_got (dest)
is what will be referred to by the Mach-O PIC subsystem. */
ASM_OUTPUT_LABEL (asm_out_file, machopic_function_base_name ());
#endif
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (XEXP (xops[2], 0)));
if (flag_pic)
@@ -13802,7 +13802,7 @@ x86_output_mi_thunk (file, delta, functi
abort ();
output_asm_insn ("push{l}\t%0", xops);
output_asm_insn ("call\t%P1", xops);
- ASM_OUTPUT_INTERNAL_LABEL (file, "L", CODE_LABEL_NUMBER (xops[1]));
+ (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (xops[1]));
output_asm_insn ("pop{l}\t%0", xops);
output_asm_insn
("add{l}\t{%2+[.-%P1], %0|%0, OFFSET FLAT: %2+[.-%P1]}", xops);
diff -rup orig/egcc-bib-CVS20020831/gcc/config/i386/i386.md egcc-bib-CVS20020831/gcc/config/i386/i386.md
--- orig/egcc-bib-CVS20020831/gcc/config/i386/i386.md Mon Aug 12 06:50:02 2002
+++ egcc-bib-CVS20020831/gcc/config/i386/i386.md Sat Aug 31 10:20:13 2002
@@ -17768,7 +17768,7 @@
{
operands[2] = gen_label_rtx ();
output_asm_insn ("j%c0\t%l2\; int\t%1", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (operands[2]));
RET;
})
@@ -19703,7 +19703,7 @@
output_asm_insn (\"rex\", operands);
output_asm_insn (\"movaps\\t{%5, %4|%4, %5}\", operands);
}
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (operands[3]));
RET;
}
diff -rup orig/egcc-bib-CVS20020831/gcc/config/i386/sco5.h egcc-bib-CVS20020831/gcc/config/i386/sco5.h
--- orig/egcc-bib-CVS20020831/gcc/config/i386/sco5.h Sat Aug 31 09:50:54 2002
+++ egcc-bib-CVS20020831/gcc/config/i386/sco5.h Sat Aug 31 10:20:13 2002
@@ -343,7 +343,7 @@ do { \
do { \
if (TARGET_ELF) \
ASM_OUTPUT_ALIGN ((FILE), 2); \
- ASM_OUTPUT_INTERNAL_LABEL((FILE),(PREFIX),(NUM)); \
+ (*targetm.asm_out.internal_label)((FILE),(PREFIX),(NUM)); \
} while (0)
#undef ASM_OUTPUT_IDENT
diff -rup orig/egcc-bib-CVS20020831/gcc/config/ia64/ia64.h egcc-bib-CVS20020831/gcc/config/ia64/ia64.h
--- orig/egcc-bib-CVS20020831/gcc/config/ia64/ia64.h Tue Jul 30 22:13:30 2002
+++ egcc-bib-CVS20020831/gcc/config/ia64/ia64.h Sat Aug 31 10:20:13 2002
@@ -2251,7 +2251,7 @@ do { \
/* Use tags for debug info labels, so that they don't break instruction
bundles. This also avoids getting spurious DV warnings from the
- assembler. This is similar to ASM_OUTPUT_INTERNAL_LABEL, except that we
+ assembler. This is similar to (*targetm.asm_out.internal_label), except that we
add brackets around the label. */
#define ASM_OUTPUT_DEBUG_LABEL(FILE, PREFIX, NUM) \
diff -rup orig/egcc-bib-CVS20020831/gcc/config/ip2k/ip2k.h egcc-bib-CVS20020831/gcc/config/ip2k/ip2k.h
--- orig/egcc-bib-CVS20020831/gcc/config/ip2k/ip2k.h Tue Aug 13 05:58:37 2002
+++ egcc-bib-CVS20020831/gcc/config/ip2k/ip2k.h Sat Aug 31 10:20:13 2002
@@ -2302,7 +2302,7 @@ do { \
The definition should be a C statement to output to the stdio
stream STREAM an assembler pseudo-instruction to generate a
reference to a label. VALUE is the number of an internal label
- whose definition is output using `ASM_OUTPUT_INTERNAL_LABEL'. For
+ whose definition is output using `(*targetm.asm_out.internal_label)'. For
example,
fprintf ((STREAM), "\t.word L%d\n", (VALUE)) */
diff -rup orig/egcc-bib-CVS20020831/gcc/config/m68hc11/m68hc11.md egcc-bib-CVS20020831/gcc/config/m68hc11/m68hc11.md
--- orig/egcc-bib-CVS20020831/gcc/config/m68hc11/m68hc11.md Wed Aug 14 03:53:55 2002
+++ egcc-bib-CVS20020831/gcc/config/m68hc11/m68hc11.md Sat Aug 31 10:20:13 2002
@@ -1483,7 +1483,7 @@
if (X_REG_P (operands[0]))
output_asm_insn (\"dex\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[2]));
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[2]));
if (!X_REG_P (operands[0]))
{
@@ -1552,7 +1552,7 @@
output_asm_insn (\"bpl\\t%l0\", ops);
output_asm_insn (\"deca\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[0]));
}
else
@@ -1570,7 +1570,7 @@
output_asm_insn (\"bpl\\t%l0\", ops);
}
output_asm_insn (\"dec\\t%h0\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[0]));
}
@@ -1653,7 +1653,7 @@
ops[0] = gen_label_rtx ();
output_asm_insn (\"bpl\\t%l0\", ops);
output_asm_insn (\"dex\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[0]));
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[0]));
return \"\";
}")
@@ -1810,7 +1810,7 @@
output_asm_insn (\"inx\", ops);
CC_STATUS_INIT;
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[2]));
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[2]));
return \"\";
}")
@@ -1892,7 +1892,7 @@
output_asm_insn (\"bcc\\t%l3\", ops);
output_asm_insn (\"inx\", ops);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[3]));
}
CC_STATUS_INIT;
@@ -1995,7 +1995,7 @@
output_asm_insn (inch_mem, ops);
}
}
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[2]));
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[2]));
CC_STATUS_INIT;
return \"\";
@@ -2060,7 +2060,7 @@
ops[0] = gen_label_rtx ();
output_asm_insn (\"bcc\\t%l0\", ops);
output_asm_insn (\"in%0\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[0]));
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[0]));
CC_STATUS_INIT;
return \"\";
}")
@@ -2538,7 +2538,7 @@
output_asm_insn (\"subd\\t%2\", operands);
output_asm_insn (\"bcc\\t%l0\", ops);
output_asm_insn (\"dex\", ops);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[0]));
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[0]));
CC_STATUS_INIT;
return \"\";
}")
@@ -2565,7 +2565,7 @@
output_asm_insn (\"sbca\\t#0\", operands);
output_asm_insn (\"bcc\\t%l0\", ops);
output_asm_insn (\"dex\", ops);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[0]));
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[0]));
CC_STATUS_INIT;
return \"\";
}")
@@ -3090,7 +3090,7 @@
if ((val & 0x0FF00) != 0x0FF00)
output_asm_insn (\"bclr\\t0,%2, %h1\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[2]));
return \"\";
}
@@ -3241,7 +3241,7 @@
output_asm_insn (\".relax\\t%l2\", ops);
m68hc11_gen_movhi (insn, ops);
output_asm_insn (\"bclr\\t0,%2, %1\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[2]));
return \"\";
}
@@ -3357,7 +3357,7 @@
if ((val & 0x0FF00) != 0)
output_asm_insn (\"bset\\t0,%2, %h1\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[2]));
return \"\";
}
@@ -3455,7 +3455,7 @@
output_asm_insn (\".relax\\t%l2\", ops);
m68hc11_gen_movhi (insn, ops);
output_asm_insn (\"bset\\t0,%2, %1\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[2]));
return \"\";
}
@@ -4283,7 +4283,7 @@
output_asm_insn (\"comb\\n\\tcoma\\n\\tinx\\n\\txgdx\", operands);
output_asm_insn (\"bne\\t%l0\", ops);
output_asm_insn (\"inx\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[0]));
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\", CODE_LABEL_NUMBER (ops[0]));
return \"\";
}")
@@ -4993,7 +4993,7 @@
output_asm_insn (\"comb\", operands);
CC_STATUS_INIT;
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[0]));
return \"\";
}
@@ -5007,7 +5007,7 @@
output_asm_insn (\"bge\\t%l0\", ops);
output_asm_insn (\"deca\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[0]));
val -= 8;
@@ -5030,7 +5030,7 @@
output_asm_insn (\"bcc\\t%l0\", ops);
output_asm_insn (\"coma\", ops);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[0]));
return \"\";
}
@@ -5722,14 +5722,14 @@
ops[1] = gen_label_rtx ();
output_asm_insn (\"ble\\t%l1\", ops);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[0]));
output_asm_insn (\"lsrb\", operands);
output_asm_insn (\"deca\", operands);
output_asm_insn (\"bne\\t%l0\", ops);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (ops[1]));
return \"\";
}")
diff -rup orig/egcc-bib-CVS20020831/gcc/config/m68k/hp320.h egcc-bib-CVS20020831/gcc/config/m68k/hp320.h
--- orig/egcc-bib-CVS20020831/gcc/config/m68k/hp320.h Sat Aug 31 09:55:13 2002
+++ egcc-bib-CVS20020831/gcc/config/m68k/hp320.h Sat Aug 31 10:36:48 2002
@@ -173,7 +173,6 @@ Boston, MA 02111-1307, USA. */
#undef ASM_OUTPUT_LOCAL
#undef ASM_FORMAT_PRIVATE_NAME
#undef FUNCTION_PROFILER
-#undef ASM_OUTPUT_INTERNAL_LABEL
#undef GLOBAL_ASM_OP
#undef IMMEDIATE_PREFIX
#undef REGISTER_PREFIX
diff -rup orig/egcc-bib-CVS20020831/gcc/config/m68k/m68k.c egcc-bib-CVS20020831/gcc/config/m68k/m68k.c
--- orig/egcc-bib-CVS20020831/gcc/config/m68k/m68k.c Sat Aug 31 09:55:13 2002
+++ egcc-bib-CVS20020831/gcc/config/m68k/m68k.c Sat Aug 31 10:20:13 2002
@@ -1340,13 +1340,13 @@ output_scc_di(op, operand1, operand2, de
switch (op_code)
{
case EQ:
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[4]));
output_asm_insn ("seq %5", loperands);
break;
case NE:
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[4]));
output_asm_insn ("sne %5", loperands);
break;
@@ -1358,15 +1358,15 @@ output_scc_di(op, operand1, operand2, de
#else
output_asm_insn ("shi %5\n\tjra %l6", loperands);
#endif
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[4]));
output_asm_insn ("sgt %5", loperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[6]));
break;
case GTU:
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[4]));
output_asm_insn ("shi %5", loperands);
break;
@@ -1378,15 +1378,15 @@ output_scc_di(op, operand1, operand2, de
#else
output_asm_insn ("scs %5\n\tjra %l6", loperands);
#endif
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[4]));
output_asm_insn ("slt %5", loperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[6]));
break;
case LTU:
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[4]));
output_asm_insn ("scs %5", loperands);
break;
@@ -1398,15 +1398,15 @@ output_scc_di(op, operand1, operand2, de
#else
output_asm_insn ("scc %5\n\tjra %l6", loperands);
#endif
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[4]));
output_asm_insn ("sge %5", loperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[6]));
break;
case GEU:
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[4]));
output_asm_insn ("scc %5", loperands);
break;
@@ -1418,15 +1418,15 @@ output_scc_di(op, operand1, operand2, de
#else
output_asm_insn ("sls %5\n\tjra %l6", loperands);
#endif
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[4]));
output_asm_insn ("sle %5", loperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[6]));
break;
case LEU:
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (loperands[4]));
output_asm_insn ("sls %5", loperands);
break;
@@ -1841,7 +1841,7 @@ output_move_himode (operands)
CODE_LABEL_NUMBER (XEXP (labelref, 0)));
#endif /* not SGS */
#else /* SGS_SWITCH_TABLES or not MOTOROLA */
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LI",
+ (*targetm.asm_out.internal_label) (asm_out_file, "LI",
CODE_LABEL_NUMBER (XEXP (labelref, 0)));
#ifdef SGS_SWITCH_TABLES
/* Set flag saying we need to define the symbol
diff -rup orig/egcc-bib-CVS20020831/gcc/config/m68k/m68k.md egcc-bib-CVS20020831/gcc/config/m68k/m68k.md
--- orig/egcc-bib-CVS20020831/gcc/config/m68k/m68k.md Thu Jun 20 19:50:13 2002
+++ egcc-bib-CVS20020831/gcc/config/m68k/m68k.md Sat Aug 31 10:20:14 2002
@@ -2326,7 +2326,7 @@
#else
output_asm_insn (\"add%.l %#1,%2\", operands);
#endif
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (operands[3]));
return \"\";
}")
@@ -6187,7 +6187,7 @@
output_asm_insn (\"cmp%.w %#0,%0\;jne %l4\;cmp%.w %#0,%3\;jeq %l1\", operands);
#endif
}
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (operands[4]));
return \"\";
} ")
@@ -7481,7 +7481,7 @@
CODE_LABEL_NUMBER (XEXP (labelref, 0)));
#endif /* not SGS */
#else /* SGS_SWITCH_TABLES or not MOTOROLA */
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"LI\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"LI\",
CODE_LABEL_NUMBER (XEXP (labelref, 0)));
#ifdef SGS_SWITCH_TABLES
/* Set flag saying we need to define the symbol
diff -rup orig/egcc-bib-CVS20020831/gcc/config/m68k/mot3300.h egcc-bib-CVS20020831/gcc/config/m68k/mot3300.h
--- orig/egcc-bib-CVS20020831/gcc/config/m68k/mot3300.h Sat Aug 31 09:50:54 2002
+++ egcc-bib-CVS20020831/gcc/config/m68k/mot3300.h Sat Aug 31 10:20:14 2002
@@ -404,7 +404,7 @@ Boston, MA 02111-1307, USA. */
/* The L after the local prefix is the "L" prefix for the normal labels
generated by gcc; why are ASM_OUTPUT_ADDR_VEC_ELT and
ASM_OUTPUT_ADDR_DIFF_ELT not called with a PREFIX parameter, like
- ASM_OUTPUT_INTERNAL_LABEL ? */
+ (*targetm.asm_out.internal_label) ? */
#undef ASM_OUTPUT_ADDR_VEC_ELT
#define ASM_OUTPUT_ADDR_VEC_ELT(FILE, VALUE) \
diff -rup orig/egcc-bib-CVS20020831/gcc/config/m68k/sgs.h egcc-bib-CVS20020831/gcc/config/m68k/sgs.h
--- orig/egcc-bib-CVS20020831/gcc/config/m68k/sgs.h Thu Dec 20 12:36:36 2001
+++ egcc-bib-CVS20020831/gcc/config/m68k/sgs.h Sat Aug 31 10:20:14 2002
@@ -360,7 +360,7 @@ do { \
#define ASM_OUTPUT_CASE_LABEL(FILE,PREFIX,NUM,TABLE) \
do { \
ASM_OUTPUT_BEFORE_CASE_LABEL((FILE),(PREFIX),(NUM),(TABLE)); \
- ASM_OUTPUT_INTERNAL_LABEL((FILE),(PREFIX),(NUM)); \
+ (*targetm.asm_out.internal_label)((FILE),(PREFIX),(NUM)); \
} while (0)
/* At end of a switch table, define LDnnn iff the symbol LInnn was defined.
diff -rup orig/egcc-bib-CVS20020831/gcc/config/m68k/tower-as.h egcc-bib-CVS20020831/gcc/config/m68k/tower-as.h
--- orig/egcc-bib-CVS20020831/gcc/config/m68k/tower-as.h Sat Aug 31 09:50:54 2002
+++ egcc-bib-CVS20020831/gcc/config/m68k/tower-as.h Sat Aug 31 10:20:14 2002
@@ -46,7 +46,7 @@ Boston, MA 02111-1307, USA. */
#define CPP_SPEC "-D__TOWER_ASM__ %{m68881:-D__HAVE_68881__}"
/* We don't want local labels to start with period.
- See ASM_OUTPUT_INTERNAL_LABEL. */
+ See (*targetm.asm_out.internal_label). */
#undef LOCAL_LABEL_PREFIX
#define LOCAL_LABEL_PREFIX ""
diff -rup orig/egcc-bib-CVS20020831/gcc/config/m88k/m88k.c egcc-bib-CVS20020831/gcc/config/m88k/m88k.c
--- orig/egcc-bib-CVS20020831/gcc/config/m88k/m88k.c Sat Aug 31 09:55:13 2002
+++ egcc-bib-CVS20020831/gcc/config/m88k/m88k.c Sat Aug 31 10:20:14 2002
@@ -1721,7 +1721,7 @@ void
output_label (label_number)
int label_number;
{
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L", label_number);
+ (*targetm.asm_out.internal_label) (asm_out_file, "L", label_number);
}
/* Generate the assembly code for function entry.
diff -rup orig/egcc-bib-CVS20020831/gcc/config/m88k/m88k.h egcc-bib-CVS20020831/gcc/config/m88k/m88k.h
--- orig/egcc-bib-CVS20020831/gcc/config/m88k/m88k.h Sat Aug 31 09:55:13 2002
+++ egcc-bib-CVS20020831/gcc/config/m88k/m88k.h Sat Aug 31 10:20:14 2002
@@ -1112,7 +1112,7 @@ enum reg_class { NO_REGS, AP_REG, XRF_RE
fprintf (FILE, "\tor\t %s,%s,0\n", reg_names[11], reg_names[1]); \
/* Locate this block; transfer to the next instruction. */ \
fprintf (FILE, "\tbsr\t %s\n", &buf[1]); \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, "LTRMP", labelno); \
+ (*targetm.asm_out.internal_label) (FILE, "LTRMP", labelno); \
/* Save r10; use it as the relative pointer; restore r1. */ \
fprintf (FILE, "\tst\t %s,%s,24\n", reg_names[10], reg_names[1]); \
fprintf (FILE, "\tor\t %s,%s,0\n", reg_names[10], reg_names[1]); \
@@ -1889,7 +1889,7 @@ do { \
the symbol_ref name of an internal numbered label where
PREFIX is the class of label and NUM is the number within the class.
This is suitable for output with `assemble_name'. This must agree
- with ASM_OUTPUT_INTERNAL_LABEL above, except for being prefixed
+ with (*targetm.asm_out.internal_label) above, except for being prefixed
with an `*'. */
#undef ASM_GENERATE_INTERNAL_LABEL
@@ -1911,7 +1911,7 @@ do { \
readonly_data_section (); \
ASM_OUTPUT_ALIGN (FILE, 2); \
} \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM); \
+ (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM); \
} while (0)
/* Epilogue for case labels. This jump instruction is called by casesi
@@ -2024,10 +2024,10 @@ do { \
#define OCS_END_PREFIX "Lte"
#define PUT_OCS_FUNCTION_START(FILE) \
- { ASM_OUTPUT_INTERNAL_LABEL (FILE, OCS_START_PREFIX, m88k_function_number); }
+ { (*targetm.asm_out.internal_label) (FILE, OCS_START_PREFIX, m88k_function_number); }
#define PUT_OCS_FUNCTION_END(FILE) \
- { ASM_OUTPUT_INTERNAL_LABEL (FILE, OCS_END_PREFIX, m88k_function_number); }
+ { (*targetm.asm_out.internal_label) (FILE, OCS_END_PREFIX, m88k_function_number); }
/* Macros for debug information */
#define DEBUGGER_AUTO_OFFSET(X) \
diff -rup orig/egcc-bib-CVS20020831/gcc/config/mcore/mcore-pe.h egcc-bib-CVS20020831/gcc/config/mcore/mcore-pe.h
--- orig/egcc-bib-CVS20020831/gcc/config/mcore/mcore-pe.h Sun May 19 03:55:37 2002
+++ egcc-bib-CVS20020831/gcc/config/mcore/mcore-pe.h Sat Aug 31 10:20:14 2002
@@ -126,7 +126,7 @@ drectve_section () \
assemble_name (FILE, \
XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \
putc ('\n', FILE); \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, "LM", sym_lineno); \
+ (*targetm.asm_out.internal_label) (FILE, "LM", sym_lineno); \
sym_lineno ++; \
} \
}
diff -rup orig/egcc-bib-CVS20020831/gcc/config/mcore/mcore.c egcc-bib-CVS20020831/gcc/config/mcore/mcore.c
--- orig/egcc-bib-CVS20020831/gcc/config/mcore/mcore.c Thu Aug 1 19:29:55 2002
+++ egcc-bib-CVS20020831/gcc/config/mcore/mcore.c Sat Aug 31 10:20:14 2002
@@ -2618,7 +2618,7 @@ mcore_output_jump_label_table ()
{
pool_node * p = pool_vector + i;
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L", CODE_LABEL_NUMBER (p->label));
+ (*targetm.asm_out.internal_label) (asm_out_file, "L", CODE_LABEL_NUMBER (p->label));
output_asm_insn (".long %0", &p->value);
}
diff -rup orig/egcc-bib-CVS20020831/gcc/config/mips/mips.c egcc-bib-CVS20020831/gcc/config/mips/mips.c
--- orig/egcc-bib-CVS20020831/gcc/config/mips/mips.c Tue Aug 20 17:53:28 2002
+++ egcc-bib-CVS20020831/gcc/config/mips/mips.c Sat Aug 31 10:20:14 2002
@@ -10130,7 +10130,7 @@ mips_output_conditional_branch (insn,
INSN_DELETED_P (XVECEXP (insn, 0, 1)) = 1;
}
output_asm_insn ("%>%)", 0);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (target));
return "";
}
diff -rup orig/egcc-bib-CVS20020831/gcc/config/mips/mips.h egcc-bib-CVS20020831/gcc/config/mips/mips.h
--- orig/egcc-bib-CVS20020831/gcc/config/mips/mips.h Sat Aug 31 09:50:54 2002
+++ egcc-bib-CVS20020831/gcc/config/mips/mips.h Sat Aug 31 10:20:14 2002
@@ -4441,7 +4441,7 @@ do { \
do { \
if (TARGET_EMBEDDED_PIC || TARGET_MIPS16) \
function_section (current_function_decl); \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM); \
+ (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM); \
} while (0)
/* This is how to output an assembler line
diff -rup orig/egcc-bib-CVS20020831/gcc/config/ns32k/ns32k.md egcc-bib-CVS20020831/gcc/config/ns32k/ns32k.md
--- orig/egcc-bib-CVS20020831/gcc/config/ns32k/ns32k.md Tue Jul 16 13:46:33 2002
+++ egcc-bib-CVS20020831/gcc/config/ns32k/ns32k.md Sat Aug 31 10:20:14 2002
@@ -2693,7 +2693,7 @@
""
"*
{
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"LI\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"LI\",
CODE_LABEL_NUMBER (operands[1]));
return \"cased %0\";
}")
diff -rup orig/egcc-bib-CVS20020831/gcc/config/pa/pa-linux.h egcc-bib-CVS20020831/gcc/config/pa/pa-linux.h
--- orig/egcc-bib-CVS20020831/gcc/config/pa/pa-linux.h Tue Aug 20 22:41:50 2002
+++ egcc-bib-CVS20020831/gcc/config/pa/pa-linux.h Sat Aug 31 10:20:14 2002
@@ -164,7 +164,7 @@ Boston, MA 02111-1307, USA. */
/* Use the default. */
#undef ASM_OUTPUT_LABEL
-/* NOTE: ASM_OUTPUT_INTERNAL_LABEL() is defined for us by elfos.h, and
+/* NOTE: (*targetm.asm_out.internal_label)() is defined for us by elfos.h, and
does what we want (i.e. uses colons). It must be compatible with
ASM_GENERATE_INTERNAL_LABEL(), so do not define it here. */
diff -rup orig/egcc-bib-CVS20020831/gcc/config/pa/pa.c egcc-bib-CVS20020831/gcc/config/pa/pa.c
--- orig/egcc-bib-CVS20020831/gcc/config/pa/pa.c Tue Aug 20 22:41:50 2002
+++ egcc-bib-CVS20020831/gcc/config/pa/pa.c Sat Aug 31 10:20:14 2002
@@ -4733,7 +4733,7 @@ output_deferred_plabels (file)
/* Now output the deferred plabels. */
for (i = 0; i < n_deferred_plabels; i++)
{
- ASM_OUTPUT_INTERNAL_LABEL (file, "L", CODE_LABEL_NUMBER (deferred_plabels[i].internal_label));
+ (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (deferred_plabels[i].internal_label));
assemble_integer (gen_rtx_SYMBOL_REF (Pmode, deferred_plabels[i].name),
TARGET_64BIT ? 8 : 4, TARGET_64BIT ? 64 : 32, 1);
}
@@ -5459,7 +5459,7 @@ output_cbranch (operands, nullify, lengt
if (TARGET_SOM || ! TARGET_GAS)
{
output_asm_insn ("addil L'%l0-%l4,%%r1", xoperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (xoperands[4]));
output_asm_insn ("ldo R'%l0-%l4(%%r1),%%r1", xoperands);
}
@@ -6066,7 +6066,7 @@ output_millicode_call (insn, call_dest)
{
/* Add %r1 to the offset of our target from the next insn. */
output_asm_insn ("addil L%%%0-%1,%%r1", xoperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (xoperands[1]));
output_asm_insn ("ldo R%%%0-%1(%%r1),%%r1", xoperands);
}
@@ -6158,7 +6158,7 @@ output_millicode_call (insn, call_dest)
xoperands[2] = gen_label_rtx ();
output_asm_insn ("\n\t{bl|b,l} %0,%3\n\tldo %1-%2(%3),%3",
xoperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (xoperands[2]));
}
@@ -6326,7 +6326,7 @@ output_call (insn, call_dest, sibcall)
{
/* Add %r1 to the offset of dyncall from the next insn. */
output_asm_insn ("addil L%%$$dyncall-%1,%%r1", xoperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (xoperands[1]));
output_asm_insn ("ldo R%%$$dyncall-%1(%%r1),%%r1", xoperands);
}
@@ -6424,7 +6424,7 @@ output_call (insn, call_dest, sibcall)
xoperands[3] = gen_label_rtx ();
output_asm_insn ("\n\t{bl|b,l} %0,%%r2\n\tldo %1-%3(%%r2),%%r2",
xoperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (xoperands[3]));
}
@@ -6588,7 +6588,7 @@ pa_asm_output_mi_thunk (file, thunk_fnde
{
data_section ();
fprintf (file, "\t.align 4\n");
- ASM_OUTPUT_INTERNAL_LABEL (file, "LTHN", current_thunk_number);
+ (*targetm.asm_out.internal_label) (file, "LTHN", current_thunk_number);
fprintf (file, "\t.word P%%%s\n", target_name);
function_section (thunk_fndecl);
}
diff -rup orig/egcc-bib-CVS20020831/gcc/config/pa/pa.h egcc-bib-CVS20020831/gcc/config/pa/pa.h
--- orig/egcc-bib-CVS20020831/gcc/config/pa/pa.h Sat Aug 31 09:50:54 2002
+++ egcc-bib-CVS20020831/gcc/config/pa/pa.h Sat Aug 31 10:20:14 2002
@@ -879,7 +879,7 @@ extern enum cmp_type hppa_branch_type;
#endif
#define FUNCTION_PROFILER(FILE, LABEL) \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, FUNC_BEGIN_PROLOG_LABEL, LABEL)
+ (*targetm.asm_out.internal_label) (FILE, FUNC_BEGIN_PROLOG_LABEL, LABEL)
#define PROFILE_HOOK(label_no) hppa_profile_hook (label_no)
void hppa_profile_hook PARAMS ((int label_no));
diff -rup orig/egcc-bib-CVS20020831/gcc/config/pa/pa.md egcc-bib-CVS20020831/gcc/config/pa/pa.md
--- orig/egcc-bib-CVS20020831/gcc/config/pa/pa.md Fri Jul 26 22:31:07 2002
+++ egcc-bib-CVS20020831/gcc/config/pa/pa.md Sat Aug 31 10:20:14 2002
@@ -2438,7 +2438,7 @@
output_asm_insn (\"{bl|b,l} .+8,%0\", xoperands);
output_asm_insn (\"{depi|depwi} 0,31,2,%0\", xoperands);
if (TARGET_SOM || ! TARGET_GAS)
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (xoperands[2]));
/* If we're trying to load the address of a label that happens to be
@@ -5806,7 +5806,7 @@
xoperands[2] = gen_label_rtx ();
output_asm_insn (\"{bl|b,l} %0,%%r2\;ldo %1-%2(%%r2),%%r25\", xoperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (xoperands[2]));
return \"\";
}"
@@ -5871,7 +5871,7 @@
output_asm_insn (\"{bl|b,l} .+8,%%r1\\n\\taddil L'%l0-%l1,%%r1\",
xoperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (xoperands[1]));
output_asm_insn (\"ldo R'%l0-%l1(%%r1),%%r1\", xoperands);
}
@@ -6111,7 +6111,7 @@
if (TARGET_SOM || ! TARGET_GAS)
{
output_asm_insn (\"addil L%%$$dyncall-%1,%%r1\", xoperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (xoperands[1]));
output_asm_insn (\"ldo R%%$$dyncall-%1(%%r1),%%r1\", xoperands);
}
@@ -6297,7 +6297,7 @@
if (TARGET_SOM || ! TARGET_GAS)
{
output_asm_insn (\"addil L%%$$dyncall-%1,%%r1\", xoperands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (xoperands[1]));
output_asm_insn (\"ldo R%%$$dyncall-%1(%%r1),%%r1\", xoperands);
}
diff -rup orig/egcc-bib-CVS20020831/gcc/config/romp/romp.h egcc-bib-CVS20020831/gcc/config/romp/romp.h
--- orig/egcc-bib-CVS20020831/gcc/config/romp/romp.h Sat Aug 31 09:50:55 2002
+++ egcc-bib-CVS20020831/gcc/config/romp/romp.h Sat Aug 31 10:20:14 2002
@@ -1323,11 +1323,11 @@ struct rt_cargs {int gregs, fregs; };
#define USER_LABEL_PREFIX "_"
/* This is how to output a label for a jump table. Arguments are the same as
- for ASM_OUTPUT_INTERNAL_LABEL, except the insn for the jump table is
+ for (*targetm.asm_out.internal_label), except the insn for the jump table is
passed. */
#define ASM_OUTPUT_CASE_LABEL(FILE,PREFIX,NUM,TABLEINSN) \
-{ ASM_OUTPUT_ALIGN (FILE, 2); ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM); }
+{ ASM_OUTPUT_ALIGN (FILE, 2); (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM); }
/* This is how to store into the string LABEL
the symbol_ref name of an internal numbered label where
diff -rup orig/egcc-bib-CVS20020831/gcc/config/rs6000/linux64.h egcc-bib-CVS20020831/gcc/config/rs6000/linux64.h
--- orig/egcc-bib-CVS20020831/gcc/config/rs6000/linux64.h Thu Aug 8 13:55:37 2002
+++ egcc-bib-CVS20020831/gcc/config/rs6000/linux64.h Sat Aug 31 10:23:47 2002
@@ -325,7 +325,7 @@ do \
assemble_name (FILE, \
XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0));\
putc ('\n', FILE); \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, "LM", sym_lineno); \
+ (*targetm.asm_out.internal_label) (FILE, "LM", sym_lineno); \
sym_lineno += 1; \
} \
while (0)
diff -rup orig/egcc-bib-CVS20020831/gcc/config/rs6000/lynx.h egcc-bib-CVS20020831/gcc/config/rs6000/lynx.h
--- orig/egcc-bib-CVS20020831/gcc/config/rs6000/lynx.h Tue Jul 9 20:33:51 2002
+++ egcc-bib-CVS20020831/gcc/config/rs6000/lynx.h Sat Aug 31 10:24:11 2002
@@ -33,7 +33,6 @@ Boston, MA 02111-1307, USA. */
#undef TARGET_ASM_SELECT_SECTION
#undef USER_LABEL_PREFIX
#undef ASM_OUTPUT_LABELREF
-#undef ASM_OUTPUT_INTERNAL_LABEL
#undef ASM_GENERATE_INTERNAL_LABEL
#undef ASM_OUTPUT_COMMON
#undef ASM_OUTPUT_LOCAL
diff -rup orig/egcc-bib-CVS20020831/gcc/config/rs6000/rs6000.c egcc-bib-CVS20020831/gcc/config/rs6000/rs6000.c
--- orig/egcc-bib-CVS20020831/gcc/config/rs6000/rs6000.c Thu Aug 29 21:55:16 2002
+++ egcc-bib-CVS20020831/gcc/config/rs6000/rs6000.c Sat Aug 31 10:30:25 2002
@@ -11350,7 +11350,7 @@ output_mi_thunk (file, thunk_fndecl, del
/* Set up a TOC entry for the function. */
ASM_GENERATE_INTERNAL_LABEL (buf, "Lthunk", labelno);
toc_section ();
- ASM_OUTPUT_INTERNAL_LABEL (file, "Lthunk", labelno);
+ (*targetm.asm_out.internal_label) (file, "Lthunk", labelno);
labelno++;
if (TARGET_MINIMAL_TOC)
@@ -11660,7 +11660,7 @@ output_toc (file, x, labelno, mode)
ASM_OUTPUT_ALIGN (file, 3);
}
- ASM_OUTPUT_INTERNAL_LABEL (file, "LC", labelno);
+ (*targetm.asm_out.internal_label) (file, "LC", labelno);
/* Handle FP constants specially. Note that if we have a minimal
TOC, things we put here aren't actually in the TOC, so we can allow
diff -rup orig/egcc-bib-CVS20020831/gcc/config/rs6000/sysv4.h egcc-bib-CVS20020831/gcc/config/rs6000/sysv4.h
--- orig/egcc-bib-CVS20020831/gcc/config/rs6000/sysv4.h Tue Aug 20 22:41:50 2002
+++ egcc-bib-CVS20020831/gcc/config/rs6000/sysv4.h Sat Aug 31 10:31:18 2002
@@ -453,7 +453,7 @@ toc_section () \
{ \
toc_initialized = 1; \
fprintf (asm_out_file, "%s\n", TOC_SECTION_ASM_OP); \
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LCTOC", 0); \
+ (*targetm.asm_out.internal_label) (asm_out_file, "LCTOC", 0); \
fprintf (asm_out_file, "\t.tc "); \
ASM_OUTPUT_INTERNAL_LABEL_PREFIX (asm_out_file, "LCTOC1[TC],"); \
ASM_OUTPUT_INTERNAL_LABEL_PREFIX (asm_out_file, "LCTOC1"); \
@@ -598,7 +598,7 @@ extern int rs6000_pic_labelno;
{ \
char buf[256]; \
\
- ASM_OUTPUT_INTERNAL_LABEL (FILE, "LCL", rs6000_pic_labelno); \
+ (*targetm.asm_out.internal_label) (FILE, "LCL", rs6000_pic_labelno); \
\
ASM_GENERATE_INTERNAL_LABEL (buf, "LCTOC", 1); \
fprintf (FILE, "\t%s ", init_ptr); \
@@ -674,7 +674,7 @@ extern int rs6000_pic_labelno;
#define LOCAL_LABEL_PREFIX "."
#define USER_LABEL_PREFIX ""
-/* svr4.h overrides ASM_OUTPUT_INTERNAL_LABEL. */
+/* svr4.h overrides (*targetm.asm_out.internal_label). */
#define ASM_OUTPUT_INTERNAL_LABEL_PREFIX(FILE,PREFIX) \
asm_fprintf (FILE, "%L%s", PREFIX)
diff -rup orig/egcc-bib-CVS20020831/gcc/config/rs6000/xcoff.h egcc-bib-CVS20020831/gcc/config/rs6000/xcoff.h
--- orig/egcc-bib-CVS20020831/gcc/config/rs6000/xcoff.h Sat Aug 31 09:50:55 2002
+++ egcc-bib-CVS20020831/gcc/config/rs6000/xcoff.h Sat Aug 31 10:31:31 2002
@@ -325,11 +325,11 @@ toc_section () \
fprintf (FILE, "%s..", PREFIX)
/* This is how to output a label for a jump table. Arguments are the same as
- for ASM_OUTPUT_INTERNAL_LABEL, except the insn for the jump table is
+ for (*targetm.asm_out.internal_label), except the insn for the jump table is
passed. */
#define ASM_OUTPUT_CASE_LABEL(FILE,PREFIX,NUM,TABLEINSN) \
-{ ASM_OUTPUT_ALIGN (FILE, 2); ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM); }
+{ ASM_OUTPUT_ALIGN (FILE, 2); (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM); }
/* This is how to store into the string LABEL
the symbol_ref name of an internal numbered label where
diff -rup orig/egcc-bib-CVS20020831/gcc/config/s390/s390.c egcc-bib-CVS20020831/gcc/config/s390/s390.c
--- orig/egcc-bib-CVS20020831/gcc/config/s390/s390.c Thu Aug 15 05:55:31 2002
+++ egcc-bib-CVS20020831/gcc/config/s390/s390.c Sat Aug 31 10:20:14 2002
@@ -4552,7 +4552,7 @@ s390_function_profiler (file, labelno)
output_asm_insn ("bras\t%2,%l6", op);
output_asm_insn (".long\t%4", op);
output_asm_insn (".long\t%3", op);
- ASM_OUTPUT_INTERNAL_LABEL (file, "L", CODE_LABEL_NUMBER (op[6]));
+ (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (op[6]));
output_asm_insn ("l\t%0,0(%2)", op);
output_asm_insn ("l\t%2,4(%2)", op);
output_asm_insn ("basr\t%0,%0", op);
@@ -4565,10 +4565,10 @@ s390_function_profiler (file, labelno)
output_asm_insn ("st\t%0,%1", op);
output_asm_insn ("bras\t%2,%l6", op);
- ASM_OUTPUT_INTERNAL_LABEL (file, "L", CODE_LABEL_NUMBER (op[5]));
+ (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (op[5]));
output_asm_insn (".long\t%4-%l5", op);
output_asm_insn (".long\t%3-%l5", op);
- ASM_OUTPUT_INTERNAL_LABEL (file, "L", CODE_LABEL_NUMBER (op[6]));
+ (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (op[6]));
output_asm_insn ("lr\t%0,%2", op);
output_asm_insn ("a\t%0,0(%2)", op);
output_asm_insn ("a\t%2,4(%2)", op);
diff -rup orig/egcc-bib-CVS20020831/gcc/config/s390/s390.md egcc-bib-CVS20020831/gcc/config/s390/s390.md
--- orig/egcc-bib-CVS20020831/gcc/config/s390/s390.md Wed Aug 14 06:04:51 2002
+++ egcc-bib-CVS20020831/gcc/config/s390/s390.md Sat Aug 31 10:20:14 2002
@@ -5197,7 +5197,7 @@
output_asm_insn (\"lcr\\t%N0,%N1\", operands);
output_asm_insn (\"je\\t%l0\", xop);
output_asm_insn (\"bctr\\t%0,0\", operands);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\",
+ (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
CODE_LABEL_NUMBER (xop[0]));
return \"\";
}"
diff -rup orig/egcc-bib-CVS20020831/gcc/config/sh/sh.c egcc-bib-CVS20020831/gcc/config/sh/sh.c
--- orig/egcc-bib-CVS20020831/gcc/config/sh/sh.c Tue Aug 13 12:52:27 2002
+++ egcc-bib-CVS20020831/gcc/config/sh/sh.c Sat Aug 31 10:20:14 2002
@@ -1010,12 +1010,12 @@ output_far_jump (insn, op)
if (far && flag_pic && TARGET_SH2)
{
braf_base_lab = gen_label_rtx ();
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (braf_base_lab));
}
if (far)
output_asm_insn (".align 2", 0);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L", CODE_LABEL_NUMBER (this.lab));
+ (*targetm.asm_out.internal_label) (asm_out_file, "L", CODE_LABEL_NUMBER (this.lab));
this.op = op;
if (far && flag_pic)
{
@@ -1074,7 +1074,7 @@ output_branch (logic, insn, operands)
output_asm_insn ("bra\t%l0", &op0);
fprintf (asm_out_file, "\tnop\n");
- ASM_OUTPUT_INTERNAL_LABEL(asm_out_file, "LF", label);
+ (*targetm.asm_out.internal_label)(asm_out_file, "LF", label);
return "";
}
@@ -4172,7 +4172,7 @@ final_prescan_insn (insn, opvec, noperan
asm_fprintf (asm_out_file, "\t.uses %LL%d\n",
CODE_LABEL_NUMBER (XEXP (note, 0)));
else if (GET_CODE (pattern) == SET)
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (XEXP (note, 0)));
else
abort ();
@@ -4195,7 +4195,7 @@ output_jump_label_table ()
{
pool_node *p = &pool_vector[i];
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
+ (*targetm.asm_out.internal_label) (asm_out_file, "L",
CODE_LABEL_NUMBER (p->label));
output_asm_insn (".long %O0", &p->value);
}
diff -rup orig/egcc-bib-CVS20020831/gcc/config/sparc/sparc.c egcc-bib-CVS20020831/gcc/config/sparc/sparc.c
--- orig/egcc-bib-CVS20020831/gcc/config/sparc/sparc.c Tue Jul 16 16:59:06 2002
+++ egcc-bib-CVS20020831/gcc/config/sparc/sparc.c Sat Aug 31 10:31:56 2002
@@ -3287,7 +3287,7 @@ load_pic_register ()
align = floor_log2 (FUNCTION_BOUNDARY / BITS_PER_UNIT);
if (align > 0)
ASM_OUTPUT_ALIGN (asm_out_file, align);
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LGETPC", 0);
+ (*targetm.asm_out.internal_label) (asm_out_file, "LGETPC", 0);
fputs ("\tretl\n\tadd\t%o7, %l7, %l7\n", asm_out_file);
}
@@ -7812,7 +7812,7 @@ sparc_output_addr_vec (vec)
ASM_OUTPUT_CASE_LABEL (asm_out_file, "L", CODE_LABEL_NUMBER (lab),
NEXT_INSN (lab));
#else
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L", CODE_LABEL_NUMBER (lab));
+ (*targetm.asm_out.internal_label) (asm_out_file, "L", CODE_LABEL_NUMBER (lab));
#endif
for (idx = 0; idx < vlen; idx++)
@@ -7842,7 +7842,7 @@ sparc_output_addr_diff_vec (vec)
ASM_OUTPUT_CASE_LABEL (asm_out_file, "L", CODE_LABEL_NUMBER (lab),
NEXT_INSN (lab));
#else
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L", CODE_LABEL_NUMBER (lab));
+ (*targetm.asm_out.internal_label) (asm_out_file, "L", CODE_LABEL_NUMBER (lab));
#endif
for (idx = 0; idx < vlen; idx++)
diff -rup orig/egcc-bib-CVS20020831/gcc/config/sparc/sysv4.h egcc-bib-CVS20020831/gcc/config/sparc/sysv4.h
--- orig/egcc-bib-CVS20020831/gcc/config/sparc/sysv4.h Sat May 18 19:47:21 2002
+++ egcc-bib-CVS20020831/gcc/config/sparc/sysv4.h Sat Aug 31 10:32:13 2002
@@ -93,7 +93,7 @@ Boston, MA 02111-1307, USA. */
#undef ASM_OUTPUT_CASE_LABEL
#define ASM_OUTPUT_CASE_LABEL(FILE, PREFIX, NUM, JUMPTABLE) \
do { ASM_OUTPUT_ALIGN ((FILE), Pmode == SImode ? 2 : 3); \
- ASM_OUTPUT_INTERNAL_LABEL ((FILE), PREFIX, NUM); \
+ (*targetm.asm_out.internal_label) ((FILE), PREFIX, NUM); \
} while (0)
/* This is how to equate one symbol to another symbol. The syntax used is
diff -rup orig/egcc-bib-CVS20020831/gcc/config/stormy16/stormy16.h egcc-bib-CVS20020831/gcc/config/stormy16/stormy16.h
--- orig/egcc-bib-CVS20020831/gcc/config/stormy16/stormy16.h Sat Aug 31 09:50:55 2002
+++ egcc-bib-CVS20020831/gcc/config/stormy16/stormy16.h Sat Aug 31 10:20:14 2002
@@ -2645,7 +2645,7 @@ do { \
outputting the label definition at the proper place. Here is how to do
this:
- ASM_OUTPUT_INTERNAL_LABEL (FILE, "LC", LABELNO);
+ (*targetm.asm_out.internal_label) (FILE, "LC", LABELNO);
When you output a pool entry specially, you should end with a `goto' to the
label JUMPTO. This will prevent the same pool entry from being output a
@@ -2922,7 +2922,7 @@ do { \
from the string PREFIX and the number NUM.
This string, when output subsequently by `assemble_name', should produce the
- output that `ASM_OUTPUT_INTERNAL_LABEL' would produce with the same PREFIX
+ output that `(*targetm.asm_out.internal_label)' would produce with the same PREFIX
and NUM.
If the string begins with `*', then `assemble_name' will output the rest of
diff -rup orig/egcc-bib-CVS20020831/gcc/dbxout.c egcc-bib-CVS20020831/gcc/dbxout.c
--- orig/egcc-bib-CVS20020831/gcc/dbxout.c Thu Aug 15 15:59:28 2002
+++ egcc-bib-CVS20020831/gcc/dbxout.c Sat Aug 31 10:20:12 2002
@@ -392,7 +392,7 @@ dbxout_function_end ()
the system doesn't insert underscores in front of user generated
labels. */
ASM_GENERATE_INTERNAL_LABEL (lscope_label_name, "Lscope", scope_labelno);
- ASM_OUTPUT_INTERNAL_LABEL (asmfile, "Lscope", scope_labelno);
+ (*targetm.asm_out.internal_label) (asmfile, "Lscope", scope_labelno);
scope_labelno++;
/* By convention, GCC will mark the end of a function with an N_FUN
@@ -461,7 +461,7 @@ dbxout_init (input_file_name)
assemble_name (asmfile, ltext_label_name);
fputc ('\n', asmfile);
text_section ();
- ASM_OUTPUT_INTERNAL_LABEL (asmfile, "Ltext", 0);
+ (*targetm.asm_out.internal_label) (asmfile, "Ltext", 0);
#endif /* no DBX_OUTPUT_MAIN_SOURCE_FILENAME */
#ifdef DBX_OUTPUT_GCC_MARKER
@@ -589,7 +589,7 @@ dbxout_source_file (file, filename)
; /* Don't change section amid function. */
else
text_section ();
- ASM_OUTPUT_INTERNAL_LABEL (file, "Ltext", source_label_number);
+ (*targetm.asm_out.internal_label) (file, "Ltext", source_label_number);
source_label_number++;
#endif
lastfile = filename;
@@ -620,7 +620,7 @@ dbxout_begin_block (line, n)
unsigned int line ATTRIBUTE_UNUSED;
unsigned int n;
{
- ASM_OUTPUT_INTERNAL_LABEL (asmfile, "LBB", n);
+ (*targetm.asm_out.internal_label) (asmfile, "LBB", n);
}
/* Describe the end line-number of an internal block within a function. */
@@ -630,7 +630,7 @@ dbxout_end_block (line, n)
unsigned int line ATTRIBUTE_UNUSED;
unsigned int n;
{
- ASM_OUTPUT_INTERNAL_LABEL (asmfile, "LBE", n);
+ (*targetm.asm_out.internal_label) (asmfile, "LBE", n);
}
/* Output dbx data for a function definition.
diff -rup orig/egcc-bib-CVS20020831/gcc/defaults.h egcc-bib-CVS20020831/gcc/defaults.h
--- orig/egcc-bib-CVS20020831/gcc/defaults.h Sat Aug 31 09:55:13 2002
+++ egcc-bib-CVS20020831/gcc/defaults.h Sat Aug 31 10:21:06 2002
@@ -82,7 +82,7 @@ Software Foundation, 59 Temple Place - S
#ifndef ASM_OUTPUT_ADDR_VEC_ELT
#define ASM_OUTPUT_ADDR_VEC_ELT(FILE, VALUE) \
do { fputs (integer_asm_op (POINTER_SIZE / UNITS_PER_WORD, TRUE), FILE); \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, "L", (VALUE)); \
+ (*targetm.asm_out.internal_label) (FILE, "L", (VALUE)); \
fputc ('\n', FILE); \
} while (0)
#endif
@@ -148,12 +148,6 @@ do { fputs (integer_asm_op (POINTER_SIZE
do { assemble_name ((FILE), (NAME)); fputs (":\n", (FILE)); } while (0)
#endif
-/* This is how to output an internal numbered label where PREFIX is
- the class of label and NUM is the number within the class. */
-
-#define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,LABELNO) \
- (*targetm.asm_out.internal_label) (FILE, PREFIX, LABELNO)
-
/* This is how to output a reference to a user-level label named NAME. */
#ifndef ASM_OUTPUT_LABELREF
@@ -166,7 +160,7 @@ do { fputs (integer_asm_op (POINTER_SIZE
#ifndef ASM_OUTPUT_DEBUG_LABEL
#define ASM_OUTPUT_DEBUG_LABEL(FILE, PREFIX, NUM) \
- ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM)
+ (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM)
#endif
/* This is how we tell the assembler that a symbol is weak. */
diff -rup orig/egcc-bib-CVS20020831/gcc/doc/tm.texi egcc-bib-CVS20020831/gcc/doc/tm.texi
--- orig/egcc-bib-CVS20020831/gcc/doc/tm.texi Wed Aug 21 10:33:54 2002
+++ egcc-bib-CVS20020831/gcc/doc/tm.texi Sat Aug 31 11:19:05 2002
@@ -6232,7 +6232,7 @@ responsible for outputting the label def
Here is how to do this:
@example
-ASM_OUTPUT_INTERNAL_LABEL (@var{file}, "LC", @var{labelno});
+@code{(*targetm.asm_out.internal_label)} (@var{file}, "LC", @var{labelno});
@end example
When you output a pool entry specially, you should end with a
@@ -6694,11 +6694,11 @@ This macro is not used by @code{output_a
specifier that calls it; the intention is that this macro should be set
when it is necessary to output a label differently when its address
is being taken.
+@end table
-@findex ASM_OUTPUT_INTERNAL_LABEL
-@item ASM_OUTPUT_INTERNAL_LABEL (@var{stream}, @var{prefix}, @var{num})
-A C statement to output to the stdio stream @var{stream} a label whose
-name is made from the string @var{prefix} and the number @var{num}.
+@deftypefn {Target Hook} void TARGET_ASM_INTERNAL_LABEL (FILE *@var{stream}, const char *@var{prefix}, unsigned long @var{labelno})
+A function to output to the stdio stream @var{stream} a label whose
+name is made from the string @var{prefix} and the number @var{labelno}.
It is absolutely essential that these labels be distinct from the labels
used for user-level functions and variables. Otherwise, certain programs
@@ -6710,12 +6710,11 @@ should be excluded; on many systems, the
beginning of a label has this effect. You should find out what
convention your system uses, and follow it.
-The usual definition of this macro is as follows:
+The default version of this function utilizes ASM_GENERATE_INTERNAL_LABEL.
-@example
-fprintf (@var{stream}, "L%s%d:\n", @var{prefix}, @var{num})
-@end example
+@end deftypefn
+@table @code
@findex ASM_OUTPUT_DEBUG_LABEL
@item ASM_OUTPUT_DEBUG_LABEL (@var{stream}, @var{prefix}, @var{num})
A C statement to output to the stdio stream @var{stream} a debug info
@@ -6726,7 +6725,7 @@ systems, branch target labels must be at
bundles, but debug info labels can occur in the middle of instruction
bundles.
-If this macro is not defined, then @code{ASM_OUTPUT_INTERNAL_LABEL} will be
+If this macro is not defined, then @code{(*targetm.asm_out.internal_label)} will be
used.
@findex ASM_GENERATE_INTERNAL_LABEL
@@ -6735,7 +6734,7 @@ A C statement to store into the string @
is made from the string @var{prefix} and the number @var{num}.
This string, when output subsequently by @code{assemble_name}, should
-produce the output that @code{ASM_OUTPUT_INTERNAL_LABEL} would produce
+produce the output that @code{(*targetm.asm_out.internal_label)} would produce
with the same @var{prefix} and @var{num}.
If the string begins with @samp{*}, then @code{assemble_name} will
@@ -7334,7 +7333,7 @@ A C statement to output to the stdio str
pseudo-instruction to generate a difference between two labels.
@var{value} and @var{rel} are the numbers of two internal labels. The
definitions of these labels are output using
-@code{ASM_OUTPUT_INTERNAL_LABEL}, and they must be printed in the same
+@code{(*targetm.asm_out.internal_label)}, and they must be printed in the same
way here. For example,
@example
@@ -7356,7 +7355,7 @@ in a dispatch table are absolute.
The definition should be a C statement to output to the stdio stream
@var{stream} an assembler pseudo-instruction to generate a reference to
a label. @var{value} is the number of an internal label whose
-definition is output using @code{ASM_OUTPUT_INTERNAL_LABEL}.
+definition is output using @code{(*targetm.asm_out.internal_label)}.
For example,
@example
@@ -7367,7 +7366,7 @@ fprintf (@var{stream}, "\t.word L%d\n",
@item ASM_OUTPUT_CASE_LABEL (@var{stream}, @var{prefix}, @var{num}, @var{table})
Define this if the label before a jump-table needs to be output
specially. The first three arguments are the same as for
-@code{ASM_OUTPUT_INTERNAL_LABEL}; the fourth argument is the
+@code{(*targetm.asm_out.internal_label)}; the fourth argument is the
jump-table which follows (a @code{jump_insn} containing an
@code{addr_vec} or @code{addr_diff_vec}).
@@ -7375,7 +7374,7 @@ This feature is used on system V to outp
for the table.
If this macro is not defined, these labels are output with
-@code{ASM_OUTPUT_INTERNAL_LABEL}.
+@code{(*targetm.asm_out.internal_label)}.
@findex ASM_OUTPUT_CASE_END
@item ASM_OUTPUT_CASE_END (@var{stream}, @var{num}, @var{table})
diff -rup orig/egcc-bib-CVS20020831/gcc/dwarf2out.c egcc-bib-CVS20020831/gcc/dwarf2out.c
--- orig/egcc-bib-CVS20020831/gcc/dwarf2out.c Tue Aug 20 22:41:43 2002
+++ egcc-bib-CVS20020831/gcc/dwarf2out.c Sat Aug 31 10:20:13 2002
@@ -1956,7 +1956,7 @@ output_call_frame_info (for_eh)
&& ! fde->uses_eh_lsda)
continue;
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, FDE_LABEL, for_eh + i * 2);
+ (*targetm.asm_out.internal_label) (asm_out_file, FDE_LABEL, for_eh + i * 2);
ASM_GENERATE_INTERNAL_LABEL (l1, FDE_AFTER_SIZE_LABEL, for_eh + i * 2);
ASM_GENERATE_INTERNAL_LABEL (l2, FDE_END_LABEL, for_eh + i * 2);
dw2_asm_output_delta (for_eh ? 4 : DWARF_OFFSET_SIZE, l2, l1,
@@ -11837,7 +11837,7 @@ dwarf2out_source_line (line, filename)
else if (DECL_SECTION_NAME (current_function_decl))
{
dw_separate_line_info_ref line_info;
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, SEPARATE_LINE_CODE_LABEL,
+ (*targetm.asm_out.internal_label) (asm_out_file, SEPARATE_LINE_CODE_LABEL,
separate_line_info_table_in_use);
/* expand the line info table if necessary */
@@ -11863,7 +11863,7 @@ dwarf2out_source_line (line, filename)
{
dw_line_info_ref line_info;
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, LINE_CODE_LABEL,
+ (*targetm.asm_out.internal_label) (asm_out_file, LINE_CODE_LABEL,
line_info_table_in_use);
/* Expand the line info table if necessary. */
@@ -12180,7 +12180,7 @@ dwarf2out_finish (input_filename)
/* Output a terminator label for the .text section. */
text_section ();
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, TEXT_END_LABEL, 0);
+ (*targetm.asm_out.internal_label) (asm_out_file, TEXT_END_LABEL, 0);
/* Output the source line correspondence table. We must do this
even if there is no line information. Otherwise, on an empty
diff -rup orig/egcc-bib-CVS20020831/gcc/dwarfout.c egcc-bib-CVS20020831/gcc/dwarfout.c
--- orig/egcc-bib-CVS20020831/gcc/dwarfout.c Thu Aug 15 15:59:29 2002
+++ egcc-bib-CVS20020831/gcc/dwarfout.c Sat Aug 31 10:20:13 2002
@@ -1015,7 +1015,7 @@ static void retry_incomplete_types PARAM
stock m88k/svr4 assembler, both of which need to see .L at the start of
a label in order to prevent that label from going into the linker symbol
table). When I get time, I'll have to fix this the right way so that we
- will use ASM_GENERATE_INTERNAL_LABEL and ASM_OUTPUT_INTERNAL_LABEL herein,
+ will use ASM_GENERATE_INTERNAL_LABEL and (*targetm.asm_out.internal_label) herein,
but that will require a rather massive set of changes. For the moment,
the following definitions out to produce the right results for all svr4
and svr3 assemblers. -- rfg
diff -rup orig/egcc-bib-CVS20020831/gcc/except.c egcc-bib-CVS20020831/gcc/except.c
--- orig/egcc-bib-CVS20020831/gcc/except.c Tue Jul 9 11:28:22 2002
+++ egcc-bib-CVS20020831/gcc/except.c Sat Aug 31 10:20:13 2002
@@ -3600,7 +3600,7 @@ output_function_exception_table ()
assemble_align (tt_format_size * BITS_PER_UNIT);
}
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LLSDA",
+ (*targetm.asm_out.internal_label) (asm_out_file, "LLSDA",
current_function_funcdef_no);
/* The LSDA header. */
diff -rup orig/egcc-bib-CVS20020831/gcc/final.c egcc-bib-CVS20020831/gcc/final.c
--- orig/egcc-bib-CVS20020831/gcc/final.c Tue Aug 20 22:41:44 2002
+++ egcc-bib-CVS20020831/gcc/final.c Sat Aug 31 10:20:13 2002
@@ -1718,7 +1718,7 @@ profile_function (file)
#ifndef NO_PROFILE_COUNTERS
data_section ();
ASM_OUTPUT_ALIGN (file, floor_log2 (align / BITS_PER_UNIT));
- ASM_OUTPUT_INTERNAL_LABEL (file, "LP", current_function_funcdef_no);
+ (*targetm.asm_out.internal_label) (file, "LP", current_function_funcdef_no);
assemble_integer (const0_rtx, LONG_TYPE_SIZE / BITS_PER_UNIT, align, 1);
#endif
@@ -2269,7 +2269,7 @@ final_scan_insn (insn, file, optimize, p
ASM_OUTPUT_CASE_LABEL (file, "L", CODE_LABEL_NUMBER (insn),
NEXT_INSN (insn));
#else
- ASM_OUTPUT_INTERNAL_LABEL (file, "L", CODE_LABEL_NUMBER (insn));
+ (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (insn));
#endif
#endif
break;
@@ -2278,7 +2278,7 @@ final_scan_insn (insn, file, optimize, p
if (LABEL_ALT_ENTRY_P (insn))
output_alternate_entry_point (file, insn);
else
- ASM_OUTPUT_INTERNAL_LABEL (file, "L", CODE_LABEL_NUMBER (insn));
+ (*targetm.asm_out.internal_label) (file, "L", CODE_LABEL_NUMBER (insn));
break;
default:
diff -rup orig/egcc-bib-CVS20020831/gcc/system.h egcc-bib-CVS20020831/gcc/system.h
--- orig/egcc-bib-CVS20020831/gcc/system.h Tue Aug 20 22:41:44 2002
+++ egcc-bib-CVS20020831/gcc/system.h Sat Aug 31 10:35:00 2002
@@ -621,7 +621,7 @@ typedef char _Bool;
BLOCK_PROFILER BLOCK_PROFILER_CODE FUNCTION_BLOCK_PROFILER \
FUNCTION_BLOCK_PROFILER_EXIT MACHINE_STATE_SAVE \
MACHINE_STATE_RESTORE SCCS_DIRECTIVE SECTION_ASM_OP \
- ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL
+ ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL ASM_OUTPUT_INTERNAL_LABEL
/* Hooks that are no longer used. */
#pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \
diff -rup orig/egcc-bib-CVS20020831/gcc/varasm.c egcc-bib-CVS20020831/gcc/varasm.c
--- orig/egcc-bib-CVS20020831/gcc/varasm.c Sat Aug 31 09:55:13 2002
+++ egcc-bib-CVS20020831/gcc/varasm.c Sat Aug 31 10:21:21 2002
@@ -1860,7 +1860,7 @@ assemble_trampoline_template ()
ASM_OUTPUT_ALIGN (asm_out_file, align);
}
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LTRAMP", 0);
+ (*targetm.asm_out.internal_label) (asm_out_file, "LTRAMP", 0);
TRAMPOLINE_TEMPLATE (asm_out_file);
/* Record the rtl to refer to it. */
@@ -2855,7 +2855,7 @@ output_constant_def_contents (exp, reloc
}
/* Output the label itself. */
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LC", labelno);
+ (*targetm.asm_out.internal_label) (asm_out_file, "LC", labelno);
/* Output the value of EXP. */
output_constant (exp,
@@ -3404,7 +3404,7 @@ output_constant_pool (fnname, fndecl)
assemble_align (pool->align);
/* Output the label. */
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "LC", pool->labelno);
+ (*targetm.asm_out.internal_label) (asm_out_file, "LC", pool->labelno);
/* Output the value of the constant itself. */
switch (GET_MODE_CLASS (pool->mode))
@@ -5256,7 +5256,7 @@ default_globalize_label (stream, name)
#endif /* GLOBAL_ASM_OP */
/* This is how to output an internal numbered label where PREFIX is
- the class of label and NUM is the number within the class. */
+ the class of label and LABELNO is the number within the class. */
void
default_internal_label (stream, prefix, labelno)
diff -rup orig/egcc-bib-CVS20020831/gcc/vmsdbgout.c egcc-bib-CVS20020831/gcc/vmsdbgout.c
--- orig/egcc-bib-CVS20020831/gcc/vmsdbgout.c Thu Aug 15 15:59:29 2002
+++ egcc-bib-CVS20020831/gcc/vmsdbgout.c Sat Aug 31 10:20:13 2002
@@ -1361,7 +1361,7 @@ vmsdbgout_begin_block (line, blocknum)
(*dwarf2_debug_hooks.begin_block) (line, blocknum);
if (debug_info_level > DINFO_LEVEL_TERSE)
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, BLOCK_BEGIN_LABEL, blocknum);
+ (*targetm.asm_out.internal_label) (asm_out_file, BLOCK_BEGIN_LABEL, blocknum);
}
/* Output a marker (i.e. a label) for the end of the generated code for a
@@ -1376,7 +1376,7 @@ vmsdbgout_end_block (line, blocknum)
(*dwarf2_debug_hooks.end_block) (line, blocknum);
if (debug_info_level > DINFO_LEVEL_TERSE)
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, BLOCK_END_LABEL, blocknum);
+ (*targetm.asm_out.internal_label) (asm_out_file, BLOCK_END_LABEL, blocknum);
}
/* Not implemented in VMS Debug. */
@@ -1563,7 +1563,7 @@ vmsdbgout_source_line (line, filename)
{
dst_line_info_ref line_info;
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, LINE_CODE_LABEL,
+ (*targetm.asm_out.internal_label) (asm_out_file, LINE_CODE_LABEL,
line_info_table_in_use);
/* Expand the line info table if necessary. */
@@ -1735,7 +1735,7 @@ vmsdbgout_finish (input_filename)
/* Output a terminator label for the .text section. */
text_section ();
- ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, TEXT_END_LABEL, 0);
+ (*targetm.asm_out.internal_label) (asm_out_file, TEXT_END_LABEL, 0);
/* Output debugging information.
Warning! Do not change the name of the .vmsdebug section without