OSDN Git Service

* Revert patch from 2005-04-13.
[pf3gnuchains/gcc-fork.git] / gcc / config / elfos.h
index dfcbb92..9eed0d1 100644 (file)
@@ -1,25 +1,37 @@
 /* elfos.h  --  operating system specific defines to be used when
    targeting GCC for some generic ELF system
-   Copyright (C) 1991, 1994, 1995, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
    Based on svr4.h contributed by Ron Guilmette (rfg@netcom.com).
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
+GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-GNU CC is distributed in the hope that it will be useful,
+GCC is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
+along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#define TARGET_OBJFMT_CPP_BUILTINS()           \
+  do                                           \
+    {                                          \
+       builtin_define ("__ELF__");             \
+    }                                          \
+  while (0)
+
+/* Define a symbol indicating that we are using elfos.h.
+   Some CPU specific configuration files use this.  */
+#define USING_ELFOS_H
+
 /* The prefix to add to user-visible assembler symbols.
 
    For ELF systems the convention is *not* to prepend a leading
@@ -36,52 +48,30 @@ Boston, MA 02111-1307, USA.  */
 #define MAX_OFILE_ALIGNMENT (32768 * 8)
 #endif
 
-#undef  ENDFILE_SPEC
-#define ENDFILE_SPEC "crtend.o%s"
-
-#undef STARTFILE_SPEC
-#define STARTFILE_SPEC "%{!shared: \
-                        %{!symbolic: \
-                         %{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}}\
-                       crtbegin.o%s"
-
 /* Use periods rather than dollar signs in special g++ assembler names.  */
 
 #define NO_DOLLAR_IN_LABEL
 
-/* Writing `int' for a bitfield forces int alignment for the structure.  */
+/* Writing `int' for a bit-field forces int alignment for the structure.  */
 
+#ifndef PCC_BITFIELD_TYPE_MATTERS
 #define PCC_BITFIELD_TYPE_MATTERS 1
-
-/* Implicit library calls should use memcpy, not bcopy, etc.  */
-
-#define TARGET_MEM_FUNCTIONS
+#endif
 
 /* Handle #pragma weak and #pragma pack.  */
 
-#define HANDLE_SYSV_PRAGMA
-
-/* System V Release 4 uses DWARF debugging info.  */
-
-#ifndef DWARF_DEBUGGING_INFO
-#define DWARF_DEBUGGING_INFO 1
-#endif
+#define HANDLE_SYSV_PRAGMA 1
 
 /* All ELF targets can support DWARF-2.  */
 
-#ifndef DWARF2_DEBUGGING_INFO
 #define DWARF2_DEBUGGING_INFO 1
-#endif
 
-/* Also allow them to support STABS debugging.  */
-
-#include "dbxelf.h"
-
-/* The GNU tools operate better with stabs.  Since we don't have
-   any native tools to be compatible with, default to stabs.  */
+/* The GNU tools operate better with dwarf2, and it is required by some
+   psABI's.  Since we don't have any native tools to be compatible with,
+   default to dwarf2.  */
 
 #ifndef PREFERRED_DEBUGGING_TYPE
-#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
+#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 #endif
 
 /* All SVR4 targets use the ELF object file format.  */
@@ -91,63 +81,26 @@ Boston, MA 02111-1307, USA.  */
 /* Output #ident as a .ident.  */
 
 #define ASM_OUTPUT_IDENT(FILE, NAME) \
-  fprintf (FILE, "\t%s\t\"%s\"\n", IDENT_ASM_OP, NAME);
-
-/* Attach a special .ident directive to the end of the file to identify
-   the version of GCC which compiled this code.  The format of the
-   .ident string is patterned after the ones produced by native svr4
-   C compilers.  */
+  fprintf (FILE, "%s\"%s\"\n", IDENT_ASM_OP, NAME);
 
