OSDN Git Service

* config/rs6000/darwin.h (SUBTARGET_OPTIONS): Move from here, to...
[pf3gnuchains/gcc-fork.git] / gcc / config / darwin.h
index 4f9b487..0099e0b 100644 (file)
@@ -1,25 +1,28 @@
 /* Target definitions for Darwin (Mac OS X) systems.
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 2000, 2001, 2002, 2003
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
    Contributed by Apple Computer Inc.
 
-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.  */
 
+#ifndef CONFIG_DARWIN_H
+#define CONFIG_DARWIN_H
+
 /* The definitions in this file are common to all processor types
    running Darwin, which is the kernel for Mac OS X.  Darwin is
    basically a BSD user layer laid over a Mach kernel, then evolved
@@ -30,21 +33,13 @@ Boston, MA 02111-1307, USA.  */
 /* Although NeXT ran on many different architectures, as of Jan 2001
    the only supported Darwin targets are PowerPC and x86.  */
 
-/* Technically, STANDARD_EXEC_PREFIX should be /usr/libexec/, but in
-   practice this makes it hard to install new compilers elsewhere, so
-   leave it undefined and expect system builders to set configure args
-   correctly.  */
-
 /* One of Darwin's NeXT legacies is the Mach-O format, which is partly
    like a.out and partly like COFF, with additional features like
    multi-architecture binary support.  */
 
 #define OBJECT_FORMAT_MACHO
 
-/* Suppress g++ attempt to link in the math library automatically.
-   (Some Darwin versions have a libm, but they seem to cause problems
-   for C++ executables.)  */
-
+/* Suppress g++ attempt to link in the math library automatically. */
 #define MATH_LIBRARY ""
 
 /* We have atexit.  */
@@ -99,7 +94,13 @@ Boston, MA 02111-1307, USA.  */
    Note that an option name with a prefix that matches another option
    name, that also takes an argument, needs to be modified so the
    prefix is different, otherwise a '*' after the shorter option will
-   match with the longer one.  */
+   match with the longer one.
+   
+   The SUBTARGET_OPTION_TRANSLATE_TABLE macro, which _must_ be defined
+   in gcc/config/{i386,rs6000}/darwin.h, should contain any additional
+   command-line option translations specific to the particular target
+   architecture.  */
+   
 #define TARGET_OPTION_TRANSLATE_TABLE \
   { "-all_load", "-Zall_load" },  \
   { "-allowable_client", "-Zallowable_client" },  \
@@ -108,6 +109,8 @@ Boston, MA 02111-1307, USA.  */
   { "-bundle", "-Zbundle" },  \
   { "-bundle_loader", "-Zbundle_loader" },  \
   { "-weak_reference_mismatches", "-Zweak_reference_mismatches" },  \
+  { "-dead_strip", "-Zdead_strip" }, \
+  { "-no_dead_strip_inits_and_terms", "-Zno_dead_strip_inits_and_terms" }, \
   { "-dependency-file", "-MF" }, \
   { "-dylib_file", "-Zdylib_file" }, \
   { "-dynamic", "-Zdynamic" },  \
@@ -115,6 +118,7 @@ Boston, MA 02111-1307, USA.  */
   { "-exported_symbols_list", "-Zexported_symbols_list" },  \
   { "-seg_addr_table_filename", "-Zseg_addr_table_filename" }, \
   { "-filelist", "-Xlinker -filelist -Xlinker" },  \
+  { "-framework", "-Xlinker -framework -Xlinker" },  \
   { "-flat_namespace", "-Zflat_namespace" },  \
   { "-force_cpusubtype_ALL", "-Zforce_cpusubtype_ALL" },  \
   { "-force_flat_namespace", "-Zforce_flat_namespace" },  \
@@ -126,7 +130,26 @@ Boston, MA 02111-1307, USA.  */
   { "-multi_module", "-Zmulti_module" },  \
   { "-static", "-static -Wa,-static" },  \
   { "-single_module", "-Zsingle_module" },  \
