diff options
58 files changed, 123 insertions, 867 deletions
diff --git a/bfd/.gitignore b/bfd/.gitignore index 3316133..0a5530d 100644 --- a/bfd/.gitignore +++ b/bfd/.gitignore @@ -1,6 +1,5 @@ /bfd-in3.h /bfd.h -/bfd_stdint.h /bfdver.h /elf32-ia64.c /elf32-target.h diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5936279..58ddab0 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,21 @@ 2021-03-31 Alan Modra <amodra@gmail.com> + * .gitignore: Delete bfd_stdint.h entry. + * Makefile.am (bfdinclude_HEADERS): Delete bfd_stdint.h. + (BUILD_HFILES, LOCAL_H_DEPS): Likewise. + * bfd-in.h: Include stdint.h in place of bfd_stdint.h. + * configure.ac: Don't invoke GCC_HEADER_STDINT. + * configure.com: Don't create bfd_stdint.h. + * Makefile.in: Regenerate. + * aclocal.m4: Regenerate. + * bfd-in2.h: Regenerate. + * config.in: Regenerate. + * configure: Regenerate. + * doc/Makefile.in: Regenerate. + * po/BLD-POTFILES.in: Regenerate. + +2021-03-31 Alan Modra <amodra@gmail.com> + * bfd-in.h: Include string.h. (LITMEMCPY, LITSTRCPY): Delete. * bfd-in2.h: Regenerate. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 3f143dc..ed2f701 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -33,7 +33,7 @@ bfdlibdir = @bfdlibdir@ bfdincludedir = @bfdincludedir@ bfdlib_LTLIBRARIES = libbfd.la bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - bfd_stdint.h $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h + $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h else !INSTALL_LIBBFD # Empty these so that the respective installation directories will not be created. bfdlibdir = @@ -700,7 +700,7 @@ SOURCE_HFILES = \ ## ... and .h files which are in the build tree, minus config.h and bfd.h BUILD_HFILES = \ - bfdver.h elf32-target.h elf64-target.h targmatch.h bfd_stdint.h + bfdver.h elf32-target.h elf64-target.h targmatch.h # Ensure they are built early: BUILT_SOURCES = $(BUILD_HFILES) @@ -863,7 +863,7 @@ pex64igen.c: peXXigen.c $(SED) -e s/XX/pex64/g < $< >> $@ BFD_H_DEPS= $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/diagnostics.h -LOCAL_H_DEPS= libbfd.h sysdep.h config.h bfd_stdint.h +LOCAL_H_DEPS= libbfd.h sysdep.h config.h $(BFD32_LIBS) \ $(BFD64_LIBS) \ $(ALL_MACHINES) \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index bd64658..12807d9 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -124,7 +124,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/plugins.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/progtest.m4 \ - $(top_srcdir)/../config/stdint.m4 \ $(top_srcdir)/../config/zlib.m4 $(top_srcdir)/../libtool.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ @@ -249,7 +248,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \ - $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bfd_stdint.h \ + $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h HEADERS = $(bfdinclude_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -470,7 +469,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ @INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2) @INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \ @INSTALL_LIBBFD_TRUE@ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ -@INSTALL_LIBBFD_TRUE@ bfd_stdint.h $(INCDIR)/diagnostics.h \ +@INSTALL_LIBBFD_TRUE@ $(INCDIR)/diagnostics.h \ @INSTALL_LIBBFD_TRUE@ $(INCDIR)/bfdlink.h $(am__append_2) @INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@ @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la @@ -1123,7 +1122,7 @@ SOURCE_HFILES = \ xcofflink.h xsym.h BUILD_HFILES = \ - bfdver.h elf32-target.h elf64-target.h targmatch.h bfd_stdint.h + bfdver.h elf32-target.h elf64-target.h targmatch.h # Ensure they are built early: @@ -1155,7 +1154,7 @@ libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL) $(ZLIB) noinst_LIBRARIES = libbfd.a libbfd_a_SOURCES = BFD_H_DEPS = $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/diagnostics.h -LOCAL_H_DEPS = libbfd.h sysdep.h config.h bfd_stdint.h +LOCAL_H_DEPS = libbfd.h sysdep.h config.h BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c \ bfdio.c bfdwin.c section.c archures.c reloc.c \ syms.c bfd.c archive.c corefile.c targets.c format.c \ diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4 index 519325d..a62ee4d 100644 --- a/bfd/aclocal.m4 +++ b/bfd/aclocal.m4 @@ -1178,7 +1178,6 @@ m4_include([../config/override.m4]) m4_include([../config/plugins.m4]) m4_include([../config/po.m4]) m4_include([../config/progtest.m4]) -m4_include([../config/stdint.m4]) m4_include([../config/zlib.m4]) m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index f90f718..46a0fcd 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -34,7 +34,7 @@ extern "C" { #include "ansidecl.h" #include "symcat.h" -#include "bfd_stdint.h" +#include <stdint.h> #include "diagnostics.h" #include <stdarg.h> #include <string.h> diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 426ab86d..92af6ca 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -41,7 +41,7 @@ extern "C" { #include "ansidecl.h" #include "symcat.h" -#include "bfd_stdint.h" +#include <stdint.h> #include "diagnostics.h" #include <stdarg.h> #include <string.h> diff --git a/bfd/config.in b/bfd/config.in index 18fb8ae..14f3cac 100644 --- a/bfd/config.in +++ b/bfd/config.in @@ -326,9 +326,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* The size of `char', as computed by sizeof. */ -#undef SIZEOF_CHAR - /* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT @@ -341,9 +338,6 @@ /* The size of `off_t', as computed by sizeof. */ #undef SIZEOF_OFF_T -/* The size of `short', as computed by sizeof. */ -#undef SIZEOF_SHORT - /* The size of `void *', as computed by sizeof. */ #undef SIZEOF_VOID_P diff --git a/bfd/configure b/bfd/configure index accd39c..fa499bb 100755 --- a/bfd/configure +++ b/bfd/configure @@ -13567,407 +13567,6 @@ fi done - - -inttype_headers=`echo inttypes.h sys/inttypes.h | sed -e 's/,/ /g'` - -acx_cv_header_stdint=stddef.h -acx_cv_header_stdint_kind="(already complete)" -for i in stdint.h $inttype_headers; do - unset ac_cv_type_uintptr_t - unset ac_cv_type_uintmax_t - unset ac_cv_type_int_least32_t - unset ac_cv_type_int_fast32_t - unset ac_cv_type_uint64_t - $as_echo_n "looking for a compliant stdint.h in $i, " >&6 - ac_fn_c_check_type "$LINENO" "uintmax_t" "ac_cv_type_uintmax_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uintmax_t" = xyes; then : - acx_cv_header_stdint=$i -else - continue -fi - - ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uintptr_t" = xyes; then : - -else - acx_cv_header_stdint_kind="(mostly complete)" -fi - - ac_fn_c_check_type "$LINENO" "int_least32_t" "ac_cv_type_int_least32_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_int_least32_t" = xyes; then : - -else - acx_cv_header_stdint_kind="(mostly complete)" -fi - - ac_fn_c_check_type "$LINENO" "int_fast32_t" "ac_cv_type_int_fast32_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_int_fast32_t" = xyes; then : - -else - acx_cv_header_stdint_kind="(mostly complete)" -fi - - ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uint64_t" = xyes; then : - -else - acx_cv_header_stdint_kind="(lacks uint64_t)" -fi - - break -done -if test "$acx_cv_header_stdint" = stddef.h; then - acx_cv_header_stdint_kind="(lacks uintmax_t)" - for i in stdint.h $inttype_headers; do - unset ac_cv_type_uintptr_t - unset ac_cv_type_uint32_t - unset ac_cv_type_uint64_t - $as_echo_n "looking for an incomplete stdint.h in $i, " >&6 - ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uint32_t" = xyes; then : - acx_cv_header_stdint=$i -else - continue -fi - - ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uint64_t" = xyes; then : - -fi - - ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_uintptr_t" = xyes; then : - -fi - - break - done -fi -if test "$acx_cv_header_stdint" = stddef.h; then - acx_cv_header_stdint_kind="(u_intXX_t style)" - for i in sys/types.h $inttype_headers; do - unset ac_cv_type_u_int32_t - unset ac_cv_type_u_int64_t - $as_echo_n "looking for u_intXX_t types in $i, " >&6 - ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_u_int32_t" = xyes; then : - acx_cv_header_stdint=$i -else - continue -fi - - ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "#include <sys/types.h> -#include <$i> -" -if test "x$ac_cv_type_u_int64_t" = xyes; then : - -fi - - break - done -fi -if test "$acx_cv_header_stdint" = stddef.h; then - acx_cv_header_stdint_kind="(using manual detection)" -fi - -test -z "$ac_cv_type_uintptr_t" && ac_cv_type_uintptr_t=no -test -z "$ac_cv_type_uint64_t" && ac_cv_type_uint64_t=no -test -z "$ac_cv_type_u_int64_t" && ac_cv_type_u_int64_t=no -test -z "$ac_cv_type_int_least32_t" && ac_cv_type_int_least32_t=no -test -z "$ac_cv_type_int_fast32_t" && ac_cv_type_int_fast32_t=no - -# ----------------- Summarize what we found so far - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what to include in bfd_stdint.h" >&5 -$as_echo_n "checking what to include in bfd_stdint.h... " >&6; } - -case `$as_basename -- bfd_stdint.h || -$as_expr X/bfd_stdint.h : '.*/\([^/][^/]*\)/*$' \| \ - Xbfd_stdint.h : 'X\(//\)$' \| \ - Xbfd_stdint.h : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/bfd_stdint.h | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` in - stdint.h) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: are you sure you want it there?" >&5 -$as_echo "$as_me: WARNING: are you sure you want it there?" >&2;} ;; - inttypes.h) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: are you sure you want it there?" >&5 -$as_echo "$as_me: WARNING: are you sure you want it there?" >&2;} ;; - *) ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_header_stdint $acx_cv_header_stdint_kind" >&5 -$as_echo "$acx_cv_header_stdint $acx_cv_header_stdint_kind" >&6; } - -# ----------------- done included file, check C basic types -------- - -# Lacking an uintptr_t? Test size of void * -case "$acx_cv_header_stdint:$ac_cv_type_uintptr_t" in - stddef.h:* | *:no) # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -$as_echo_n "checking size of void *... " >&6; } -if ${ac_cv_sizeof_void_p+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_void_p" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (void *) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_void_p=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 -$as_echo "$ac_cv_sizeof_void_p" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_VOID_P $ac_cv_sizeof_void_p -_ACEOF - - ;; -esac - -# Lacking an uint64_t? Test size of long -case "$acx_cv_header_stdint:$ac_cv_type_uint64_t:$ac_cv_type_u_int64_t" in - stddef.h:*:* | *:no:no) # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if ${ac_cv_sizeof_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (long) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_long=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -$as_echo "$ac_cv_sizeof_long" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long -_ACEOF - - ;; -esac - -if test $acx_cv_header_stdint = stddef.h; then - # Lacking a good header? Test size of everything and deduce all types. - # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -$as_echo_n "checking size of int... " >&6; } -if ${ac_cv_sizeof_int+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_int" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (int) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_int=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -$as_echo "$ac_cv_sizeof_int" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_INT $ac_cv_sizeof_int -_ACEOF - - - # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 -$as_echo_n "checking size of short... " >&6; } -if ${ac_cv_sizeof_short+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_short" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (short) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_short=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 -$as_echo "$ac_cv_sizeof_short" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SHORT $ac_cv_sizeof_short -_ACEOF - - - # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5 -$as_echo_n "checking size of char... " >&6; } -if ${ac_cv_sizeof_char+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then : - -else - if test "$ac_cv_type_char" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (char) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_char=0 - fi -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5 -$as_echo "$ac_cv_sizeof_char" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_CHAR $ac_cv_sizeof_char -_ACEOF - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int8_t" >&5 -$as_echo_n "checking for type equivalent to int8_t... " >&6; } - case "$ac_cv_sizeof_char" in - 1) acx_cv_type_int8_t=char ;; - *) as_fn_error $? "no 8-bit type, please report a bug" "$LINENO" 5 - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_int8_t" >&5 -$as_echo "$acx_cv_type_int8_t" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int16_t" >&5 -$as_echo_n "checking for type equivalent to int16_t... " >&6; } - case "$ac_cv_sizeof_int:$ac_cv_sizeof_short" in - 2:*) acx_cv_type_int16_t=int ;; - *:2) acx_cv_type_int16_t=short ;; - *) as_fn_error $? "no 16-bit type, please report a bug" "$LINENO" 5 - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_int16_t" >&5 -$as_echo "$acx_cv_type_int16_t" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int32_t" >&5 -$as_echo_n "checking for type equivalent to int32_t... " >&6; } - case "$ac_cv_sizeof_int:$ac_cv_sizeof_long" in - 4:*) acx_cv_type_int32_t=int ;; - *:4) acx_cv_type_int32_t=long ;; - *) as_fn_error $? "no 32-bit type, please report a bug" "$LINENO" 5 - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_int32_t" >&5 -$as_echo "$acx_cv_type_int32_t" >&6; } -fi - -# These tests are here to make the output prettier - -if test "$ac_cv_type_uint64_t" != yes && test "$ac_cv_type_u_int64_t" != yes; then - case "$ac_cv_sizeof_long" in - 8) acx_cv_type_int64_t=long ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int64_t" >&5 -$as_echo_n "checking for type equivalent to int64_t... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${acx_cv_type_int64_t-'using preprocessor symbols'}" >&5 -$as_echo "${acx_cv_type_int64_t-'using preprocessor symbols'}" >&6; } -fi - -# Now we can use the above types - -if test "$ac_cv_type_uintptr_t" != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to intptr_t" >&5 -$as_echo_n "checking for type equivalent to intptr_t... " >&6; } - case $ac_cv_sizeof_void_p in - 2) acx_cv_type_intptr_t=int16_t ;; - 4) acx_cv_type_intptr_t=int32_t ;; - 8) acx_cv_type_intptr_t=int64_t ;; - *) as_fn_error $? "no equivalent for intptr_t, please report a bug" "$LINENO" 5 - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_intptr_t" >&5 -$as_echo "$acx_cv_type_intptr_t" >&6; } -fi - -# ----------------- done all checks, emit header ------------- -ac_config_commands="$ac_config_commands bfd_stdint.h" - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } if ${ac_cv_header_time+:} false; then : @@ -17458,24 +17057,6 @@ fi LINGUAS="${LINGUAS-%UNSET%}" -GCC="$GCC" -CC="$CC" -acx_cv_header_stdint="$acx_cv_header_stdint" -acx_cv_type_int8_t="$acx_cv_type_int8_t" -acx_cv_type_int16_t="$acx_cv_type_int16_t" -acx_cv_type_int32_t="$acx_cv_type_int32_t" -acx_cv_type_int64_t="$acx_cv_type_int64_t" -acx_cv_type_intptr_t="$acx_cv_type_intptr_t" -ac_cv_type_uintmax_t="$ac_cv_type_uintmax_t" -ac_cv_type_uintptr_t="$ac_cv_type_uintptr_t" -ac_cv_type_uint64_t="$ac_cv_type_uint64_t" -ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t" -ac_cv_type_u_int32_t="$ac_cv_type_u_int32_t" -ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t" -ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t" -ac_cv_sizeof_void_p="$ac_cv_sizeof_void_p" - - _ACEOF @@ -17489,7 +17070,6 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "bfd_stdint.h") CONFIG_COMMANDS="$CONFIG_COMMANDS bfd_stdint.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "bfd-in3.h") CONFIG_FILES="$CONFIG_FILES bfd-in3.h:bfd-in2.h" ;; @@ -18923,378 +18503,6 @@ _LT_EOF ;; esac done ;; - "bfd_stdint.h":C) -if test "$GCC" = yes; then - echo "/* generated for " `$CC --version | sed 1q` "*/" > tmp-stdint.h -else - echo "/* generated for $CC */" > tmp-stdint.h -fi - -sed 's/^ *//' >> tmp-stdint.h <<EOF - - #ifndef GCC_GENERATED_STDINT_H - #define GCC_GENERATED_STDINT_H 1 - - #include <sys/types.h> -EOF - -if test "$acx_cv_header_stdint" != stdint.h; then - echo "#include <stddef.h>" >> tmp-stdint.h -fi -if test "$acx_cv_header_stdint" != stddef.h; then - echo "#include <$acx_cv_header_stdint>" >> tmp-stdint.h -fi - -sed 's/^ *//' >> tmp-stdint.h <<EOF - /* glibc uses these symbols as guards to prevent redefinitions. */ - #ifdef __int8_t_defined - #define _INT8_T - #define _INT16_T - #define _INT32_T - #endif - #ifdef __uint32_t_defined - #define _UINT32_T - #endif - -EOF - -# ----------------- done header, emit basic int types ------------- -if test "$acx_cv_header_stdint" = stddef.h; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - #ifndef _UINT8_T - #define _UINT8_T - #ifndef __uint8_t_defined - #define __uint8_t_defined - #ifndef uint8_t - typedef unsigned $acx_cv_type_int8_t uint8_t; - #endif - #endif - #endif - - #ifndef _UINT16_T - #define _UINT16_T - #ifndef __uint16_t_defined - #define __uint16_t_defined - #ifndef uint16_t - typedef unsigned $acx_cv_type_int16_t uint16_t; - #endif - #endif - #endif - - #ifndef _UINT32_T - #define _UINT32_T - #ifndef __uint32_t_defined - #define __uint32_t_defined - #ifndef uint32_t - typedef unsigned $acx_cv_type_int32_t uint32_t; - #endif - #endif - #endif - - #ifndef _INT8_T - #define _INT8_T - #ifndef __int8_t_defined - #define __int8_t_defined - #ifndef int8_t - typedef $acx_cv_type_int8_t int8_t; - #endif - #endif - #endif - - #ifndef _INT16_T - #define _INT16_T - #ifndef __int16_t_defined - #define __int16_t_defined - #ifndef int16_t - typedef $acx_cv_type_int16_t int16_t; - #endif - #endif - #endif - - #ifndef _INT32_T - #define _INT32_T - #ifndef __int32_t_defined - #define __int32_t_defined - #ifndef int32_t - typedef $acx_cv_type_int32_t int32_t; - #endif - #endif - #endif -EOF -elif test "$ac_cv_type_u_int32_t" = yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* int8_t int16_t int32_t defined by inet code, we do the u_intXX types */ - #ifndef _INT8_T - #define _INT8_T - #endif - #ifndef _INT16_T - #define _INT16_T - #endif - #ifndef _INT32_T - #define _INT32_T - #endif - - #ifndef _UINT8_T - #define _UINT8_T - #ifndef __uint8_t_defined - #define __uint8_t_defined - #ifndef uint8_t - typedef u_int8_t uint8_t; - #endif - #endif - #endif - - #ifndef _UINT16_T - #define _UINT16_T - #ifndef __uint16_t_defined - #define __uint16_t_defined - #ifndef uint16_t - typedef u_int16_t uint16_t; - #endif - #endif - #endif - - #ifndef _UINT32_T - #define _UINT32_T - #ifndef __uint32_t_defined - #define __uint32_t_defined - #ifndef uint32_t - typedef u_int32_t uint32_t; - #endif - #endif - #endif -EOF -else - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* Some systems have guard macros to prevent redefinitions, define them. */ - #ifndef _INT8_T - #define _INT8_T - #endif - #ifndef _INT16_T - #define _INT16_T - #endif - #ifndef _INT32_T - #define _INT32_T - #endif - #ifndef _UINT8_T - #define _UINT8_T - #endif - #ifndef _UINT16_T - #define _UINT16_T - #endif - #ifndef _UINT32_T - #define _UINT32_T - #endif -EOF -fi - -# ------------- done basic int types, emit int64_t types ------------ -if test "$ac_cv_type_uint64_t" = yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* system headers have good uint64_t and int64_t */ - #ifndef _INT64_T - #define _INT64_T - #endif - #ifndef _UINT64_T - #define _UINT64_T - #endif -EOF -elif test "$ac_cv_type_u_int64_t" = yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* system headers have an u_int64_t (and int64_t) */ - #ifndef _INT64_T - #define _INT64_T - #endif - #ifndef _UINT64_T - #define _UINT64_T - #ifndef __uint64_t_defined - #define __uint64_t_defined - #ifndef uint64_t - typedef u_int64_t uint64_t; - #endif - #endif - #endif -EOF -elif test -n "$acx_cv_type_int64_t"; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* architecture has a 64-bit type, $acx_cv_type_int64_t */ - #ifndef _INT64_T - #define _INT64_T - #ifndef int64_t - typedef $acx_cv_type_int64_t int64_t; - #endif - #endif - #ifndef _UINT64_T - #define _UINT64_T - #ifndef __uint64_t_defined - #define __uint64_t_defined - #ifndef uint64_t - typedef unsigned $acx_cv_type_int64_t uint64_t; - #endif - #endif - #endif -EOF -else - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* some common heuristics for int64_t, using compiler-specific tests */ - #if defined __STDC_VERSION__ && (__STDC_VERSION__-0) >= 199901L - #ifndef _INT64_T - #define _INT64_T - #ifndef __int64_t_defined - #ifndef int64_t - typedef long long int64_t; - #endif - #endif - #endif - #ifndef _UINT64_T - #define _UINT64_T - #ifndef uint64_t - typedef unsigned long long uint64_t; - #endif - #endif - - #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0 - /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and - does not implement __extension__. But that compiler doesn't define - __GNUC_MINOR__. */ - # if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__) - # define __extension__ - # endif - - # ifndef _INT64_T - # define _INT64_T - # ifndef int64_t - __extension__ typedef long long int64_t; - # endif - # endif - # ifndef _UINT64_T - # define _UINT64_T - # ifndef uint64_t - __extension__ typedef unsigned long long uint64_t; - # endif - # endif - - #elif !defined __STRICT_ANSI__ - # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ - - # ifndef _INT64_T - # define _INT64_T - # ifndef int64_t - typedef __int64 int64_t; - # endif - # endif - # ifndef _UINT64_T - # define _UINT64_T - # ifndef uint64_t - typedef unsigned __int64 uint64_t; - # endif - # endif - # endif /* compiler */ - - #endif /* ANSI version */ -EOF -fi - -# ------------- done int64_t types, emit intptr types ------------ -if test "$ac_cv_type_uintptr_t" != yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */ - #ifndef __uintptr_t_defined - #ifndef uintptr_t - typedef u$acx_cv_type_intptr_t uintptr_t; - #endif - #endif - #ifndef __intptr_t_defined - #ifndef intptr_t - typedef $acx_cv_type_intptr_t intptr_t; - #endif - #endif -EOF -fi - -# ------------- done intptr types, emit int_least types ------------ -if test "$ac_cv_type_int_least32_t" != yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* Define int_least types */ - typedef int8_t int_least8_t; - typedef int16_t int_least16_t; - typedef int32_t int_least32_t; - #ifdef _INT64_T - typedef int64_t int_least64_t; - #endif - - typedef uint8_t uint_least8_t; - typedef uint16_t uint_least16_t; - typedef uint32_t uint_least32_t; - #ifdef _UINT64_T - typedef uint64_t uint_least64_t; - #endif -EOF -fi - -# ------------- done intptr types, emit int_fast types ------------ -if test "$ac_cv_type_int_fast32_t" != yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* Define int_fast types. short is often slow */ - typedef int8_t int_fast8_t; - typedef int int_fast16_t; - typedef int32_t int_fast32_t; - #ifdef _INT64_T - typedef int64_t int_fast64_t; - #endif - - typedef uint8_t uint_fast8_t; - typedef unsigned int uint_fast16_t; - typedef uint32_t uint_fast32_t; - #ifdef _UINT64_T - typedef uint64_t uint_fast64_t; - #endif -EOF -fi - -if test "$ac_cv_type_uintmax_t" != yes; then - sed 's/^ *//' >> tmp-stdint.h <<EOF - - /* Define intmax based on what we found */ - #ifndef intmax_t - #ifdef _INT64_T - typedef int64_t intmax_t; - #else - typedef long intmax_t; - #endif - #endif - #ifndef uintmax_t - #ifdef _UINT64_T - typedef uint64_t uintmax_t; - #else - typedef unsigned long uintmax_t; - #endif - #endif -EOF -fi - -sed 's/^ *//' >> tmp-stdint.h <<EOF - - #endif /* GCC_GENERATED_STDINT_H */ -EOF - -if test -r bfd_stdint.h && cmp -s tmp-stdint.h bfd_stdint.h; then - rm -f tmp-stdint.h -else - mv -f tmp-stdint.h bfd_stdint.h -fi - - ;; "default":C) case "$srcdir" in .) srcdirpre= ;; diff --git a/bfd/configure.ac b/bfd/configure.ac index e9a07b8..cb43ebc 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -246,7 +246,6 @@ BFD_CC_FOR_BUILD AC_CHECK_HEADERS(alloca.h fcntl.h limits.h stddef.h stdlib.h string.h \ strings.h sys/file.h sys/resource.h sys/stat.h sys/time.h \ time.h unistd.h wchar.h wctype.h) -GCC_HEADER_STDINT(bfd_stdint.h) AC_HEADER_TIME AC_HEADER_DIRENT diff --git a/bfd/configure.com b/bfd/configure.com index cb93a65..33012fb 100644 --- a/bfd/configure.com +++ b/bfd/configure.com @@ -239,13 +239,6 @@ $DECK $ EOD $! $! -$! create bfd_stdint.h -$! -$ write sys$output "Generate `bfd_stdint.h'" -$ create []bfd_stdint.h -#include <inttypes.h> -$! -$! $! create targmatch.h $! $ write sys$output "Generate `targmatch.h'" diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index a0b5195..93ba83a 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -119,7 +119,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/plugins.m4 \ $(top_srcdir)/../config/po.m4 \ $(top_srcdir)/../config/progtest.m4 \ - $(top_srcdir)/../config/stdint.m4 \ $(top_srcdir)/../config/zlib.m4 $(top_srcdir)/../libtool.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ diff --git a/bfd/po/BLD-POTFILES.in b/bfd/po/BLD-POTFILES.in index 5fc39cf..f81e2b4 100644 --- a/bfd/po/BLD-POTFILES.in +++ b/bfd/po/BLD-POTFILES.in @@ -1,4 +1,3 @@ -bfd_stdint.h bfdver.h elf32-aarch64.c elf32-ia64.c diff --git a/binutils/ChangeLog b/binutils/ChangeLog index b62f115..aa7d9d8 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,10 @@ 2021-03-31 Alan Modra <amodra@gmail.com> + * coffdump.c: Include stdint.h in place of bfd_stdint.h. + * dwarf.c: Likewise. + +2021-03-31 Alan Modra <amodra@gmail.com> + * prdbg.c (pr_function_type): Replace LITSTTCPY with strcpy. 2021-03-29 Alan Modra <amodra@gmail.com> diff --git a/binutils/coffdump.c b/binutils/coffdump.c index 5ce3985..dd40221 100644 --- a/binutils/coffdump.c +++ b/binutils/coffdump.c @@ -26,7 +26,7 @@ #include "sysdep.h" #include "bfd.h" -#include "bfd_stdint.h" +#include <stdint.h> #include "libiberty.h" #include "bucomm.h" diff --git a/binutils/dwarf.c b/binutils/dwarf.c index 23ee705..476e391 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -21,7 +21,7 @@ #include "sysdep.h" #include "libiberty.h" #include "bfd.h" -#include "bfd_stdint.h" +#include <stdint.h> #include "bucomm.h" #include "elfcomm.h" #include "elf/common.h" diff --git a/gas/ChangeLog b/gas/ChangeLog index 354a14b..174cc86 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2021-03-31 Alan Modra <amodra@gmail.com> + + * config/tc-aarch64.c: Include stdint.h in place of bfd_stdint.h. + * config/tc-crx.c: Likewise. + * config/tc-nds32.h: Likewise. + 2021-03-30 Jan Beulich <jbeulich@suse.com> * config/tc-i386.c (build_modrm_byte): Change return type. diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index 6f782d0..9dd1def 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -22,7 +22,7 @@ #include "as.h" #include <limits.h> #include <stdarg.h> -#include "bfd_stdint.h" +#include <stdint.h> #define NO_RELOC 0 #include "safe-ctype.h" #include "subsegs.h" diff --git a/gas/config/tc-crx.c b/gas/config/tc-crx.c index 52eebcb..a82acb5 100644 --- a/gas/config/tc-crx.c +++ b/gas/config/tc-crx.c @@ -23,7 +23,7 @@ MA 02110-1301, USA. */ #include "as.h" -#include "bfd_stdint.h" +#include <stdint.h> #include "safe-ctype.h" #include "dwarf2dbg.h" #include "opcode/crx.h" diff --git a/gas/config/tc-nds32.h b/gas/config/tc-nds32.h index 7dbeb59..a74390a 100644 --- a/gas/config/tc-nds32.h +++ b/gas/config/tc-nds32.h @@ -22,7 +22,7 @@ #ifndef TC_NDS32 #define TC_NDS32 -#include "bfd_stdint.h" +#include <stdint.h> /* Enum mapping symbol. */ enum mstate diff --git a/gas/config/tc-pru.c b/gas/config/tc-pru.c index 5c41fa0..139e28e 100644 --- a/gas/config/tc-pru.c +++ b/gas/config/tc-pru.c @@ -21,7 +21,7 @@ 02110-1301, USA. */ #include "as.h" -#include "bfd_stdint.h" +#include <stdint.h> #include "opcode/pru.h" #include "elf/pru.h" #include "tc-pru.h" diff --git a/include/ChangeLog b/include/ChangeLog index 2bacadf..a542710 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,12 @@ +2021-03-31 Alan Modra <amodra@gmail.com> + + * cgen/basic-modes.h: Include stdint.h in place of bfd_stdint.h. + * elf/nfp.h: Likewise. + * opcode/aarch64.h: Likewise. + * opcode/cgen.h: Likewise. + * opcode/nfp.h: Likewise. + * opcode/ppc.h: Likewise. + 2021-03-29 Alan Modra <amodra@gmail.com> * opcode/aarch64.h (alias_opcode_p): Simplify boolean expression. diff --git a/include/cgen/basic-modes.h b/include/cgen/basic-modes.h index 3a476d4..2d76594 100644 --- a/include/cgen/basic-modes.h +++ b/include/cgen/basic-modes.h @@ -24,12 +24,10 @@ /* This file doesn't contain all modes, just the basic/portable ones. - It also provides access to stdint.h (*1) so the includer doesn't have - to deal with the portability issues. - (*1): To the extent that bfd_stdint.h does for now. */ + It also provides access to stdint.h so the includer doesn't have + to deal with the portability issues. */ -/* IWBN to avoid unnecessary dependencies on bfd-anything. */ -#include "bfd_stdint.h" +#include <stdint.h> typedef int8_t QI; typedef uint8_t UQI; diff --git a/include/elf/nfp.h b/include/elf/nfp.h index ae5f4f8..ca609c1 100644 --- a/include/elf/nfp.h +++ b/include/elf/nfp.h @@ -24,7 +24,7 @@ #include "bfd.h" #include "elf/common.h" #include "elf/reloc-macros.h" -#include "bfd_stdint.h" +#include <stdint.h> #ifdef __cplusplus extern "C" diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h index e48bea6..7a97fa8 100644 --- a/include/opcode/aarch64.h +++ b/include/opcode/aarch64.h @@ -23,7 +23,7 @@ #define OPCODE_AARCH64_H #include "bfd.h" -#include "bfd_stdint.h" +#include <stdint.h> #include <assert.h> #include <stdlib.h> diff --git a/include/opcode/cgen.h b/include/opcode/cgen.h index 0e68c85..8b7d2a4 100644 --- a/include/opcode/cgen.h +++ b/include/opcode/cgen.h @@ -24,8 +24,7 @@ #include "symcat.h" #include "cgen/bitset.h" -/* ??? IWBN to replace bfd in the name. */ -#include "bfd_stdint.h" +#include <stdint.h> #ifdef __cplusplus extern "C" { diff --git a/include/opcode/nfp.h b/include/opcode/nfp.h index 7f322a1..88c7d08 100644 --- a/include/opcode/nfp.h +++ b/include/opcode/nfp.h @@ -23,7 +23,7 @@ #define _NFP_H_ #include "bfd.h" -#include "bfd_stdint.h" +#include <stdint.h> #include "elf/nfp.h" #ifdef __cplusplus diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h index a5ee560..1c5f383 100644 --- a/include/opcode/ppc.h +++ b/include/opcode/ppc.h @@ -22,7 +22,7 @@ #ifndef PPC_H #define PPC_H -#include "bfd_stdint.h" +#include <stdint.h> #ifdef __cplusplus extern "C" { diff --git a/ld/ChangeLog b/ld/ChangeLog index 4b96e1a..dbdb4e1 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,23 @@ +2021-03-31 Alan Modra <amodra@gmail.com> + + * elf-hints-local.h: Include stdint.h in place of bfd_stdint.h. + * emultempl/nds32elf.em: Likewise. + * testsuite/ld-elf/mbind2b.c: Likewise. + * testsuite/ld-elf/pr18718.c: Likewise. + * testsuite/ld-elf/pr18720a.c: Likewise. + * testsuite/ld-elf/pr25749-1.c: Likewise. + * testsuite/ld-elf/pr25749-1a.c: Likewise. + * testsuite/ld-elf/pr25749-1b.c: Likewise. + * testsuite/ld-elf/pr25749-1c.c: Likewise. + * testsuite/ld-elf/pr25749-1d.c: Likewise. + * testsuite/ld-elf/pr25749-2.c: Likewise. + * testsuite/ld-elf/pr25754-1a.c: Likewise. + * testsuite/ld-elf/pr25754-2a.c: Likewise. + * testsuite/ld-elf/pr25754-3a.c: Likewise. + * testsuite/ld-elf/pr25754-4a.c: Likewise. + * testsuite/ld-elf/pr25754-5a.c: Likewise. + * testsuite/ld-elf/pr25754-6a.c: Likewise. + 2021-03-29 Alan Modra <amodra@gmail.com> * emultempl/aix.em (gld${EMULATION_NAME}_before_allocation): Simplify diff --git a/ld/elf-hints-local.h b/ld/elf-hints-local.h index 02dd019..9cdfa2f 100644 --- a/ld/elf-hints-local.h +++ b/ld/elf-hints-local.h @@ -25,7 +25,7 @@ #ifndef _ELF_HINTS_H_ #define _ELF_HINTS_H_ -#include "bfd_stdint.h" +#include <stdint.h> /* Hints file produced by ldconfig. */ struct elfhints_hdr diff --git a/ld/emultempl/nds32elf.em b/ld/emultempl/nds32elf.em index 0ebdec9..b00b774 100644 --- a/ld/emultempl/nds32elf.em +++ b/ld/emultempl/nds32elf.em @@ -24,7 +24,7 @@ fragment <<EOF #include "elf-bfd.h" #include "elf/nds32.h" -#include "bfd_stdint.h" +#include <stdint.h> #include "elf32-nds32.h" static int relax_fp_as_gp = 1; /* --mrelax-omit-fp */ diff --git a/ld/testsuite/ld-elf/mbind2b.c b/ld/testsuite/ld-elf/mbind2b.c index 10922a1..7e1367d 100644 --- a/ld/testsuite/ld-elf/mbind2b.c +++ b/ld/testsuite/ld-elf/mbind2b.c @@ -1,6 +1,6 @@ #include <stdio.h> #include <stdlib.h> -#include <bfd_stdint.h> +#include <stdint.h> extern char bss_in_mbind0; extern char data_in_mbind3; diff --git a/ld/testsuite/ld-elf/pr18718.c b/ld/testsuite/ld-elf/pr18718.c index 426f46a..bbf8e03 100644 --- a/ld/testsuite/ld-elf/pr18718.c +++ b/ld/testsuite/ld-elf/pr18718.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <bfd_stdint.h> +#include <stdint.h> extern void foo (void); extern void check_ptr_eq (void (*) (void), void (*) (void)); diff --git a/ld/testsuite/ld-elf/pr18720a.c b/ld/testsuite/ld-elf/pr18720a.c index b4a3369..fec4cf9 100644 --- a/ld/testsuite/ld-elf/pr18720a.c +++ b/ld/testsuite/ld-elf/pr18720a.c @@ -1,4 +1,4 @@ -#include <bfd_stdint.h> +#include <stdint.h> extern void bar (void); extern void foo (void); diff --git a/ld/testsuite/ld-elf/pr25749-1.c b/ld/testsuite/ld-elf/pr25749-1.c index 12d0574..249d80f 100644 --- a/ld/testsuite/ld-elf/pr25749-1.c +++ b/ld/testsuite/ld-elf/pr25749-1.c @@ -1,12 +1,12 @@ #include <stdio.h> -#include <bfd_stdint.h> +#include <stdint.h> extern intptr_t size (void); int main () { - if (size () == 303 /* size of this file */) + if (size () == 299 /* size of this file */) printf ("PASS\n"); #ifdef __GLIBC_PREREQ # if !__GLIBC_PREREQ (2, 28) diff --git a/ld/testsuite/ld-elf/pr25749-1a.c b/ld/testsuite/ld-elf/pr25749-1a.c index 775623b..657d29d 100644 --- a/ld/testsuite/ld-elf/pr25749-1a.c +++ b/ld/testsuite/ld-elf/pr25749-1a.c @@ -1,4 +1,4 @@ -#include <bfd_stdint.h> +#include <stdint.h> extern void *_binary_pr25749_1_c_start; extern void *_binary_pr25749_1_c_end; diff --git a/ld/testsuite/ld-elf/pr25749-1b.c b/ld/testsuite/ld-elf/pr25749-1b.c index f02a408..328b47c 100644 --- a/ld/testsuite/ld-elf/pr25749-1b.c +++ b/ld/testsuite/ld-elf/pr25749-1b.c @@ -1,4 +1,4 @@ -#include <bfd_stdint.h> +#include <stdint.h> extern void *_binary_pr25749_1_c_size; diff --git a/ld/testsuite/ld-elf/pr25749-1c.c b/ld/testsuite/ld-elf/pr25749-1c.c index f2847d7..3203624 100644 --- a/ld/testsuite/ld-elf/pr25749-1c.c +++ b/ld/testsuite/ld-elf/pr25749-1c.c @@ -1,4 +1,4 @@ -#include <bfd_stdint.h> +#include <stdint.h> extern void *_binary_pr25749_1_c_size __attribute__ ((visibility("hidden"))); diff --git a/ld/testsuite/ld-elf/pr25749-1d.c b/ld/testsuite/ld-elf/pr25749-1d.c index 33b869d..361d74c 100644 --- a/ld/testsuite/ld-elf/pr25749-1d.c +++ b/ld/testsuite/ld-elf/pr25749-1d.c @@ -1,4 +1,4 @@ -#include <bfd_stdint.h> +#include <stdint.h> extern void *_binary_pr25749_1_c_start; extern void *_binary_pr25749_1_c_end; diff --git a/ld/testsuite/ld-elf/pr25749-2.c b/ld/testsuite/ld-elf/pr25749-2.c index 3ef6f0c..9a1b2b8 100644 --- a/ld/testsuite/ld-elf/pr25749-2.c +++ b/ld/testsuite/ld-elf/pr25749-2.c @@ -1,12 +1,12 @@ #include <stdio.h> -#include <bfd_stdint.h> +#include <stdint.h> extern intptr_t size; int main () { - if (size == 293 /* size of this file */) + if (size == 289 /* size of this file */) printf ("PASS\n"); #ifdef __GLIBC_PREREQ # if !__GLIBC_PREREQ (2, 28) diff --git a/ld/testsuite/ld-elf/pr25754-1a.c b/ld/testsuite/ld-elf/pr25754-1a.c index 2b048ec..bc65c17 100644 --- a/ld/testsuite/ld-elf/pr25754-1a.c +++ b/ld/testsuite/ld-elf/pr25754-1a.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <bfd_stdint.h> +#include <stdint.h> extern uintptr_t bar; diff --git a/ld/testsuite/ld-elf/pr25754-2a.c b/ld/testsuite/ld-elf/pr25754-2a.c index 7c9f581..7c7fb28 100644 --- a/ld/testsuite/ld-elf/pr25754-2a.c +++ b/ld/testsuite/ld-elf/pr25754-2a.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <bfd_stdint.h> +#include <stdint.h> extern uintptr_t bar; diff --git a/ld/testsuite/ld-elf/pr25754-3a.c b/ld/testsuite/ld-elf/pr25754-3a.c index 2d4f02a..e57dfe2 100644 --- a/ld/testsuite/ld-elf/pr25754-3a.c +++ b/ld/testsuite/ld-elf/pr25754-3a.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <bfd_stdint.h> +#include <stdint.h> extern uintptr_t bar; diff --git a/ld/testsuite/ld-elf/pr25754-4a.c b/ld/testsuite/ld-elf/pr25754-4a.c index e2c2f8d..1148eca 100644 --- a/ld/testsuite/ld-elf/pr25754-4a.c +++ b/ld/testsuite/ld-elf/pr25754-4a.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <bfd_stdint.h> +#include <stdint.h> extern uintptr_t *get_bar (void); diff --git a/ld/testsuite/ld-elf/pr25754-5a.c b/ld/testsuite/ld-elf/pr25754-5a.c index cb791dd..8ddfccd 100644 --- a/ld/testsuite/ld-elf/pr25754-5a.c +++ b/ld/testsuite/ld-elf/pr25754-5a.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <bfd_stdint.h> +#include <stdint.h> extern uintptr_t *get_bar (void); diff --git a/ld/testsuite/ld-elf/pr25754-6a.c b/ld/testsuite/ld-elf/pr25754-6a.c index 59633a3..b8e7ade 100644 --- a/ld/testsuite/ld-elf/pr25754-6a.c +++ b/ld/testsuite/ld-elf/pr25754-6a.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <bfd_stdint.h> +#include <stdint.h> extern uintptr_t *get_bar (void); diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 7179187..ae4dea9 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,17 @@ +2021-03-31 Alan Modra <amodra@gmail.com> + + * aarch64-dis.c: Include stdint.h in place of bfd_stdint.h. + * aarch64-dis.h: Likewise. + * aarch64-opc.c: Likewise. + * avr-dis.c: Likewise. + * csky-dis.c: Likewise. + * nds32-asm.c: Likewise. + * nds32-dis.c: Likewise. + * nfp-dis.c: Likewise. + * riscv-dis.c: Likewise. + * s12z-dis.c: Likewise. + * wasm32-dis.c: Likewise. + 2021-03-30 Jan Beulich <jbeulich@suse.com> * i386-opc.c (cs, ds, ss, es, fs, gs): Delete. diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c index 349d7ea..1472f7d 100644 --- a/opcodes/aarch64-dis.c +++ b/opcodes/aarch64-dis.c @@ -19,7 +19,7 @@ see <http://www.gnu.org/licenses/>. */ #include "sysdep.h" -#include "bfd_stdint.h" +#include <stdint.h> #include "disassemble.h" #include "libiberty.h" #include "opintl.h" diff --git a/opcodes/aarch64-dis.h b/opcodes/aarch64-dis.h index 5bb546a..9704511 100644 --- a/opcodes/aarch64-dis.h +++ b/opcodes/aarch64-dis.h @@ -20,7 +20,7 @@ #ifndef OPCODES_AARCH64_DIS_H #define OPCODES_AARCH64_DIS_H -#include "bfd_stdint.h" +#include <stdint.h> #include "aarch64-opc.h" /* Lookup opcode WORD in the opcode table. diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c index c4397bc..1f04aad 100644 --- a/opcodes/aarch64-opc.c +++ b/opcodes/aarch64-opc.c @@ -22,7 +22,7 @@ #include <assert.h> #include <stdlib.h> #include <stdio.h> -#include "bfd_stdint.h" +#include <stdint.h> #include <stdarg.h> #include <inttypes.h> diff --git a/opcodes/avr-dis.c b/opcodes/avr-dis.c index b58958f..06f8a0c 100644 --- a/opcodes/avr-dis.c +++ b/opcodes/avr-dis.c @@ -25,7 +25,7 @@ #include "disassemble.h" #include "opintl.h" #include "libiberty.h" -#include "bfd_stdint.h" +#include <stdint.h> struct avr_opcodes_s { diff --git a/opcodes/csky-dis.c b/opcodes/csky-dis.c index 399c180..45af88c 100644 --- a/opcodes/csky-dis.c +++ b/opcodes/csky-dis.c @@ -22,7 +22,7 @@ #include "sysdep.h" #include "config.h" #include <stdio.h> -#include "bfd_stdint.h" +#include <stdint.h> #include <elf/csky.h> #include "disassemble.h" #include "elf-bfd.h" diff --git a/opcodes/nds32-asm.c b/opcodes/nds32-asm.c index d2f41f5..f641c60 100644 --- a/opcodes/nds32-asm.c +++ b/opcodes/nds32-asm.c @@ -22,7 +22,7 @@ #include "sysdep.h" -#include "bfd_stdint.h" +#include <stdint.h> #include <assert.h> #include "safe-ctype.h" diff --git a/opcodes/nds32-dis.c b/opcodes/nds32-dis.c index 96c3f38..25bb475 100644 --- a/opcodes/nds32-dis.c +++ b/opcodes/nds32-dis.c @@ -27,7 +27,7 @@ #include "symcat.h" #include "libiberty.h" #include "opintl.h" -#include "bfd_stdint.h" +#include <stdint.h> #include "hashtab.h" #include "nds32-asm.h" #include "opcode/nds32.h" diff --git a/opcodes/nfp-dis.c b/opcodes/nfp-dis.c index 4f79581..39ded66 100644 --- a/opcodes/nfp-dis.c +++ b/opcodes/nfp-dis.c @@ -33,7 +33,7 @@ #include "opintl.h" #include "elf-bfd.h" #include "bfd.h" -#include "bfd_stdint.h" +#include <stdint.h> #define _NFP_ERR_STOP -1 #define _NFP_ERR_CONT -8 diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index cc80d90..7ef4d4d 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -29,7 +29,7 @@ #include "elf/riscv.h" #include "cpu-riscv.h" -#include "bfd_stdint.h" +#include <stdint.h> #include <ctype.h> static enum riscv_spec_class default_priv_spec = PRIV_SPEC_CLASS_NONE; diff --git a/opcodes/s12z-dis.c b/opcodes/s12z-dis.c index 6645297..4616bc8 100644 --- a/opcodes/s12z-dis.c +++ b/opcodes/s12z-dis.c @@ -20,7 +20,7 @@ #include "sysdep.h" #include <stdio.h> -#include "bfd_stdint.h" +#include <stdint.h> #include <stdbool.h> #include <assert.h> diff --git a/opcodes/wasm32-dis.c b/opcodes/wasm32-dis.c index 6926661..f3fde32 100644 --- a/opcodes/wasm32-dis.c +++ b/opcodes/wasm32-dis.c @@ -27,7 +27,7 @@ #include "elf-bfd.h" #include "elf/internal.h" #include "elf/wasm32.h" -#include "bfd_stdint.h" +#include <stdint.h> #ifdef HAVE_LIMITS_H #include <limits.h> |