+2010-06-02 Tristan Gingold <gingold@adacore.com>
+
+ * as.h: Remove conditionnal definition of HAVE_STDARG_H,
+ USE_STDARG, va_alist, va_dcl, va_list, va_start, va_end.
+ Remove conditionnal inclusion of stdarg.h and varargs.h.
+ Assume ISO C.
+ * config.in: Regenerate.
+ * configure: Regenerate.
+ * configure.in: Remove stdarg.h and varargs.h from
+ AC_CHECK_HEADERS list.
+ * messages.c (as_tsktsk): Remove non ISO C version.
+ (as_warn, as_warn_where, as_bad, as_bad_where, as_fatal): Ditto.
+
2010-05-31 Tristan Gingold <gingold@adacore.com>
* config/tc-alpha.c: Add comments for evax.
#include "alloca-conf.h"
-/* Prefer varargs for non-ANSI compiler, since some will barf if the
- ellipsis definition is used with a no-arguments declaration. */
-#if defined (HAVE_VARARGS_H) && !defined (__STDC__)
-#undef HAVE_STDARG_H
-#endif
-
-#if defined (HAVE_STDARG_H)
-#define USE_STDARG
-#endif
-#if !defined (USE_STDARG) && defined (HAVE_VARARGS_H)
-#define USE_VARARGS
-#endif
-
/* Now, tend to the rest of the configuration. */
/* System include files first... */
#include <errno.h>
#endif
-#ifdef USE_STDARG
#include <stdarg.h>
-#endif
-
-#ifdef USE_VARARGS
-#include <varargs.h>
-#endif
-
-#if !defined (USE_STDARG) && !defined (USE_VARARGS)
-/* Roll our own. */
-#define va_alist REST
-#define va_dcl
-typedef int * va_list;
-#define va_start(ARGS) ARGS = &REST
-#define va_end(ARGS)
-#endif
#include "getopt.h"
/* The first getopt value for machine-independent long options.
typedef struct _pseudo_type pseudo_typeS;
-#ifdef USE_STDARG
#if (__GNUC__ >= 2) && !defined(VMS)
/* for use with -Wformat */
#endif /* __GNUC__ < 2 || defined(VMS) */
-#else /* ! USE_STDARG */
-
-#define PRINTF_LIKE(FCN) void FCN ()
-#define PRINTF_WHERE_LIKE(FCN) void FCN ()
-
-#endif /* ! USE_STDARG */
-
PRINTF_LIKE (as_bad);
PRINTF_LIKE (as_fatal) ATTRIBUTE_NORETURN;
PRINTF_LIKE (as_tsktsk);
Please explain in string (which may have '\n's) what recovery was
done. */
-#ifdef USE_STDARG
void
as_tsktsk (const char *format, ...)
{
va_end (args);
(void) putc ('\n', stderr);
}
-#else
-void
-as_tsktsk (format, va_alist)
- const char *format;
- va_dcl
-{
- va_list args;
-
- as_show_where ();
- va_start (args);
- vfprintf (stderr, format, args);
- va_end (args);
- (void) putc ('\n', stderr);
-}
-#endif /* not NO_STDARG */
/* The common portion of as_warn and as_warn_where. */
Please explain in string (which may have '\n's) what recovery was
done. */
-#ifdef USE_STDARG
void
as_warn (const char *format, ...)
{
as_warn_internal ((char *) NULL, 0, buffer);
}
}
-#else
-void
-as_warn (format, va_alist)
- const char *format;
- va_dcl
-{
- va_list args;
- char buffer[2000];
-
- if (!flag_no_warnings)
- {
- va_start (args);
- vsnprintf (buffer, sizeof (buffer), format, args);
- va_end (args);
- as_warn_internal ((char *) NULL, 0, buffer);
- }
-}
-#endif /* not NO_STDARG */
/* Like as_bad but the file name and line number are passed in.
Unfortunately, we have to repeat the function in order to handle
the varargs correctly and portably. */
-#ifdef USE_STDARG
void
as_warn_where (char *file, unsigned int line, const char *format, ...)
{
as_warn_internal (file, line, buffer);
}
}
-#else
-void
-as_warn_where (file, line, format, va_alist)
- char *file;
- unsigned int line;
- const char *format;
- va_dcl
-{
- va_list args;
- char buffer[2000];
-
- if (!flag_no_warnings)
- {
- va_start (args);
- vsnprintf (buffer, sizeof (buffer), format, args);
- va_end (args);
- as_warn_internal (file, line, buffer);
- }
-}
-#endif /* not NO_STDARG */
/* The common portion of as_bad and as_bad_where. */
Please explain in string (which may have '\n's) what recovery was
done. */
-#ifdef USE_STDARG
void
as_bad (const char *format, ...)
{
as_bad_internal ((char *) NULL, 0, buffer);
}
-#else
-void
-as_bad (format, va_alist)
- const char *format;
- va_dcl
-{
- va_list args;
- char buffer[2000];
-
- va_start (args);
- vsnprintf (buffer, sizeof (buffer), format, args);
- va_end (args);
-
- as_bad_internal ((char *) NULL, 0, buffer);
-}
-#endif /* not NO_STDARG */
-
/* Like as_bad but the file name and line number are passed in.
Unfortunately, we have to repeat the function in order to handle
the varargs correctly and portably. */
-#ifdef USE_STDARG
void
as_bad_where (char *file, unsigned int line, const char *format, ...)
{
as_bad_internal (file, line, buffer);
}
-#else
-void
-as_bad_where (file, line, format, va_alist)
- char *file;
- unsigned int line;
- const char *format;
- va_dcl
-{
- va_list args;
- char buffer[2000];
-
- va_start (args);
- vsnprintf (buffer, sizeof (buffer), format, args);
- va_end (args);
-
- as_bad_internal (file, line, buffer);
-}
-#endif /* not NO_STDARG */
-
/* Send to stderr a string as a fatal message, and print location of
error in input file(s).
Please only use this for when we DON'T have some recovery action.
It xexit()s with a warning status. */
-#ifdef USE_STDARG
void
as_fatal (const char *format, ...)
{
unlink_if_ordinary (out_file_name);
xexit (EXIT_FAILURE);
}
-#else
-void
-as_fatal (format, va_alist)
- char *format;
- va_dcl
-{
- va_list args;
-
- as_show_where ();
- va_start (args);
- fprintf (stderr, _("Fatal error: "));
- vfprintf (stderr, format, args);
- (void) putc ('\n', stderr);
- va_end (args);
- if (out_file_name != NULL)
- unlink_if_ordinary (out_file_name);
- xexit (EXIT_FAILURE);
-}
-#endif /* not NO_STDARG */
/* Indicate assertion failure.
Arguments: Filename, line number, optional function name. */
projects / external / binutils.git / commitdiff