elf.h (ASM_FILE_START): Define.

        * pa/elf.h (ASM_FILE_START): Define.
        * pa/som.h (ASM_FILE_START): Include .level directives.
        * pa/hpux10.h (ASM_FILE_START): Delete.
        * pa/hpux11.h (ASM_FILE_START): Delete.

From-SVN: r28024

5 files changed, 29 insertions, 51 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 280c60f..4c8b353 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -6,6 +6,11 @@ Thu Jul  8 14:18:46 1999  Richard Henderson  <rth@cygnus.com>
 
 Thu Jul  8 12:55:12 1999  Jeffrey A Law  (law@cygnus.com)
 
+	* pa/elf.h (ASM_FILE_START): Define.
+	* pa/som.h (ASM_FILE_START): Include .level directives.
+	* pa/hpux10.h (ASM_FILE_START): Delete.
+	* pa/hpux11.h (ASM_FILE_START): Delete.
+
 	* pa/elf.h (BSS_SECTION_ASM_OP): Use .section .bss.
 
 Thu Jul  8 18:03:19 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
diff --git a/gcc/config/pa/elf.h b/gcc/config/pa/elf.h
index 0ea2f78..6596bc2 100644
--- a/gcc/config/pa/elf.h
+++ b/gcc/config/pa/elf.h
@@ -41,3 +41,19 @@ Boston, MA 02111-1307, USA.  */
 { fputs ("\t.word ", FILE);			\
   output_addr_const (FILE, (VALUE));		\
   fputs ("\n", FILE);}
+
+#undef ASM_FILE_START
+#define ASM_FILE_START(FILE) \
+do {  \
+     if (TARGET_PA_20) \
+       fputs("\t.LEVEL 2.0\n", FILE); \
+     else if (TARGET_PA_11) \
+       fputs("\t.LEVEL 1.1\n", FILE); \
+     else \
+       fputs("\t.LEVEL 1.0\n", FILE); \
+     if (profile_flag)\
+       fprintf (FILE, "\t.IMPORT _mcount, CODE\n");\
+     if (write_symbols != NO_DEBUG) \
+       output_file_directive ((FILE), main_input_filename); \
+   } while (0)
+
diff --git a/gcc/config/pa/pa-hpux10.h b/gcc/config/pa/pa-hpux10.h
index 183020c..9540a97 100644
--- a/gcc/config/pa/pa-hpux10.h
+++ b/gcc/config/pa/pa-hpux10.h
@@ -41,31 +41,6 @@ Boston, MA 02111-1307, USA.  */
        %{p: -L/lib/libp/ -lc}\
        %{pg: -L/lib/libp/ -lc}}}"
 
-/* The hpux10 assembler requires a .LEVEL pseudo-op at the start of
-   the assembly file.  */
-#undef ASM_FILE_START
-#define ASM_FILE_START(FILE) \
-do {  \
-     if (TARGET_PA_20) \
-       fputs("\t.LEVEL 2.0\n", FILE); \
-     else if (TARGET_PA_11) \
-       fputs("\t.LEVEL 1.1\n", FILE); \
-     else \
-       fputs("\t.LEVEL 1.0\n", FILE); \
-     fputs ("\t.SPACE $PRIVATE$\n\
-\t.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31\n\
-\t.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82\n\
-\t.SPACE $TEXT$\n\
-\t.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44\n\
-\t.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY\n\
-\t.IMPORT $global$,DATA\n\
-\t.IMPORT $$dyncall,MILLICODE\n", FILE);\
-     if (profile_flag)\
-       fprintf (FILE, "\t.IMPORT _mcount, CODE\n");\
-     if (write_symbols != NO_DEBUG) \
-       output_file_directive ((FILE), main_input_filename); \
-   } while (0)
-
 /* Under hpux10, the normal location of the `ld' and `as' programs is the
    /usr/ccs/bin directory.  */
 
diff --git a/gcc/config/pa/pa-hpux11.h b/gcc/config/pa/pa-hpux11.h
index 5dcecd4..18bf453 100644
--- a/gcc/config/pa/pa-hpux11.h
+++ b/gcc/config/pa/pa-hpux11.h
@@ -40,31 +40,6 @@ Boston, MA 02111-1307, USA.  */
        %{p: -L/lib/libp/ -lc}\
        %{pg: -L/lib/libp/ -lc}}}"
 
-/* The hpux11 assembler requires a .LEVEL pseudo-op at the start of the
-   assembly file.  */
-#undef ASM_FILE_START
-#define ASM_FILE_START(FILE) \
-do {  \
-     if (TARGET_PA_20) \
-       fputs("\t.LEVEL 2.0\n", FILE); \
-     else if (TARGET_PA_11) \
-       fputs("\t.LEVEL 1.1\n", FILE); \
-     else \
-       fputs("\t.LEVEL 1.0\n", FILE); \
-     fputs ("\t.SPACE $PRIVATE$\n\
-\t.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31\n\
-\t.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82\n\
-\t.SPACE $TEXT$\n\
-\t.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44\n\
-\t.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY\n\
-\t.IMPORT $global$,DATA\n\
-\t.IMPORT $$dyncall,MILLICODE\n", FILE);\
-     if (profile_flag)\
-       fprintf (FILE, "\t.IMPORT _mcount, CODE\n");\
-     if (write_symbols != NO_DEBUG) \
-       output_file_directive ((FILE), main_input_filename); \
-   } while (0)
-
 /* Under hpux11, the normal location of the `ld' and `as' programs is the
    /usr/ccs/bin directory.  */
 
diff --git a/gcc/config/pa/som.h b/gcc/config/pa/som.h
index 1f8e5c7..b549248 100644
--- a/gcc/config/pa/som.h
+++ b/gcc/config/pa/som.h
@@ -281,7 +281,14 @@ while (0)
 /* Output at beginning of assembler file.  */
 
 #define ASM_FILE_START(FILE) \
-do { fputs ("\t.SPACE $PRIVATE$\n\
+do {  \
+     if (TARGET_PA_20) \
+       fputs("\t.LEVEL 2.0\n", FILE); \
+     else if (TARGET_PA_11) \
+       fputs("\t.LEVEL 1.1\n", FILE); \
+     else \
+       fputs("\t.LEVEL 1.0\n", FILE); \
+     fputs ("\t.SPACE $PRIVATE$\n\
 \t.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31\n\
 \t.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82\n\
 \t.SPACE $TEXT$\n\