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.

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index a26f74d7199b775de611e260f4aedf10602b2e43..330096a58d71e1852a88e7f5930e0b48aedebd42 100644 (file)
--- 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 5ae7e48214feb353cf863a98c2a408be4869fe94..8605056aefe6837efbbaeaabd56564082506d1ed 100644 (file)
--- 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 a95e4a24cad0df968b64e5c0fc02101bc91fdf43..0d2e915b413e0d3656875519d1c75b8fb9bb0747 100644 (file)
--- 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 35e0b78405bde81fd8d05a428d044050fb63f314..9632f52a51c3d32f67bbb24a4c22aae655d35053 100755 (executable)
--- 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 <stdio.h>
-       #include <inttypes.h>
-       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 6146efb5ae37b3ad96b119f63afa23f18ecb93d8..2d4f82e0708109ddcf40e1811e9bfeed6d4e9f35 100644 (file)
--- 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 <stdio.h>
-       #include <inttypes.h>
-       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 cfff494a561ee5ae47eab38ee7294e3e4784fd20..5dfa7d1db1266b6849af37f61b583f54bbc39819 100644 (file)
--- 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));