objc-act.c: Remove all code ifdefed with the never-used macro OBJC_INT_SELECTORS.

        * objc/objc-act.c: Remove all code ifdefed with the never-used
        macro OBJC_INT_SELECTORS.
        * config/d30v/d30v.h: Remove commented-out ref to OBJC_INT_SELECTORS.
        * tm.texi: Remove doc for OBJC_INT_SELECTORS.

From-SVN: r41317

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0c29c3039d6899b3ee591d90d4ab531aa170be8a..f079d10abdae82eea7e9c097c0abf5a975f987b5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-12  Stan Shebs  <shebs@apple.com>
+
+       * objc/objc-act.c: Remove all code ifdefed with the never-used
+       macro OBJC_INT_SELECTORS.
+       * config/d30v/d30v.h: Remove commented-out ref to OBJC_INT_SELECTORS.
+       * tm.texi: Remove doc for OBJC_INT_SELECTORS.
+
 Thu Apr 12 18:13:37 2001  Rodney Brown  <RodneyBrown@mynd.com>
 
        * config/pa/quadlib.c: Add prototypes.

diff --git a/gcc/config/d30v/d30v.h b/gcc/config/d30v/d30v.h
index 890639a0376ab784961c76cee7db23aaf2f1be65..1d150cfefb49ef1136f4ce29fbbfae75f7a62ef5 100644 (file)
--- a/gcc/config/d30v/d30v.h
+++ b/gcc/config/d30v/d30v.h
@@ -1013,12 +1013,6 @@ do {                                                                     \
    at run-time.  This is used in `cpp'.  */
 /* #define MAX_WCHAR_TYPE_SIZE */
 
-/* Define this macro if the type of Objective C selectors should be `int'.
-
-   If this macro is not defined, then selectors should have the type `struct
-   objc_selector *'.  */
-/* #define OBJC_INT_SELECTORS */
-
 /* Define this macro if the compiler can group all the selectors together into
    a vector and use just one label at the beginning of the vector.  Otherwise,
    the compiler must give each selector its own assembler label.

diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 51f940eb2a1bcf58ee41c226023a5c95f21d4e42..75789bf3e5f9e3065387b674fcae75a6b0559d97 100644 (file)
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -37,7 +37,7 @@ Boston, MA 02111-1307, USA.  */
 
    code generation `options':
 
-   - OBJC_INT_SELECTORS  */
+   */
 
 #include "config.h"
 #include "system.h"
@@ -1276,15 +1276,10 @@ synth_module_prologue ()
 
   /* Declare type of selector-objects that represent an operation name.  */
 
-#ifdef OBJC_INT_SELECTORS
-  /* `unsigned int' */
-  selector_type = unsigned_type_node;
-#else
   /* `struct objc_selector *' */
   selector_type
     = build_pointer_type (xref_tag (RECORD_TYPE,
                                    get_identifier (TAG_SELECTOR)));
-#endif /* not OBJC_INT_SELECTORS */
 
   /* Forward declare type, or else the prototype for msgSendSuper will
      complain.  */
@@ -2807,18 +2802,10 @@ build_method_prototype_template ()
   proto_record
     = start_struct (RECORD_TYPE, get_identifier (UTAG_METHOD_PROTOTYPE));
 
-#ifdef OBJC_INT_SELECTORS
-  /* unsigned int _cmd; */
-  decl_specs
-    = tree_cons (NULL_TREE, ridpointers[(int) RID_UNSIGNED], NULL_TREE);
-  decl_specs = tree_cons (NULL_TREE, ridpointers[(int) RID_INT], decl_specs);
-  field_decl = get_identifier ("_cmd");
-#else /* OBJC_INT_SELECTORS */
   /* struct objc_selector *_cmd; */
   decl_specs = tree_cons (NULL_TREE, xref_tag (RECORD_TYPE,
                          get_identifier (TAG_SELECTOR)), NULL_TREE);
   field_decl = build1 (INDIRECT_REF, NULL_TREE, get_identifier ("_cmd"));
-#endif /* OBJC_INT_SELECTORS */
 
   field_decl
     = grokfield (input_filename, lineno, field_decl, decl_specs, NULL_TREE);
@@ -4047,20 +4034,12 @@ build_method_template ()
 
   _SLT_record = start_struct (RECORD_TYPE, get_identifier (UTAG_METHOD));
 
-#ifdef OBJC_INT_SELECTORS
-  /* unsigned int _cmd; */
-  decl_specs = tree_cons (NULL_TREE, ridpointers[(int) RID_UNSIGNED],
-                         NULL_TREE);
-  decl_specs = tree_cons (NULL_TREE, ridpointers[(int) RID_INT], decl_specs);
-  field_decl = get_identifier ("_cmd");
-#else /* not OBJC_INT_SELECTORS */
   /* struct objc_selector *_cmd; */
   decl_specs = tree_cons (NULL_TREE,
                          xref_tag (RECORD_TYPE,
                                    get_identifier (TAG_SELECTOR)),
                          NULL_TREE);
   field_decl = build1 (INDIRECT_REF, NULL_TREE, get_identifier ("_cmd"));
-#endif /* not OBJC_INT_SELECTORS */
 
   field_decl = grokfield (input_filename, lineno, field_decl,
                          decl_specs, NULL_TREE);
@@ -6559,13 +6538,11 @@ encode_pointer (type, curtype, format)
              obstack_1grow (&util_obstack, '#');
              return;
            }
