From 3286ab57366ae3422fdacff3c2e605ea81a29c44 Mon Sep 17 00:00:00 2001
From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
Date: Mon, 6 Apr 1998 12:03:16 +0000
Subject: [PATCH] gansidecl.h: Check if compiler supports __attribute__.

        * gansidecl.h: Check if compiler supports __attribute__.  Provide
        definitions for ATTRIBUTE_UNUSED and ATTRIBUTE_PRINTF using
        __attribute__ when its available.  Also provide definitions for
        ATTRIBUTE_PRINTF_1, ATTRIBUTE_PRINTF_2 and ATTRIBUTE_PRINTF_3 in
        terms of ATTRIBUTE_PRINTF.
        * genoutput.c (process_template): Use ATTRIBUTE_UNUSED in place
        of __attribute__.

From-SVN: r19019
---
 gcc/ChangeLog   | 11 +++++++++++
 gcc/gansidecl.h | 15 +++++++++++++++
 gcc/genoutput.c |  9 ++-------
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e74d6f395a1c..3a6db44977bf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+Mon Apr  6 14:59:58 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * gansidecl.h: Check if compiler supports __attribute__.  Provide
+        definitions for ATTRIBUTE_UNUSED and ATTRIBUTE_PRINTF using
+        __attribute__ when its available.  Also provide definitions for
+        ATTRIBUTE_PRINTF_1, ATTRIBUTE_PRINTF_2 and ATTRIBUTE_PRINTF_3 in
+        terms of ATTRIBUTE_PRINTF.
+ 
+        * genoutput.c (process_template): Use ATTRIBUTE_UNUSED in place
+	of __attribute__.
+
 Mon Apr  6 07:17:52 1998  Catherine Moore  <clm@cygnus.com>
 
         * combine.c (can_combine_p):  Include successor in volatile test.
diff --git a/gcc/gansidecl.h b/gcc/gansidecl.h
index 09a369afd4ec..68cf7b264039 100644
--- a/gcc/gansidecl.h
+++ b/gcc/gansidecl.h
@@ -46,6 +46,21 @@ Boston, MA 02111-1307, USA.  */
 #endif
 #endif
 
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# define __attribute__(x)
+#endif
+
+#ifndef ATTRIBUTE_UNUSED
+#define ATTRIBUTE_UNUSED __attribute__ ((unused))
+#endif /* ATTRIBUTE_UNUSED */
+
+#ifndef ATTRIBUTE_PRINTF
+#define ATTRIBUTE_PRINTF(m, n) __attribute__ ((format (__printf__, m, n)))
+#define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
+#define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
+#define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
+#endif /* ATTRIBUTE_PRINTF */
+
 /* Define a generic NULL if one hasn't already been defined.  */
 
 #ifndef NULL
diff --git a/gcc/genoutput.c b/gcc/genoutput.c
index 6af827dcb6e3..540685d3db59 100644
--- a/gcc/genoutput.c
+++ b/gcc/genoutput.c
@@ -562,13 +562,8 @@ process_template (d, template)
 
   printf ("\nstatic char *\n");
   printf ("output_%d (operands, insn)\n", d->code_number);
-  printf ("#ifdef __GNUC__\n");
-  printf ("     rtx *operands __attribute__ ((unused));\n");
-  printf ("     rtx insn __attribute__ ((unused));\n");
-  printf ("#else\n");
-  printf ("     rtx *operands;\n");
-  printf ("     rtx insn;\n");
-  printf ("#endif\n");
+  printf ("     rtx *operands ATTRIBUTE_UNUSED;\n");
+  printf ("     rtx insn ATTRIBUTE_UNUSED;\n");
   printf ("{\n");
 
   /* If the assembler code template starts with a @ it is a newline-separated