From 5bdd342ffa415e91e17436d39b79d0b61d7b3826 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 31 Mar 2012 17:43:19 +0200
Subject: [PATCH] gcc: ASM_COMMENT_START shouldn't be defined at the OS level.

* arm: ASM_COMMENT_START is defined in arm/aout.h.
* i386 and x86_64: define ASM_COMMENT_START.
* others: ASM_COMMENT_START is defined in ${arch}/${arch}.h.
---
 gcc/gcc/config/haiku.h        | 3 ---
 gcc/gcc/config/arm/haiku.h    | 3 +--
 gcc/gcc/config/i386/haiku.h   | 3 +++
 gcc/gcc/config/i386/haiku64.h | 3 +++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gcc/gcc/config/haiku.h b/gcc/gcc/config/haiku.h
index 798e325..fbfb4f9 100644
--- a/gcc/gcc/config/haiku.h
+++ a/gcc/gcc/config/haiku.h
@@ -25,9 +25,6 @@
 #undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 
-#undef ASM_COMMENT_START
-#define ASM_COMMENT_START " #"
-
 #undef MCOUNT_NAME
 #define MCOUNT_NAME "_mcount"
 
diff --git a/gcc/gcc/config/arm/haiku.h b/gcc/gcc/config/arm/haiku.h
index 072f3df..776da36 100644
--- a/gcc/gcc/config/arm/haiku.h
+++ a/gcc/gcc/config/arm/haiku.h
@@ -21,8 +21,7 @@
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (ARM Haiku/ELF)");
-#undef ASM_COMMENT_START
-#define ASM_COMMENT_START "@"
+
 /* Unsigned chars produces much better code than signed.  */
 #define DEFAULT_SIGNED_CHAR  0
 
diff --git a/gcc/gcc/config/i386/haiku.h b/gcc/gcc/config/i386/haiku.h
index 5669a12..2a3aaf4 100644
--- a/gcc/gcc/config/i386/haiku.h
+++ a/gcc/gcc/config/i386/haiku.h
@@ -22,6 +22,9 @@
 
 #define TARGET_VERSION fprintf (stderr, " (i386 Haiku/ELF)");
 
+#undef ASM_COMMENT_START
+#define ASM_COMMENT_START " #"
+
 /* The SVR4 ABI for the i386 says that records and unions are returned
    in memory.  */
 #undef DEFAULT_PCC_STRUCT_RETURN
diff --git a/gcc/gcc/config/i386/haiku64.h b/gcc/gcc/config/i386/haiku64.h
index 6103760..44ef197 100644
--- a/gcc/gcc/config/i386/haiku64.h
+++ a/gcc/gcc/config/i386/haiku64.h
@@ -26,6 +26,9 @@
 #define TARGET_VERSION fprintf (stderr, " (i386 Haiku/ELF)");
 #endif
 
+#undef ASM_COMMENT_START
+#define ASM_COMMENT_START " #"
+
 /* The SVR4 ABI for the i386 says that records and unions are returned
  *   in memory.
  *
--
gitore 0.2.1