-#ifndef OBJC_INT_SELECTORS
          else if (strcmp (name, TAG_SELECTOR) == 0) /* ':' */
            {
              obstack_1grow (&util_obstack, ':');
              return;
            }
-#endif /* OBJC_INT_SELECTORS */
        }
     }
   else if (TREE_CODE (pointer_to) == INTEGER_TYPE
@@ -6981,12 +6958,6 @@ start_method_def (method)
                                    build1 (INDIRECT_REF, NULL_TREE, self_id)),
                   build_tree_list (unused_list, NULL_TREE)));
 
-#ifdef OBJC_INT_SELECTORS
-  decl_specs = build_tree_list (NULL_TREE, ridpointers[(int) RID_UNSIGNED]);
-  decl_specs = tree_cons (NULL_TREE, ridpointers[(int) RID_INT], decl_specs);
-  push_parm_decl (build_tree_list (build_tree_list (decl_specs, ucmd_id),
-                                  build_tree_list (unused_list, NULL_TREE)));
-#else /* not OBJC_INT_SELECTORS */
   decl_specs = build_tree_list (NULL_TREE,
                                xref_tag (RECORD_TYPE,
                                          get_identifier (TAG_SELECTOR)));
@@ -6994,7 +6965,6 @@ start_method_def (method)
                  (build_tree_list (decl_specs,
                                    build1 (INDIRECT_REF, NULL_TREE, ucmd_id)),
                   build_tree_list (unused_list, NULL_TREE)));
-#endif /* not OBJC_INT_SELECTORS */
 
   /* Generate argument declarations if a keyword_decl.  */
   if (METHOD_SEL_ARGS (method))

diff --git a/gcc/tm.texi b/gcc/tm.texi
index 1956979f1bde80830c10df98cd62da0c73a19b5e..51dd01ec53d2c6ccb99739474836c7b8408b5f5c 100644 (file)
--- a/gcc/tm.texi
+++ b/gcc/tm.texi
@@ -1435,14 +1435,6 @@ If you don't define this macro, the default is the first of
 unsigned int"} that has as much precision as @code{long long unsigned
 int}.
 
-@findex OBJC_INT_SELECTORS
-@item OBJC_INT_SELECTORS
-Define this macro if the type of Objective C selectors should be
-@code{int}.
-
-If this macro is not defined, then selectors should have the type
-@code{struct objc_selector *}.
-
 @findex OBJC_SELECTORS_WITHOUT_LABELS
 @item OBJC_SELECTORS_WITHOUT_LABELS
 Define this macro if the compiler can group all the selectors together