diff options
author | Mike Frysinger <vapier@gentoo.org> | 2021-12-04 00:28:14 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-01-01 12:49:07 -0500 |
commit | 1d5269c994bf4af088b1a9d0ed39825541623a99 (patch) | |
tree | 427712dedcd41fc7d1d0e8f837444ec8f6c6c762 /ld/configure.ac | |
parent | 3cc8ed6aaee33355a5d911a7401db3f1b05a2714 (diff) | |
download | gdb-1d5269c994bf4af088b1a9d0ed39825541623a99.zip gdb-1d5269c994bf4af088b1a9d0ed39825541623a99.tar.gz gdb-1d5269c994bf4af088b1a9d0ed39825541623a99.tar.bz2 |
unify 64-bit bfd checks
Move the 64-bit bfd logic out of bfd/configure.ac and into bfd64.m4
under config so it can be shared between all the other subdirs.
This replaces want64 with enable_64_bit_bfd which was already being
declared, but not used directly.
Diffstat (limited to 'ld/configure.ac')
-rw-r--r-- | ld/configure.ac | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/ld/configure.ac b/ld/configure.ac index 2b4c108..5e930ab 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -60,13 +60,8 @@ AC_ARG_ENABLE(targets, no) enable_targets= ;; *) enable_targets=$enableval ;; esac])dnl -AC_ARG_ENABLE(64-bit-bfd, -[ --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)], -[case "${enableval}" in - yes) want64=true ;; - no) want64=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for 64-bit-bfd option) ;; -esac],[want64=false])dnl + +BFD_64_BIT AC_ARG_WITH(sysroot, [ --with-sysroot[=DIR] Search for usr/lib et al within DIR.], @@ -366,15 +361,6 @@ all_emul_extras= all_libpath= TDIRS= -# If the host is 64-bit, then we enable 64-bit targets by default. -# This is consistent with what ../bfd/configure.ac does. -if test x${want64} = xfalse; then - AC_CHECK_SIZEOF(void *) - if test "x${ac_cv_sizeof_void_p}" = "x8"; then - want64=true - fi -fi - elf_list_options=false elf_shlib_list_options=false elf_plt_unwind_list_options=false @@ -400,11 +386,11 @@ do EMUL=$targ_emul fi - if test x${want64} = xfalse; then + if test x${enable_64_bit_bfd} = xno; then . ${srcdir}/../bfd/config.bfd fi - if test x${want64} = xtrue; then + if test x${enable_64_bit_bfd} = xyes; then targ_extra_emuls="$targ_extra_emuls $targ64_extra_emuls" targ_extra_libpath="$targ_extra_libpath $targ64_extra_libpath" fi @@ -539,7 +525,7 @@ AC_SUBST(TDIRS) AM_SUBST_NOTMAKE(TDIRS) if test x${all_targets} = xtrue; then - if test x${want64} = xtrue; then + if test x${enable_64_bit_bfd} = xyes; then EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)' EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES) $(ALL_64_EMUL_EXTRA_OFILES)' else |