git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sync toplevel files from binutils-gdb 

commit 28ea7ae220a0343ff7fe531ec761bd77d00dcb1c
Author: Matthieu Longo <matthieu.longo@arm.com>
Date:   Tue May 28 10:49:45 2024 +0100

    autoupdate: replace old version of AC_INIT by the new one

    - old AC_INIT by AC_INIT + AC_CONFIG_SRC_DIR
      https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fINIT-3

commit 29496481662736f0a24bfc1daf31dbfc9d2bb7ee
Author: Matthieu Longo <matthieu.longo@arm.com>
Date:   Tue May 28 10:49:43 2024 +0100

    autoupdate: replace obsolete macros AC_CANONICAL_SYSTEM

    - AC_CANONICAL_SYSTEM by:
        * AC_CANONICAL_HOST where host, and host_alias are needed
        * AC_CANONICAL_TARGET where target_alias is needed
      https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fCANONICAL_005fTARGET-1

commit d9639e091c77689b10363ecb197466deaa161ade
Author: Maciej W. Rozycki <macro@redhat.com>
Date:   Mon Apr 28 18:53:30 2025 +0100

    Fix 64-bit BFD detection causing build failures

    We have a discrepancy with 64-bit BFD handling across our component
    subdirectories leading to link failures such as:

    ld: ../opcodes/.libs/libopcodes.a(disassemble.o): in function `disassembler': disassemble.c:(.text+0x65): undefined reference to `print_insn_alpha'
    ld: disassemble.c:(.text+0x105): undefined reference to `print_insn_ia64'
    ld: disassemble.c:(.text+0x11d): undefined reference to `print_insn_loongarch'
    ld: disassemble.c:(.text+0x1a1): undefined reference to `print_insn_big_mips'
    [...]

    with some configurations having a 32-bit host and 64-bit BFD, such as:
    `--host=i386-linux-gnu --target=riscv64-linux-gnu --enable-targets=all'.
    This is ultimately due to how 64-bit BFD is enabled for bfd/ itself and
    other subdirectorses and has been a regression from commit 1d5269c994bf
    ("unify 64-bit bfd checks").

    For bfd/ the BFD_64_BIT autoconf macro from config/bfd64.m4 is used
    combined with this logic in bfd/configure.ac:

    case ${host64}-${target64}-${want64} in
      *true*)
        wordsize=64
        bfd64_libs='$(BFD64_LIBS)'
        all_backends='$(BFD64_BACKENDS) $(BFD32_BACKENDS)'
        [...]
        ;;
      false-false-false)
        wordsize=32
        all_backends='$(BFD32_BACKENDS)'
        ;;
    esac

    where the value of ${wordsize} switches between 32-bit and 64-bit BFD
    via these pieces:

    #define BFD_ARCH_SIZE @wordsize@

    and:

    #if BFD_ARCH_SIZE >= 64
    #define BFD64
    #endif

    in bfd/bfd-in.h, which ultimately becomes a part of "bfd.h".

    Then ${host64} is determined in bfd/configure.ac from the host's word
    size, via the host's pointer size:

    if test "x${ac_cv_sizeof_void_p}" = "x8"; then
      host64=true
    fi

    And ${target64} is determined in bfd/configure.ac from the target's word
    size:

        if test ${target_size} = 64; then
            target64=true
        fi

    Where multiple targets have been requested with `--enable-targets=all'
    the presence of any 64-bit target will set "true" here.

    Finally ${want64} is set according to `--enable-64-bit-bfd' user option
    with an arrangement involving BFD_64_BIT:

    BFD_64_BIT
    if test $enable_64_bit_bfd = yes ; then
      want64=true
    else
      want64=false
    fi

    which also, redundantly, checks and sets its result upon the host's word
    size.  Lastly ${want64} is also selectively set by target fragments in
    bfd/config.bfd, which mostly if not completely overlaps with ${target64}
    setting as described above.

    Conversely other subdirectories only rely on BFD_64_BIT, so they fail to
    notice that BFD is 64-bit and do not enable their 64-bit handling where
    the host requested is 32-bit and 64-bit BFD has been enabled other than
    with `--enable-64-bit-bfd'.  One consequence is opcodes/disassemble.c
    enables calls to its numerous own 64-bit backends by checking the BFD64
    macro from "bfd.h", however does not actually enable said backends in
    its Makefile.  Hence the link errors quoted above.

    Address the problem then by moving the `--enable-64-bit-bfd' option back
    to bfd/configure.ac and remove the call to BFD_64_BIT from there and
    then rewrite the macro in terms of checking for the presence of BFD64
    macro in "bfd.h", which is the canonical way of determining whether BFD
    is 64-bit or not.

    Rather than running `grep' directly on ../bfd/bfd-in3.h as the opcodes/
    fragment used to before the problematic commit:

        if grep '#define BFD_ARCH_SIZE 64' ../bfd/bfd-in3.h > /dev/null; then

    run the preprocessor on "bfd.h", which allows to invoke the macro from
    configure.ac files placed in subdirectories located at deeper levels, by
    relying on the preprocessor's search path.

    This requires however that the invokers rely on `all-bfd' rather than
    `configure-bfd' for their `configure' invocation stage, because "bfd.h"
    is made by `make all' rather than `configure' in bfd/.

    Do not cache the result of this check however, as reconfiguring a tree
    such as to flip `--enable-64-bit-bfd' on or to change a secondary target
    may affect BFD64 and we have no access to information about secondary
    targets in BFD_64_BIT.

    Also remove the ENABLE_BFD_64_BIT automake conditional, as it's not used
    anywhere.

    Last but not least remove the hack from gdb/configure.ac to fail builds
    for `mips*-*-*' hosts where `--enable-targets=all' has been requested,
    but `--enable-64-bit-bfd' has not as it's no longer needed.  Such builds
    complete successfully now, having enabled 64-bit BFD implicitly.

    Tested-By: Guinevere Larsen <guinevere@redhat.com>
    Tested-By: Luis Machado <luis.machado@arm.com>
    Approved-By: Alan Modra <amodra@gmail.com>
    Approved-By: Luis Machado <luis.machado@arm.com>

	* Makefile.def: Synced from binutils-gdb.
	* Makefile.in: Regenerated.

commit 319719bb2921e978738acd408e6b16dabf0e7f5e
Author: Tom Tromey <tom@tromey.com>
Date:   Thu Mar 21 17:12:23 2024 -0600

    Revert "Pass GUILE down to subdirectories"

    This reverts commit b7e5a29602.

    This patch caused problems for some users when building gdb, because
    it would cause 'guild' to be invoked with the wrong versin of guile.
    On the whole it seems simpler to just back this out.

    I'm checking this in to the binutils-gdb repository in the interest of
    fixing the build for Andrew.  No one has responded to the identical
    patch sent to gcc-patches, but I will ping it there.

commit da48217f315084097ef25226c0acab3bbd55ebd3
Author: Simon Marchi <simon.marchi@efficios.com>
Date:   Thu Mar 14 13:39:18 2024 -0400

    gdbserver/linux: probe for libiconv in configure

    Make gdbserver's build system locate libiconv when building for Linux.

    Commit 07b3255c3bae ("Filter invalid encodings from Linux thread names")
    make libiconv madantory for building gdbserver on Linux.

    While trying to cross-compile gdb for xtensa-fsf-linux-uclibc (with a
    toolchain generated with crosstool-ng), I got:

        /home/smarchi/src/binutils-gdb/gdbserver/linux-low.cc:48:10: fatal error: iconv.h: No such file or directory
           48 | #include <iconv.h>
              |          ^~~~~~~~~

    I downloaded GNU libiconv, built it for that host, and installed it in
    an arbitrary directory.  I had to modify the gdbserver build system to
    locate libiconv and use it, the result is this patch.

    I eventually found that crosstool-ng has a config option to make uclibc
    provide an implementation of iconv, which is of course much easier.  But
    given that this patch is now written, I think it would be worth merging
    it, it could help some people who do not have iconv built-in their libc
    in the future (and may not have the luxury of rebuilding their libc like
    I do).

    Using AM_ICONV in configure.ac adds these options for configure (the
    same we have for gdb):

        --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
        --without-libiconv-prefix     don't search for libiconv in includedir and libdir
        --with-libiconv-type=TYPE     type of library to search for (auto/static/shared)

    It sets the `LIBICONV` variable with whatever is needed to link with
    libiconv, and adds the necessary `-I` flag to `CPPFLAGS`.

    To avoid unnecessarily linking against libiconv on hosts that don't need
    it, set `MAYBE_LIBICONV` with the contents of `LIBICONV` only if the
    host is Linux, and use `MAYBE_LIBICONV` in `Makefile.in`.

    Since libiconv is a hard requirement for Linux hosts, error out if it is
    not found.

    The bits in acinclude.m4 are similar to what we have in
    gdb/acinclude.m4.

    Update the top-level build system to support building against an in-tree
    libiconv (I did not test this part though).  Something tells me that the
    all-gdbserver dependency on all-libiconv is unnecessary, since there is
    already a dependency of configure-gdbserver on all-libiconv (and
    all-gdbserver surely depends on configure-gdbserver).  I just copied
    what's done for GDB though.

	* Makefile.def: Synced from binutils-gdb.
	* Makefile.tpl: Likewise.
	* configure.ac: Likewise.
	* Makefile.in: Regenerated.
	* configure: Likewise.

config/

	* acx.m4: Synced from binutils-gdb.
	* lthostflags.m4: Likewise.

libbacktrace/

	* configure.ac: Synced from binutils-gdb.
	* configure: Regenerated.

zlib/
	* configure.ac: Synced from binutils-gdb.
	* configure: Regenerated.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
This commit is contained in:
H.J. Lu 2025-10-02 06:13:41 +08:00
parent 790bbb9ca6
commit b40ef6e9dc
11 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.def
View File

@ -313,7 +313,6 @@ flags_to_pass = { flag= GNATBIND ; };
flags_to_pass = { flag= GNATMAKE ; }; flags_to_pass = { flag= GNATMAKE ; };
flags_to_pass = { flag= GDC ; }; flags_to_pass = { flag= GDC ; };
flags_to_pass = { flag= GDCFLAGS ; }; flags_to_pass = { flag= GDCFLAGS ; };
flags_to_pass = { flag= GUILE ; };
// Target tools // Target tools
flags_to_pass = { flag= AR_FOR_TARGET ; }; flags_to_pass = { flag= AR_FOR_TARGET ; };
@ -463,9 +462,11 @@ dependencies = { module=all-gdb; on=all-libbacktrace; };
// Host modules specific to gdbserver. // Host modules specific to gdbserver.
dependencies = { module=configure-gdbserver; on=all-gnulib; }; dependencies = { module=configure-gdbserver; on=all-gnulib; };
dependencies = { module=configure-gdbserver; on=all-libiconv; };
dependencies = { module=all-gdbserver; on=all-gdbsupport; }; dependencies = { module=all-gdbserver; on=all-gdbsupport; };
dependencies = { module=all-gdbserver; on=all-gnulib; }; dependencies = { module=all-gdbserver; on=all-gnulib; };
dependencies = { module=all-gdbserver; on=all-libiberty; }; dependencies = { module=all-gdbserver; on=all-libiberty; };
dependencies = { module=all-gdbserver; on=all-libiconv; };
dependencies = { module=configure-libgui; on=configure-tcl; }; dependencies = { module=configure-libgui; on=configure-tcl; };
dependencies = { module=configure-libgui; on=configure-tk; }; dependencies = { module=configure-libgui; on=configure-tk; };
@ -524,7 +525,7 @@ dependencies = { module=install-bfd; on=install-libsframe; };
dependencies = { module=install-strip-bfd; on=install-strip-libsframe; }; dependencies = { module=install-strip-bfd; on=install-strip-libsframe; };
// libopcodes depends on libbfd // libopcodes depends on libbfd
dependencies = { module=configure-opcodes; on=configure-bfd; hard=true; }; dependencies = { module=configure-opcodes; on=all-bfd; hard=true; };
dependencies = { module=install-opcodes; on=install-bfd; }; dependencies = { module=install-opcodes; on=install-bfd; };
dependencies = { module=install-strip-opcodes; on=install-strip-bfd; }; dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
@ -550,8 +551,8 @@ dependencies = { module=install-gprofng; on=install-opcodes; };
dependencies = { module=install-gprofng; on=install-bfd; }; dependencies = { module=install-gprofng; on=install-bfd; };
dependencies = { module=configure-ld; on=configure-gettext; }; dependencies = { module=configure-ld; on=configure-gettext; };
dependencies = { module=configure-ld; on=all-bfd; };
dependencies = { module=all-ld; on=all-libiberty; }; dependencies = { module=all-ld; on=all-libiberty; };
dependencies = { module=all-ld; on=all-bfd; };
dependencies = { module=all-ld; on=all-opcodes; }; dependencies = { module=all-ld; on=all-opcodes; };
dependencies = { module=all-ld; on=all-build-bison; }; dependencies = { module=all-ld; on=all-build-bison; };
dependencies = { module=all-ld; on=all-build-flex; }; dependencies = { module=all-ld; on=all-build-flex; };

50
Makefile.in
View File

@ -3,7 +3,7 @@
# #
# Makefile for directory with subdirs to build. # Makefile for directory with subdirs to build.
# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2023 # 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
# Free Software Foundation # Free Software Foundation
# #
# This file is free software; you can redistribute it and/or modify # This file is free software; you can redistribute it and/or modify
@ -144,8 +144,7 @@ BASE_EXPORTS = \
M4="$(M4)"; export M4; \ M4="$(M4)"; export M4; \
SED="$(SED)"; export SED; \ SED="$(SED)"; export SED; \
AWK="$(AWK)"; export AWK; \ AWK="$(AWK)"; export AWK; \
MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \ MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
GUILE="$(GUILE)"; export GUILE;
# This is the list of variables to export in the environment when # This is the list of variables to export in the environment when
# configuring subdirectories for the build system. # configuring subdirectories for the build system.
@ -460,8 +459,6 @@ CRAB1_LIBS = @CRAB1_LIBS@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
GUILE = guile
# Pass additional PGO and LTO compiler options to the PGO build. # Pass additional PGO and LTO compiler options to the PGO build.
BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS) BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS)
override CFLAGS += $(BUILD_CFLAGS) override CFLAGS += $(BUILD_CFLAGS)
@ -891,7 +888,6 @@ BASE_FLAGS_TO_PASS = \
"GNATMAKE=$(GNATMAKE)" \ "GNATMAKE=$(GNATMAKE)" \
"GDC=$(GDC)" \ "GDC=$(GDC)" \
"GDCFLAGS=$(GDCFLAGS)" \ "GDCFLAGS=$(GDCFLAGS)" \
"GUILE=$(GUILE)" \
"AR_FOR_TARGET=$(AR_FOR_TARGET)" \ "AR_FOR_TARGET=$(AR_FOR_TARGET)" \
"AS_FOR_TARGET=$(AS_FOR_TARGET)" \ "AS_FOR_TARGET=$(AS_FOR_TARGET)" \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
@ -68682,16 +68678,16 @@ install-strip-ld: maybe-install-strip-bfd
install-strip-ld: maybe-install-strip-libctf install-strip-ld: maybe-install-strip-libctf
install-bfd: maybe-install-libsframe install-bfd: maybe-install-libsframe
install-strip-bfd: maybe-install-strip-libsframe install-strip-bfd: maybe-install-strip-libsframe
configure-opcodes: configure-bfd configure-opcodes: all-bfd
configure-stage1-opcodes: configure-stage1-bfd configure-stage1-opcodes: all-stage1-bfd
configure-stage2-opcodes: configure-stage2-bfd configure-stage2-opcodes: all-stage2-bfd
configure-stage3-opcodes: configure-stage3-bfd configure-stage3-opcodes: all-stage3-bfd
configure-stage4-opcodes: configure-stage4-bfd configure-stage4-opcodes: all-stage4-bfd
configure-stageprofile-opcodes: configure-stageprofile-bfd configure-stageprofile-opcodes: all-stageprofile-bfd
configure-stagetrain-opcodes: configure-stagetrain-bfd configure-stagetrain-opcodes: all-stagetrain-bfd
configure-stagefeedback-opcodes: configure-stagefeedback-bfd configure-stagefeedback-opcodes: all-stagefeedback-bfd
configure-stageautoprofile-opcodes: configure-stageautoprofile-bfd configure-stageautoprofile-opcodes: all-stageautoprofile-bfd
configure-stageautofeedback-opcodes: configure-stageautofeedback-bfd configure-stageautofeedback-opcodes: all-stageautofeedback-bfd
install-opcodes: maybe-install-bfd install-opcodes: maybe-install-bfd
install-strip-opcodes: maybe-install-strip-bfd install-strip-opcodes: maybe-install-strip-bfd
configure-gas: maybe-configure-gettext configure-gas: maybe-configure-gettext
@ -68756,6 +68752,16 @@ configure-stagetrain-ld: maybe-configure-stagetrain-gettext
configure-stagefeedback-ld: maybe-configure-stagefeedback-gettext configure-stagefeedback-ld: maybe-configure-stagefeedback-gettext
configure-stageautoprofile-ld: maybe-configure-stageautoprofile-gettext configure-stageautoprofile-ld: maybe-configure-stageautoprofile-gettext
configure-stageautofeedback-ld: maybe-configure-stageautofeedback-gettext configure-stageautofeedback-ld: maybe-configure-stageautofeedback-gettext
configure-ld: maybe-all-bfd
configure-stage1-ld: maybe-all-stage1-bfd
configure-stage2-ld: maybe-all-stage2-bfd
configure-stage3-ld: maybe-all-stage3-bfd
configure-stage4-ld: maybe-all-stage4-bfd
configure-stageprofile-ld: maybe-all-stageprofile-bfd
configure-stagetrain-ld: maybe-all-stagetrain-bfd
configure-stagefeedback-ld: maybe-all-stagefeedback-bfd
configure-stageautoprofile-ld: maybe-all-stageautoprofile-bfd
configure-stageautofeedback-ld: maybe-all-stageautofeedback-bfd
all-ld: maybe-all-libiberty all-ld: maybe-all-libiberty
all-stage1-ld: maybe-all-stage1-libiberty all-stage1-ld: maybe-all-stage1-libiberty
all-stage2-ld: maybe-all-stage2-libiberty all-stage2-ld: maybe-all-stage2-libiberty
@ -68766,16 +68772,6 @@ all-stagetrain-ld: maybe-all-stagetrain-libiberty
all-stagefeedback-ld: maybe-all-stagefeedback-libiberty all-stagefeedback-ld: maybe-all-stagefeedback-libiberty
all-stageautoprofile-ld: maybe-all-stageautoprofile-libiberty all-stageautoprofile-ld: maybe-all-stageautoprofile-libiberty
all-stageautofeedback-ld: maybe-all-stageautofeedback-libiberty all-stageautofeedback-ld: maybe-all-stageautofeedback-libiberty
all-ld: maybe-all-bfd
all-stage1-ld: maybe-all-stage1-bfd
all-stage2-ld: maybe-all-stage2-bfd
all-stage3-ld: maybe-all-stage3-bfd
all-stage4-ld: maybe-all-stage4-bfd
all-stageprofile-ld: maybe-all-stageprofile-bfd
all-stagetrain-ld: maybe-all-stagetrain-bfd
all-stagefeedback-ld: maybe-all-stagefeedback-bfd
all-stageautoprofile-ld: maybe-all-stageautoprofile-bfd
all-stageautofeedback-ld: maybe-all-stageautofeedback-bfd
all-ld: maybe-all-opcodes all-ld: maybe-all-opcodes
all-stage1-ld: maybe-all-stage1-opcodes all-stage1-ld: maybe-all-stage1-opcodes
all-stage2-ld: maybe-all-stage2-opcodes all-stage2-ld: maybe-all-stage2-opcodes
@ -69249,7 +69245,9 @@ all-gdb: maybe-all-opcodes
all-gdb: maybe-all-libdecnumber all-gdb: maybe-all-libdecnumber
all-gdb: maybe-all-libctf all-gdb: maybe-all-libctf
all-gdb: maybe-all-libbacktrace all-gdb: maybe-all-libbacktrace
configure-gdbserver: maybe-all-libiconv
all-gdbserver: maybe-all-libiberty all-gdbserver: maybe-all-libiberty
all-gdbserver: maybe-all-libiconv
configure-gdbsupport: maybe-configure-gettext configure-gdbsupport: maybe-configure-gettext
all-gdbsupport: maybe-all-gettext all-gdbsupport: maybe-all-gettext
configure-gprof: maybe-configure-gettext configure-gprof: maybe-configure-gettext

7
Makefile.tpl
View File

@ -6,7 +6,7 @@ in
# #
# Makefile for directory with subdirs to build. # Makefile for directory with subdirs to build.
# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2023 # 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
# Free Software Foundation # Free Software Foundation
# #
# This file is free software; you can redistribute it and/or modify # This file is free software; you can redistribute it and/or modify
@ -147,8 +147,7 @@ BASE_EXPORTS = \
M4="$(M4)"; export M4; \ M4="$(M4)"; export M4; \
SED="$(SED)"; export SED; \ SED="$(SED)"; export SED; \
AWK="$(AWK)"; export AWK; \ AWK="$(AWK)"; export AWK; \
MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \ MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
GUILE="$(GUILE)"; export GUILE;
# This is the list of variables to export in the environment when # This is the list of variables to export in the environment when
# configuring subdirectories for the build system. # configuring subdirectories for the build system.
@ -463,8 +462,6 @@ CRAB1_LIBS = @CRAB1_LIBS@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
GUILE = guile
# Pass additional PGO and LTO compiler options to the PGO build. # Pass additional PGO and LTO compiler options to the PGO build.
BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS) BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS)
override CFLAGS += $(BUILD_CFLAGS) override CFLAGS += $(BUILD_CFLAGS)

4
config/acx.m4
View File

@ -107,9 +107,9 @@ AC_SUBST([target_subdir]) []dnl
#### ####
# _NCN_TOOL_PREFIXES: Some stuff that oughtta be done in AC_CANONICAL_SYSTEM # _NCN_TOOL_PREFIXES: Some stuff that oughtta be done in AC_CANONICAL_TARGET
# or AC_INIT. # or AC_INIT.
# These demand that AC_CANONICAL_SYSTEM be called beforehand. # These demand that AC_CANONICAL_HOST and AC_CANONICAL_TARGET be called beforehand.
AC_DEFUN([_NCN_TOOL_PREFIXES], AC_DEFUN([_NCN_TOOL_PREFIXES],
[ncn_tool_prefix= [ncn_tool_prefix=
test -n "$host_alias" && ncn_tool_prefix=$host_alias- test -n "$host_alias" && ncn_tool_prefix=$host_alias-

2
config/lthostflags.m4
View File

@ -10,7 +10,7 @@ dnl Defines and AC_SUBSTs lt_host_flags
AC_DEFUN([ACX_LT_HOST_FLAGS], [ AC_DEFUN([ACX_LT_HOST_FLAGS], [
AC_REQUIRE([AC_CANONICAL_SYSTEM]) AC_REQUIRE([AC_CANONICAL_HOST])
case $host in case $host in
*-cygwin* | *-mingw*) *-cygwin* | *-mingw*)

2
configure vendored
View File

@ -2343,6 +2343,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
progname=$0 progname=$0
# if PWD already has a value, it is probably wrong. # if PWD already has a value, it is probably wrong.
if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
@ -2538,7 +2539,6 @@ test -n "$target_alias" &&
test "$program_prefix$program_suffix$program_transform_name" = \ test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, && NONENONEs,x,x, &&
program_prefix=${target_alias}- program_prefix=${target_alias}-
test "$program_prefix" != NONE && test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name" program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it. # Use a double $ so make ignores it.

7
configure.ac
View File

@ -32,7 +32,8 @@ m4_include([ltversion.m4])
m4_include([lt~obsolete.m4]) m4_include([lt~obsolete.m4])
m4_include([config/isl.m4]) m4_include([config/isl.m4])
AC_INIT(move-if-change) AC_INIT
AC_CONFIG_SRCDIR([move-if-change])
AC_DISABLE_OPTION_CHECKING AC_DISABLE_OPTION_CHECKING
progname=$0 progname=$0
@ -70,14 +71,14 @@ ACX_NONCANONICAL_TARGET
dnl Autoconf 2.5x and later will set a default program prefix if dnl Autoconf 2.5x and later will set a default program prefix if
dnl --target was used, even if it was the same as --host. Disable dnl --target was used, even if it was the same as --host. Disable
dnl that behavior. This must be done before AC_CANONICAL_SYSTEM dnl that behavior. This must be done before AC_CANONICAL_TARGET
dnl to take effect. dnl to take effect.
test "$host_noncanonical" = "$target_noncanonical" && test "$host_noncanonical" = "$target_noncanonical" &&
test "$program_prefix$program_suffix$program_transform_name" = \ test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, && NONENONEs,x,x, &&
program_transform_name=s,y,y, program_transform_name=s,y,y,
AC_CANONICAL_SYSTEM AC_CANONICAL_TARGET
AC_ARG_PROGRAM AC_ARG_PROGRAM
m4_pattern_allow([^AS_FOR_TARGET$])dnl m4_pattern_allow([^AS_FOR_TARGET$])dnl

5
libbacktrace/configure vendored
View File

@ -2739,7 +2739,6 @@ test -n "$target_alias" &&
test "$program_prefix$program_suffix$program_transform_name" = \ test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, && NONENONEs,x,x, &&
program_prefix=${target_alias}- program_prefix=${target_alias}-
target_alias=${target_alias-$host_alias} target_alias=${target_alias-$host_alias}
# Expand $ac_aux_dir to an absolute path. # Expand $ac_aux_dir to an absolute path.
@ -11636,7 +11635,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11639 "configure" #line 11638 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -11742,7 +11741,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11745 "configure" #line 11744 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H

3
libbacktrace/configure.ac
View File

@ -37,7 +37,8 @@ if test -n "${with_target_subdir}"; then
AM_ENABLE_MULTILIB(, ..) AM_ENABLE_MULTILIB(, ..)
fi fi
AC_CANONICAL_SYSTEM AC_CANONICAL_HOST
AC_CANONICAL_TARGET
target_alias=${target_alias-$host_alias} target_alias=${target_alias-$host_alias}
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS

5
zlib/configure vendored
View File

@ -2425,7 +2425,6 @@ test -n "$target_alias" &&
NONENONEs,x,x, && NONENONEs,x,x, &&
program_prefix=${target_alias}- program_prefix=${target_alias}-
# This works around an automake problem. # This works around an automake problem.
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
@ -10854,7 +10853,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 10857 "configure" #line 10856 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -10960,7 +10959,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 10963 "configure" #line 10962 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H

2
zlib/configure.ac
View File

@ -7,7 +7,7 @@ if test -n "${with_target_subdir}"; then
AM_ENABLE_MULTILIB(, ..) AM_ENABLE_MULTILIB(, ..)
fi fi
AC_CANONICAL_SYSTEM AC_CANONICAL_TARGET
# This works around an automake problem. # This works around an automake problem.
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"