-#define IDENT_ASM_OP ".ident"
-
-#define ASM_FILE_END(FILE)                             \
-  do                                                   \
-    {                                                  \
-      if (!flag_no_ident)                              \
-       fprintf ((FILE), "\t%s\t\"GCC: (GNU) %s\"\n",   \
-                IDENT_ASM_OP, version_string);         \
-    }                                                  \
-  while (0)
-
-#undef  ASM_BYTE_OP
-#define ASM_BYTE_OP    ".byte"
+#define IDENT_ASM_OP "\t.ident\t"
 
 #undef  SET_ASM_OP
-#define SET_ASM_OP     ".set"
-
-/* This is how to begin an assembly language file.  Most svr4 assemblers want
-   at least a .file directive to come first, and some want to see a .version
-   directive come right after that.  Here we just establish a default
-   which generates only the .file directive.  If you need a .version
-   directive for any specific target, you should override this definition
-   in the target-specific file which includes this one.  */
+#define SET_ASM_OP     "\t.set\t"
 
-#undef ASM_FILE_START
-#define ASM_FILE_START(FILE)                            \
-  output_file_directive ((FILE), main_input_filename)
+/* Most svr4 assemblers want a .file directive at the beginning of
+   their input file.  */
+#define TARGET_ASM_FILE_START_FILE_DIRECTIVE true
 
 /* This is how to allocate empty space in some section.  The .zero
    pseudo-op is used for this on most svr4 assemblers.  */
 
-#define SKIP_ASM_OP    ".zero"
+#define SKIP_ASM_OP    "\t.zero\t"
 
 #undef  ASM_OUTPUT_SKIP
 #define ASM_OUTPUT_SKIP(FILE, SIZE) \
-  fprintf (FILE, "\t%s\t%u\n", SKIP_ASM_OP, (SIZE))
-
-/* This is how to output an internal numbered label where
-   PREFIX is the class of label and NUM is the number within the class.
-
-   For most svr4 systems, the convention is that any symbol which begins
-   with a period is not put into the linker symbol table by the assembler.  */
-
-#undef  ASM_OUTPUT_INTERNAL_LABEL
-#define ASM_OUTPUT_INTERNAL_LABEL(FILE, PREFIX, NUM)   \
-  do                                                   \
-    {                                                  \
-      fprintf (FILE, ".%s%d:\n", PREFIX, NUM);         \
-    }                                                  \
-  while (0)
+   fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\
+           SKIP_ASM_OP, (SIZE))
 
 /* This is how to store into the string LABEL
    the symbol_ref name of an internal numbered label where
@@ -161,7 +114,7 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_GENERATE_INTERNAL_LABEL(LABEL, PREFIX, NUM)                \
   do                                                           \
     {                                                          \
-      sprintf (LABEL, "*.%s%d", PREFIX, (unsigned) (NUM));     \
+      sprintf (LABEL, "*.%s%u", PREFIX, (unsigned) (NUM));     \
     }                                                          \
   while (0)
 
@@ -173,7 +126,8 @@ Boston, MA 02111-1307, USA.  */
    make sure that the location counter for the .rodata section gets pro-
    perly re-aligned prior to the actual beginning of the jump table.  */
 
-#define ALIGN_ASM_OP ".align"
+#undef ALIGN_ASM_OP
+#define ALIGN_ASM_OP "\t.align\t"
 
 #ifndef ASM_OUTPUT_BEFORE_CASE_LABEL
 #define ASM_OUTPUT_BEFORE_CASE_LABEL(FILE, PREFIX, NUM, TABLE) \
@@ -185,7 +139,7 @@ Boston, MA 02111-1307, USA.  */
   do                                                                   \
     {                                                                  \
       ASM_OUTPUT_BEFORE_CASE_LABEL (FILE, PREFIX, NUM, JUMPTABLE)      \
-       ASM_OUTPUT_INTERNAL_LABEL (FILE, PREFIX, NUM);                  \
+       (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM);                  \
     }                                                                  \
   while (0)
 
@@ -194,22 +148,23 @@ Boston, MA 02111-1307, USA.  */
    in each assembly file where they are referenced.  */
 
 #define ASM_OUTPUT_EXTERNAL_LIBCALL(FILE, FUN) \
