pa-linux.h (ASM_OUTPUT_INTERNAL_LABEL): Undefine.

	* pa-linux.h (ASM_OUTPUT_INTERNAL_LABEL): Undefine.
	* pa.h (ASM_OUTPUT_LABEL): Output colon when using GAS.
	(ASM_OUTPUT_INTERNAL_LABEL): Define.

From-SVN: r120704

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f648ed8583c596fa586e4341ad984f1c2e7ed0d4..dfabc80b5e4a3caa6a4b79a7719c52559b9eee40 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-11  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+       * pa-linux.h (ASM_OUTPUT_INTERNAL_LABEL): Undefine.
+       * pa.h (ASM_OUTPUT_LABEL): Output colon when using GAS.
+       (ASM_OUTPUT_INTERNAL_LABEL): Define.
+
 2007-01-09  Nicolas Pitre  <nico@cam.org>
 
        PR target/30173

diff --git a/gcc/config/pa/pa-linux.h b/gcc/config/pa/pa-linux.h
index fa8671585cc510f81bf05d167a0e95629af2ed49..0d36fcb8baad6ee536ec048808acce8f78c8367e 100644 (file)
--- a/gcc/config/pa/pa-linux.h
+++ b/gcc/config/pa/pa-linux.h
@@ -140,6 +140,9 @@ Boston, MA 02111-1307, USA.  */
    does what we want (i.e. uses colons).  It must be compatible with
    ASM_GENERATE_INTERNAL_LABEL(), so do not define it here.  */
 
+/* Use the default.  */
+#undef ASM_OUTPUT_INTERNAL_LABEL
+
 /* Use the default.  */
 #undef TARGET_ASM_GLOBALIZE_LABEL
 /* Globalizing directive for a label.  */

diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index 29aee8c48e04cb9e5a9fb185135c24262aafb09c..dcd38ed04e779440b1d0cf819aba8df35d16dd58 100644 (file)
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -1948,9 +1948,14 @@ forget_section (void)                                                    \
 /* This is how to output the definition of a user-level label named NAME,
    such as the label on a static function or variable NAME.  */
 
-#define ASM_OUTPUT_LABEL(FILE, NAME)   \
-  do { assemble_name (FILE, NAME);     \
-       fputc ('\n', FILE); } while (0)
+#define ASM_OUTPUT_LABEL(FILE,NAME) \
+  do {                                                 \
+    assemble_name ((FILE), (NAME));                    \
+    if (TARGET_GAS)                                    \
+      fputs (":\n", (FILE));                           \
+    else                                               \
+      fputc ('\n', (FILE));                            \
+  } while (0)
 
 /* This is how to output a reference to a user-level label named NAME.
    `assemble_name' uses this.  */
@@ -1983,6 +1988,17 @@ forget_section (void)                                                    \
 #define ASM_GENERATE_INTERNAL_LABEL(LABEL,PREFIX,NUM)  \
   sprintf (LABEL, "*%c$%s%04ld", (PREFIX)[0], (PREFIX) + 1, (long)(NUM))
 
+/* Output the definition of a compiler-generated label named NAME.  */
+
+#define ASM_OUTPUT_INTERNAL_LABEL(FILE,NAME) \
+  do {                                                 \
+    assemble_name_raw ((FILE), (NAME));                        \
+    if (TARGET_GAS)                                    \
+      fputs (":\n", (FILE));                           \
+    else                                               \
+      fputc ('\n', (FILE));                            \
+  } while (0)
+
 #define TARGET_ASM_GLOBALIZE_LABEL pa_globalize_label
 
 #define ASM_OUTPUT_ASCII(FILE, P, SIZE)  \