-  { "-unexported_symbols_list", "-Zunexported_symbols_list" }
+  { "-unexported_symbols_list", "-Zunexported_symbols_list" }, \
+  SUBTARGET_OPTION_TRANSLATE_TABLE
+
+/* Nonzero if the user has chosen to force sizeof(bool) to be 1
+   by providing the -mone-byte-bool switch.  It would be better
+   to use SUBTARGET_SWITCHES for this instead of SUBTARGET_OPTIONS,
+   but there are no more bits in rs6000 TARGET_SWITCHES.  Note
+   that this switch has no "no-" variant. */
+extern const char *darwin_one_byte_bool;
+  
+extern int darwin_fix_and_continue;
+extern const char *darwin_fix_and_continue_switch;
+
+#undef SUBTARGET_OPTIONS
+#define SUBTARGET_OPTIONS \
+  {"one-byte-bool", &darwin_one_byte_bool, N_("Set sizeof(bool) to 1"), 0 }, \
+  {"fix-and-continue", &darwin_fix_and_continue_switch,                        \
+   N_("Generate code suitable for fast turn around debugging"), 0},    \
+  {"no-fix-and-continue", &darwin_fix_and_continue_switch,             \
+   N_("Don't generate code suitable for fast turn around debugging"), 0}
 
 /* These compiler options take n arguments.  */
 
@@ -170,10 +193,13 @@ Boston, MA 02111-1307, USA.  */
    !strcmp (STR, "dylinker_install_name") ? 1 : \
    0)
 
-/* Machine dependent cpp options.  */
+/* Machine dependent cpp options.  __APPLE_CC__ is defined as the
+   Apple include files expect it to be defined and won't work if it
+   isn't.  */
 
 #undef CPP_SPEC
-#define CPP_SPEC "%{static:%{!dynamic:-D__STATIC__}}%{!static:-D__DYNAMIC__}"
+#define CPP_SPEC "%{static:%{!dynamic:-D__STATIC__}}%{!static:-D__DYNAMIC__}\
+    -D__APPLE_CC__=1"
 
 /* This is mostly a clone of the standard LINK_COMMAND_SPEC, plus
    precomp, libtool, and fat build additions.  Also we
@@ -186,14 +212,15 @@ Boston, MA 02111-1307, USA.  */
 #define LINK_COMMAND_SPEC "\
 %{!fdump=*:%{!fsyntax-only:%{!precomp:%{!c:%{!M:%{!MM:%{!E:%{!S:\
     %{!Zdynamiclib:%(linker)}%{Zdynamiclib:/usr/bin/libtool} \
+    %{!Zdynamiclib:-arch %(darwin_arch)} \
+    %{Zdynamiclib:-arch_only %(darwin_arch)} \
     %l %X %{d} %{s} %{t} %{Z} \
     %{!Zdynamiclib:%{A} %{e*} %{m} %{N} %{n} %{r} %{u*} %{x} %{z}} \
     %{@:-o %f%u.out}%{!@:%{o*}%{!o:-o a.out}} \
     %{!Zdynamiclib:%{!A:%{!nostdlib:%{!nostartfiles:%S}}}} \
-    %{L*} %(link_libgcc) %o %{fprofile-arcs:-lgcov} \
+    %{L*} %(link_libgcc) %o %{fprofile-arcs|fprofile-generate:-lgcov} \
     %{!nostdlib:%{!nodefaultlibs:%G %L}} \
-    %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} %{F*} \
-    %{!--help:%{!no-c++filt|c++filt:| c++filt3 }} }}}}}}}}"
+    %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} %{F*} }}}}}}}}"
 
 /* Please keep the random linker options in alphabetical order (modulo
    'Z' and 'no' prefixes).  Options that can only go to one of libtool
@@ -233,6 +260,8 @@ Boston, MA 02111-1307, USA.  */
    %{Zallowable_client*:-allowable_client %*} \
    %{Zbind_at_load:-bind_at_load} \
    %{Zarch_errors_fatal:-arch_errors_fatal} \
+   %{Zdead_strip:-dead_strip} \
+   %{Zno_dead_strip_inits_and_terms:-no_dead_strip_inits_and_terms} \
    %{Zdylib_file*:-dylib_file %*} \
    %{Zdynamic:-dynamic}\
    %{Zexported_symbols_list*:-exported_symbols_list %*} \
@@ -244,7 +273,7 @@ Boston, MA 02111-1307, USA.  */
    %{Zmulti_module:-multi_module} %{Zsingle_module:-single_module} \
    %{Zmultiply_defined*:-multiply_defined %*} \
    %{Zmultiplydefinedunused*:-multiply_defined_unused %*} \
