2002-06-20 Nathanael Nerode <neroden@twcny.rr.com>

	* com.c: Remove #ifdef HOHO sections.

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

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 9e1dd91..99a9756 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,7 +1,11 @@
+2002-06-20  Nathanael Nerode  <neroden@twcny.rr.com>
+
+       * com.c: Remove #ifdef HOHO sections.
+
 2002-06-17  Jason Thorpe  <thorpej@wasabisystems.com>
 
        * bit.c: Don't include glimits.h.
-       * target.c: Likewise.   
+       * target.c: Likewise.
        * where.h: Likewise.
 
 2002-06-12  Gabriel Dos Reis  <gdr@codesourcery.com>

diff --git a/gcc/f/com.c b/gcc/f/com.c
index 310a310..0cd8fc4 100644 (file)
--- a/gcc/f/com.c
+++ b/gcc/f/com.c
@@ -1812,15 +1812,8 @@ ffecom_call_ (tree fn, ffeinfoKindtype kt, bool is_f2c_complex,
                                       callee_commons,
                                       scalar_args))
        {
-#ifdef HOHO
-         tempvar = ffecom_make_tempvar (ffecom_tree_type
-                                        [FFEINFO_basictypeCOMPLEX][kt],
-                                        FFETARGET_charactersizeNONE,
-                                        -1);
-#else
          tempvar = hook;
          assert (tempvar);
-#endif
        }
       else
        {
@@ -2168,13 +2161,8 @@ ffecom_char_args_x_ (tree *xitem, tree *length, ffebld expr, bool with_null)
            if (!ffesymbol_hook (s).addr)
              item = ffecom_1_fn (item);
          }
-
-#ifdef HOHO
-       tempvar = ffecom_push_tempvar (char_type_node, size, -1, TRUE);
-#else
        tempvar = ffebld_nonter_hook (expr);
        assert (tempvar);
-#endif
        tempvar = ffecom_1 (ADDR_EXPR,
                            build_pointer_type (TREE_TYPE (tempvar)),
                            tempvar);
@@ -2226,13 +2214,8 @@ ffecom_char_args_x_ (tree *xitem, tree *length, ffebld expr, bool with_null)
          tree args;
          tree newlen;
 
-#ifdef HOHO
-         tempvar = ffecom_make_tempvar (char_type_node,
-                                        ffebld_size (expr), -1);
-#else
          tempvar = ffebld_nonter_hook (expr);
          assert (tempvar);
-#endif
          tempvar = ffecom_1 (ADDR_EXPR,
                              build_pointer_type (TREE_TYPE (tempvar)),
                              tempvar);
@@ -4046,12 +4029,8 @@ ffecom_expr_intrinsic_ (ffebld expr, tree dest_tree,
 
     case FFEINTRIN_impCHAR:
     case FFEINTRIN_impACHAR:
-#ifdef HOHO
-      tempvar = ffecom_make_tempvar (char_type_node, 1, -1);
-#else
       tempvar = ffebld_nonter_hook (expr);
       assert (tempvar);
-#endif
       {
        tree tmv = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (tempvar)));
 
@@ -6735,15 +6714,6 @@ ffecom_let_char_ (tree dest_tree, tree dest_length,
     tree citem;
     tree clength;
 
-#ifdef HOHO
-    length_array
-      = lengths
-      = ffecom_push_tempvar (ffecom_f2c_ftnlen_type_node,
-                            FFETARGET_charactersizeNONE, count, TRUE);
-    item_array = items = ffecom_push_tempvar (ffecom_f2c_address_type_node,
-                                             FFETARGET_charactersizeNONE,
-                                             count, TRUE);
-#else
     {
       tree hook;
 
@@ -6754,7 +6724,6 @@ ffecom_let_char_ (tree dest_tree, tree dest_length,
       length_array = lengths = TREE_VEC_ELT (hook, 0);
       item_array = items = TREE_VEC_ELT (hook, 1);
     }
-#endif
 
     for (i = 0; i < count; ++i)
       {
@@ -10258,18 +10227,6 @@ ffecom_arg_ptr_to_expr (ffebld expr, tree *length)
     /* ~~Kludge! */
     assert (sz != FFETARGET_charactersizeNONE);
 
-#ifdef HOHO
-    length_array
-      = lengths
-      = ffecom_push_tempvar (ffecom_f2c_ftnlen_type_node,
-                            FFETARGET_charactersizeNONE, count, TRUE);
-    item_array
-      = items
-      = ffecom_push_tempvar (ffecom_f2c_address_type_node,
-                            FFETARGET_charactersizeNONE, count, TRUE);
-    temporary = ffecom_push_tempvar (char_type_node,
-                                    sz, -1, TRUE);
-#else
     {
       tree hook;
 
@@ -10281,7 +10238,6 @@ ffecom_arg_ptr_to_expr (ffebld expr, tree *length)
       item_array = items = TREE_VEC_ELT (hook, 1);
       temporary = TREE_VEC_ELT (hook, 2);
     }
-#endif
 
     known_length = ffecom_f2c_ftnlen_zero_node;