-  ASM_GLOBALIZE_LABEL (FILE, XSTR (FUN, 0))
+  (*targetm.asm_out.globalize_label) (FILE, XSTR (FUN, 0))
 
 /* This says how to output assembler code to declare an
    uninitialized external linkage data object.  Under SVR4,
    the linker seems to want the alignment of data objects
    to depend on their types.  We do exactly that here.  */
 
-#define COMMON_ASM_OP  ".comm"
+#define COMMON_ASM_OP  "\t.comm\t"
 
 #undef  ASM_OUTPUT_ALIGNED_COMMON
 #define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN)             \
   do                                                                   \
     {                                                                  \
-      fprintf ((FILE), "\t%s\t", COMMON_ASM_OP);                       \
+      fprintf ((FILE), "%s", COMMON_ASM_OP);                           \
       assemble_name ((FILE), (NAME));                                  \
-      fprintf ((FILE), ",%u,%u\n", (SIZE), (ALIGN) / BITS_PER_UNIT);   \
+      fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n",         \
+              (SIZE), (ALIGN) / BITS_PER_UNIT);                        \
     }                                                                  \
   while (0)
 
@@ -218,61 +173,28 @@ Boston, MA 02111-1307, USA.  */
    the linker seems to want the alignment of data objects
    to depend on their types.  We do exactly that here.  */
 
-#define LOCAL_ASM_OP   ".local"
+#define LOCAL_ASM_OP   "\t.local\t"
 
 #undef  ASM_OUTPUT_ALIGNED_LOCAL
 #define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN)      \
   do                                                           \
     {                                                          \
-      fprintf ((FILE), "\t%s\t", LOCAL_ASM_OP);                        \
+      fprintf ((FILE), "%s", LOCAL_ASM_OP);                    \
       assemble_name ((FILE), (NAME));                          \
       fprintf ((FILE), "\n");                                  \
       ASM_OUTPUT_ALIGNED_COMMON (FILE, NAME, SIZE, ALIGN);     \
     }                                                          \
   while (0)
 
-/* This is the pseudo-op used to generate a 32-bit word of data with a
-   specific value in some section.  This is the same for all known svr4
-   assemblers.  */
-
-#define INT_ASM_OP             ".long"
-
 /* This is the pseudo-op used to generate a contiguous sequence of byte
    values from a double-quoted string WITHOUT HAVING A TERMINATING NUL
    AUTOMATICALLY APPENDED.  This is the same for most svr4 assemblers.  */
 
 #undef  ASCII_DATA_ASM_OP
-#define ASCII_DATA_ASM_OP      ".ascii"
-
-/* Support const sections and the ctors and dtors sections for g++.
-   Note that there appears to be two different ways to support const
-   sections at the moment.  You can either #define the symbol
-   READONLY_DATA_SECTION (giving it some code which switches to the
-   readonly data section) or else you can #define the symbols
-   EXTRA_SECTIONS, EXTRA_SECTION_FUNCTIONS, SELECT_SECTION, and
-   SELECT_RTX_SECTION.  We do both here just to be on the safe side.  */
-
-#define USE_CONST_SECTION      1
-
-#define CONST_SECTION_ASM_OP   "\t.section\t.rodata"
-
-/* Define the pseudo-ops used to switch to the .ctors and .dtors sections.
-
-   Note that we want to give these sections the SHF_WRITE attribute
-   because these sections will actually contain data (i.e. tables of
-   addresses of functions in the current root executable or shared library
-   file) and, in the case of a shared library, the relocatable addresses
-   will have to be properly resolved/relocated (and then written into) by
-   the dynamic linker when it actually attaches the given shared library
-   to the executing process.  (Note that on SVR4, you may wish to use the
-   `-z text' option to the ELF linker, when building a shared library, as
-   an additional check that you are doing everything right.  But if you do
-   use the `-z text' option when building a shared library, you will get
-   errors unless the .ctors and .dtors sections are marked as writable
-   via the SHF_WRITE attribute.)  */
-
-#define CTORS_SECTION_ASM_OP   "\t.section\t.ctors,\"aw\""
-#define DTORS_SECTION_ASM_OP   "\t.section\t.dtors,\"aw\""
+#define ASCII_DATA_ASM_OP      "\t.ascii\t"
+
+/* Support a read-only data section.  */
+#define READONLY_DATA_SECTION_ASM_OP   "\t.section\t.rodata"
 
 /* On svr4, we *do* have support for the .init and .fini sections, and we
    can put stuff in there to be executed before and after `main'.  We let
@@ -283,230 +205,22 @@ Boston, MA 02111-1307, USA.  */
 #define INIT_SECTION_ASM_OP    "\t.section\t.init"
 #define FINI_SECTION_ASM_OP    "\t.section\t.fini"
 
-/* A default list of other sections which we might be "in" at any given
-   time.  For targets that use additional sections (e.g. .tdesc) you
-   should override this definition in the target-specific file which
-   includes this file.  */
-
-#undef  EXTRA_SECTIONS
-#define EXTRA_SECTIONS in_const, in_ctors, in_dtors
-
-/* A default list of extra section function definitions.  For targets
-   that use additional sections (e.g. .tdesc) you should override this
-   definition in the target-specific file which includes this file.  */
-
-#undef  EXTRA_SECTION_FUNCTIONS
-#define EXTRA_SECTION_FUNCTIONS                \
-  CONST_SECTION_FUNCTION               \
-  CTORS_SECTION_FUNCTION               \
-  DTORS_SECTION_FUNCTION
-
-#define READONLY_DATA_SECTION() const_section ()
-
-#define CONST_SECTION_FUNCTION                                 \
-void                                                           \
-const_section ()                                               \
-{                                                              \
-  if (!USE_CONST_SECTION)                                      \
-    text_section ();                                           \
-  else if (in_section != in_const)                             \
-    {                                                          \
-      fprintf (asm_out_file, "\t%s\n", CONST_SECTION_ASM_OP);  \
-      in_section = in_const;                                   \
-    }                                                          \
-}
-
-#define CTORS_SECTION_FUNCTION                                 \
-void                                                           \
-ctors_section ()                                               \
-{                                                              \
-  if (in_section != in_ctors)                                  \
-    {                                                          \
-      fprintf (asm_out_file, "\t%s\n", CTORS_SECTION_ASM_OP);  \
-      in_section = in_ctors;                                   \
-    }                                                          \
-}
-
-#define DTORS_SECTION_FUNCTION                                 \
-void                                                           \
-dtors_section ()                                               \
-{                                                              \
-  if (in_section != in_dtors)                                  \
-    {                                                          \
-      fprintf (asm_out_file, "\t%s\n", DTORS_SECTION_ASM_OP);  \
-      in_section = in_dtors;                                   \
-    }                                                          \
-}
+/* Output assembly directive to move to the beginning of current section.  */
+#ifdef HAVE_GAS_SUBSECTION_ORDERING
+# define ASM_SECTION_START_OP  "\t.subsection\t-1"
+# define ASM_OUTPUT_SECTION_START(FILE)        \
+  fprintf ((FILE), "%s\n", ASM_SECTION_START_OP)
+#endif
 
 #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1)
 
-#define UNIQUE_SECTION_P(DECL)   (DECL_ONE_ONLY (DECL))
-
-#define UNIQUE_SECTION(DECL, RELOC)                            \
-  do                                                           \
-    {                                                          \
-      int len;                                                 \
-      int sec;                                                 \
-      const char *name;                                                \
-      char *string;                                            \
-      const char *prefix;                                      \
-      static const char *prefixes[/*4*/3][2] =                 \
-      {                                                                \
-       { ".text.",   ".gnu.linkonce.t." },                     \
-       { ".rodata.", ".gnu.linkonce.r." },                     \
-       { ".data.",   ".gnu.linkonce.d." }                      \
-       /* Do not generate unique sections for uninitialised    \
-          data since we do not have support for this in the    \
-          linker scripts yet...                                \
-        ,{ ".bss.",    ".gnu.linkonce.b." }  */                        \
-      };                                                       \
-                                                               \
-      if (TREE_CODE (DECL) == FUNCTION_DECL)                   \
-       sec = 0;                                                \
-  /*  else if (DECL_INITIAL (DECL) == 0                                \
-              || DECL_INITIAL (DECL) == error_mark_node)       \
-        sec =  3; */                                           \
-      else if (DECL_READONLY_SECTION (DECL, RELOC))            \
-       sec = 1;                                                \
-      else                                                     \
-       sec = 2;                                                \
-                                                               \
-      name   = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (DECL));        \
-      prefix = prefixes[sec][DECL_ONE_ONLY(DECL)];             \
-      len    = strlen (name) + strlen (prefix);                        \
-      string = alloca (len + 1);                               \
-                                                               \
-      sprintf (string, "%s%s", prefix, name);                  \
-                                                               \
-      DECL_SECTION_NAME (DECL) = build_string (len, string);   \
-    }                                                          \
-  while (0)
-     
-/* A C statement (sans semicolon) to output an
-   element in the table of global constructors.  */
-#define ASM_OUTPUT_CONSTRUCTOR(FILE, NAME)                     \
-  do                                                           \
-    {                                                          \
-      ctors_section ();                                                \
-      fprintf (FILE, "\t%s\t ", INT_ASM_OP);                   \
-      assemble_name (FILE, NAME);                              \
-      fprintf (FILE, "\n");                                    \
-    }                                                          \
-  while (0)
-
-/* A C statement (sans semicolon) to output an
-   element in the table of global destructors.  */
-#define ASM_OUTPUT_DESTRUCTOR(FILE,NAME)                               \
-  do                                                           \
-    {                                                          \
-      dtors_section ();                                        \
-      fprintf (FILE, "\t%s\t ", INT_ASM_OP);                   \
-      assemble_name (FILE, NAME);                                      \
-      fprintf (FILE, "\n");                                    \
-    }                                                          \
-  while (0)
+/* Switch into a generic section.  */
+#define TARGET_ASM_NAMED_SECTION  default_elf_asm_named_section
 