-   %{prebind} %{noprebind} %{prebind_all_twolevel_modules} \
+   %{prebind} %{noprebind} %{nofixprebinding} %{prebind_all_twolevel_modules} \
    %{read_only_relocs} \
    %{sectcreate*} %{sectorder*} %{seg1addr*} %{segprot*} %{seg_addr_table*} \
    %{Zseg_addr_table_filename*:-seg_addr_table_filename %*} \
@@ -263,10 +292,12 @@ Boston, MA 02111-1307, USA.  */
    %{dylinker} %{Mach} "
 
 
-/* Machine dependent libraries.  */
+/* Machine dependent libraries but do not redefine it if we already on 7.0 and
+   above as it needs to link with libmx also.  */
 
-#undef LIB_SPEC
+#ifndef        LIB_SPEC
 #define LIB_SPEC "%{!static:-lSystem}"
+#endif
 
 /* We specify crt0.o as -lcrt0.o so that ld will search the library path.  */
 
@@ -276,11 +307,11 @@ Boston, MA 02111-1307, USA.  */
      %{!Zbundle:%{pg:%{static:-lgcrt0.o} \
                      %{!static:%{object:-lgcrt0.o} \
                                %{!object:%{preload:-lgcrt0.o} \
-                                 %{!preload:-lgcrt1.o -lcrt2.o}}}} \
+                                 %{!preload:-lgcrt1.o crt2.o%s}}}} \
                 %{!pg:%{static:-lcrt0.o} \
                       %{!static:%{object:-lcrt0.o} \
                                 %{!object:%{preload:-lcrt0.o} \
-                                  %{!preload:-lcrt1.o -lcrt2.o}}}}}}"
+                                  %{!preload:-lcrt1.o crt2.o%s}}}}}}"
 
 /* The native Darwin linker doesn't necessarily place files in the order
    that they're specified on the link line.  Thus, it is pointless
@@ -291,6 +322,21 @@ Boston, MA 02111-1307, USA.  */
 
 #define DBX_DEBUGGING_INFO 1
 
+/* Also enable Dwarf 2 as an option.  */
+#define DWARF2_DEBUGGING_INFO
+#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
+
+#define DEBUG_FRAME_SECTION   "__DWARFA,__debug_frame,coalesced,no_toc+strip_static_syms"
+#define DEBUG_INFO_SECTION    "__DWARFA,__debug_info"
+#define DEBUG_ABBREV_SECTION  "__DWARFA,__debug_abbrev"
+#define DEBUG_ARANGES_SECTION "__DWARFA,__debug_aranges"
+#define DEBUG_MACINFO_SECTION "__DWARFA,__debug_macinfo"
+#define DEBUG_LINE_SECTION    "__DWARFA,__debug_line"
+#define DEBUG_LOC_SECTION     "__DWARFA,__debug_loc"
+#define DEBUG_PUBNAMES_SECTION        "__DWARFA,__debug_pubnames"
+#define DEBUG_STR_SECTION     "__DWARFA,__debug_str"
+#define DEBUG_RANGES_SECTION  "__DWARFA,__debug_ranges"
+
 /* When generating stabs debugging, use N_BINCL entries.  */
 
 #define DBX_USE_BINCL
@@ -308,6 +354,46 @@ do { text_section ();                                                      \
              "\t.stabs \"%s\",%d,0,0,Letext\nLetext:\n", "" , N_SO);   \
    } while (0)
 
