* pa-linux.h (ASM_OUTPUT_INTERNAL_LABEL): Undefine.

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

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5c4277d..89bb0d6 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-11  Zdenek Dvorak <dvorakz@suse.cz>
 
        * tree-ssa-loop-ivopts.c (extract_cond_operands): Split from

diff --git a/gcc/config/pa/pa-linux.h b/gcc/config/pa/pa-linux.h
index 7d604a1..21d32c5 100644 (file)
--- a/gcc/config/pa/pa-linux.h
+++ b/gcc/config/pa/pa-linux.h
@@ -106,6 +106,9 @@ Boston, MA 02110-1301, USA.  */
    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.  */
 #define GLOBAL_ASM_OP ".globl "

diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index 69d599c..09a3d93 100644 (file)
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -1742,9 +1742,14 @@ do {                                                                     \
 /* 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.  */
@@ -1777,6 +1782,17 @@ do {                                                                     \
 #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)  \