darwin.h (ASM_OUTPUT_LABEL): Move to here from config/rs6000/darwin.h.

        * config/darwin.h (ASM_OUTPUT_LABEL): Move to here from
        config/rs6000/darwin.h.
        (ASM_OUTPUT_SKIP): Ditto.
        (TEXT_SECTION_ASM_OP): Ditto.
        (DATA_SECTION_ASM_OP): Ditto.
        (ASM_APP_ON): Define.
        (ASM_APP_OFF): Define.
        * config/rs6000/darwin.h (ASM_OUTPUT_LABEL, ASM_OUTPUT_SKIP,
        TEXT_SECTION_ASM_OP, DATA_SECTION_ASM_OP): Remove.

From-SVN: r55504

3 files changed, 34 insertions, 21 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1a40901..3f6418d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -5,11 +5,21 @@
 
 2002-07-16  Stan Shebs  <shebs@apple.com>
 
-	* darwin.c (func_name_maybe_scoped): Remove unused decl.
+	* config/darwin.h (ASM_OUTPUT_LABEL): Move to here from
+	config/rs6000/darwin.h.
+	(ASM_OUTPUT_SKIP): Ditto.
+	(TEXT_SECTION_ASM_OP): Ditto.
+	(DATA_SECTION_ASM_OP): Ditto.
+	(ASM_APP_ON): Define.
+	(ASM_APP_OFF): Define.
+	* config/rs6000/darwin.h (ASM_OUTPUT_LABEL, ASM_OUTPUT_SKIP,
+	TEXT_SECTION_ASM_OP, DATA_SECTION_ASM_OP): Remove.
+
+	* config/darwin.c (func_name_maybe_scoped): Remove unused decl.
 	(machopic_function_base_name): Declare result to be const.
 	(machopic_non_lazy_ptr_name): Ditto.
 	(machopic_stub_name): Ditto.
-	* darwin-protos.h: Ditto for the prototypes.
+	* config/darwin-protos.h: Ditto for the prototypes.
 
 Wed Jul 17 00:22:39 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 906951f..44d69d4 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -165,7 +165,14 @@ do { text_section ();							\
       }								\
   } while (0)
 
-/* Give ObjcC methods pretty symbol names. */
+#undef ASM_OUTPUT_LABEL
+#define ASM_OUTPUT_LABEL(FILE,NAME)	\
+  do { assemble_name (FILE, NAME); fputs (":\n", FILE); } while (0)
+
+#define ASM_OUTPUT_SKIP(FILE,SIZE)  \
+  fprintf (FILE, "\t.space %d\n", SIZE)
+
+/* Give ObjC methods pretty symbol names. */
 
 #undef	OBJC_GEN_METHOD_LABEL
 #define OBJC_GEN_METHOD_LABEL(BUF,IS_INST,CLASS_NAME,CAT_NAME,SEL_NAME,NUM) \
@@ -247,6 +254,15 @@ do { text_section ();							\
          fprintf (FILE, "_%s", xname);					     \
   } while (0)
 
+/* Output before executable code.  */
+#undef TEXT_SECTION_ASM_OP
+#define TEXT_SECTION_ASM_OP ".text"
+
+/* Output before writable data.  */
+
+#undef DATA_SECTION_ASM_OP
+#define DATA_SECTION_ASM_OP ".data"
+
 #undef	ALIGN_ASM_OP
 #define ALIGN_ASM_OP		".align"
 
@@ -613,3 +629,8 @@ enum machopic_addr_class {
     cpp_register_pragma (PFILE, 0, "segment", darwin_pragma_ignore);	\
     cpp_register_pragma (PFILE, 0, "unused", darwin_pragma_unused);	\
   } while (0)
+
+#undef ASM_APP_ON
+#define ASM_APP_ON ""
+#undef ASM_APP_OFF
+#define ASM_APP_OFF ""
diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h
index f874354..417cfb9 100644
--- a/gcc/config/rs6000/darwin.h
+++ b/gcc/config/rs6000/darwin.h
@@ -103,13 +103,6 @@ Boston, MA 02111-1307, USA.  */
 #define RS6000_OUTPUT_BASENAME(FILE, NAME)	\
     assemble_name (FILE, NAME);
 
-/* Output before instructions.  */
-/* 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); fputs (":\n", FILE); } while (0)
-
 /* This is how to output a command to make the user-level label named NAME
    defined for reference from other files.  */
 
@@ -126,14 +119,6 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_OUTPUT_INTERNAL_LABEL_PREFIX(FILE,PREFIX)	\
   fprintf (FILE, "%s", PREFIX)
 
-#undef TEXT_SECTION_ASM_OP
-#define TEXT_SECTION_ASM_OP ".text"
-
-/* Output before writable data.  */
-
-#undef DATA_SECTION_ASM_OP
-#define DATA_SECTION_ASM_OP ".data"
-
 /* This says how to output an assembler line to define a global common
    symbol.  */
 /* ? */
@@ -143,9 +128,6 @@ Boston, MA 02111-1307, USA.  */
        RS6000_OUTPUT_BASENAME ((FILE), (NAME));		\
        fprintf ((FILE), ",%d\n", (SIZE)); } while (0)
 
-#define ASM_OUTPUT_SKIP(FILE,SIZE)  \
-  fprintf (FILE, "\t.space %d\n", SIZE)
-
 /* Override the standard rs6000 definition.  */
 
 #undef ASM_COMMENT_START