diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 437e4faf78bc6e9f962c62e09d4f9c488255f6d1..ef408b6f8dd6315f81adae217d3e1de7a13c1c80 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-03 Stan Shebs <shebs@apple.com>
+
+ * darwin.h (SECTION_FUNCTION): Remove WAS_TEXT argument, remove
+ case for flag_no_mach_text_sections.
+ (EXTRA_SECTION_FUNCTIONS): Remove arg from uses of SECTION_FUNCTION.
+ * darwin.c (flag_no_mach_text_sections): Remove.
+ * darwin-protos.h (darwin_init_pragma): Remove decl.
+
Tue Jul 3 15:35:52 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
* explow.c (plus_constant_wide, case PLUS): Call find_constant_term
diff --git a/gcc/config/darwin-protos.h b/gcc/config/darwin-protos.h
index 9b91a193bea8626d0b684ffbc7f80e7f33549f3a..6eb5bfd02d9c6ddee0196fc2cd17a7012c4f5341 100644
--- a/gcc/config/darwin-protos.h
+++ b/gcc/config/darwin-protos.h
@@ -58,7 +58,6 @@ extern void darwin_encode_section_info PARAMS ((tree));
extern void machopic_finish PARAMS ((FILE *));
#ifdef GCC_C_PRAGMA_H
-extern void darwin_init_pragma PARAMS ((int (*) (tree *)));
extern void darwin_pragma_ignore PARAMS ((cpp_reader *));
extern void darwin_pragma_options PARAMS ((cpp_reader *));
extern void darwin_pragma_unused PARAMS ((cpp_reader *));
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 816cd4bbb4f6cc92ba53349c0ec7fbfff86d8d17..a3c382cee69439f2cb363cf7148ffeab23230df0 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -46,10 +46,6 @@ static int machopic_data_defined_p PARAMS ((const char *));
static int func_name_maybe_scoped PARAMS ((const char *));
static void update_non_lazy_ptrs PARAMS ((const char *));
-/* Make everything that used to go in the text section really go there. */
-
-int flag_no_mach_text_sections = 0;
-
int
name_needs_quotes (name)
const char *name;
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index aa628c63965958868c9654538e31a2df82b880d0..5cebd58b7e7801160513e6d8b2b7954908531665 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -308,17 +308,13 @@ do { text_section (); \
/* Create new Mach-O sections. */
#undef SECTION_FUNCTION
-#define SECTION_FUNCTION(FUNCTION, SECTION, DIRECTIVE, WAS_TEXT, OBJC) \
+#define SECTION_FUNCTION(FUNCTION, SECTION, DIRECTIVE, OBJC) \
void \
FUNCTION () \
{ \
- extern void text_section (); \
extern void objc_section_init (); \
- extern int flag_no_mach_text_sections; \
\
- if (WAS_TEXT && flag_no_mach_text_sections) \
- text_section (); \
- else if (in_section != SECTION) \
+ if (in_section != SECTION) \
{ \
if (OBJC) \
objc_section_init (); \
@@ -361,104 +357,104 @@ do { if (!strcmp (alias_name, name)) \
#define EXTRA_SECTION_FUNCTIONS \
SECTION_FUNCTION (const_section, \
in_const, \
- ".const", 1, 0) \
+ ".const", 0) \
SECTION_FUNCTION (const_data_section, \
in_const_data, \
- ".const_data", 1, 0) \
+ ".const_data", 0) \
SECTION_FUNCTION (cstring_section, \
in_cstring, \
- ".cstring", 1, 0) \
+ ".cstring", 0) \
SECTION_FUNCTION (literal4_section, \
in_literal4, \
- ".literal4", 1, 0) \
+ ".literal4", 0) \
SECTION_FUNCTION (literal8_section, \
in_literal8, \
- ".literal8", 1, 0) \
+ ".literal8", 0) \
SECTION_FUNCTION (constructor_section, \
in_constructor, \
- ".constructor", 0, 0) \
+ ".constructor", 0) \
SECTION_FUNCTION (mod_init_section, \
in_mod_init, \
- ".mod_init_func", 0, 0) \
+ ".mod_init_func", 0) \
SECTION_FUNCTION (mod_term_section, \
in_mod_term, \
- ".mod_term_func", 0, 0) \
+ ".mod_term_func", 0) \
SECTION_FUNCTION (destructor_section, \
in_destructor, \
- ".destructor", 0, 0) \
+ ".destructor", 0) \
SECTION_FUNCTION (objc_class_section, \
in_objc_class, \
- ".objc_class", 0, 1) \
+ ".objc_class", 1) \
SECTION_FUNCTION (objc_meta_class_section, \
in_objc_meta_class, \
- ".objc_meta_class", 0, 1) \
+ ".objc_meta_class", 1) \
SECTION_FUNCTION (objc_category_section, \
in_objc_category, \
- ".objc_category", 0, 1) \
+ ".objc_category", 1) \
SECTION_FUNCTION (objc_class_vars_section, \
in_objc_class_vars, \
- ".objc_class_vars", 0, 1) \
+ ".objc_class_vars", 1) \
SECTION_FUNCTION (objc_instance_vars_section, \
in_objc_instance_vars, \
- ".objc_instance_vars", 0, 1) \
+ ".objc_instance_vars", 1) \
SECTION_FUNCTION (objc_cls_meth_section, \
in_objc_cls_meth, \
- ".objc_cls_meth", 0, 1) \
+ ".objc_cls_meth", 1) \
SECTION_FUNCTION (objc_inst_meth_section, \
in_objc_inst_meth, \
- ".objc_inst_meth", 0, 1) \
+ ".objc_inst_meth", 1) \
SECTION_FUNCTION (objc_cat_cls_meth_section, \
in_objc_cat_cls_meth, \
- ".objc_cat_cls_meth", 0, 1) \
+ ".objc_cat_cls_meth", 1) \
SECTION_FUNCTION (objc_cat_inst_meth_section, \
in_objc_cat_inst_meth, \
- ".objc_cat_inst_meth", 0, 1) \
+ ".objc_cat_inst_meth", 1) \
SECTION_FUNCTION (objc_selector_refs_section, \
in_objc_selector_refs, \
- ".objc_message_refs", 0, 1) \
+ ".objc_message_refs", 1) \
SECTION_FUNCTION (objc_selector_fixup_section, \
in_objc_selector_fixup, \
- ".section __OBJC, __sel_fixup", 0, 1) \
+ ".section __OBJC, __sel_fixup", 1) \
SECTION_FUNCTION (objc_symbols_section, \
in_objc_symbols, \
- ".objc_symbols", 0, 1) \
+ ".objc_symbols", 1) \
SECTION_FUNCTION (objc_module_info_section, \
in_objc_module_info, \
- ".objc_module_info", 0, 1) \
+ ".objc_module_info", 1) \
SECTION_FUNCTION (objc_protocol_section, \
in_objc_protocol, \
- ".objc_protocol", 0, 1) \
+ ".objc_protocol", 1) \
SECTION_FUNCTION (objc_string_object_section, \
in_objc_string_object, \
- ".objc_string_object", 0, 1) \
+ ".objc_string_object", 1) \
SECTION_FUNCTION (objc_constant_string_object_section, \
in_objc_constant_string_object, \
- ".section __OBJC, __cstring_object", 0, 1) \
+ ".section __OBJC, __cstring_object", 1) \
SECTION_FUNCTION (objc_class_names_section, \
in_objc_class_names, \
- ".objc_class_names", 0, 1) \
+ ".objc_class_names", 1) \
SECTION_FUNCTION (objc_meth_var_names_section, \
in_objc_meth_var_names, \
- ".objc_meth_var_names", 0, 1) \
+ ".objc_meth_var_names", 1) \
SECTION_FUNCTION (objc_meth_var_types_section, \
in_objc_meth_var_types, \
- ".objc_meth_var_types", 0, 1) \
+ ".objc_meth_var_types", 1) \
SECTION_FUNCTION (objc_cls_refs_section, \
in_objc_cls_refs, \
- ".objc_cls_refs", 0, 1) \
+ ".objc_cls_refs", 1) \
\
SECTION_FUNCTION (machopic_lazy_symbol_ptr_section, \
in_machopic_lazy_symbol_ptr, \
- ".lazy_symbol_pointer", 0, 0) \
+ ".lazy_symbol_pointer", 0) \
SECTION_FUNCTION (machopic_nl_symbol_ptr_section, \
in_machopic_nl_symbol_ptr, \
- ".non_lazy_symbol_pointer", 0, 0) \
+ ".non_lazy_symbol_pointer", 0) \
SECTION_FUNCTION (machopic_symbol_stub_section, \
in_machopic_symbol_stub, \
- ".symbol_stub", 0, 0) \
+ ".symbol_stub", 0) \
SECTION_FUNCTION (machopic_picsymbol_stub_section, \
in_machopic_picsymbol_stub, \
- ".picsymbol_stub", 0, 0) \
+ ".picsymbol_stub", 0) \
\
void \
objc_section_init () \