Based on patch from Michael Gschwind <mikeg@watson.ibm.com>:

        * unroll.c (unroll_loop): Cast return value of alloca.
        * i370/i370.c: Include function.h and toplev.h.
        (i370_label_scan): Remove c++ commented abort.
        * i370/i370.h (HANDLE_PRAGMA): Takes three arguments.
        (ASM_OUTPUT_LABELREF): Fix TOUPPER/else broken 16 Sept.
        * i370/xm-i370.h (HOST_BITS_PER_LONGLONG): Define.
        * i370/xm-mvs.h, i370/xm-oe.h: Likewise.

From-SVN: r30021

7 files changed, 20 insertions, 8 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index edd7840..a9ba846 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+Fri Oct 15 11:02:46 1999  Richard Henderson  <rth@cygnus.com>
+
+	Based on patch from Michael Gschwind <mikeg@watson.ibm.com>:
+	* unroll.c (unroll_loop): Cast return value of alloca.
+	* i370/i370.c: Include function.h and toplev.h.
+	(i370_label_scan): Remove c++ commented abort.
+	* i370/i370.h (HANDLE_PRAGMA): Takes three arguments.
+	(ASM_OUTPUT_LABELREF): Fix TOUPPER/else broken 16 Sept.
+	* i370/xm-i370.h (HOST_BITS_PER_LONGLONG): Define.
+	* i370/xm-mvs.h, i370/xm-oe.h: Likewise.
+
 Fri Oct 15 03:01:01 1999  Loren Rittle  <ljrittle@acm.org>
 
 	* config/t-freebsd: Do not override USER_H.
diff --git a/gcc/config/i370/i370.c b/gcc/config/i370/i370.c
index e683027..6957b5d 100644
--- a/gcc/config/i370/i370.c
+++ b/gcc/config/i370/i370.c
@@ -33,9 +33,10 @@ Boston, MA 02111-1307, USA.  */
 #include "insn-flags.h"
 #include "output.h"
 #include "insn-attr.h"
-/* #include "function.h" */
+#include "function.h"
 #include "flags.h"
 #include "recog.h"
+#include "toplev.h"
 
 extern FILE *asm_out_file;
 
@@ -473,7 +474,6 @@ i370_label_scan (void)
    last week, and so we punt for now.  */
 
                     debug_rtx (insn);
-// abort();
                     for (j=0; j < XVECLEN (body, 0); j++)
                       {
                          int labelno;
diff --git a/gcc/config/i370/i370.h b/gcc/config/i370/i370.h
index 45da9fa..4ecc07d 100644
--- a/gcc/config/i370/i370.h
+++ b/gcc/config/i370/i370.h
@@ -152,7 +152,8 @@ extern int mvs_function_name_length;
    text can be read.  CH is the first character after the #pragma.  The
    result of the expression is the terminating character found
    (newline or EOF).  */
-#define HANDLE_PRAGMA(FILE, NODE) handle_pragma ((FILE), (NODE))
+#define HANDLE_PRAGMA(FILE, ungetc_unused, NODE) \
+  handle_pragma ((FILE), (NODE))
 #endif /* TARGET_HLASM */
 
 /* Define maximum length of page minus page escape overhead.  */
@@ -1137,10 +1138,7 @@ enum reg_class
   else									\
     ch = '@';								\
   for (bp = temp; *bp; bp++)						\
-    {									\
-      *bp = TOUPPER (*bp);						\
-      else if (*bp == '_') *bp = ch;					\
-    }									\
+    *bp = (*bp == '_' ? ch : TOUPPER (*bp));				\
   fprintf (FILE, "%s", temp);						\
 }
 
diff --git a/gcc/config/i370/xm-i370.h b/gcc/config/i370/xm-i370.h
index ac75363..b80efb9 100644
--- a/gcc/config/i370/xm-i370.h
+++ b/gcc/config/i370/xm-i370.h
@@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_SHORT	16
 #define HOST_BITS_PER_INT	32
 #define HOST_BITS_PER_LONG	32
+#define HOST_BITS_PER_LONGLONG	64
 #define HOST_FLOAT_FORMAT	IBM_FLOAT_FORMAT
 #define HOST_EBCDIC		1
 
diff --git a/gcc/config/i370/xm-mvs.h b/gcc/config/i370/xm-mvs.h
index d764eb3..f43a840 100644
--- a/gcc/config/i370/xm-mvs.h
+++ b/gcc/config/i370/xm-mvs.h
@@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_SHORT	16
 #define HOST_BITS_PER_INT	32
 #define HOST_BITS_PER_LONG	32
+#define HOST_BITS_PER_LONGLONG	64
 #define HOST_FLOAT_FORMAT	IBM_FLOAT_FORMAT
 #define HOST_EBCDIC		1
 
diff --git a/gcc/config/i370/xm-oe.h b/gcc/config/i370/xm-oe.h
index 22e7bfa..370ec09 100644
--- a/gcc/config/i370/xm-oe.h
+++ b/gcc/config/i370/xm-oe.h
@@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_SHORT	16
 #define HOST_BITS_PER_INT	32
 #define HOST_BITS_PER_LONG	32
+#define HOST_BITS_PER_LONGLONG	64
 #define HOST_FLOAT_FORMAT	IBM_FLOAT_FORMAT
 #define HOST_EBCDIC		1
 
diff --git a/gcc/unroll.c b/gcc/unroll.c
index dce90b2..c21638f 100644
--- a/gcc/unroll.c
+++ b/gcc/unroll.c
@@ -769,7 +769,7 @@ unroll_loop (loop_end, insn_count, loop_start, end_insert_before,
 
   splittable_regs = (rtx *) alloca (maxregnum * sizeof (rtx));
   bzero ((char *) splittable_regs, maxregnum * sizeof (rtx));
-  derived_regs = alloca (maxregnum);
+  derived_regs = (char *) alloca (maxregnum);
   bzero (derived_regs, maxregnum);
   splittable_regs_updates = (int *) alloca (maxregnum * sizeof (int));
   bzero ((char *) splittable_regs_updates, maxregnum * sizeof (int));