diff options
author | Alan Modra <amodra@gmail.com> | 2021-04-05 15:30:22 +0930 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2021-04-05 15:30:22 +0930 |
commit | 87b9f2556d5f47328f3ac59088e9be0759959ebb (patch) | |
tree | ec6646d13ad2269930deb9a49418dee23600d567 /binutils/sysdep.h | |
parent | ab2af25e83abb7da1619e8ae678b9286d5448d67 (diff) | |
download | fsf-binutils-gdb-87b9f2556d5f47328f3ac59088e9be0759959ebb.zip fsf-binutils-gdb-87b9f2556d5f47328f3ac59088e9be0759959ebb.tar.gz fsf-binutils-gdb-87b9f2556d5f47328f3ac59088e9be0759959ebb.tar.bz2 |
C99 binutils configury
* configure.ac: Assume long long is available. Don't test for
strings.h, stdlib.h, limits.h, locale.h, or wchar.h. Check
inttypes.h, stdint.h, sys/stat.h and sys/types.h. Don't check for
strcoll, setlocale, setmode or location of time_t. Don't check
for fprintf, getenv, snprintf, strnlen, strstr or vsnprintf decls.
(AC_ISC_POSIX, AXC_HEADER_STRING, AC_FUNC_ALLOCA): Don't invoke.
* sysdep.h: Don't include alloca-conf.h, include config.h instead.
Test HAVE_SYS_TYPES_H and reorder includes. Include limits.h,
locale.h, string.h and stdlib.h unconditionally. Remove various
fallback declarations. Assume long long is available.
* addr2line.c: Don't test HAVE_SETLOCALE.
* ar.c: Likewise.
* coffdump.c: Likewise.
* dlltool.c: Likewise.
* dllwrap.c: Likewise.
* elfedit.c: Likewise.
* nm.c: Likewise.
* objcopy.c: Likewise.
* objdump.c: Likewise.
* readelf.c: Likewise.
* size.c: Likewise.
* srconv.c: Likewise.
* strings.c: Likewise.
* sysdump.c: Likewise.
* windmc.c: Likewise.
* windres.c: Likewise.
* bucomm.c: Don't test HAVE_TIME_T_IN_TIME_H or HAVE_TIME_T_IN_TYPES_H.
* dwarf.c: Include limits.h unconditionally. Assume long long
is available.
* nm.c: Don't test HAVE_STRCOLL.
* readelf.c: Don't test HAVE_WCHAR_H.
* strings.c: Assume long long is available.
* syslex.l: Include string.h unconditionally.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
Diffstat (limited to 'binutils/sysdep.h')
-rw-r--r-- | binutils/sysdep.h | 102 |
1 files changed, 25 insertions, 77 deletions
diff --git a/binutils/sysdep.h b/binutils/sysdep.h index 981ec02..747ff4c 100644 --- a/binutils/sysdep.h +++ b/binutils/sysdep.h @@ -20,50 +20,21 @@ #ifndef _BIN_SYSDEP_H #define _BIN_SYSDEP_H -#include "alloca-conf.h" -#include "ansidecl.h" +#include "config.h" #include <stdio.h> +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> - -#include "bfdver.h" - -#include <stdarg.h> - -#ifdef USE_BINARY_FOPEN -#include "fopen-bin.h" -#else -#include "fopen-same.h" #endif - -#include <errno.h> -#ifndef errno -extern int errno; +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> #endif - +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <errno.h> #ifdef HAVE_UNISTD_H #include <unistd.h> #endif - -#ifdef STRING_WITH_STRINGS -#include <string.h> -#include <strings.h> -#else -#ifdef HAVE_STRING_H -#include <string.h> -#else -#ifdef HAVE_STRINGS_H -#include <strings.h> -#else -extern char *strchr (); -extern char *strrchr (); -#endif -#endif -#endif - -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif - #ifdef HAVE_FCNTL_H #include <fcntl.h> #else @@ -72,8 +43,13 @@ extern char *strrchr (); #endif #endif -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> +#include "ansidecl.h" +#include "bfdver.h" + +#ifdef USE_BINARY_FOPEN +#include "fopen-bin.h" +#else +#include "fopen-same.h" #endif #include "binary-io.h" @@ -82,40 +58,16 @@ extern char *strrchr (); extern char *stpcpy (char *, const char *); #endif -#if !HAVE_DECL_STRSTR -extern char *strstr (); -#endif - #ifdef HAVE_SBRK #if !HAVE_DECL_SBRK extern char *sbrk (); #endif #endif -#if !HAVE_DECL_GETENV -extern char *getenv (); -#endif - #if !HAVE_DECL_ENVIRON extern char **environ; #endif -#if !HAVE_DECL_FPRINTF -extern int fprintf (FILE *, const char *, ...); -#endif - -#if !HAVE_DECL_SNPRINTF -extern int snprintf(char *, size_t, const char *, ...); -#endif - -#if !HAVE_DECL_VSNPRINTF -extern int vsnprintf(char *, size_t, const char *, va_list); -#endif - -#if !HAVE_DECL_STRNLEN -size_t strnlen (const char *, size_t); -#endif - #ifndef O_RDONLY #define O_RDONLY 0 #endif @@ -134,18 +86,16 @@ size_t strnlen (const char *, size_t); #define SEEK_END 2 #endif -#ifdef HAVE_LOCALE_H -# ifndef ENABLE_NLS - /* The Solaris version of locale.h always includes libintl.h. If we have - been configured with --disable-nls then ENABLE_NLS will not be defined - and the dummy definitions of bindtextdomain (et al) below will conflict - with the defintions in libintl.h. So we define these values to prevent - the bogus inclusion of libintl.h. */ -# define _LIBINTL_H -# define _LIBGETTEXT_H -# endif -# include <locale.h> +#ifndef ENABLE_NLS + /* The Solaris version of locale.h always includes libintl.h. If we have + been configured with --disable-nls then ENABLE_NLS will not be defined + and the dummy definitions of bindtextdomain (et al) below will conflict + with the defintions in libintl.h. So we define these values to prevent + the bogus inclusion of libintl.h. */ +# define _LIBINTL_H +# define _LIBGETTEXT_H #endif +#include <locale.h> #ifdef ENABLE_NLS # include <libintl.h> @@ -175,9 +125,7 @@ size_t strnlen (const char *, size_t); #define BUFSIZE 8192 /* For PATH_MAX. */ -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #ifndef PATH_MAX /* For MAXPATHLEN. */ @@ -193,7 +141,7 @@ size_t strnlen (const char *, size_t); # endif #endif -#if defined HAVE_LONG_LONG && SIZEOF_LONG_LONG > SIZEOF_LONG +#if SIZEOF_LONG_LONG > SIZEOF_LONG /* We can't use any bfd types here since readelf may define BFD64 and objdump may not. */ #define HOST_WIDEST_INT long long |