* config/dbxcoff.h (DBX_OUTPUT_MAIN_SOURCE_FILE_END): Use

        asm_fprintf and %L to generate the label name.
        * config/dbxelf.h (DBX_OUTPUT_MAIN_SOURCE_FILE_END): Likewise.
        (ASM_OUTPUT_SOURCE_LINE): Correct generation of internal labels.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27048 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80c1243..5a20e94 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+1999-05-20  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+       * config/dbxcoff.h (DBX_OUTPUT_MAIN_SOURCE_FILE_END): Use
+       asm_fprintf and %L to generate the label name.
+       * config/dbxelf.h (DBX_OUTPUT_MAIN_SOURCE_FILE_END): Likewise.
+       (ASM_OUTPUT_SOURCE_LINE): Correct generation of internal labels.
+
 Thu May 20 01:40:55 1999  Jeffrey A Law  (law@cygnus.com)
 
        * jump.c (can_reverse_comparison_p): Do not abort if the comparison

diff --git a/gcc/config/dbxcoff.h b/gcc/config/dbxcoff.h
index 9497a70..1d5b448 100644 (file)
--- a/gcc/config/dbxcoff.h
+++ b/gcc/config/dbxcoff.h
@@ -49,8 +49,8 @@ Boston, MA 02111-1307, USA.  */
 
 #undef DBX_OUTPUT_MAIN_SOURCE_FILE_END
 #define DBX_OUTPUT_MAIN_SOURCE_FILE_END(FILE, FILENAME)                        \
-  fprintf (FILE,                                                       \
-          "\t.text\n\t.stabs \"\",%d,0,0,Letext\nLetext:\n", N_SO)
+  asm_fprintf (FILE,                                                   \
+              "\t.text\n\t.stabs \"\",%d,0,0,%LLetext\n%LLetext:\n", N_SO)
 
 /* Like block addresses, stabs line numbers are relative to the
    current function.  */

diff --git a/gcc/config/dbxelf.h b/gcc/config/dbxelf.h
index 9472887..3971bc1 100644 (file)
--- a/gcc/config/dbxelf.h
+++ b/gcc/config/dbxelf.h
@@ -80,15 +80,19 @@ while (0)
    current function.  */
 
 #undef  ASM_OUTPUT_SOURCE_LINE
-#define ASM_OUTPUT_SOURCE_LINE(file, line)                             \
+#define ASM_OUTPUT_SOURCE_LINE(FILE, LINE)                             \
 do                                                                     \
   {                                                                    \
     static int sym_lineno = 1;                                         \
-    fprintf (file, ".stabn 68,0,%d,.LM%d-",                            \
-            line, sym_lineno);                                         \
-    assemble_name (file,                                               \
+    char temp[256];                                                    \
+    ASM_GENERATE_INTERNAL_LABEL (temp, "LM", sym_lineno);              \
+    fprintf (FILE, ".stabn 68,0,%d,", LINE);                           \
+    assemble_name (FILE, temp);                                                \
+    putc ('-', FILE);                                                  \
+    assemble_name (FILE,                                               \
                   XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0));\
-    fprintf (file, "\n.LM%d:\n", sym_lineno);                          \
+    putc ('\n', FILE);                                                 \
+    ASM_OUTPUT_INTERNAL_LABEL (FILE, "LM", sym_lineno);                        \
     sym_lineno += 1;                                                   \
   }                                                                    \
 while (0)
@@ -99,7 +103,7 @@ while (0)
 
 #undef  DBX_OUTPUT_MAIN_SOURCE_FILE_END
 #define DBX_OUTPUT_MAIN_SOURCE_FILE_END(FILE, FILENAME)                        \
-  fprintf (FILE,                                                       \
-          "\t.text\n\t.stabs \"\",%d,0,0,Letext\nLetext:\n", N_SO)
+  asm_fprintf (FILE,                                                   \
+              "\t.text\n\t.stabs \"\",%d,0,0,%LLetext\n%LLetext:\n", N_SO)
 
 #endif /* __DBX_ELF_H */