[llvm-commits] [llvm-gcc-4.2] r46240 - in /llvm-gcc-4.2/trunk/gcc: java/lang.c stub-c.c

[Eric Christopher]

Author: echristo
Date: Mon Jan 21 21:06:28 2008
New Revision: 46240

URL: http://llvm.org/viewvc/llvm-project?rev=46240&view=rev
Log:
Fix normal configure bootstrap. Remove unnecessary local code. Update stub-c.c for changes.

Modified:
    llvm-gcc-4.2/trunk/gcc/java/lang.c
    llvm-gcc-4.2/trunk/gcc/stub-c.c

Modified: llvm-gcc-4.2/trunk/gcc/java/lang.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/java/lang.c?rev=46240&r1=46239&r2=46240&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/java/lang.c (original)
+++ llvm-gcc-4.2/trunk/gcc/java/lang.c Mon Jan 21 21:06:28 2008
@@ -139,7 +139,7 @@
 /* int flag_optimize_sci = 0;  */
 
 /* Don't attempt to verify invocations.  */
-int flag_verify_invocations = 0; 
+int flag_verify_invocations = 0;
 
 /* When nonzero, print extra version information.  */
 static int v_flag = 0;
@@ -342,7 +342,7 @@
     case OPT_version:
       v_flag = 1;
       break;
-      
+
     default:
       if (cl_options[code].flags & CL_Java)
 	break;
@@ -798,103 +798,9 @@
 }
 /* APPLE LOCAL end AltiVec */
 
-/* APPLE LOCAL begin constant cfstrings */
-enum { blabla } c_language;
-const char *constant_string_class_name = "die die";
-int flag_weak = 1;
-int parse_in = 0;
-void build_stmt (void);
-void build_stmt (void) { abort (); }
-void store_init_value(void);
-void store_init_value(void) { abort (); }
-/* APPLE LOCAL end constant cfstrings */
-
 /* APPLE LOCAL disable_typechecking_for_spec_flag */
 int disable_typechecking_for_spec_flag = 0;
 
-/* APPLE LOCAL begin CW asm blocks */
-/* Dummies needed because we use them from cpplib, yuck.  */
-int flag_iasm_blocks;
-int iasm_state;
-bool iasm_in_operands;
-void build_modify_expr (void);
-void iasm_addr (void);
-void iasm_build_bracket (void);
-void build_function_call (void);
-void iasm_get_register_var (void);
-bool iasm_is_pseudo (void);
-void iasm_for_constraint (void);
-void iasm_print_operand (void);
-void iasm_force_constraint (void);
-void pointer_int_sum (void);
-tree decl_attributes (tree *tp, tree p, int s);
-void build_modify_expr (void) { abort (); }
-void iasm_addr (void) { abort (); }
-void iasm_build_bracket (void) { abort (); }
-void build_function_call (void) { abort (); }
-void iasm_get_register_var (void) { abort (); }
-bool iasm_is_pseudo (void) { abort (); }
-void iasm_for_constraint (void) { abort (); }
-void iasm_print_operand (void) { abort (); }
-void iasm_force_constraint (void) { abort (); }
-void pointer_int_sum (void) { abort (); }
-tree decl_attributes (tree *ARG_UNUSED (tp),
-		      tree ARG_UNUSED (p),
-		      int ARG_UNUSED (s))
-{
-  abort ();
-}
-/* APPLE LOCAL end CW asm blocks */
-
-/* APPLE LOCAL begin 4174833 */
-tree objc_is_class_name (tree);
-
-tree
-objc_is_class_name (tree ARG_UNUSED (arg))
-{
-  return 0;
-}
-
-bool objc_method_decl (enum tree_code ARG_UNUSED (opcode));
-bool 
-objc_method_decl (enum tree_code ARG_UNUSED (opcode))
-{
-  return false;
-}
-/* APPLE LOCAL end 4174833 */
-/* APPLE LOCAL begin radar 4441049 */
-tree objc_v2_bitfield_ivar_bitpos (tree);
-
-tree
-objc_v2_bitfield_ivar_bitpos (tree ARG_UNUSED (exp))
-{
-  return 0;
-}
-
-tree objc_v2_component_ref_field_offset (tree);
-
-tree
-objc_v2_component_ref_field_offset (tree ARG_UNUSED (exp))
-{
-  return 0;
-}
-/* APPLE LOCAL end radar 4441049 */ 
-/* APPLE LOCAL begin fariborz 2996215 */
-tree objc_create_init_utf16_var (void);
-tree
-objc_create_init_utf16_var (void)
-{
-  return NULL;
-}
-
-bool objc_anonymous_local_objc_name (const char * ARG_UNUSED (name));
-bool
-objc_anonymous_local_objc_name (const char * ARG_UNUSED (name))
-{
-  return false;
-}
-/* APPLE LOCAL end fariborz 2996215 */
-
 /* Every call to a static constructor has an associated boolean
    variable which is in the outermost scope of the calling method.
    This variable is used to avoid multiple calls to the static

Modified: llvm-gcc-4.2/trunk/gcc/stub-c.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/stub-c.c?rev=46240&r1=46239&r2=46240&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/stub-c.c (original)
+++ llvm-gcc-4.2/trunk/gcc/stub-c.c Mon Jan 21 21:06:28 2008
@@ -31,6 +31,7 @@
 enum iasm_states iasm_state ATTRIBUTE_WEAK;
 bool iasm_in_operands ATTRIBUTE_WEAK;
 int flag_iasm_blocks ATTRIBUTE_WEAK;
+int parse_in ATTRIBUTE_WEAK;
 
 
 tree iasm_addr (tree) ATTRIBUTE_WEAK;