+/* Making a symbols weak on Darwin requires more than just setting DECL_WEAK. */
+#define MAKE_DECL_ONE_ONLY(DECL) darwin_make_decl_one_only (DECL)
+
+/* Representation of linkonce symbols for the MACH-O assembler. Linkonce
+   symbols must be given a special section *and* must be preceded by a 
+   special assembler directive. */
+#define ASM_MAKE_LABEL_LINKONCE(FILE,  NAME)                            \
+ do { const char* _x = (NAME); if (!!strncmp (_x, "_OBJC_", 6)) {      \
+  fputs (".weak_definition ", FILE); assemble_name (FILE, _x);         \
+  fputs ("\n", FILE); }} while (0)
+
+/* We support hidden visibility */
+#undef TARGET_SUPPORTS_HIDDEN
+#define TARGET_SUPPORTS_HIDDEN 1
+
+/* The Darwin linker imposes two limitations on common symbols: they 
+   can't have hidden visibility, and they can't appear in dylibs.  As
+   a consequence, we should never use common symbols to represent 
+   vague linkage. */
+#undef USE_COMMON_FOR_ONE_ONLY
+#define USE_COMMON_FOR_ONE_ONLY 0
+
+/* The Darwin linker doesn't want coalesced symbols to appear in
+   a static archive's table of contents. */
+#undef TARGET_WEAK_NOT_IN_ARCHIVE_TOC
+#define TARGET_WEAK_NOT_IN_ARCHIVE_TOC 1
+
+/* We make exception information linkonce. */
+#undef TARGET_USES_WEAK_UNWIND_INFO
+#define TARGET_USES_WEAK_UNWIND_INFO 1
+
+/* We need to use a nonlocal label for the start of an EH frame: the
+   Darwin linker requires that a coalesced section start with a label. */
+#undef FRAME_BEGIN_LABEL
+#define FRAME_BEGIN_LABEL "EH_frame"
+
+/* Emit a label for the FDE corresponding to DECL.  EMPTY means 
+   emit a label for an empty FDE. */
+#define TARGET_ASM_EMIT_UNWIND_LABEL darwin_emit_unwind_label
+
 /* Our profiling scheme doesn't LP labels and counter words.  */
 
 #define NO_PROFILE_COUNTERS    1