-/* Switch into a generic section.
-   We make the section read-only and executable for a function decl,
-   read-only for a const data decl, and writable for a non-const data decl.
-   If the section has already been defined, we must not
-   emit the attributes here. The SVR4 assembler does not
-   recognize section redefinitions.
-   If DECL is NULL, no attributes are emitted.  */
-
-#define ASM_OUTPUT_SECTION_NAME(FILE, DECL, NAME, RELOC)               \
-  do                                                                   \
-    {                                                                  \
-      static struct section_info                                       \
-      {                                                                        \
-       struct section_info *next;                                      \
-       char *name;                                                     \
-       enum sect_enum {SECT_RW, SECT_RO, SECT_EXEC} type;              \
-      } *sections;                                                     \
-      struct section_info *s;                                          \
-      const char *mode;                                                        \
-      enum sect_enum type;                                             \
-                                                                       \
-      for (s = sections; s; s = s->next)                               \
-       if (!strcmp (NAME, s->name))                                    \
-         break;                                                        \
-                                                                       \
-      if (DECL && TREE_CODE (DECL) == FUNCTION_DECL)                   \
-       type = SECT_EXEC, mode = "ax";                                  \
-      else if (DECL && DECL_READONLY_SECTION (DECL, RELOC))            \
-       type = SECT_RO, mode = "a";                                     \
-      else                                                             \
-       type = SECT_RW, mode = "aw";                                    \
-                                                                       \
-      if (s == 0)                                                      \
-       {                                                               \
-         s = (struct section_info *) xmalloc (sizeof (* s));           \
-         s->name = xmalloc ((strlen (NAME) + 1) * sizeof (* NAME));    \
-         strcpy (s->name, NAME);                                       \
-         s->type = type;                                               \
-         s->next = sections;                                           \
-         sections = s;                                                 \
-         fprintf (FILE, "\t.section\t%s,\"%s\",@progbits\n",           \
-                  NAME, mode);                                         \
-       }                                                               \
-      else                                                             \
-       {                                                               \
-         if (DECL && s->type != type)                                  \
-           error_with_decl (DECL, "%s causes a section type conflict");\
-                                                                       \
-         fprintf (FILE, "\t.section\t%s\n", NAME);                     \
-       }                                                               \
-    }                                                                  \
-  while (0)
-
-/* A C statement or statements to switch to the appropriate
-   section for output of RTX in mode MODE.  RTX is some kind
-   of constant in RTL.  The argument MODE is redundant except
-   in the case of a `const_int' rtx.  Currently, these always
-   go into the const section.  */
-
-#undef  SELECT_RTX_SECTION
-#define SELECT_RTX_SECTION(MODE, RTX) const_section ()
-
-/* A C statement or statements to switch to the appropriate
-   section for output of DECL.  DECL is either a `VAR_DECL' node
-   or a constant of some sort.  RELOC indicates whether forming
-   the initial value of DECL requires link-time relocations.  */
-
-#define SELECT_SECTION(DECL, RELOC)                            \
-{                                                              \
-  if (TREE_CODE (DECL) == STRING_CST)                          \
-    {                                                          \
-      if (! flag_writable_strings)                             \
-       const_section ();                                       \
-      else                                                     \
-       data_section ();                                        \
-    }                                                          \
-  else if (TREE_CODE (DECL) == VAR_DECL)                       \
-    {                                                          \
-      if ((flag_pic && RELOC)                                  \
-         || !TREE_READONLY (DECL) || TREE_SIDE_EFFECTS (DECL)  \
-         || !DECL_INITIAL (DECL)                               \
-         || (DECL_INITIAL (DECL) != error_mark_node            \
-             && !TREE_CONSTANT (DECL_INITIAL (DECL))))         \
-       data_section ();                                        \
-      else                                                     \
-       const_section ();                                       \
-    }                                                          \
-  else if (TREE_CODE (DECL) == CONSTRUCTOR)                    \
-    {                                                          \
-      if ((flag_pic && RELOC)                                  \
-         || !TREE_READONLY (DECL) || TREE_SIDE_EFFECTS (DECL)  \
-         || ! TREE_CONSTANT (DECL))                            \
-       data_section ();                                        \
-      else                                                     \
-       const_section ();                                       \
-    }                                                          \
-  else                                                         \
-    const_section ();                                          \
-}
+#undef  TARGET_ASM_SELECT_RTX_SECTION
+#define TARGET_ASM_SELECT_RTX_SECTION default_elf_select_rtx_section
+#undef TARGET_ASM_SELECT_SECTION
+#define TARGET_ASM_SELECT_SECTION default_elf_select_section
 
 /* Define the strings used for the special svr4 .type and .size directives.
    These strings generally do not vary from one system running svr4 to
@@ -514,16 +228,16 @@ dtors_section ()                                          \
    different pseudo-op names for these, they may be overridden in the
    file which includes this one.  */
 
