From 4900c4e60c75113e71f80722267dde68668204dd Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 4 Aug 2022 12:49:03 +0930 Subject: [PATCH] Get rid of BFD_VMA_FMT Remove the BFD_VMA_FMT defines in bfd.h and configure support. * bfd-in.h (BFD_VMA_FMT): Don't define. * configure.ac (BFD_INT64_FMT): Remove configure test. * configure.com: Likewise. * Makefile.in: Regenerate. * bfd-in2.h: Regenerate. * configure: Regenerate. --- bfd/Makefile.in | 1 - bfd/bfd-in.h | 4 ---- bfd/bfd-in2.h | 4 ---- bfd/configure | 38 ++------------------------------------ bfd/configure.ac | 12 ------------ bfd/configure.com | 12 ------------ 6 files changed, 2 insertions(+), 69 deletions(-) diff --git a/bfd/Makefile.in b/bfd/Makefile.in index a26f74d7199..330096a58d7 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -330,7 +330,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BFD_INT64_FMT = @BFD_INT64_FMT@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 5ae7e48214f..8605056aefe 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -113,8 +113,6 @@ typedef int64_t bfd_signed_vma; typedef uint64_t bfd_size_type; typedef uint64_t symvalue; -#define BFD_VMA_FMT @BFD_INT64_FMT@ - #else /* not BFD64 */ typedef unsigned long bfd_vma; @@ -122,8 +120,6 @@ typedef long bfd_signed_vma; typedef unsigned long symvalue; typedef unsigned long bfd_size_type; -#define BFD_VMA_FMT "l" - #endif /* not BFD64 */ #define HALF_BFD_SIZE_TYPE \ diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index a95e4a24cad..0d2e915b413 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -120,8 +120,6 @@ typedef int64_t bfd_signed_vma; typedef uint64_t bfd_size_type; typedef uint64_t symvalue; -#define BFD_VMA_FMT @BFD_INT64_FMT@ - #else /* not BFD64 */ typedef unsigned long bfd_vma; @@ -129,8 +127,6 @@ typedef long bfd_signed_vma; typedef unsigned long symvalue; typedef unsigned long bfd_size_type; -#define BFD_VMA_FMT "l" - #endif /* not BFD64 */ #define HALF_BFD_SIZE_TYPE \ diff --git a/bfd/configure b/bfd/configure index 35e0b78405b..9632f52a51c 100755 --- a/bfd/configure +++ b/bfd/configure @@ -652,7 +652,6 @@ TDEFINES SHARED_LIBADD SHARED_LDFLAGS LIBM -BFD_INT64_FMT zlibinc zlibdir EXEEXT_FOR_BUILD @@ -11087,7 +11086,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11090 "configure" +#line 11089 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11193,7 +11192,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11196 "configure" +#line 11195 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13034,39 +13033,6 @@ $as_echo "#define HAVE_HIDDEN 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking printf int64_t format" >&5 -$as_echo_n "checking printf int64_t format... " >&6; } -if ${bfd_cv_int64_fmt+:} false; then : - $as_echo_n "(cached) " >&6 -else - for style in I64 ll l; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #define __STDC_FORMAT_MACROS 1 - #include - #include - extern char PRId64_probe[sizeof PRId64 == sizeof "${style}d" ? 1 : -1]; - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - bfd_cv_int64_fmt=${style} -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_int64_fmt" >&5 -$as_echo "$bfd_cv_int64_fmt" >&6; } -BFD_INT64_FMT=\"$bfd_cv_int64_fmt\" - - # Check if linker supports --as-needed and --no-as-needed options { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5 $as_echo_n "checking linker --as-needed support... " >&6; } diff --git a/bfd/configure.ac b/bfd/configure.ac index 6146efb5ae3..2d4f82e0708 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -248,18 +248,6 @@ if test $bfd_cv_hidden = yes; then [Define if your compiler supports hidden visibility.]) fi -AC_CACHE_CHECK([printf int64_t format], [bfd_cv_int64_fmt], - for style in I64 ll l; do - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #define __STDC_FORMAT_MACROS 1 - #include - #include - extern char PRId64_probe[sizeof PRId64 == sizeof "${style}d" ? 1 : -1]; - ]])], [bfd_cv_int64_fmt=${style}], [])] - done) -BFD_INT64_FMT=\"$bfd_cv_int64_fmt\" -AC_SUBST(BFD_INT64_FMT) - # Check if linker supports --as-needed and --no-as-needed options AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, [bfd_cv_ld_as_needed=no diff --git a/bfd/configure.com b/bfd/configure.com index cfff494a561..5dfa7d1db12 100644 --- a/bfd/configure.com +++ b/bfd/configure.com @@ -60,12 +60,6 @@ $DECK ERASE(match_pos); COPY_TEXT('64'); ENDIF; - match_pos := SEARCH_QUIETLY('@BFD_INT64_FMT@', FORWARD, EXACT, rang); - IF match_pos <> 0 THEN; - POSITION(BEGINNING_OF(match_pos)); - ERASE(match_pos); - COPY_TEXT('"l"'); - ENDIF; match_pos := SEARCH_QUIETLY('@bfd_file_ptr@', FORWARD, EXACT, rang); IF match_pos <> 0 THEN; POSITION(BEGINNING_OF(match_pos)); @@ -120,12 +114,6 @@ $DECK ERASE(match_pos); COPY_TEXT('32'); ENDIF; - match_pos := SEARCH_QUIETLY('@BFD_INT64_FMT@', FORWARD, EXACT, rang); - IF match_pos <> 0 THEN; - POSITION(BEGINNING_OF(match_pos)); - ERASE(match_pos); - COPY_TEXT('"ll"'); - ENDIF; match_pos := SEARCH_QUIETLY('@bfd_file_ptr@', FORWARD, EXACT, rang); IF match_pos <> 0 THEN; POSITION(BEGINNING_OF(match_pos)); -- 2.30.2