@@ -349,25 +435,30 @@ do { text_section ();                                                     \
 
 /* The RTTI data (e.g., __ti4name) is common and public (and static),
    but it does need to be referenced via indirect PIC data pointers.
-   The machopic_define_name calls are telling the machopic subsystem
+   The machopic_define_symbol calls are telling the machopic subsystem
    that the name *is* defined in this module, so it doesn't need to
    make them indirect.  */
 
 #undef ASM_DECLARE_OBJECT_NAME
 #define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL)                      \
   do {                                                                 \
-    const char *xname = NAME;                                           \
-    if (GET_CODE (XEXP (DECL_RTL (DECL), 0)) != SYMBOL_REF)             \
-      xname = IDENTIFIER_POINTER (DECL_NAME (DECL));                    \
-    if ((TREE_STATIC (DECL)                                             \
-        && (!DECL_COMMON (DECL) || !TREE_PUBLIC (DECL)))               \
-        || DECL_INITIAL (DECL))                                         \
-      machopic_define_name (xname);                                     \
-    if ((TREE_STATIC (DECL)                                             \
-        && (!DECL_COMMON (DECL) || !TREE_PUBLIC (DECL)))               \
-        || DECL_INITIAL (DECL))                                         \
+    const char *xname = NAME;                                          \
+    if (GET_CODE (XEXP (DECL_RTL (DECL), 0)) != SYMBOL_REF)            \
+      xname = IDENTIFIER_POINTER (DECL_NAME (DECL));                   \
+    if (! DECL_ONE_ONLY (DECL) && ! DECL_WEAK (DECL))                   \
+      if ((TREE_STATIC (DECL)                                          \
+          && (!DECL_COMMON (DECL) || !TREE_PUBLIC (DECL)))             \
+          || DECL_INITIAL (DECL))                                      \
+        machopic_define_symbol (DECL_RTL (DECL));                      \
+    if ((TREE_STATIC (DECL)                                            \
+        && (!DECL_COMMON (DECL) || !TREE_PUBLIC (DECL)))               \
+        || DECL_INITIAL (DECL))                                                \
       (* targetm.encode_section_info) (DECL, DECL_RTL (DECL), false);  \
-    ASM_OUTPUT_LABEL (FILE, xname);                                     \
+    ASM_OUTPUT_LABEL (FILE, xname);                                    \
+    /* Darwin doesn't support zero-size objects, so give them a        \
+       byte.  */                                                       \
+    if (tree_low_cst (DECL_SIZE_UNIT (DECL), 1) == 0)                  \
+      assemble_zeros (1);                                              \
   } while (0)
 
 #define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL)                     \
@@ -375,18 +466,25 @@ do { text_section ();                                                     \
     const char *xname = NAME;                                           \
     if (GET_CODE (XEXP (DECL_RTL (DECL), 0)) != SYMBOL_REF)             \
       xname = IDENTIFIER_POINTER (DECL_NAME (DECL));                    \
-    if ((TREE_STATIC (DECL)                                             \
-        && (!DECL_COMMON (DECL) || !TREE_PUBLIC (DECL)))               \
-        || DECL_INITIAL (DECL))                                         \
-      machopic_define_name (xname);                                     \
+    if (! DECL_ONE_ONLY (DECL) && ! DECL_WEAK (DECL))                  \
+      if ((TREE_STATIC (DECL)                                           \
+          && (!DECL_COMMON (DECL) || !TREE_PUBLIC (DECL)))             \
+          || DECL_INITIAL (DECL))                                       \
+        machopic_define_symbol (DECL_RTL (DECL));                       \
     if ((TREE_STATIC (DECL)                                             \
         && (!DECL_COMMON (DECL) || !TREE_PUBLIC (DECL)))               \
         || DECL_INITIAL (DECL))                                         \
       (* targetm.encode_section_info) (DECL, DECL_RTL (DECL), false);  \
     ASM_OUTPUT_LABEL (FILE, xname);                                     \
-    /* Avoid generating stubs for functions we've just defined by      \
-       outputting any required stub name label now.  */                        \
-    machopic_output_possible_stub_label (FILE, xname);                 \
+  } while (0)
+
+#define ASM_DECLARE_CONSTANT_NAME(FILE, NAME, EXP, SIZE)       \
+  do {                                                         \
+    ASM_OUTPUT_LABEL (FILE, NAME);                             \
+    /* Darwin doesn't support zero-size objects, so give them a        \
+       byte.  */                                               \
+    if ((SIZE) == 0)                                           \
+      assemble_zeros (1);                                      \
   } while (0)
 
 /* Wrap new method names in quotes so the assembler doesn't gag.
@@ -395,18 +493,18 @@ do { text_section ();                                                     \
 #undef ASM_OUTPUT_LABELREF
 #define ASM_OUTPUT_LABELREF(FILE,NAME)                                      \
   do {                                                                      \
-       const char *xname = darwin_strip_name_encoding (NAME);               \
+       const char *xname = (NAME);                                          \
        if (! strcmp (xname, "<pic base>"))                                  \
          machopic_output_function_base_name(FILE);                           \
        else if (xname[0] == '&' || xname[0] == '*')                         \
          {                                                                  \
            int len = strlen (xname);                                        \
           if (len > 6 && !strcmp ("$stub", xname + len - 5))                \
-            machopic_validate_stub_or_non_lazy_ptr (xname, 1);              \
+            machopic_validate_stub_or_non_lazy_ptr (xname);                 \
           else if (len > 7 && !strcmp ("$stub\"", xname + len - 6))         \
-            machopic_validate_stub_or_non_lazy_ptr (xname, 1);              \
+            machopic_validate_stub_or_non_lazy_ptr (xname);                 \
           else if (len > 14 && !strcmp ("$non_lazy_ptr", xname + len - 13)) \
-            machopic_validate_stub_or_non_lazy_ptr (xname, 0);              \
+            machopic_validate_stub_or_non_lazy_ptr (xname);                 \
           fputs (&xname[1], FILE);                                          \
         }                                                                   \
        else if (xname[0] == '+' || xname[0] == '-')                         \
@@ -416,7 +514,7 @@ do { text_section ();                                                       \
        else if (!strncmp (xname, ".objc_class_name_", 17))                  \
         fprintf (FILE, "%s", xname);                                        \
        else                                                                 \
-         fprintf (FILE, "_%s", xname);                                      \
+         asm_fprintf (FILE, "%U%s", xname);                                 \
   } while (0)
 
 /* Output before executable code.  */
@@ -438,7 +536,7 @@ do { text_section ();                                                       \
 
 /* Ensure correct alignment of bss data.  */
 
-#undef ASM_OUTPUT_ALIGNED_DECL_LOCAL
+#undef ASM_OUTPUT_ALIGNED_DECL_LOCAL                                   
 #define ASM_OUTPUT_ALIGNED_DECL_LOCAL(FILE, DECL, NAME, SIZE, ALIGN)   \
   do {                                                                 \
     fputs (".lcomm ", (FILE));                                         \
@@ -448,11 +546,10 @@ do { text_section ();                                                     \
     if ((DECL) && ((TREE_STATIC (DECL)                                 \
         && (!DECL_COMMON (DECL) || !TREE_PUBLIC (DECL)))               \
         || DECL_INITIAL (DECL)))                                       \
-      (* targetm.encode_section_info) (DECL, DECL_RTL (DECL), false);  \
-    if ((DECL) && ((TREE_STATIC (DECL)                                 \
-        && (!DECL_COMMON (DECL) || !TREE_PUBLIC (DECL)))               \
-        || DECL_INITIAL (DECL)))                                       \
-      machopic_define_name (NAME);                                     \
+      {                                                                        \
+       (* targetm.encode_section_info) (DECL, DECL_RTL (DECL), false); \
+       machopic_define_symbol (DECL_RTL (DECL));                       \
+      }                                                                        \
   } while (0)
 
 /* The maximum alignment which the object file format can support.
@@ -465,9 +562,9 @@ do { text_section ();                                                       \
 
 #undef SECTION_FUNCTION
 #define SECTION_FUNCTION(FUNCTION, SECTION, DIRECTIVE, OBJC)           \
-extern void FUNCTION PARAMS ((void));                                  \
+extern void FUNCTION (void);                                           \
 void                                                                   \
-FUNCTION ()                                                            \
+FUNCTION (void)                                                                \
 {                                                                      \
   if (in_section != SECTION)                                           \
     {                                                                  \
@@ -495,8 +592,9 @@ FUNCTION ()                                                         \
   in_objc_symbols, in_objc_module_info,                        \
   in_objc_protocol, in_objc_string_object,             \
   in_objc_constant_string_object,                      \
+  in_objc_image_info,                                  \
   in_objc_class_names, in_objc_meth_var_names,         \
-  in_objc_meth_var_types, in_objc_cls_refs,            \
+  in_objc_meth_var_types, in_objc_cls_refs,            \
   in_machopic_nl_symbol_ptr,                           \
   in_machopic_lazy_symbol_ptr,                         \
   in_machopic_symbol_stub,                             \
@@ -508,7 +606,7 @@ FUNCTION ()                                                         \
 
 #undef EXTRA_SECTION_FUNCTIONS
 #define EXTRA_SECTION_FUNCTIONS                        \
-static void objc_section_init PARAMS ((void)); \
+static void objc_section_init (void);          \
 SECTION_FUNCTION (const_section,               \
                   in_const,                    \
                   ".const", 0)                 \
@@ -568,7 +666,7 @@ SECTION_FUNCTION (objc_selector_refs_section,       \
                  ".objc_message_refs", 1)      \
 SECTION_FUNCTION (objc_selector_fixup_section, \
                  in_objc_selector_fixup,       \
-                 ".section __OBJC, __sel_fixup", 1)    \
+                 ".section __OBJC, __sel_fixup, regular, no_dead_strip", 1)    \
 SECTION_FUNCTION (objc_symbols_section,                \
                  in_objc_symbols,              \
                  ".objc_symbols", 1)   \
@@ -583,7 +681,11 @@ SECTION_FUNCTION (objc_string_object_section,      \
                  ".objc_string_object", 1)     \
 SECTION_FUNCTION (objc_constant_string_object_section, \
                  in_objc_constant_string_object,       \
-                 ".section __OBJC, __cstring_object", 1)       \
+                 ".section __OBJC, __cstring_object, regular, no_dead_strip", 1)       \
+/* Fix-and-Continue image marker.  */          \
+SECTION_FUNCTION (objc_image_info_section,     \
+                  in_objc_image_info,          \
+                  ".section __OBJC, __image_info, regular, no_dead_strip", 1)  \
 SECTION_FUNCTION (objc_class_names_section,    \
                in_objc_class_names,            \
                ".objc_class_names", 1) \
@@ -599,19 +701,19 @@ SECTION_FUNCTION (objc_cls_refs_section,  \
                                                \
 SECTION_FUNCTION (machopic_lazy_symbol_ptr_section,    \
                in_machopic_lazy_symbol_ptr,            \
-               ".lazy_symbol_pointer", 0)              \
+               ".lazy_symbol_pointer", 0)      \
 SECTION_FUNCTION (machopic_nl_symbol_ptr_section,      \
                in_machopic_nl_symbol_ptr,              \
-               ".non_lazy_symbol_pointer", 0)          \
+               ".non_lazy_symbol_pointer", 0)  \
 SECTION_FUNCTION (machopic_symbol_stub_section,                \
                in_machopic_symbol_stub,                \
-               ".symbol_stub", 0)                      \
+               ".symbol_stub", 0)              \
 SECTION_FUNCTION (machopic_symbol_stub1_section,       \
                in_machopic_symbol_stub1,               \
                ".section __TEXT,__symbol_stub1,symbol_stubs,pure_instructions,16", 0)\
 SECTION_FUNCTION (machopic_picsymbol_stub_section,     \
                in_machopic_picsymbol_stub,             \
-               ".picsymbol_stub", 0)                   \
+               ".picsymbol_stub", 0)           \
 SECTION_FUNCTION (machopic_picsymbol_stub1_section,    \
                in_machopic_picsymbol_stub1,            \
                ".section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32", 0)\