-#define TYPE_ASM_OP    ".type"
-#define SIZE_ASM_OP    ".size"
+#define TYPE_ASM_OP    "\t.type\t"
+#define SIZE_ASM_OP    "\t.size\t"
 
 /* This is how we tell the assembler that a symbol is weak.  */
 
-#define ASM_WEAKEN_LABEL(FILE, NAME)   \
+#define ASM_WEAKEN_LABEL(FILE, NAME)   \
   do                                   \
     {                                  \
       fputs ("\t.weak\t", (FILE));     \
-      assemble_name ((FILE), (NAME));  \
+      assemble_name ((FILE), (NAME));  \
       fputc ('\n', (FILE));            \
     }                                  \
   while (0)
@@ -554,18 +268,13 @@ dtors_section ()                                          \
    function's return value.  We allow for that here.  */
 
 #ifndef ASM_DECLARE_FUNCTION_NAME
-#define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL)    \
-  do                                                   \
-    {                                                  \
-      fprintf (FILE, "\t%s\t ", TYPE_ASM_OP);          \
-      assemble_name (FILE, NAME);                      \
-      putc (',', FILE);                                        \
-      fprintf (FILE, TYPE_OPERAND_FMT, "function");    \
-      putc ('\n', FILE);                               \
-                                                       \
-      ASM_DECLARE_RESULT (FILE, DECL_RESULT (DECL));   \
-      ASM_OUTPUT_LABEL(FILE, NAME);                    \
-    }                                                  \
+#define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL)            \
+  do                                                           \
+    {                                                          \
+      ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "function");      \
+      ASM_DECLARE_RESULT (FILE, DECL_RESULT (DECL));           \
+      ASM_OUTPUT_LABEL (FILE, NAME);                           \
+    }                                                          \
   while (0)
 #endif
 
