Reverted usage of TARGET_64BIT for code generation for GNU Objective-C runtime

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170343 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 19 deletions

diff --git a/gcc/objc/objc-gnu-runtime-abi-01.c b/gcc/objc/objc-gnu-runtime-abi-01.c
index e2a3ce7b339..7fb87611d69 100644
--- a/gcc/objc/objc-gnu-runtime-abi-01.c
+++ b/gcc/objc/objc-gnu-runtime-abi-01.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
 #include "tree.h"
 
 #ifdef OBJCPLUS
@@ -83,11 +82,6 @@ along with GCC; see the file COPYING3.  If not see
   if (VERS)								\
     DECL_ATTRIBUTES (DECL) = build_tree_list ((VERS), (KIND));
 
-/* FIXME: Remove this macro, not needed.  */
-#ifndef TARGET_64BIT
-#define TARGET_64BIT 0
-#endif
-
 static void gnu_runtime_01_initialize (void);
 
 static void build_selector_template (void);
@@ -1995,9 +1989,7 @@ build_objc_symtab_template (void)
   /* short cat_def_cnt; */
   add_field_decl (short_integer_type_node, "cat_def_cnt", &chain);
 
-  /* FIXME: Remove.  */
-  if (TARGET_64BIT)
-    add_field_decl (integer_type_node, "_explicit_padder", &chain);
+  /* Note that padding will be added here on LP64.  */
 
   /* void *defs[imp_count + cat_count (+ 1)]; */
   /* NB: The index is one less than the size of the array.  */
@@ -2043,19 +2035,9 @@ init_objc_symtab (tree type)
   CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, 
 			  build_int_cst (short_integer_type_node, cat_count));
 
-  /* FIXME: Remove.  */
-  if (TARGET_64BIT)
-    CONSTRUCTOR_APPEND_ELT (v, NULL_TREE,
-			  build_int_cst (integer_type_node, 0));
-
   /* cls_def = { ..., { &Foo, &Bar, ...}, ... } */
 
   field = TYPE_FIELDS (type);
-
-  /* FIXME: Remove.  */
-  if (TARGET_64BIT)
-    field = DECL_CHAIN (field);
-
   field = DECL_CHAIN (DECL_CHAIN (DECL_CHAIN (DECL_CHAIN (field))));
 
   CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, init_def_list (TREE_TYPE (field)));