From c654b659dd6cc9475bf485794eb2f95234674030 Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Mon, 26 May 2008 10:22:30 +0000
Subject: [PATCH] gigi.h (gigi): Remove bogus ATTRIBUTE_UNUSED marker.

	* gigi.h (gigi): Remove bogus ATTRIBUTE_UNUSED marker.
	(builtin_decl_for): Likewise.
	* trans.c (gigi): Likewise.
	* utils.c (def_builtin_1): Fix formatting.

From-SVN: r135911
---
 gcc/ada/ChangeLog   |  7 +++++++
 gcc/ada/Makefile.in | 26 +++++++++++++-------------
 gcc/ada/gigi.h      |  6 +++---
 gcc/ada/trans.c     |  4 ++--
 gcc/ada/utils.c     |  4 ++--
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 88cc32572ba..7929d702bb4 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gigi.h (gigi): Remove bogus ATTRIBUTE_UNUSED marker.
+	(builtin_decl_for): Likewise.
+	* trans.c (gigi): Likewise.
+	* utils.c (def_builtin_1): Fix formatting.
+
 2008-05-26  Hristian Kirtchev  <kirtchev@adacore.com>
 
 	* exp_ch3.adb (Build_Init_Statements): Alphabetize local variables.
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index 4d486f2e637..4fc101a6ffb 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -62,7 +62,7 @@
 # Variables that exist for you to override.
 # See below for how to change them for certain systems.
 
-# Various ways of specifying flags for compilations:  
+# Various ways of specifying flags for compilations:
 # CFLAGS is for the user to override to, e.g., do a bootstrap with -O2.
 # BOOT_CFLAGS is the value of CFLAGS to pass
 # to the stage2 and stage3 compilations
@@ -139,7 +139,7 @@ shext  =
 hyphen = -
 
 # Define this as & to perform parallel make on a Sequent.
-# Note that this has some bugs, and it seems currently necessary 
+# Note that this has some bugs, and it seems currently necessary
 # to compile all the gen* files first by hand to avoid erroneous results.
 P =
 
@@ -424,7 +424,7 @@ ifeq ($(strip $(filter-out m68k% wrs vx%,$(targ))),)
     s-tratas.adb<s-tratas-default.adb \
     s-trafor.adb<s-trafor-default.adb \
     s-trafor.ads<s-trafor-default.ads \
-    s-tfsetr.adb<s-tfsetr-vxworks.adb 
+    s-tfsetr.adb<s-tfsetr-vxworks.adb
   endif
 endif
 
@@ -458,7 +458,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(targ))),)
     s-trafor.adb<s-trafor-default.adb \
     s-trafor.ads<s-trafor-default.ads \
     s-tratas.adb<s-tratas-default.adb \
-    s-tfsetr.adb<s-tfsetr-vxworks.adb 
+    s-tfsetr.adb<s-tfsetr-vxworks.adb
   endif
 
   ifeq ($(strip $(filter-out rtp,$(THREAD_KIND))),)
@@ -761,7 +761,7 @@ ifeq ($(strip $(filter-out sparc% sun solaris%,$(targ))),)
   else
     LIBGNAT_TARGET_PAIRS = $(LIBGNAT_TARGET_PAIRS_64)
   endif
-  
+
   TOOLS_TARGET_PAIRS=mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb
 
   EH_MECHANISM=-gcc
@@ -1197,7 +1197,7 @@ LN_S = cp -p
 
 .SUFFIXES: .sym
 
-.o.sym: 
+.o.sym:
 	@ gnu:[bin]vmssymvec $<
 endif
 
@@ -1752,9 +1752,9 @@ ADA_INCLUDE_SRCS =\
  machcode.ads text_io.ads unchconv.ads unchdeal.ads \
  sequenio.ads system.ads memtrack.adb \
  a-[a-o]*.adb a-[p-z]*.adb a-[a-o]*.ads a-[p-z]*.ads g-*.ad? i-*.ad? \
- s-[a-o]*.adb s-[p-z]*.adb s-[a-o]*.ads s-[p-z]*.ads  
+ s-[a-o]*.adb s-[p-z]*.adb s-[a-o]*.ads s-[p-z]*.ads
 
-LIBGNAT=../rts/libgnat.a 
+LIBGNAT=../rts/libgnat.a
 
 GCC_LINK=$(CC) -static-libgcc $(ADA_INCLUDES)
 
@@ -1767,7 +1767,7 @@ ifeq ($(TOOLSCASE),native)
   vpath %.h   ../rts ../
 endif
 
-# in the cross tools case, everything is compiled with the native 
+# in the cross tools case, everything is compiled with the native
 # gnatmake/link. Therefore only -I needs to be modified in ADA_INCLUDES
 ifeq ($(TOOLSCASE),cross)
   vpath %.ads ../