@@ -620,10 +722,10 @@ SECTION_FUNCTION (darwin_exception_section,               \
                ".section __DATA,__gcc_except_tab", 0)  \
 SECTION_FUNCTION (darwin_eh_frame_section,             \
                in_darwin_eh_frame,                     \
-               ".section __TEXT,__eh_frame", 0)        \
+               ".section " EH_FRAME_SECTION_NAME ",__eh_frame" EH_FRAME_SECTION_ATTR, 0)  \
                                                        \
 static void                                    \
-objc_section_init ()                           \
+objc_section_init (void)                       \
 {                                              \
   static int been_here = 0;                    \
                                                \
@@ -640,7 +742,7 @@ objc_section_init ()                                \
       objc_cls_refs_section ();                        \
       objc_class_section ();                   \
       objc_meta_class_section ();              \
-          /* shared, hot -> cold */                    \
+          /* shared, hot -> cold */            \
       objc_cls_meth_section ();                        \
       objc_inst_meth_section ();               \
       objc_protocol_section ();                        \
@@ -661,9 +763,14 @@ objc_section_init ()                               \
 #define TARGET_ASM_SELECT_SECTION machopic_select_section
 #undef TARGET_ASM_SELECT_RTX_SECTION
 #define TARGET_ASM_SELECT_RTX_SECTION machopic_select_rtx_section
+#undef  TARGET_ASM_UNIQUE_SECTION
+#define TARGET_ASM_UNIQUE_SECTION darwin_unique_section
+#undef  TARGET_ASM_FUNCTION_RODATA_SECTION
+#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+
 
 #define ASM_DECLARE_UNRESOLVED_REFERENCE(FILE,NAME)                    \
-    do {                                                               \
+    do {                                                               \
         if (FILE) {                                                    \
           if (MACHOPIC_INDIRECT)                                       \
             fprintf (FILE, "\t.lazy_reference ");                      \
@@ -678,7 +785,7 @@ objc_section_init ()                                \
     do {                                                               \
         if (FILE) {                                                    \
           fprintf (FILE, "\t");                                        \
-          assemble_name (FILE, NAME);                                  \
+          assemble_name (FILE, NAME);                                  \
           fprintf (FILE, "=0\n");                                      \
           (*targetm.asm_out.globalize_label) (FILE, NAME);             \
         }                                                              \
@@ -688,10 +795,20 @@ objc_section_init ()                              \
 #define GLOBAL_ASM_OP ".globl "
 #define TARGET_ASM_GLOBALIZE_LABEL darwin_globalize_label
 
+/* Emit an assembler directive to set visibility for a symbol.  Used
+   to support visibility attribute and Darwin's private extern
+   feature.  */
+#undef TARGET_ASM_ASSEMBLE_VISIBILITY
+#define TARGET_ASM_ASSEMBLE_VISIBILITY darwin_assemble_visibility
+
+
 #undef ASM_GENERATE_INTERNAL_LABEL
 #define ASM_GENERATE_INTERNAL_LABEL(LABEL,PREFIX,NUM)  \
   sprintf (LABEL, "*%s%ld", PREFIX, (long)(NUM))
 
+#undef TARGET_ASM_MARK_DECL_PRESERVED
+#define TARGET_ASM_MARK_DECL_PRESERVED darwin_mark_decl_preserved
+
 /* Since we have a separate readonly data section, define this so that
    jump tables end up in text rather than data.  */
 
@@ -699,6 +816,20 @@ objc_section_init ()                               \
 #define JUMP_TABLES_IN_TEXT_SECTION 1
 #endif
 
+/* Set on a symbol with SYMBOL_FLAG_FUNCTION or
+   MACHO_SYMBOL_FLAG_VARIABLE to indicate that the function or
+   variable has been defined in this translation unit.  */
+
+#define MACHO_SYMBOL_FLAG_VARIABLE (SYMBOL_FLAG_MACH_DEP)
+#define MACHO_SYMBOL_FLAG_DEFINED ((SYMBOL_FLAG_MACH_DEP) << 1)
+
+/* Set on a symbol to indicate when fix-and-continue style code
+   generation is being used and the symbol refers to a static symbol
+   that should be rebound from new instances of a translation unit to
+   the original instance of the data.  */
+
+#define MACHO_SYMBOL_STATIC ((SYMBOL_FLAG_MACH_DEP) << 2)
+
 /* Symbolic names for various things we might know about a symbol.  */
 
 enum machopic_addr_class {
@@ -719,7 +850,7 @@ enum machopic_addr_class {
 #undef TARGET_ENCODE_SECTION_INFO
 #define TARGET_ENCODE_SECTION_INFO  darwin_encode_section_info
 #undef TARGET_STRIP_NAME_ENCODING
-#define TARGET_STRIP_NAME_ENCODING  darwin_strip_name_encoding
+#define TARGET_STRIP_NAME_ENCODING  default_strip_name_encoding
 
 #define GEN_BINDER_NAME_FOR_STUB(BUF,STUB,STUB_LENGTH)         \
   do {                                                         \
@@ -755,7 +886,7 @@ enum machopic_addr_class {
 
 #define GEN_LAZY_PTR_NAME_FOR_SYMBOL(BUF,SYMBOL,SYMBOL_LENGTH) \
   do {                                                         \
-    const char *symbol_ = darwin_strip_name_encoding (SYMBOL); \
+    const char *symbol_ = (SYMBOL);                             \
     char *buffer_ = (BUF);                                     \
     if (symbol_[0] == '"')                                     \
       {                                                                \
@@ -780,7 +911,10 @@ enum machopic_addr_class {
 #define TARGET_ASM_EXCEPTION_SECTION darwin_exception_section
 
 #define TARGET_ASM_EH_FRAME_SECTION darwin_eh_frame_section
-  
+
+#define EH_FRAME_SECTION_NAME   "__TEXT"
+#define EH_FRAME_SECTION_ATTR ",coalesced,no_toc+strip_static_syms+live_support"
+
 #undef ASM_PREFERRED_EH_DATA_FORMAT
 #define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL)  \
   (((CODE) == 2 && (GLOBAL) == 1) \
@@ -790,8 +924,20 @@ enum machopic_addr_class {
 #define ASM_OUTPUT_DWARF_DELTA(FILE,SIZE,LABEL1,LABEL2)  \
   darwin_asm_output_dwarf_delta (FILE, SIZE, LABEL1, LABEL2)
 
+#define ASM_MAYBE_OUTPUT_ENCODED_ADDR_RTX(ASM_OUT_FILE, ENCODING, SIZE, ADDR, DONE)    \
+      if (ENCODING == ASM_PREFERRED_EH_DATA_FORMAT (2, 1)) {                           \
+       darwin_non_lazy_pcrel (ASM_OUT_FILE, ADDR);                                     \
+       goto DONE;                                                                      \
+      }
+
+
 #define TARGET_TERMINATE_DW2_EH_FRAME_INFO false
 
+#undef TARGET_ASM_NAMED_SECTION
+#define TARGET_ASM_NAMED_SECTION darwin_asm_named_section
+#undef TARGET_SECTION_TYPE_FLAGS
+#define TARGET_SECTION_TYPE_FLAGS darwin_section_type_flags
+
 #define DARWIN_REGISTER_TARGET_PRAGMAS()                       \
   do {                                                         \
     c_register_pragma (0, "mark", darwin_pragma_ignore);       \
@@ -804,3 +950,20 @@ enum machopic_addr_class {
 #define ASM_APP_ON ""
 #undef ASM_APP_OFF
 #define ASM_APP_OFF ""
+
+void darwin_register_frameworks (int);
+#define TARGET_EXTRA_INCLUDES darwin_register_frameworks
+
+void add_framework_path (char *);
+#define TARGET_OPTF add_framework_path
+
+#define TARGET_HAS_F_SETLKW
+
+/* Darwin before 7.0 does not have C99 functions.   */
+#ifndef TARGET_C99_FUNCTIONS
+#define TARGET_C99_FUNCTIONS 0
+#endif
+
+#define WINT_TYPE "int"
+
+#endif /* CONFIG_DARWIN_H */