@@ -574,25 +283,19 @@ dtors_section ()                                          \
 #define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL)              \
   do                                                           \
     {                                                          \
-      fprintf (FILE, "\t%s\t ", TYPE_ASM_OP);                  \
-      assemble_name (FILE, NAME);                              \
-      putc (',', FILE);                                                \
-      fprintf (FILE, TYPE_OPERAND_FMT, "object");              \
-      putc ('\n', FILE);                                       \
-                                                               \
+      HOST_WIDE_INT size;                                      \
+                                                               \
+      ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object");                \
+                                                               \
       size_directive_output = 0;                               \
-                                                               \
-      if (!flag_inhibit_size_directive && DECL_SIZE (DECL))    \
+      if (!flag_inhibit_size_directive                         \
+         && (DECL) && DECL_SIZE (DECL))                        \
        {                                                       \
          size_directive_output = 1;                            \
-         fprintf (FILE, "\t%s\t ", SIZE_ASM_OP);               \
-         assemble_name (FILE, NAME);                           \
-         putc (',', FILE);                                     \
-         fprintf (FILE, HOST_WIDE_INT_PRINT_DEC,               \
-                  int_size_in_bytes (TREE_TYPE (DECL)));       \
-         fputc ('\n', FILE);                                   \
+         size = int_size_in_bytes (TREE_TYPE (DECL));          \
+         ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, size);         \
        }                                                       \
-                                                               \
+                                                               \
       ASM_OUTPUT_LABEL (FILE, NAME);                           \
     }                                                          \
   while (0)
@@ -603,11 +306,13 @@ dtors_section ()                                          \
    size_directive_output was set
    by ASM_DECLARE_OBJECT_NAME when it was run for the same decl.  */
 
+#undef ASM_FINISH_DECLARE_OBJECT
 #define ASM_FINISH_DECLARE_OBJECT(FILE, DECL, TOP_LEVEL, AT_END)\
   do                                                           \
     {                                                          \
       const char *name = XSTR (XEXP (DECL_RTL (DECL), 0), 0);  \
-                                                               \
+      HOST_WIDE_INT size;                                      \
+                                                               \
       if (!flag_inhibit_size_directive                         \
          && DECL_SIZE (DECL)                                   \
          && ! AT_END && TOP_LEVEL                              \
@@ -615,12 +320,8 @@ dtors_section ()                                           \
          && !size_directive_output)                            \
        {                                                       \
          size_directive_output = 1;                            \
-         fprintf (FILE, "\t%s\t ", SIZE_ASM_OP);               \
-         assemble_name (FILE, name);                           \
-         putc (',', FILE);                                     \
-         fprintf (FILE, HOST_WIDE_INT_PRINT_DEC,               \
-                  int_size_in_bytes (TREE_TYPE (DECL)));       \
-         fputc ('\n', FILE);                                   \
+         size = int_size_in_bytes (TREE_TYPE (DECL));          \
+         ASM_OUTPUT_SIZE_DIRECTIVE (FILE, name, size);         \
        }                                                       \
     }                                                          \
   while (0)
@@ -631,23 +332,7 @@ dtors_section ()                                           \
   do                                                           \
     {                                                          \
       if (!flag_inhibit_size_directive)                                \
-       {                                                       \
-         char label[256];                                      \
-         static int labelno;                                   \
-                                                               \
-         labelno++;                                            \
-                                                               \
-         ASM_GENERATE_INTERNAL_LABEL (label, "Lfe", labelno);  \
-         ASM_OUTPUT_INTERNAL_LABEL (FILE, "Lfe", labelno);     \
-                                                               \
-         fprintf (FILE, "\t%s\t ", SIZE_ASM_OP);               \
-         assemble_name (FILE, (FNAME));                        \
-         fprintf (FILE, ",");                                  \
-         assemble_name (FILE, label);                          \
-         fprintf (FILE, "-");                                  \
-         assemble_name (FILE, (FNAME));                        \
-         putc ('\n', FILE);                                    \
-       }                                                       \
+       ASM_OUTPUT_MEASURED_SIZE (FILE, FNAME);                 \
     }                                                          \
   while (0)
 #endif
@@ -690,14 +375,14 @@ dtors_section ()                                          \
 
 #define STRING_LIMIT   ((unsigned) 256)
 
-#define STRING_ASM_OP  ".string"
+#define STRING_ASM_OP  "\t.string\t"
 
 /* The routine used to output NUL terminated strings.  We use a special
    version of this for most svr4 targets because doing so makes the
    generated assembly code more compact (and thus faster to assemble)
    as well as more readable, especially for targets like the i386
    (where the only alternative is to output character sequences as
-   comma separated lists of numbers).   */
+   comma separated lists of numbers).  */
 
 #define ASM_OUTPUT_LIMITED_STRING(FILE, STR)           \
   do                                                   \
