From 0f399b0c6b04b819c910665ad02f90f1e8848145 Mon Sep 17 00:00:00 2001
From: Stu Grossman <grossman@cygnus>
Date: Tue, 22 Apr 1997 16:00:06 +0000
Subject: [PATCH] 	* Make-common.in:  Change clean targets to use :: so
 that other 	Makefiles can have their own clean targets. 	* sim-load.c
 (xprintf eprintf):  Use ANSI_PROTOTYPES instead of 	__STDC__ to control
 use of stdarg vs. varargs syntax.  Some 	systems can't use __STDC__,
 but require stdarg.

---
 sim/common/ChangeLog      |  8 ++++++++
 sim/common/Make-common.in |  5 +++--
 sim/common/sim-load.c     | 12 ++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index c5bff24..cb12926 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,11 @@
+Tue Apr 22 08:48:16 1997  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* Make-common.in:  Change clean targets to use :: so that other
+	Makefiles can have their own clean targets.
+	* sim-load.c (xprintf eprintf):  Use ANSI_PROTOTYPES instead of
+	__STDC__ to control use of stdarg vs. varargs syntax.  Some
+	systems can't use __STDC__, but require stdarg.
+
 Fri Apr 18 11:14:43 1997  Doug Evans  <dje@canuck.cygnus.com>
 
 	* sim-options.c (standard_options): Add --endian.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 521ecb2..ad34813 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -299,16 +299,17 @@ tags etags: TAGS
 TAGS: force
 	etags *.c *.h
 
-clean: $(SIM_EXTRA_CLEAN)
+clean::
 	rm -f *.[oa] *~ core
 	rm -f run libsim.a
 	rm -f gentmap targ-map.c targ-vals.h
 	rm -f $(BUILT_SRC_FROM_COMMON)
 
-distclean mostlyclean maintainer-clean realclean: clean
+distclean mostlyclean maintainer-clean realclean:: clean
 	rm -f TAGS
 	rm -f Makefile config.cache config.log config.status
 	rm -f tconfig.h config.h stamp-h
+	rm -f targ-vals.def
 
 .c.o:
 	$(CC) -c $(ALL_CFLAGS) $<
diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c
index 1d5cb09..23258c5 100644
--- a/sim/common/sim-load.c
+++ b/sim/common/sim-load.c
@@ -20,7 +20,8 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
    to suggest that they shouldn't :-)].  */
 
 #include "config.h"
-#ifdef __STDC__
+#include "ansidecl.h"
+#ifdef ANSI_PROTOTYPES
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -29,7 +30,6 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
 #include <stdlib.h>
 #endif
 #include <time.h>
-#include "ansidecl.h"
 #include "bfd.h"
 #include "callback.h"
 #include "remote-sim.h"
@@ -146,14 +146,14 @@ sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p)
 static void
 xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
 {
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
   host_callback *callback;
   char *fmt;
 #endif
   va_list ap;
 
   VA_START (ap, fmt);
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
   callback = va_arg (ap, host_callback *);
   fmt = va_arg (ap, char *);
 #endif
@@ -166,14 +166,14 @@ xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
 static void
 eprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
 {
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
   host_callback *callback;
   char *fmt;
 #endif
   va_list ap;
 
   VA_START (ap, fmt);
-#ifndef __STDC__
+#ifndef ANSI_PROTOTYPES
   callback = va_arg (ap, host_callback *);
   fmt = va_arg (ap, char *);
 #endif
-- 
2.7.4