@@ -1812,13 +1812,13 @@ common-tools:
 
 ../../vxaddr2line$(exeext): targext.o
 	$(GNATMAKE) -c  $(ADA_INCLUDES) vxaddr2line --GCC="$(CC) $(ALL_ADAFLAGS)"
-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vxaddr2line 
+	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vxaddr2line
 	$(GNATLINK) -v vxaddr2line -o $@ --GCC="$(GCC_LINK)" targext.o $(CLIB)
 
 gnatmake-re:  link.o targext.o
 	$(GNATMAKE) $(ADA_INCLUDES) -u sdefault --GCC="$(CC) $(MOST_ADA_FLAGS)"
 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatmake --GCC="$(CC) $(ALL_ADAFLAGS)"
-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmake 
+	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmake
 	$(GNATLINK) -v gnatmake -o ../../gnatmake$(exeext) \
 		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
 
@@ -1826,11 +1826,11 @@ gnatmake-re:  link.o targext.o
 # with the former version of gnatlink itself which cannot override itself.
 gnatlink-re:  link.o targext.o
 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)"
-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink 
+	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink
 	$(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \
 		    --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
 	$(MV)  ../../gnatlinknew$(exeext)  ../../gnatlink$(exeext)
-  
+
 # Needs to be built with CC=gcc
 # Since the RTL should be built with the latest compiler, remove the
 #  stamp target in the parent directory whenever gnat1 is rebuilt
diff --git a/gcc/ada/gigi.h b/gcc/ada/gigi.h
index 9b0c2bec8d5..68e5ebf141e 100644
--- a/gcc/ada/gigi.h
+++ b/gcc/ada/gigi.h
@@ -104,7 +104,7 @@ extern void add_decl_expr (tree gnu_decl, Entity_Id gnat_entity);
 
 /* Mark nodes rooted at *TP with TREE_VISITED and types as having their
    sized gimplified.  We use this to indicate all variable sizes and
-   positions in global types may not be shared by any subprograms.  */
+   positions in global types may not be shared by any subprogram.  */
 extern void mark_visited (tree *);
 
 /* Finalize any From_With_Type incomplete types.  We do this after processing
@@ -217,7 +217,7 @@ extern void gigi (Node_Id gnat_root, int max_gnat_node, int number_name,
                   Char_Code *strings_chars_ptr,
                   struct List_Header *list_headers_ptr,
                   Nat number_file,
-                  struct File_Info_Type *file_info_ptr ATTRIBUTE_UNUSED,
+                  struct File_Info_Type *file_info_ptr,
                   Entity_Id standard_integer,
                   Entity_Id standard_long_long_float,
                   Entity_Id standard_exception_type,
@@ -852,7 +852,7 @@ extern tree gnat_builtin_function (tree decl);
 /* Search the chain of currently reachable declarations for a builtin
    FUNCTION_DECL node corresponding to function NAME (an IDENTIFIER_NODE).
    Return the first node found, if any, or NULL_TREE otherwise.  */
-extern tree builtin_decl_for (tree name ATTRIBUTE_UNUSED);
+extern tree builtin_decl_for (tree name);
 
 /* This function is called by the front end to enumerate all the supported
    modes for the machine.  We pass a function which is called back with
diff --git a/gcc/ada/trans.c b/gcc/ada/trans.c
index 717c14bbf6a..dda85c5658c 100644
--- a/gcc/ada/trans.c
+++ b/gcc/ada/trans.c
@@ -221,14 +221,14 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name,
       struct Elist_Header *elists_ptr, struct Elmt_Item *elmts_ptr,
       struct String_Entry *strings_ptr, Char_Code *string_chars_ptr,
       struct List_Header *list_headers_ptr, Nat number_file,
-      struct File_Info_Type *file_info_ptr ATTRIBUTE_UNUSED,
+      struct File_Info_Type *file_info_ptr,
       Entity_Id standard_integer, Entity_Id standard_long_long_float,
       Entity_Id standard_exception_type, Int gigi_operating_mode)
 {
   tree gnu_standard_long_long_float;
   tree gnu_standard_exception_type;
   struct elab_info *info;
-  int i ATTRIBUTE_UNUSED;
+  int i;
 
   max_gnat_nodes = max_gnat_node;
   number_names = number_name;
diff --git a/gcc/ada/utils.c b/gcc/ada/utils.c
index 7a984b23ad5..8dd445fd8cd 100644
--- a/gcc/ada/utils.c
+++ b/gcc/ada/utils.c
@@ -4763,8 +4763,8 @@ def_builtin_1 (enum built_in_function fncode,
   if (both_p)
     /* ??? This is normally further controlled by command-line options
        like -fno-builtin, but we don't have them for Ada.  */
-      add_builtin_function (libname, libtype, fncode, fnclass,
-			    NULL, fnattrs);
+    add_builtin_function (libname, libtype, fncode, fnclass,
+			  NULL, fnattrs);
 
   built_in_decls[(int) fncode] = decl;
   if (implicit_p)
-- 
2.30.2