@@ -705,13 +390,13 @@ dtors_section ()                                          \
       register const unsigned char *_limited_str =     \
        (const unsigned char *) (STR);                  \
       register unsigned ch;                            \
-                                                       \
-      fprintf ((FILE), "\t%s\t\"", STRING_ASM_OP);     \
-                                                       \
+                                                       \
+      fprintf ((FILE), "%s\"", STRING_ASM_OP);         \
+                                                       \
       for (; (ch = *_limited_str); _limited_str++)     \
         {                                              \
          register int escape;                          \
-                                                       \
+                                                       \
          switch (escape = ESCAPES[ch])                 \
            {                                           \
            case 0:                                     \
@@ -726,7 +411,7 @@ dtors_section ()                                            \
              break;                                    \
            }                                           \
         }                                              \
-                                                       \
+                                                       \
       fprintf ((FILE), "\"\n");                                \
     }                                                  \
   while (0)
@@ -750,16 +435,16 @@ dtors_section ()                                          \
       for (; _ascii_bytes < limit; _ascii_bytes++)                     \
         {                                                              \
          register const unsigned char *p;                              \
-                                                                       \
+                                                                       \
          if (bytes_in_chunk >= 60)                                     \
            {                                                           \
              fprintf ((FILE), "\"\n");                                 \
              bytes_in_chunk = 0;                                       \
            }                                                           \
-                                                                       \
+                                                                       \
          for (p = _ascii_bytes; p < limit && *p != '\0'; p++)          \
            continue;                                                   \
-                                                                       \
+                                                                       \
          if (p < limit && (p - _ascii_bytes) <= (long)STRING_LIMIT)    \
            {                                                           \
              if (bytes_in_chunk > 0)                                   \
@@ -767,7 +452,7 @@ dtors_section ()                                            \
                  fprintf ((FILE), "\"\n");                             \
                  bytes_in_chunk = 0;                                   \
                }                                                       \
-                                                                       \
+                                                                       \
              ASM_OUTPUT_LIMITED_STRING ((FILE), _ascii_bytes);         \
              _ascii_bytes = p;                                         \
            }                                                           \
@@ -775,10 +460,10 @@ dtors_section ()                                          \
            {                                                           \
              register int escape;                                      \
              register unsigned ch;                                     \
-                                                                       \
+                                                                       \
              if (bytes_in_chunk == 0)                                  \
-               fprintf ((FILE), "\t%s\t\"", ASCII_DATA_ASM_OP);        \
-                                                                       \
+               fprintf ((FILE), "%s\"", ASCII_DATA_ASM_OP);            \
+                                                                       \
              switch (escape = ESCAPES[ch = *_ascii_bytes])             \
                {                                                       \
                case 0:                                                 \
@@ -797,7 +482,7 @@ dtors_section ()                                            \
                }                                                       \
            }                                                           \
        }                                                               \
-                                                                       \
+                                                                       \
       if (bytes_in_chunk > 0)                                          \
         fprintf ((FILE), "\"\n");                                      \
     }                                                                  \