diff options
| author | cvs2svn <> | 2006-03-21 03:57:39 +0300 |
|---|---|---|
| committer | cvs2svn <> | 2006-03-21 03:57:39 +0300 |
| commit | e6228b993d46c21876a6fb2aa8e86c3c1a112e48 (patch) | |
| tree | 877a11dbd891cea2a993db97cca4ee332c4e4b8c | |
| parent | f84325d0899e5052fd59892ece265f7c2bd6c6a7 (diff) | |
This commit was manufactured by cvs2svn to create tag 'newlib-1_14_0'.newlib-1_14_0
Sprout from newlib-csl-20060320-branch 2006-03-21 00:57:35 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'newlib-'
Cherrypick from master 2005-12-16 20:58:39 UTC Jeff Johnston <jjohnstn@redhat.com> '':
ChangeLog
MAINTAINERS
Makefile.def
Makefile.in
Makefile.tpl
config.guess
config.sub
config/ChangeLog
config/acx.m4
configure
configure.in
etc/ChangeLog
etc/Makefile.in
etc/configure.texi
etc/standards.texi
libgloss/ChangeLog
libgloss/arm/crt0.S
libgloss/arm/libcfunc.c
libgloss/arm/redboot-crt0.S
libgloss/arm/swi.h
libgloss/arm/syscalls.c
libgloss/arm/trap.S
libgloss/m32c/exit.S
libgloss/m68k/Makefile.in
libgloss/m68k/bcc.ld
libgloss/m68k/crt0.S
libgloss/m68k/idp.ld
libgloss/m68k/idpgdb.ld
libgloss/m68k/mvme135.ld
libgloss/m68k/mvme162.ld
libgloss/m68k/sbc5204.ld
libgloss/m68k/sbc5206.ld
libgloss/m68k/sim.ld
libgloss/mt/Makefile.in
libtool.m4
ltmain.sh
newlib/ChangeLog
newlib/Makefile.am
newlib/Makefile.in
newlib/acinclude.m4
newlib/aclocal.m4
newlib/configure
newlib/configure.host
newlib/configure.in
newlib/doc/aclocal.m4
newlib/doc/configure
newlib/iconvdata/aclocal.m4
newlib/iconvdata/configure
newlib/libc/aclocal.m4
newlib/libc/configure
newlib/libc/include/ieeefp.h
newlib/libc/include/math.h
newlib/libc/include/sys/config.h
newlib/libc/include/sys/time.h
newlib/libc/include/sys/types.h
newlib/libc/machine/a29k/aclocal.m4
newlib/libc/machine/a29k/configure
newlib/libc/machine/aclocal.m4
newlib/libc/machine/arm/aclocal.m4
newlib/libc/machine/arm/configure
newlib/libc/machine/arm/setjmp.S
newlib/libc/machine/configure
newlib/libc/machine/cris/aclocal.m4
newlib/libc/machine/cris/configure
newlib/libc/machine/crx/aclocal.m4
newlib/libc/machine/crx/configure
newlib/libc/machine/d10v/aclocal.m4
newlib/libc/machine/d10v/configure
newlib/libc/machine/d30v/aclocal.m4
newlib/libc/machine/d30v/configure
newlib/libc/machine/fr30/aclocal.m4
newlib/libc/machine/fr30/configure
newlib/libc/machine/frv/aclocal.m4
newlib/libc/machine/frv/configure
newlib/libc/machine/h8300/aclocal.m4
newlib/libc/machine/h8300/configure
newlib/libc/machine/h8500/aclocal.m4
newlib/libc/machine/h8500/configure
newlib/libc/machine/hppa/aclocal.m4
newlib/libc/machine/hppa/configure
newlib/libc/machine/i386/aclocal.m4
newlib/libc/machine/i386/configure
newlib/libc/machine/i960/aclocal.m4
newlib/libc/machine/i960/configure
newlib/libc/machine/iq2000/aclocal.m4
newlib/libc/machine/iq2000/configure
newlib/libc/machine/m32c/aclocal.m4
newlib/libc/machine/m32c/configure
newlib/libc/machine/m32r/aclocal.m4
newlib/libc/machine/m32r/configure
newlib/libc/machine/m68hc11/aclocal.m4
newlib/libc/machine/m68hc11/configure
newlib/libc/machine/m68k/aclocal.m4
newlib/libc/machine/m68k/configure
newlib/libc/machine/m88k/aclocal.m4
newlib/libc/machine/m88k/configure
newlib/libc/machine/mips/aclocal.m4
newlib/libc/machine/mips/configure
newlib/libc/machine/mn10200/aclocal.m4
newlib/libc/machine/mn10200/configure
newlib/libc/machine/mn10300/aclocal.m4
newlib/libc/machine/mn10300/configure
newlib/libc/machine/mt/aclocal.m4
newlib/libc/machine/mt/configure
newlib/libc/machine/necv70/aclocal.m4
newlib/libc/machine/necv70/configure
newlib/libc/machine/powerpc/aclocal.m4
newlib/libc/machine/powerpc/configure
newlib/libc/machine/sh/aclocal.m4
newlib/libc/machine/sh/configure
newlib/libc/machine/sparc/aclocal.m4
newlib/libc/machine/sparc/configure
newlib/libc/machine/tic4x/aclocal.m4
newlib/libc/machine/tic4x/configure
newlib/libc/machine/tic80/aclocal.m4
newlib/libc/machine/tic80/configure
newlib/libc/machine/v850/aclocal.m4
newlib/libc/machine/v850/configure
newlib/libc/machine/w65/aclocal.m4
newlib/libc/machine/w65/configure
newlib/libc/machine/xscale/aclocal.m4
newlib/libc/machine/xscale/configure
newlib/libc/machine/xstormy16/aclocal.m4
newlib/libc/machine/xstormy16/configure
newlib/libc/machine/z8k/aclocal.m4
newlib/libc/machine/z8k/configure
newlib/libc/stdio/fflush.c
newlib/libc/stdio/freopen.c
newlib/libc/stdio/fseek.c
newlib/libc/stdio/wsetup.c
newlib/libc/stdio64/freopen64.c
newlib/libc/stdlib/__atexit.c
newlib/libc/stdlib/__call_atexit.c
newlib/libc/stdlib/getopt.c
newlib/libc/string/strndup_r.c
newlib/libc/string/strnlen.c
newlib/libc/sys/a29khif/aclocal.m4
newlib/libc/sys/a29khif/configure
newlib/libc/sys/aclocal.m4
newlib/libc/sys/arc/aclocal.m4
newlib/libc/sys/arc/configure
newlib/libc/sys/arm/aclocal.m4
newlib/libc/sys/arm/configure
newlib/libc/sys/arm/crt0.S
newlib/libc/sys/arm/libcfunc.c
newlib/libc/sys/arm/swi.h
newlib/libc/sys/arm/syscalls.c
newlib/libc/sys/arm/trap.S
newlib/libc/sys/configure
newlib/libc/sys/d10v/aclocal.m4
newlib/libc/sys/d10v/configure
newlib/libc/sys/decstation/aclocal.m4
newlib/libc/sys/decstation/configure
newlib/libc/sys/h8300hms/aclocal.m4
newlib/libc/sys/h8300hms/configure
newlib/libc/sys/h8500hms/aclocal.m4
newlib/libc/sys/h8500hms/configure
newlib/libc/sys/linux/aclocal.m4
newlib/libc/sys/linux/aio.c
newlib/libc/sys/linux/configure
newlib/libc/sys/linux/include/getopt.h
newlib/libc/sys/linux/linuxthreads/aclocal.m4
newlib/libc/sys/linux/linuxthreads/config.h
newlib/libc/sys/linux/linuxthreads/configure
newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4
newlib/libc/sys/linux/linuxthreads/machine/configure
newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4
newlib/libc/sys/linux/linuxthreads/machine/i386/configure
newlib/libc/sys/linux/machine/aclocal.m4
newlib/libc/sys/linux/machine/configure
newlib/libc/sys/linux/machine/i386/aclocal.m4
newlib/libc/sys/linux/machine/i386/configure
newlib/libc/sys/linux/sys/types.h
newlib/libc/sys/m88kbug/aclocal.m4
newlib/libc/sys/m88kbug/configure
newlib/libc/sys/mmixware/aclocal.m4
newlib/libc/sys/mmixware/configure
newlib/libc/sys/netware/aclocal.m4
newlib/libc/sys/netware/configure
newlib/libc/sys/rtems/aclocal.m4
newlib/libc/sys/rtems/configure
newlib/libc/sys/sh/aclocal.m4
newlib/libc/sys/sh/configure
newlib/libc/sys/sparc64/aclocal.m4
newlib/libc/sys/sparc64/configure
newlib/libc/sys/sun4/aclocal.m4
newlib/libc/sys/sun4/configure
newlib/libc/sys/sysmec/aclocal.m4
newlib/libc/sys/sysmec/configure
newlib/libc/sys/sysnec810/aclocal.m4
newlib/libc/sys/sysnec810/configure
newlib/libc/sys/sysnecv850/aclocal.m4
newlib/libc/sys/sysnecv850/configure
newlib/libc/sys/sysvi386/aclocal.m4
newlib/libc/sys/sysvi386/configure
newlib/libc/sys/sysvnecv70/aclocal.m4
newlib/libc/sys/sysvnecv70/configure
newlib/libc/sys/tic80/aclocal.m4
newlib/libc/sys/tic80/configure
newlib/libc/sys/w65/aclocal.m4
newlib/libc/sys/w65/configure
newlib/libc/sys/z8ksim/aclocal.m4
newlib/libc/sys/z8ksim/configure
newlib/libm/aclocal.m4
newlib/libm/common/Makefile.am
newlib/libm/common/Makefile.in
newlib/libm/configure
newlib/libm/machine/aclocal.m4
newlib/libm/machine/configure
newlib/libm/machine/i386/aclocal.m4
newlib/libm/machine/i386/configure
newlib/libm/math/Makefile.am
newlib/libm/math/Makefile.in
newlib/libm/math/math.tex
newlib/libm/math/s_isinf.c
newlib/libm/math/s_isnan.c
newlib/libm/math/sf_isinf.c
newlib/libm/math/sf_isnan.c
newlib/libm/mathfp/Makefile.am
newlib/libm/mathfp/Makefile.in
newlib/libm/mathfp/mathfp.tex
newlib/libm/mathfp/s_atangent.c
newlib/libm/mathfp/s_frexp.c
newlib/libm/mathfp/s_isinf.c
newlib/libm/mathfp/s_isnan.c
newlib/libm/mathfp/sf_atangent.c
newlib/libm/mathfp/sf_frexp.c
newlib/libm/mathfp/sf_isinf.c
newlib/libm/mathfp/sf_isnan.c
newlib/newlib.hin
newlib/stamp-h.in
Delete:
config/mh-ppc-aix
config/stdint.m4
libgloss/m68k/dbug-cf.sc
libgloss/mt/crt0-ms2.S
libgloss/mt/exit-ms2.c
libgloss/mt/ms2.ld
libgloss/mt/startup-ms2.S
newlib/acconfig.h
newlib/libc/include/getopt.h
newlib/libc/sys/rdos/Makefile.am
newlib/libc/sys/rdos/Makefile.in
newlib/libc/sys/rdos/aclocal.m4
newlib/libc/sys/rdos/chown.c
newlib/libc/sys/rdos/close.c
newlib/libc/sys/rdos/config.h
newlib/libc/sys/rdos/configure
newlib/libc/sys/rdos/configure.in
newlib/libc/sys/rdos/crt0.S
newlib/libc/sys/rdos/execve.c
newlib/libc/sys/rdos/fork.c
newlib/libc/sys/rdos/fstat.c
newlib/libc/sys/rdos/getenv.c
newlib/libc/sys/rdos/getpid.c
newlib/libc/sys/rdos/gettod.c
newlib/libc/sys/rdos/isatty.c
newlib/libc/sys/rdos/kill.c
newlib/libc/sys/rdos/link.c
newlib/libc/sys/rdos/lseek.c
newlib/libc/sys/rdos/open.c
newlib/libc/sys/rdos/rdos.S
newlib/libc/sys/rdos/rdos.h
newlib/libc/sys/rdos/rdoshelp.c
newlib/libc/sys/rdos/read.c
newlib/libc/sys/rdos/readlink.c
newlib/libc/sys/rdos/sbrk.c
newlib/libc/sys/rdos/stat.c
newlib/libc/sys/rdos/symlink.c
newlib/libc/sys/rdos/times.c
newlib/libc/sys/rdos/unlink.c
newlib/libc/sys/rdos/user.def
newlib/libc/sys/rdos/wait.c
newlib/libc/sys/rdos/write.c
newlib/libm/common/s_isinf.c
newlib/libm/common/s_isinfd.c
newlib/libm/common/s_isnan.c
newlib/libm/common/s_isnand.c
newlib/libm/common/sf_isinf.c
newlib/libm/common/sf_isinff.c
newlib/libm/common/sf_isnan.c
newlib/libm/common/sf_isnanf.c
277 files changed, 4613 insertions, 23368 deletions
@@ -1,179 +1,3 @@ -2006-03-14 Paolo Bonzini <bonzini@gnu.org> - - * Makefile.in: Regenerate. - -2006-03-14 Paolo Bonzini <bonzini@gnu.org> - - Sync with gcc: - 2006-03-10 Aldy Hernandez <aldyh@redhat.com> - - * configure.in: Handle --disable-<component> generically. - * configure: Regenerate. - - 2006-02-21 Rafael Avila de Espindola <rafael.espindola@gmail.com> - - * Makefile.tpl (BUILD_CONFIGDIRS): Remove. - (TARGET_CONFIGDIRS): Remove. - * configure.in: Remove AC_SUBST(target_configdirs). - * Makefile.in, configure: Regenerated. - - -2006-03-01 H.J. Lu <hongjiu.lu@intel.com> - - PR libgcj/17311 - * ltmain.sh: Don't use "$finalize_rpath" for compile. - -2006-02-20 Paolo Bonzini <bonzini@gnu.org> - - PR bootstrap/25670 - - * Makefile.tpl ([+compare-target+]): Print explanation messages. - - * Makefile.def (ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES): New flags_to_pass. - * Makefile.tpl (BASE_FLAGS_TO_PASS): Support optional flags_to_pass. - (EXTRA_GCC_FLAGS): Remove ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES, - BUILD_PREFIX, BUILD_PREFIX_1. - * configure.in: (BUILD_PREFIX, BUILD_PREFIX_1): Don't substitute. - - * Makefile.def (bootstrap stage 1): Pass LIBCFLAGS too. - * Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Override LIBCFLAGS too. - - * Makefile.tpl (configure-stage[+id+]-[+prefix+][+module+], - all-stage[+id+]-[+prefix+][+module+], : Use $(current_stage) instead - of `cat stage_current`. Always provide the `r' and `s' variables. - (clean-stage[+id+]-[+prefix+][+module+]): Likewise, and make it into - a single shell execution. - (configure-[+prefix+][+module+], all-[+prefix+][+module+]): For - bootstrapped modules, make the stage1 module if the build was not - started yet, else build the current stage. - (all-host, all-target): Omit bootstrapped modules (if bootstrapping). - (all-build, all-host, all-target, [+make_target+]-host, - [+make_target+]-target): Do not use \-continued lines. - (target modules): Depend on stage_last, not all-gcc, if bootstrapping. - (current_stage, restrap, stage_last): New. - - * Makefile.in: Regenerate. - * configure: Regenerate. - -2006-02-14 Paolo Bonzini <bonzini@gnu.org> - - Sync from gcc: - - 2006-01-31 Richard Guenther <rguenther@suse.de> - Paolo Bonzini <bonzini@gnu.org> - - * Makefile.def (target_modules): Add libgcc-math target module. - * configure.in (target_libraries): Add libgcc-math target library. - (--enable-libgcc-math): New configure switch. - * Makefile.in: Re-generate. - * configure: Re-generate. - * libgcc-math: New toplevel directory. - - 2006-01-18 Richard Henderson <rth@redhat.com> - Jakub Jelinek <jakub@redhat.com> - Diego Novillo <dnovillo@redhat.com> - - * libgomp: New directory. - * Makefile.def: Add target_module libgomp. - * Makefile.in: Regenerate. - * configure.in (target_libraries): Add target-libgomp. - * configure: Regenerate. - -2006-02-14 Paolo Bonzini <bonzini@gnu.org> - Andreas Schwab <schwab@suse.de> - - * configure: Regenerate. - -2006-01-16 Paolo Bonzini <bonzini@gnu.org> - - * configure.in: Set with_gnu_as, with_gnu_ld, with_newlib earlier. - Set md_exec_prefix. Use ACX_CHECK_INSTALLED_TARGET_TOOL to find - the assembler, linker and binutils. - * configure: Regenerate. - -2006-01-16 Nick Clifton <nickc@redhat.com> - - * config.sub, config.guess: Sync from config repository. - -2006-01-05 Alexandre Oliva <aoliva@redhat.com> - - * Makefile.tpl (clean-stage[+id+]-[+prefix+][+module+]): Remove - @ from continuation. - * Makefile.in: Rebuilt. - -2006-01-04 Paolo Bonzini <bonzini@gnu.org> - - Sync from gcc: - - 2006-01-04 Paolo Bonzini <bonzini@gnu.org> - - PR bootstrap/24252 - - * Makefile.def (flags_to_pass): Add STAGE1_CFLAGS and STAGE1_LANGUAGES. - * Makefile.tpl (OBJDUMP): New. - (EXTRA_HOST_FLAGS): Add it. - (EXTRA_GCC_FLAGS): Remove flags already specified in flags_to_pass. - - * Makefile.tpl (stage[+id+]-start, stage[+id+]-end): Do not try - to use symbolic links between directories. Avoid race conditions - or make them harmless. - * configure.in: Do not try to use symbolic links between directories. - - * Makefile.def (LEAN): Pass. - * Makefile.tpl (LEAN): Define. - (stage[+id+]-start): Accept that the previous directory does not - exist, if the bootstrap is lean. - (stage[+id+]-bubble): Invoke lean bootstrap commands after - stage[+id+]-start. Use a makefile variable and an `if' instead of a - configure substitution. - ([+compare-target+]): Likewise. - ([+bootstrap-target+]-lean): New. - * configure.in: Remove lean bootstrap support from here. - - * Makefile.in: Regenerate. - * configure: Regenerate. - - 2006-01-02 Andreas Schwab <schwab@suse.de> - - * configure.in: When reconfiguring remove Makefile in - all stage directories. - * configure: Regenerate. - -2005-12-27 Leif Ekblad <leif@rdos.net> - - * configure.in: Add support for RDOS target. - * configure: Regenerate. - -2005-12-27 Nick Clifton <nickc@redhat.com> - - PR binutils/1990 - * libtool.m4: Synchronize with version in GCC sources. - -2005-12-20 Paolo Bonzini <bonzini@gnu.org> - - Revert Ada-related part of the previous change. - - * Makefile.def (ADAFLAGS, BOOT_ADAFLAGS, ADAFLAGS_FOR_TARGET): - Do not pass. - * Makefile.tpl (BOOT_ADAFLAGS): Do not define. - * Makefile.in: Regenerate. - * configure.in: Do not include mt-ppc-aix target fragment. - * configure: Regenerate. - -2005-12-19 Paolo Bonzini <bonzini@gnu.org> - - * configure.in: Select appropriate fragments for PowerPC/AIX. - * configure: Regenerate. - - * Makefile.def (flags_to_pass): Add ADAFLAGS, BOOT_ADAFLAGS, - BOOT_CFLAGS, BOOT_LDFLAGS. - * Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Handle BOOT_ADAFLAGS, - BOOT_CFLAGS, BOOT_LDFLAGS. - (TARGET_FLAGS_TO_PASS): Handle ADAFLAGS_FOR_TARGET. - (stage[+id+]-bubble): Pass flags recursively to the comparison target. - (stage): Fail if we cannot complete the work. - * Makefile.in: Regenerate. - 2005-12-16 Jeff Johnston <jjohnstn@redhat.com> * COPYING.NEWLIB: Update copyright year for default diff --git a/MAINTAINERS b/MAINTAINERS index b2077e7c2..519bafdbd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5,11 +5,7 @@ COPYING, COPYING.LIB, README http://gnu.org. Makefile.*; configure; configure.in; src-release - Any global maintainer can approve changes to these - files, but they should be aware that they need to - be kept in sync with their counterparts in the GCC - repository. Also please notify the following of - any committed patches: + Please notify the following of any committed patches. binutils@sources.redhat.com gdb-patches@sources.redhat.com @@ -98,17 +94,9 @@ winsup/ General discussion cygwin@sources.redhat.com. See also winsup/MAINTAINERS. -config-ml.in; makefile.vms; mkdep; setup.com; -etc/; intl/; utils/; - Any global maintainer can approve changes to these - files and directories. - -compile; depcomp; install-sh; missing; ylwrap; -config/ - Any global maintainer can approve changes to these - files and directories, but they should be aware - that they need to be kept in sync with their - counterparts in the GCC repository. +config-ml.in; setup.com; missing; makefile.vms; utils/; config/; +makefile.vms; missing; ylwrap; mkdep; etc/; install-sh; intl/ + Ask DJ Delorie <dj@redhat.com> after reading the libiberty entry. modules file Obviously changes to this file should not go through diff --git a/Makefile.def b/Makefile.def index 3227a4456..f857a00bf 100644 --- a/Makefile.def +++ b/Makefile.def @@ -4,7 +4,7 @@ AutoGen definitions Makefile.tpl; // Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'. // This file was originally written by Nathanael Nerode. // -// Copyright 2002, 2003, 2004, 2005, 2006 Free Software Foundation +// Copyright 2002, 2003 Free Software Foundation // // This file is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -117,7 +117,6 @@ host_modules= { module= gnattools; }; target_modules = { module= libstdc++-v3; lib_path=.libs; raw_cxx=true; }; target_modules = { module= libmudflap; lib_path=.libs; }; target_modules = { module= libssp; lib_path=.libs; }; -target_modules = { module= libgcc-math; lib_path=.libs; }; target_modules = { module= newlib; }; target_modules = { module= libgfortran; }; target_modules = { module= libobjc; }; @@ -138,7 +137,6 @@ target_modules = { module= boehm-gc; }; target_modules = { module= qthreads; }; target_modules = { module= rda; }; target_modules = { module= libada; }; -target_modules = { module= libgomp; lib_path=.libs; }; // These are (some of) the make targets to be done in each subdirectory. // Not all; these are the ones which don't have special options. @@ -207,18 +205,12 @@ flags_to_pass = { flag= SHELL ; }; flags_to_pass = { flag= YACC ; }; // Host tools -flags_to_pass = { flag= ADAFLAGS ; optional=true ; }; flags_to_pass = { flag= AR_FLAGS ; }; -flags_to_pass = { flag= BOOT_ADAFLAGS ; optional=true ; }; -flags_to_pass = { flag= BOOT_CFLAGS ; }; -flags_to_pass = { flag= BOOT_LDFLAGS ; }; flags_to_pass = { flag= CFLAGS ; }; flags_to_pass = { flag= CXXFLAGS ; }; flags_to_pass = { flag= LDFLAGS ; }; flags_to_pass = { flag= LIBCFLAGS ; }; flags_to_pass = { flag= LIBCXXFLAGS ; }; -flags_to_pass = { flag= STAGE1_CFLAGS ; }; -flags_to_pass = { flag= STAGE1_LANGUAGES ; }; // Target tools flags_to_pass = { flag= AR_FOR_TARGET ; }; @@ -242,10 +234,6 @@ flags_to_pass = { flag= RANLIB_FOR_TARGET ; }; flags_to_pass = { flag= STRIP_FOR_TARGET ; }; flags_to_pass = { flag= WINDRES_FOR_TARGET ; }; -// Miscellaneous -flags_to_pass = { flag= LANGUAGES ; optional=true ; }; -flags_to_pass = { flag= LEAN ; }; - // Inter-module dependencies // Build modules @@ -464,7 +452,7 @@ bootstrap_stage = { id=1 ; stage_configure_flags='--disable-intermodule \ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ; - stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"' ; }; + stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)"' ; }; bootstrap_stage = { id=2 ; prev=1 ; bootstrap_target=bootstrap2 ; diff --git a/Makefile.in b/Makefile.in index eae74a72e..ad5033cf2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,7 @@ # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation +# 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -84,6 +84,8 @@ GDB_NLM_DEPS = # the libraries. RPATH_ENVVAR = @RPATH_ENVVAR@ +# This is the list of directories to be built for the build system. +BUILD_CONFIGDIRS = libiberty # Build programs are put under this directory. BUILD_SUBDIR = @build_subdir@ # This is set by the configure script to the arguments to use when configuring @@ -176,6 +178,9 @@ POSTSTAGE1_HOST_EXPORTS = \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; +# This is set by the configure script to the list of directories which +# should be built using the target tools. +TARGET_CONFIGDIRS = @target_configdirs@ # Target libraries are put under this directory: TARGET_SUBDIR = @target_subdir@ # This is set by the configure script to the arguments to use when configuring @@ -247,7 +252,6 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ # Flags to pass to stage2 and later makes. They are defined # here so that they can be overridden by Makefile fragments. BOOT_CFLAGS= -g -O2 -BOOT_LDFLAGS= BISON = @BISON@ YACC = @YACC@ @@ -277,7 +281,6 @@ DLLTOOL = @DLLTOOL@ LD = @LD@ LIPO = @LIPO@ NM = @NM@ -OBJDUMP = @OBJDUMP@ RANLIB = @RANLIB@ STRIP = @STRIP@ WINDRES = @WINDRES@ @@ -351,7 +354,7 @@ all: # This is the list of directories that may be needed in RPATH_ENVVAR # so that prorgams built for the target machine work. -TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgcc-math)$(TARGET_LIB_PATH_libgomp)$(HOST_LIB_PATH_gcc) +TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(HOST_LIB_PATH_gcc) @if target-libstdc++-v3 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/.libs: @@ -365,14 +368,6 @@ TARGET_LIB_PATH_libmudflap = $$r/$(TARGET_SUBDIR)/libmudflap/.libs: TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs: @endif target-libssp -@if target-libgcc-math -TARGET_LIB_PATH_libgcc-math = $$r/$(TARGET_SUBDIR)/libgcc-math/.libs: -@endif target-libgcc-math - -@if target-libgomp -TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs: -@endif target-libgomp - # This is the list of directories that may be needed in RPATH_ENVVAR @@ -436,18 +431,12 @@ BASE_FLAGS_TO_PASS = \ "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ "SHELL=$(SHELL)" \ "YACC=$(YACC)" \ - "`echo 'ADAFLAGS=$(ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "AR_FLAGS=$(AR_FLAGS)" \ - "`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "BOOT_CFLAGS=$(BOOT_CFLAGS)" \ - "BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \ "CFLAGS=$(CFLAGS)" \ "CXXFLAGS=$(CXXFLAGS)" \ "LDFLAGS=$(LDFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCXXFLAGS=$(LIBCXXFLAGS)" \ - "STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \ - "STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \ "AR_FOR_TARGET=$(AR_FOR_TARGET)" \ "AS_FOR_TARGET=$(AS_FOR_TARGET)" \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ @@ -468,8 +457,6 @@ BASE_FLAGS_TO_PASS = \ "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \ "STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \ "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \ - "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "LEAN=$(LEAN)" \ "CONFIG_SHELL=$(SHELL)" \ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" @@ -487,7 +474,6 @@ EXTRA_HOST_FLAGS = \ 'LD=$(LD)' \ 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ - 'OBJDUMP=$(OBJDUMP)' \ 'RANLIB=$(RANLIB)' \ 'STRIP=$(STRIP)' \ 'WINDRES=$(WINDRES)' @@ -536,12 +522,18 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) # The BUILD_* variables are a special case, which are used for the gcc # cross-building scheme. EXTRA_GCC_FLAGS = \ + 'BUILD_PREFIX=$(BUILD_PREFIX)' \ + 'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ + "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" + "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ + "`echo 'STAGE1_CFLAGS=$(STAGE1_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ + "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ + "`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) @@ -620,7 +612,6 @@ configure-target: \ maybe-configure-target-libstdc++-v3 \ maybe-configure-target-libmudflap \ maybe-configure-target-libssp \ - maybe-configure-target-libgcc-math \ maybe-configure-target-newlib \ maybe-configure-target-libgfortran \ maybe-configure-target-libobjc \ @@ -636,8 +627,7 @@ configure-target: \ maybe-configure-target-boehm-gc \ maybe-configure-target-qthreads \ maybe-configure-target-rda \ - maybe-configure-target-libada \ - maybe-configure-target-libgomp + maybe-configure-target-libada # The target built for a native non-bootstrap build. .PHONY: all @@ -658,131 +648,105 @@ all: fi .PHONY: all-build - -all-build: maybe-all-build-libiberty -all-build: maybe-all-build-bison -all-build: maybe-all-build-byacc -all-build: maybe-all-build-flex -all-build: maybe-all-build-m4 -all-build: maybe-all-build-texinfo -all-build: maybe-all-build-fixincludes - +all-build: \ + maybe-all-build-libiberty \ + maybe-all-build-bison \ + maybe-all-build-byacc \ + maybe-all-build-flex \ + maybe-all-build-m4 \ + maybe-all-build-texinfo \ + maybe-all-build-fixincludes .PHONY: all-host - -all-host: maybe-all-ash -all-host: maybe-all-autoconf -all-host: maybe-all-automake -all-host: maybe-all-bash -@if bfd-no-bootstrap -all-host: maybe-all-bfd -@endif bfd-no-bootstrap -@if opcodes-no-bootstrap -all-host: maybe-all-opcodes -@endif opcodes-no-bootstrap -@if binutils-no-bootstrap -all-host: maybe-all-binutils -@endif binutils-no-bootstrap -all-host: maybe-all-bison -all-host: maybe-all-byacc -all-host: maybe-all-bzip2 -all-host: maybe-all-dejagnu -all-host: maybe-all-diff -all-host: maybe-all-dosutils -all-host: maybe-all-etc -all-host: maybe-all-fastjar -all-host: maybe-all-fileutils -all-host: maybe-all-findutils -all-host: maybe-all-find -all-host: maybe-all-fixincludes -all-host: maybe-all-flex -@if gas-no-bootstrap -all-host: maybe-all-gas -@endif gas-no-bootstrap -@if gcc-no-bootstrap -all-host: maybe-all-gcc -@endif gcc-no-bootstrap -all-host: maybe-all-gawk -all-host: maybe-all-gettext -all-host: maybe-all-gnuserv -all-host: maybe-all-gprof -all-host: maybe-all-gzip -all-host: maybe-all-hello -all-host: maybe-all-indent -@if intl-no-bootstrap -all-host: maybe-all-intl -@endif intl-no-bootstrap -all-host: maybe-all-tcl -all-host: maybe-all-itcl -@if ld-no-bootstrap -all-host: maybe-all-ld -@endif ld-no-bootstrap -@if libcpp-no-bootstrap -all-host: maybe-all-libcpp -@endif libcpp-no-bootstrap -@if libdecnumber-no-bootstrap -all-host: maybe-all-libdecnumber -@endif libdecnumber-no-bootstrap -all-host: maybe-all-libgui -@if libiberty-no-bootstrap -all-host: maybe-all-libiberty -@endif libiberty-no-bootstrap -all-host: maybe-all-libtool -all-host: maybe-all-m4 -all-host: maybe-all-make -all-host: maybe-all-mmalloc -all-host: maybe-all-patch -all-host: maybe-all-perl -all-host: maybe-all-prms -all-host: maybe-all-rcs -all-host: maybe-all-readline -all-host: maybe-all-release -all-host: maybe-all-recode -all-host: maybe-all-sed -all-host: maybe-all-send-pr -all-host: maybe-all-shellutils -all-host: maybe-all-sid -all-host: maybe-all-sim -all-host: maybe-all-tar -all-host: maybe-all-texinfo -all-host: maybe-all-textutils -all-host: maybe-all-time -all-host: maybe-all-uudecode -all-host: maybe-all-wdiff -all-host: maybe-all-zip -@if zlib-no-bootstrap -all-host: maybe-all-zlib -@endif zlib-no-bootstrap -all-host: maybe-all-gdb -all-host: maybe-all-expect -all-host: maybe-all-guile -all-host: maybe-all-tk -all-host: maybe-all-libtermcap -all-host: maybe-all-utils -all-host: maybe-all-gnattools - +all-host: \ + maybe-all-ash \ + maybe-all-autoconf \ + maybe-all-automake \ + maybe-all-bash \ + maybe-all-bfd \ + maybe-all-opcodes \ + maybe-all-binutils \ + maybe-all-bison \ + maybe-all-byacc \ + maybe-all-bzip2 \ + maybe-all-dejagnu \ + maybe-all-diff \ + maybe-all-dosutils \ + maybe-all-etc \ + maybe-all-fastjar \ + maybe-all-fileutils \ + maybe-all-findutils \ + maybe-all-find \ + maybe-all-fixincludes \ + maybe-all-flex \ + maybe-all-gas \ + maybe-all-gcc \ + maybe-all-gawk \ + maybe-all-gettext \ + maybe-all-gnuserv \ + maybe-all-gprof \ + maybe-all-gzip \ + maybe-all-hello \ + maybe-all-indent \ + maybe-all-intl \ + maybe-all-tcl \ + maybe-all-itcl \ + maybe-all-ld \ + maybe-all-libcpp \ + maybe-all-libdecnumber \ + maybe-all-libgui \ + maybe-all-libiberty \ + maybe-all-libtool \ + maybe-all-m4 \ + maybe-all-make \ + maybe-all-mmalloc \ + maybe-all-patch \ + maybe-all-perl \ + maybe-all-prms \ + maybe-all-rcs \ + maybe-all-readline \ + maybe-all-release \ + maybe-all-recode \ + maybe-all-sed \ + maybe-all-send-pr \ + maybe-all-shellutils \ + maybe-all-sid \ + maybe-all-sim \ + maybe-all-tar \ + maybe-all-texinfo \ + maybe-all-textutils \ + maybe-all-time \ + maybe-all-uudecode \ + maybe-all-wdiff \ + maybe-all-zip \ + maybe-all-zlib \ + maybe-all-gdb \ + maybe-all-expect \ + maybe-all-guile \ + maybe-all-tk \ + maybe-all-libtermcap \ + maybe-all-utils \ + maybe-all-gnattools .PHONY: all-target - -all-target: maybe-all-target-libstdc++-v3 -all-target: maybe-all-target-libmudflap -all-target: maybe-all-target-libssp -all-target: maybe-all-target-libgcc-math -all-target: maybe-all-target-newlib -all-target: maybe-all-target-libgfortran -all-target: maybe-all-target-libobjc -all-target: maybe-all-target-libtermcap -all-target: maybe-all-target-winsup -all-target: maybe-all-target-libgloss -all-target: maybe-all-target-libiberty -all-target: maybe-all-target-gperf -all-target: maybe-all-target-examples -all-target: maybe-all-target-libffi -all-target: maybe-all-target-libjava -all-target: maybe-all-target-zlib -all-target: maybe-all-target-boehm-gc -all-target: maybe-all-target-qthreads -all-target: maybe-all-target-rda -all-target: maybe-all-target-libada -all-target: maybe-all-target-libgomp +all-target: \ + maybe-all-target-libstdc++-v3 \ + maybe-all-target-libmudflap \ + maybe-all-target-libssp \ + maybe-all-target-newlib \ + maybe-all-target-libgfortran \ + maybe-all-target-libobjc \ + maybe-all-target-libtermcap \ + maybe-all-target-winsup \ + maybe-all-target-libgloss \ + maybe-all-target-libiberty \ + maybe-all-target-gperf \ + maybe-all-target-examples \ + maybe-all-target-libffi \ + maybe-all-target-libjava \ + maybe-all-target-zlib \ + maybe-all-target-boehm-gc \ + maybe-all-target-qthreads \ + maybe-all-target-rda \ + maybe-all-target-libada # Do a target for all the subdirectories. A ``make do-X'' will do a # ``make X'' in all subdirectories (because, in general, there is a @@ -799,99 +763,97 @@ do-info: .PHONY: info-host - -info-host: maybe-info-ash -info-host: maybe-info-autoconf -info-host: maybe-info-automake -info-host: maybe-info-bash -info-host: maybe-info-bfd -info-host: maybe-info-opcodes -info-host: maybe-info-binutils -info-host: maybe-info-bison -info-host: maybe-info-byacc -info-host: maybe-info-bzip2 -info-host: maybe-info-dejagnu -info-host: maybe-info-diff -info-host: maybe-info-dosutils -info-host: maybe-info-etc -info-host: maybe-info-fastjar -info-host: maybe-info-fileutils -info-host: maybe-info-findutils -info-host: maybe-info-find -info-host: maybe-info-fixincludes -info-host: maybe-info-flex -info-host: maybe-info-gas -info-host: maybe-info-gcc -info-host: maybe-info-gawk -info-host: maybe-info-gettext -info-host: maybe-info-gnuserv -info-host: maybe-info-gprof -info-host: maybe-info-gzip -info-host: maybe-info-hello -info-host: maybe-info-indent -info-host: maybe-info-intl -info-host: maybe-info-tcl -info-host: maybe-info-itcl -info-host: maybe-info-ld -info-host: maybe-info-libcpp -info-host: maybe-info-libdecnumber -info-host: maybe-info-libgui -info-host: maybe-info-libiberty -info-host: maybe-info-libtool -info-host: maybe-info-m4 -info-host: maybe-info-make -info-host: maybe-info-mmalloc -info-host: maybe-info-patch -info-host: maybe-info-perl -info-host: maybe-info-prms -info-host: maybe-info-rcs -info-host: maybe-info-readline -info-host: maybe-info-release -info-host: maybe-info-recode -info-host: maybe-info-sed -info-host: maybe-info-send-pr -info-host: maybe-info-shellutils -info-host: maybe-info-sid -info-host: maybe-info-sim -info-host: maybe-info-tar -info-host: maybe-info-texinfo -info-host: maybe-info-textutils -info-host: maybe-info-time -info-host: maybe-info-uudecode -info-host: maybe-info-wdiff -info-host: maybe-info-zip -info-host: maybe-info-zlib -info-host: maybe-info-gdb -info-host: maybe-info-expect -info-host: maybe-info-guile -info-host: maybe-info-tk -info-host: maybe-info-libtermcap -info-host: maybe-info-utils -info-host: maybe-info-gnattools +info-host: \ + maybe-info-ash \ + maybe-info-autoconf \ + maybe-info-automake \ + maybe-info-bash \ + maybe-info-bfd \ + maybe-info-opcodes \ + maybe-info-binutils \ + maybe-info-bison \ + maybe-info-byacc \ + maybe-info-bzip2 \ + maybe-info-dejagnu \ + maybe-info-diff \ + maybe-info-dosutils \ + maybe-info-etc \ + maybe-info-fastjar \ + maybe-info-fileutils \ + maybe-info-findutils \ + maybe-info-find \ + maybe-info-fixincludes \ + maybe-info-flex \ + maybe-info-gas \ + maybe-info-gcc \ + maybe-info-gawk \ + maybe-info-gettext \ + maybe-info-gnuserv \ + maybe-info-gprof \ + maybe-info-gzip \ + maybe-info-hello \ + maybe-info-indent \ + maybe-info-intl \ + maybe-info-tcl \ + maybe-info-itcl \ + maybe-info-ld \ + maybe-info-libcpp \ + maybe-info-libdecnumber \ + maybe-info-libgui \ + maybe-info-libiberty \ + maybe-info-libtool \ + maybe-info-m4 \ + maybe-info-make \ + maybe-info-mmalloc \ + maybe-info-patch \ + maybe-info-perl \ + maybe-info-prms \ + maybe-info-rcs \ + maybe-info-readline \ + maybe-info-release \ + maybe-info-recode \ + maybe-info-sed \ + maybe-info-send-pr \ + maybe-info-shellutils \ + maybe-info-sid \ + maybe-info-sim \ + maybe-info-tar \ + maybe-info-texinfo \ + maybe-info-textutils \ + maybe-info-time \ + maybe-info-uudecode \ + maybe-info-wdiff \ + maybe-info-zip \ + maybe-info-zlib \ + maybe-info-gdb \ + maybe-info-expect \ + maybe-info-guile \ + maybe-info-tk \ + maybe-info-libtermcap \ + maybe-info-utils \ + maybe-info-gnattools .PHONY: info-target - -info-target: maybe-info-target-libstdc++-v3 -info-target: maybe-info-target-libmudflap -info-target: maybe-info-target-libssp -info-target: maybe-info-target-libgcc-math -info-target: maybe-info-target-newlib -info-target: maybe-info-target-libgfortran -info-target: maybe-info-target-libobjc -info-target: maybe-info-target-libtermcap -info-target: maybe-info-target-winsup -info-target: maybe-info-target-libgloss -info-target: maybe-info-target-libiberty -info-target: maybe-info-target-gperf -info-target: maybe-info-target-examples -info-target: maybe-info-target-libffi -info-target: maybe-info-target-libjava -info-target: maybe-info-target-zlib -info-target: maybe-info-target-boehm-gc -info-target: maybe-info-target-qthreads -info-target: maybe-info-target-rda -info-target: maybe-info-target-libada -info-target: maybe-info-target-libgomp +info-target: \ + maybe-info-target-libstdc++-v3 \ + maybe-info-target-libmudflap \ + maybe-info-target-libssp \ + maybe-info-target-newlib \ + maybe-info-target-libgfortran \ + maybe-info-target-libobjc \ + maybe-info-target-libtermcap \ + maybe-info-target-winsup \ + maybe-info-target-libgloss \ + maybe-info-target-libiberty \ + maybe-info-target-gperf \ + maybe-info-target-examples \ + maybe-info-target-libffi \ + maybe-info-target-libjava \ + maybe-info-target-zlib \ + maybe-info-target-boehm-gc \ + maybe-info-target-qthreads \ + maybe-info-target-rda \ + maybe-info-target-libada .PHONY: do-dvi do-dvi: @@ -903,99 +865,97 @@ do-dvi: .PHONY: dvi-host - -dvi-host: maybe-dvi-ash -dvi-host: maybe-dvi-autoconf -dvi-host: maybe-dvi-automake -dvi-host: maybe-dvi-bash -dvi-host: maybe-dvi-bfd -dvi-host: maybe-dvi-opcodes -dvi-host: maybe-dvi-binutils -dvi-host: maybe-dvi-bison -dvi-host: maybe-dvi-byacc -dvi-host: maybe-dvi-bzip2 -dvi-host: maybe-dvi-dejagnu -dvi-host: maybe-dvi-diff -dvi-host: maybe-dvi-dosutils -dvi-host: maybe-dvi-etc -dvi-host: maybe-dvi-fastjar -dvi-host: maybe-dvi-fileutils -dvi-host: maybe-dvi-findutils -dvi-host: maybe-dvi-find -dvi-host: maybe-dvi-fixincludes -dvi-host: maybe-dvi-flex -dvi-host: maybe-dvi-gas -dvi-host: maybe-dvi-gcc -dvi-host: maybe-dvi-gawk -dvi-host: maybe-dvi-gettext -dvi-host: maybe-dvi-gnuserv -dvi-host: maybe-dvi-gprof -dvi-host: maybe-dvi-gzip -dvi-host: maybe-dvi-hello -dvi-host: maybe-dvi-indent -dvi-host: maybe-dvi-intl -dvi-host: maybe-dvi-tcl -dvi-host: maybe-dvi-itcl -dvi-host: maybe-dvi-ld -dvi-host: maybe-dvi-libcpp -dvi-host: maybe-dvi-libdecnumber -dvi-host: maybe-dvi-libgui -dvi-host: maybe-dvi-libiberty -dvi-host: maybe-dvi-libtool -dvi-host: maybe-dvi-m4 -dvi-host: maybe-dvi-make -dvi-host: maybe-dvi-mmalloc -dvi-host: maybe-dvi-patch -dvi-host: maybe-dvi-perl -dvi-host: maybe-dvi-prms -dvi-host: maybe-dvi-rcs -dvi-host: maybe-dvi-readline -dvi-host: maybe-dvi-release -dvi-host: maybe-dvi-recode -dvi-host: maybe-dvi-sed -dvi-host: maybe-dvi-send-pr -dvi-host: maybe-dvi-shellutils -dvi-host: maybe-dvi-sid -dvi-host: maybe-dvi-sim -dvi-host: maybe-dvi-tar -dvi-host: maybe-dvi-texinfo -dvi-host: maybe-dvi-textutils -dvi-host: maybe-dvi-time -dvi-host: maybe-dvi-uudecode -dvi-host: maybe-dvi-wdiff -dvi-host: maybe-dvi-zip -dvi-host: maybe-dvi-zlib -dvi-host: maybe-dvi-gdb -dvi-host: maybe-dvi-expect -dvi-host: maybe-dvi-guile -dvi-host: maybe-dvi-tk -dvi-host: maybe-dvi-libtermcap -dvi-host: maybe-dvi-utils -dvi-host: maybe-dvi-gnattools +dvi-host: \ + maybe-dvi-ash \ + maybe-dvi-autoconf \ + maybe-dvi-automake \ + maybe-dvi-bash \ + maybe-dvi-bfd \ + maybe-dvi-opcodes \ + maybe-dvi-binutils \ + maybe-dvi-bison \ + maybe-dvi-byacc \ + maybe-dvi-bzip2 \ + maybe-dvi-dejagnu \ + maybe-dvi-diff \ + maybe-dvi-dosutils \ + maybe-dvi-etc \ + maybe-dvi-fastjar \ + maybe-dvi-fileutils \ + maybe-dvi-findutils \ + maybe-dvi-find \ + maybe-dvi-fixincludes \ + maybe-dvi-flex \ + maybe-dvi-gas \ + maybe-dvi-gcc \ + maybe-dvi-gawk \ + maybe-dvi-gettext \ + maybe-dvi-gnuserv \ + maybe-dvi-gprof \ + maybe-dvi-gzip \ + maybe-dvi-hello \ + maybe-dvi-indent \ + maybe-dvi-intl \ + maybe-dvi-tcl \ + maybe-dvi-itcl \ + maybe-dvi-ld \ + maybe-dvi-libcpp \ + maybe-dvi-libdecnumber \ + maybe-dvi-libgui \ + maybe-dvi-libiberty \ + maybe-dvi-libtool \ + maybe-dvi-m4 \ + maybe-dvi-make \ + maybe-dvi-mmalloc \ + maybe-dvi-patch \ + maybe-dvi-perl \ + maybe-dvi-prms \ + maybe-dvi-rcs \ + maybe-dvi-readline \ + maybe-dvi-release \ + maybe-dvi-recode \ + maybe-dvi-sed \ + maybe-dvi-send-pr \ + maybe-dvi-shellutils \ + maybe-dvi-sid \ + maybe-dvi-sim \ + maybe-dvi-tar \ + maybe-dvi-texinfo \ + maybe-dvi-textutils \ + maybe-dvi-time \ + maybe-dvi-uudecode \ + maybe-dvi-wdiff \ + maybe-dvi-zip \ + maybe-dvi-zlib \ + maybe-dvi-gdb \ + maybe-dvi-expect \ + maybe-dvi-guile \ + maybe-dvi-tk \ + maybe-dvi-libtermcap \ + maybe-dvi-utils \ + maybe-dvi-gnattools .PHONY: dvi-target - -dvi-target: maybe-dvi-target-libstdc++-v3 -dvi-target: maybe-dvi-target-libmudflap -dvi-target: maybe-dvi-target-libssp -dvi-target: maybe-dvi-target-libgcc-math -dvi-target: maybe-dvi-target-newlib -dvi-target: maybe-dvi-target-libgfortran -dvi-target: maybe-dvi-target-libobjc -dvi-target: maybe-dvi-target-libtermcap -dvi-target: maybe-dvi-target-winsup -dvi-target: maybe-dvi-target-libgloss -dvi-target: maybe-dvi-target-libiberty -dvi-target: maybe-dvi-target-gperf -dvi-target: maybe-dvi-target-examples -dvi-target: maybe-dvi-target-libffi -dvi-target: maybe-dvi-target-libjava -dvi-target: maybe-dvi-target-zlib -dvi-target: maybe-dvi-target-boehm-gc -dvi-target: maybe-dvi-target-qthreads -dvi-target: maybe-dvi-target-rda -dvi-target: maybe-dvi-target-libada -dvi-target: maybe-dvi-target-libgomp +dvi-target: \ + maybe-dvi-target-libstdc++-v3 \ + maybe-dvi-target-libmudflap \ + maybe-dvi-target-libssp \ + maybe-dvi-target-newlib \ + maybe-dvi-target-libgfortran \ + maybe-dvi-target-libobjc \ + maybe-dvi-target-libtermcap \ + maybe-dvi-target-winsup \ + maybe-dvi-target-libgloss \ + maybe-dvi-target-libiberty \ + maybe-dvi-target-gperf \ + maybe-dvi-target-examples \ + maybe-dvi-target-libffi \ + maybe-dvi-target-libjava \ + maybe-dvi-target-zlib \ + maybe-dvi-target-boehm-gc \ + maybe-dvi-target-qthreads \ + maybe-dvi-target-rda \ + maybe-dvi-target-libada .PHONY: do-html do-html: @@ -1007,99 +967,97 @@ do-html: .PHONY: html-host - -html-host: maybe-html-ash -html-host: maybe-html-autoconf -html-host: maybe-html-automake -html-host: maybe-html-bash -html-host: maybe-html-bfd -html-host: maybe-html-opcodes -html-host: maybe-html-binutils -html-host: maybe-html-bison -html-host: maybe-html-byacc -html-host: maybe-html-bzip2 -html-host: maybe-html-dejagnu -html-host: maybe-html-diff -html-host: maybe-html-dosutils -html-host: maybe-html-etc -html-host: maybe-html-fastjar -html-host: maybe-html-fileutils -html-host: maybe-html-findutils -html-host: maybe-html-find -html-host: maybe-html-fixincludes -html-host: maybe-html-flex -html-host: maybe-html-gas -html-host: maybe-html-gcc -html-host: maybe-html-gawk -html-host: maybe-html-gettext -html-host: maybe-html-gnuserv -html-host: maybe-html-gprof -html-host: maybe-html-gzip -html-host: maybe-html-hello -html-host: maybe-html-indent -html-host: maybe-html-intl -html-host: maybe-html-tcl -html-host: maybe-html-itcl -html-host: maybe-html-ld -html-host: maybe-html-libcpp -html-host: maybe-html-libdecnumber -html-host: maybe-html-libgui -html-host: maybe-html-libiberty -html-host: maybe-html-libtool -html-host: maybe-html-m4 -html-host: maybe-html-make -html-host: maybe-html-mmalloc -html-host: maybe-html-patch -html-host: maybe-html-perl -html-host: maybe-html-prms -html-host: maybe-html-rcs -html-host: maybe-html-readline -html-host: maybe-html-release -html-host: maybe-html-recode -html-host: maybe-html-sed -html-host: maybe-html-send-pr -html-host: maybe-html-shellutils -html-host: maybe-html-sid -html-host: maybe-html-sim -html-host: maybe-html-tar -html-host: maybe-html-texinfo -html-host: maybe-html-textutils -html-host: maybe-html-time -html-host: maybe-html-uudecode -html-host: maybe-html-wdiff -html-host: maybe-html-zip -html-host: maybe-html-zlib -html-host: maybe-html-gdb -html-host: maybe-html-expect -html-host: maybe-html-guile -html-host: maybe-html-tk -html-host: maybe-html-libtermcap -html-host: maybe-html-utils -html-host: maybe-html-gnattools +html-host: \ + maybe-html-ash \ + maybe-html-autoconf \ + maybe-html-automake \ + maybe-html-bash \ + maybe-html-bfd \ + maybe-html-opcodes \ + maybe-html-binutils \ + maybe-html-bison \ + maybe-html-byacc \ + maybe-html-bzip2 \ + maybe-html-dejagnu \ + maybe-html-diff \ + maybe-html-dosutils \ + maybe-html-etc \ + maybe-html-fastjar \ + maybe-html-fileutils \ + maybe-html-findutils \ + maybe-html-find \ + maybe-html-fixincludes \ + maybe-html-flex \ + maybe-html-gas \ + maybe-html-gcc \ + maybe-html-gawk \ + maybe-html-gettext \ + maybe-html-gnuserv \ + maybe-html-gprof \ + maybe-html-gzip \ + maybe-html-hello \ + maybe-html-indent \ + maybe-html-intl \ + maybe-html-tcl \ + maybe-html-itcl \ + maybe-html-ld \ + maybe-html-libcpp \ + maybe-html-libdecnumber \ + maybe-html-libgui \ + maybe-html-libiberty \ + maybe-html-libtool \ + maybe-html-m4 \ + maybe-html-make \ + maybe-html-mmalloc \ + maybe-html-patch \ + maybe-html-perl \ + maybe-html-prms \ + maybe-html-rcs \ + maybe-html-readline \ + maybe-html-release \ + maybe-html-recode \ + maybe-html-sed \ + maybe-html-send-pr \ + maybe-html-shellutils \ + maybe-html-sid \ + maybe-html-sim \ + maybe-html-tar \ + maybe-html-texinfo \ + maybe-html-textutils \ + maybe-html-time \ + maybe-html-uudecode \ + maybe-html-wdiff \ + maybe-html-zip \ + maybe-html-zlib \ + maybe-html-gdb \ + maybe-html-expect \ + maybe-html-guile \ + maybe-html-tk \ + maybe-html-libtermcap \ + maybe-html-utils \ + maybe-html-gnattools .PHONY: html-target - -html-target: maybe-html-target-libstdc++-v3 -html-target: maybe-html-target-libmudflap -html-target: maybe-html-target-libssp -html-target: maybe-html-target-libgcc-math -html-target: maybe-html-target-newlib -html-target: maybe-html-target-libgfortran -html-target: maybe-html-target-libobjc -html-target: maybe-html-target-libtermcap -html-target: maybe-html-target-winsup -html-target: maybe-html-target-libgloss -html-target: maybe-html-target-libiberty -html-target: maybe-html-target-gperf -html-target: maybe-html-target-examples -html-target: maybe-html-target-libffi -html-target: maybe-html-target-libjava -html-target: maybe-html-target-zlib -html-target: maybe-html-target-boehm-gc -html-target: maybe-html-target-qthreads -html-target: maybe-html-target-rda -html-target: maybe-html-target-libada -html-target: maybe-html-target-libgomp +html-target: \ + maybe-html-target-libstdc++-v3 \ + maybe-html-target-libmudflap \ + maybe-html-target-libssp \ + maybe-html-target-newlib \ + maybe-html-target-libgfortran \ + maybe-html-target-libobjc \ + maybe-html-target-libtermcap \ + maybe-html-target-winsup \ + maybe-html-target-libgloss \ + maybe-html-target-libiberty \ + maybe-html-target-gperf \ + maybe-html-target-examples \ + maybe-html-target-libffi \ + maybe-html-target-libjava \ + maybe-html-target-zlib \ + maybe-html-target-boehm-gc \ + maybe-html-target-qthreads \ + maybe-html-target-rda \ + maybe-html-target-libada .PHONY: do-TAGS do-TAGS: @@ -1111,99 +1069,97 @@ do-TAGS: .PHONY: TAGS-host - -TAGS-host: maybe-TAGS-ash -TAGS-host: maybe-TAGS-autoconf -TAGS-host: maybe-TAGS-automake -TAGS-host: maybe-TAGS-bash -TAGS-host: maybe-TAGS-bfd -TAGS-host: maybe-TAGS-opcodes -TAGS-host: maybe-TAGS-binutils -TAGS-host: maybe-TAGS-bison -TAGS-host: maybe-TAGS-byacc -TAGS-host: maybe-TAGS-bzip2 -TAGS-host: maybe-TAGS-dejagnu -TAGS-host: maybe-TAGS-diff -TAGS-host: maybe-TAGS-dosutils -TAGS-host: maybe-TAGS-etc -TAGS-host: maybe-TAGS-fastjar -TAGS-host: maybe-TAGS-fileutils -TAGS-host: maybe-TAGS-findutils -TAGS-host: maybe-TAGS-find -TAGS-host: maybe-TAGS-fixincludes -TAGS-host: maybe-TAGS-flex -TAGS-host: maybe-TAGS-gas -TAGS-host: maybe-TAGS-gcc -TAGS-host: maybe-TAGS-gawk -TAGS-host: maybe-TAGS-gettext -TAGS-host: maybe-TAGS-gnuserv -TAGS-host: maybe-TAGS-gprof -TAGS-host: maybe-TAGS-gzip -TAGS-host: maybe-TAGS-hello -TAGS-host: maybe-TAGS-indent -TAGS-host: maybe-TAGS-intl -TAGS-host: maybe-TAGS-tcl -TAGS-host: maybe-TAGS-itcl -TAGS-host: maybe-TAGS-ld -TAGS-host: maybe-TAGS-libcpp -TAGS-host: maybe-TAGS-libdecnumber -TAGS-host: maybe-TAGS-libgui -TAGS-host: maybe-TAGS-libiberty -TAGS-host: maybe-TAGS-libtool -TAGS-host: maybe-TAGS-m4 -TAGS-host: maybe-TAGS-make -TAGS-host: maybe-TAGS-mmalloc -TAGS-host: maybe-TAGS-patch -TAGS-host: maybe-TAGS-perl -TAGS-host: maybe-TAGS-prms -TAGS-host: maybe-TAGS-rcs -TAGS-host: maybe-TAGS-readline -TAGS-host: maybe-TAGS-release -TAGS-host: maybe-TAGS-recode -TAGS-host: maybe-TAGS-sed -TAGS-host: maybe-TAGS-send-pr -TAGS-host: maybe-TAGS-shellutils -TAGS-host: maybe-TAGS-sid -TAGS-host: maybe-TAGS-sim -TAGS-host: maybe-TAGS-tar -TAGS-host: maybe-TAGS-texinfo -TAGS-host: maybe-TAGS-textutils -TAGS-host: maybe-TAGS-time -TAGS-host: maybe-TAGS-uudecode -TAGS-host: maybe-TAGS-wdiff -TAGS-host: maybe-TAGS-zip -TAGS-host: maybe-TAGS-zlib -TAGS-host: maybe-TAGS-gdb -TAGS-host: maybe-TAGS-expect -TAGS-host: maybe-TAGS-guile -TAGS-host: maybe-TAGS-tk -TAGS-host: maybe-TAGS-libtermcap -TAGS-host: maybe-TAGS-utils -TAGS-host: maybe-TAGS-gnattools +TAGS-host: \ + maybe-TAGS-ash \ + maybe-TAGS-autoconf \ + maybe-TAGS-automake \ + maybe-TAGS-bash \ + maybe-TAGS-bfd \ + maybe-TAGS-opcodes \ + maybe-TAGS-binutils \ + maybe-TAGS-bison \ + maybe-TAGS-byacc \ + maybe-TAGS-bzip2 \ + maybe-TAGS-dejagnu \ + maybe-TAGS-diff \ + maybe-TAGS-dosutils \ + maybe-TAGS-etc \ + maybe-TAGS-fastjar \ + maybe-TAGS-fileutils \ + maybe-TAGS-findutils \ + maybe-TAGS-find \ + maybe-TAGS-fixincludes \ + maybe-TAGS-flex \ + maybe-TAGS-gas \ + maybe-TAGS-gcc \ + maybe-TAGS-gawk \ + maybe-TAGS-gettext \ + maybe-TAGS-gnuserv \ + maybe-TAGS-gprof \ + maybe-TAGS-gzip \ + maybe-TAGS-hello \ + maybe-TAGS-indent \ + maybe-TAGS-intl \ + maybe-TAGS-tcl \ + maybe-TAGS-itcl \ + maybe-TAGS-ld \ + maybe-TAGS-libcpp \ + maybe-TAGS-libdecnumber \ + maybe-TAGS-libgui \ + maybe-TAGS-libiberty \ + maybe-TAGS-libtool \ + maybe-TAGS-m4 \ + maybe-TAGS-make \ + maybe-TAGS-mmalloc \ + maybe-TAGS-patch \ + maybe-TAGS-perl \ + maybe-TAGS-prms \ + maybe-TAGS-rcs \ + maybe-TAGS-readline \ + maybe-TAGS-release \ + maybe-TAGS-recode \ + maybe-TAGS-sed \ + maybe-TAGS-send-pr \ + maybe-TAGS-shellutils \ + maybe-TAGS-sid \ + maybe-TAGS-sim \ + maybe-TAGS-tar \ + maybe-TAGS-texinfo \ + maybe-TAGS-textutils \ + maybe-TAGS-time \ + maybe-TAGS-uudecode \ + maybe-TAGS-wdiff \ + maybe-TAGS-zip \ + maybe-TAGS-zlib \ + maybe-TAGS-gdb \ + maybe-TAGS-expect \ + maybe-TAGS-guile \ + maybe-TAGS-tk \ + maybe-TAGS-libtermcap \ + maybe-TAGS-utils \ + maybe-TAGS-gnattools .PHONY: TAGS-target - -TAGS-target: maybe-TAGS-target-libstdc++-v3 -TAGS-target: maybe-TAGS-target-libmudflap -TAGS-target: maybe-TAGS-target-libssp -TAGS-target: maybe-TAGS-target-libgcc-math -TAGS-target: maybe-TAGS-target-newlib -TAGS-target: maybe-TAGS-target-libgfortran -TAGS-target: maybe-TAGS-target-libobjc -TAGS-target: maybe-TAGS-target-libtermcap -TAGS-target: maybe-TAGS-target-winsup -TAGS-target: maybe-TAGS-target-libgloss -TAGS-target: maybe-TAGS-target-libiberty -TAGS-target: maybe-TAGS-target-gperf -TAGS-target: maybe-TAGS-target-examples -TAGS-target: maybe-TAGS-target-libffi -TAGS-target: maybe-TAGS-target-libjava -TAGS-target: maybe-TAGS-target-zlib -TAGS-target: maybe-TAGS-target-boehm-gc -TAGS-target: maybe-TAGS-target-qthreads -TAGS-target: maybe-TAGS-target-rda -TAGS-target: maybe-TAGS-target-libada -TAGS-target: maybe-TAGS-target-libgomp +TAGS-target: \ + maybe-TAGS-target-libstdc++-v3 \ + maybe-TAGS-target-libmudflap \ + maybe-TAGS-target-libssp \ + maybe-TAGS-target-newlib \ + maybe-TAGS-target-libgfortran \ + maybe-TAGS-target-libobjc \ + maybe-TAGS-target-libtermcap \ + maybe-TAGS-target-winsup \ + maybe-TAGS-target-libgloss \ + maybe-TAGS-target-libiberty \ + maybe-TAGS-target-gperf \ + maybe-TAGS-target-examples \ + maybe-TAGS-target-libffi \ + maybe-TAGS-target-libjava \ + maybe-TAGS-target-zlib \ + maybe-TAGS-target-boehm-gc \ + maybe-TAGS-target-qthreads \ + maybe-TAGS-target-rda \ + maybe-TAGS-target-libada .PHONY: do-install-info do-install-info: @@ -1215,99 +1171,97 @@ do-install-info: .PHONY: install-info-host - -install-info-host: maybe-install-info-ash -install-info-host: maybe-install-info-autoconf -install-info-host: maybe-install-info-automake -install-info-host: maybe-install-info-bash -install-info-host: maybe-install-info-bfd -install-info-host: maybe-install-info-opcodes -install-info-host: maybe-install-info-binutils -install-info-host: maybe-install-info-bison -install-info-host: maybe-install-info-byacc -install-info-host: maybe-install-info-bzip2 -install-info-host: maybe-install-info-dejagnu -install-info-host: maybe-install-info-diff -install-info-host: maybe-install-info-dosutils -install-info-host: maybe-install-info-etc -install-info-host: maybe-install-info-fastjar -install-info-host: maybe-install-info-fileutils -install-info-host: maybe-install-info-findutils -install-info-host: maybe-install-info-find -install-info-host: maybe-install-info-fixincludes -install-info-host: maybe-install-info-flex -install-info-host: maybe-install-info-gas -install-info-host: maybe-install-info-gcc -install-info-host: maybe-install-info-gawk -install-info-host: maybe-install-info-gettext -install-info-host: maybe-install-info-gnuserv -install-info-host: maybe-install-info-gprof -install-info-host: maybe-install-info-gzip -install-info-host: maybe-install-info-hello -install-info-host: maybe-install-info-indent -install-info-host: maybe-install-info-intl -install-info-host: maybe-install-info-tcl -install-info-host: maybe-install-info-itcl -install-info-host: maybe-install-info-ld -install-info-host: maybe-install-info-libcpp -install-info-host: maybe-install-info-libdecnumber -install-info-host: maybe-install-info-libgui -install-info-host: maybe-install-info-libiberty -install-info-host: maybe-install-info-libtool -install-info-host: maybe-install-info-m4 -install-info-host: maybe-install-info-make -install-info-host: maybe-install-info-mmalloc -install-info-host: maybe-install-info-patch -install-info-host: maybe-install-info-perl -install-info-host: maybe-install-info-prms -install-info-host: maybe-install-info-rcs -install-info-host: maybe-install-info-readline -install-info-host: maybe-install-info-release -install-info-host: maybe-install-info-recode -install-info-host: maybe-install-info-sed -install-info-host: maybe-install-info-send-pr -install-info-host: maybe-install-info-shellutils -install-info-host: maybe-install-info-sid -install-info-host: maybe-install-info-sim -install-info-host: maybe-install-info-tar -install-info-host: maybe-install-info-texinfo -install-info-host: maybe-install-info-textutils -install-info-host: maybe-install-info-time -install-info-host: maybe-install-info-uudecode -install-info-host: maybe-install-info-wdiff -install-info-host: maybe-install-info-zip -install-info-host: maybe-install-info-zlib -install-info-host: maybe-install-info-gdb -install-info-host: maybe-install-info-expect -install-info-host: maybe-install-info-guile -install-info-host: maybe-install-info-tk -install-info-host: maybe-install-info-libtermcap -install-info-host: maybe-install-info-utils -install-info-host: maybe-install-info-gnattools +install-info-host: \ + maybe-install-info-ash \ + maybe-install-info-autoconf \ + maybe-install-info-automake \ + maybe-install-info-bash \ + maybe-install-info-bfd \ + maybe-install-info-opcodes \ + maybe-install-info-binutils \ + maybe-install-info-bison \ + maybe-install-info-byacc \ + maybe-install-info-bzip2 \ + maybe-install-info-dejagnu \ + maybe-install-info-diff \ + maybe-install-info-dosutils \ + maybe-install-info-etc \ + maybe-install-info-fastjar \ + maybe-install-info-fileutils \ + maybe-install-info-findutils \ + maybe-install-info-find \ + maybe-install-info-fixincludes \ + maybe-install-info-flex \ + maybe-install-info-gas \ + maybe-install-info-gcc \ + maybe-install-info-gawk \ + maybe-install-info-gettext \ + maybe-install-info-gnuserv \ + maybe-install-info-gprof \ + maybe-install-info-gzip \ + maybe-install-info-hello \ + maybe-install-info-indent \ + maybe-install-info-intl \ + maybe-install-info-tcl \ + maybe-install-info-itcl \ + maybe-install-info-ld \ + maybe-install-info-libcpp \ + maybe-install-info-libdecnumber \ + maybe-install-info-libgui \ + maybe-install-info-libiberty \ + maybe-install-info-libtool \ + maybe-install-info-m4 \ + maybe-install-info-make \ + maybe-install-info-mmalloc \ + maybe-install-info-patch \ + maybe-install-info-perl \ + maybe-install-info-prms \ + maybe-install-info-rcs \ + maybe-install-info-readline \ + maybe-install-info-release \ + maybe-install-info-recode \ + maybe-install-info-sed \ + maybe-install-info-send-pr \ + maybe-install-info-shellutils \ + maybe-install-info-sid \ + maybe-install-info-sim \ + maybe-install-info-tar \ + maybe-install-info-texinfo \ + maybe-install-info-textutils \ + maybe-install-info-time \ + maybe-install-info-uudecode \ + maybe-install-info-wdiff \ + maybe-install-info-zip \ + maybe-install-info-zlib \ + maybe-install-info-gdb \ + maybe-install-info-expect \ + maybe-install-info-guile \ + maybe-install-info-tk \ + maybe-install-info-libtermcap \ + maybe-install-info-utils \ + maybe-install-info-gnattools .PHONY: install-info-target - -install-info-target: maybe-install-info-target-libstdc++-v3 -install-info-target: maybe-install-info-target-libmudflap -install-info-target: maybe-install-info-target-libssp -install-info-target: maybe-install-info-target-libgcc-math -install-info-target: maybe-install-info-target-newlib -install-info-target: maybe-install-info-target-libgfortran -install-info-target: maybe-install-info-target-libobjc -install-info-target: maybe-install-info-target-libtermcap -install-info-target: maybe-install-info-target-winsup -install-info-target: maybe-install-info-target-libgloss -install-info-target: maybe-install-info-target-libiberty -install-info-target: maybe-install-info-target-gperf -install-info-target: maybe-install-info-target-examples -install-info-target: maybe-install-info-target-libffi -install-info-target: maybe-install-info-target-libjava -install-info-target: maybe-install-info-target-zlib -install-info-target: maybe-install-info-target-boehm-gc -install-info-target: maybe-install-info-target-qthreads -install-info-target: maybe-install-info-target-rda -install-info-target: maybe-install-info-target-libada -install-info-target: maybe-install-info-target-libgomp +install-info-target: \ + maybe-install-info-target-libstdc++-v3 \ + maybe-install-info-target-libmudflap \ + maybe-install-info-target-libssp \ + maybe-install-info-target-newlib \ + maybe-install-info-target-libgfortran \ + maybe-install-info-target-libobjc \ + maybe-install-info-target-libtermcap \ + maybe-install-info-target-winsup \ + maybe-install-info-target-libgloss \ + maybe-install-info-target-libiberty \ + maybe-install-info-target-gperf \ + maybe-install-info-target-examples \ + maybe-install-info-target-libffi \ + maybe-install-info-target-libjava \ + maybe-install-info-target-zlib \ + maybe-install-info-target-boehm-gc \ + maybe-install-info-target-qthreads \ + maybe-install-info-target-rda \ + maybe-install-info-target-libada .PHONY: do-installcheck do-installcheck: @@ -1319,99 +1273,97 @@ do-installcheck: .PHONY: installcheck-host - -installcheck-host: maybe-installcheck-ash -installcheck-host: maybe-installcheck-autoconf -installcheck-host: maybe-installcheck-automake -installcheck-host: maybe-installcheck-bash -installcheck-host: maybe-installcheck-bfd -installcheck-host: maybe-installcheck-opcodes -installcheck-host: maybe-installcheck-binutils -installcheck-host: maybe-installcheck-bison -installcheck-host: maybe-installcheck-byacc -installcheck-host: maybe-installcheck-bzip2 -installcheck-host: maybe-installcheck-dejagnu -installcheck-host: maybe-installcheck-diff -installcheck-host: maybe-installcheck-dosutils -installcheck-host: maybe-installcheck-etc -installcheck-host: maybe-installcheck-fastjar -installcheck-host: maybe-installcheck-fileutils -installcheck-host: maybe-installcheck-findutils -installcheck-host: maybe-installcheck-find -installcheck-host: maybe-installcheck-fixincludes -installcheck-host: maybe-installcheck-flex -installcheck-host: maybe-installcheck-gas -installcheck-host: maybe-installcheck-gcc -installcheck-host: maybe-installcheck-gawk -installcheck-host: maybe-installcheck-gettext -installcheck-host: maybe-installcheck-gnuserv -installcheck-host: maybe-installcheck-gprof -installcheck-host: maybe-installcheck-gzip -installcheck-host: maybe-installcheck-hello -installcheck-host: maybe-installcheck-indent -installcheck-host: maybe-installcheck-intl -installcheck-host: maybe-installcheck-tcl -installcheck-host: maybe-installcheck-itcl -installcheck-host: maybe-installcheck-ld -installcheck-host: maybe-installcheck-libcpp -installcheck-host: maybe-installcheck-libdecnumber -installcheck-host: maybe-installcheck-libgui -installcheck-host: maybe-installcheck-libiberty -installcheck-host: maybe-installcheck-libtool -installcheck-host: maybe-installcheck-m4 -installcheck-host: maybe-installcheck-make -installcheck-host: maybe-installcheck-mmalloc -installcheck-host: maybe-installcheck-patch -installcheck-host: maybe-installcheck-perl -installcheck-host: maybe-installcheck-prms -installcheck-host: maybe-installcheck-rcs -installcheck-host: maybe-installcheck-readline -installcheck-host: maybe-installcheck-release -installcheck-host: maybe-installcheck-recode -installcheck-host: maybe-installcheck-sed -installcheck-host: maybe-installcheck-send-pr -installcheck-host: maybe-installcheck-shellutils -installcheck-host: maybe-installcheck-sid -installcheck-host: maybe-installcheck-sim -installcheck-host: maybe-installcheck-tar -installcheck-host: maybe-installcheck-texinfo -installcheck-host: maybe-installcheck-textutils -installcheck-host: maybe-installcheck-time -installcheck-host: maybe-installcheck-uudecode -installcheck-host: maybe-installcheck-wdiff -installcheck-host: maybe-installcheck-zip -installcheck-host: maybe-installcheck-zlib -installcheck-host: maybe-installcheck-gdb -installcheck-host: maybe-installcheck-expect -installcheck-host: maybe-installcheck-guile -installcheck-host: maybe-installcheck-tk -installcheck-host: maybe-installcheck-libtermcap -installcheck-host: maybe-installcheck-utils -installcheck-host: maybe-installcheck-gnattools +installcheck-host: \ + maybe-installcheck-ash \ + maybe-installcheck-autoconf \ + maybe-installcheck-automake \ + maybe-installcheck-bash \ + maybe-installcheck-bfd \ + maybe-installcheck-opcodes \ + maybe-installcheck-binutils \ + maybe-installcheck-bison \ + maybe-installcheck-byacc \ + maybe-installcheck-bzip2 \ + maybe-installcheck-dejagnu \ + maybe-installcheck-diff \ + maybe-installcheck-dosutils \ + maybe-installcheck-etc \ + maybe-installcheck-fastjar \ + maybe-installcheck-fileutils \ + maybe-installcheck-findutils \ + maybe-installcheck-find \ + maybe-installcheck-fixincludes \ + maybe-installcheck-flex \ + maybe-installcheck-gas \ + maybe-installcheck-gcc \ + maybe-installcheck-gawk \ + maybe-installcheck-gettext \ + maybe-installcheck-gnuserv \ + maybe-installcheck-gprof \ + maybe-installcheck-gzip \ + maybe-installcheck-hello \ + maybe-installcheck-indent \ + maybe-installcheck-intl \ + maybe-installcheck-tcl \ + maybe-installcheck-itcl \ + maybe-installcheck-ld \ + maybe-installcheck-libcpp \ + maybe-installcheck-libdecnumber \ + maybe-installcheck-libgui \ + maybe-installcheck-libiberty \ + maybe-installcheck-libtool \ + maybe-installcheck-m4 \ + maybe-installcheck-make \ + maybe-installcheck-mmalloc \ + maybe-installcheck-patch \ + maybe-installcheck-perl \ + maybe-installcheck-prms \ + maybe-installcheck-rcs \ + maybe-installcheck-readline \ + maybe-installcheck-release \ + maybe-installcheck-recode \ + maybe-installcheck-sed \ + maybe-installcheck-send-pr \ + maybe-installcheck-shellutils \ + maybe-installcheck-sid \ + maybe-installcheck-sim \ + maybe-installcheck-tar \ + maybe-installcheck-texinfo \ + maybe-installcheck-textutils \ + maybe-installcheck-time \ + maybe-installcheck-uudecode \ + maybe-installcheck-wdiff \ + maybe-installcheck-zip \ + maybe-installcheck-zlib \ + maybe-installcheck-gdb \ + maybe-installcheck-expect \ + maybe-installcheck-guile \ + maybe-installcheck-tk \ + maybe-installcheck-libtermcap \ + maybe-installcheck-utils \ + maybe-installcheck-gnattools .PHONY: installcheck-target - -installcheck-target: maybe-installcheck-target-libstdc++-v3 -installcheck-target: maybe-installcheck-target-libmudflap -installcheck-target: maybe-installcheck-target-libssp -installcheck-target: maybe-installcheck-target-libgcc-math -installcheck-target: maybe-installcheck-target-newlib -installcheck-target: maybe-installcheck-target-libgfortran -installcheck-target: maybe-installcheck-target-libobjc -installcheck-target: maybe-installcheck-target-libtermcap -installcheck-target: maybe-installcheck-target-winsup -installcheck-target: maybe-installcheck-target-libgloss -installcheck-target: maybe-installcheck-target-libiberty -installcheck-target: maybe-installcheck-target-gperf -installcheck-target: maybe-installcheck-target-examples -installcheck-target: maybe-installcheck-target-libffi -installcheck-target: maybe-installcheck-target-libjava -installcheck-target: maybe-installcheck-target-zlib -installcheck-target: maybe-installcheck-target-boehm-gc -installcheck-target: maybe-installcheck-target-qthreads -installcheck-target: maybe-installcheck-target-rda -installcheck-target: maybe-installcheck-target-libada -installcheck-target: maybe-installcheck-target-libgomp +installcheck-target: \ + maybe-installcheck-target-libstdc++-v3 \ + maybe-installcheck-target-libmudflap \ + maybe-installcheck-target-libssp \ + maybe-installcheck-target-newlib \ + maybe-installcheck-target-libgfortran \ + maybe-installcheck-target-libobjc \ + maybe-installcheck-target-libtermcap \ + maybe-installcheck-target-winsup \ + maybe-installcheck-target-libgloss \ + maybe-installcheck-target-libiberty \ + maybe-installcheck-target-gperf \ + maybe-installcheck-target-examples \ + maybe-installcheck-target-libffi \ + maybe-installcheck-target-libjava \ + maybe-installcheck-target-zlib \ + maybe-installcheck-target-boehm-gc \ + maybe-installcheck-target-qthreads \ + maybe-installcheck-target-rda \ + maybe-installcheck-target-libada .PHONY: do-mostlyclean do-mostlyclean: @@ -1423,99 +1375,97 @@ do-mostlyclean: .PHONY: mostlyclean-host - -mostlyclean-host: maybe-mostlyclean-ash -mostlyclean-host: maybe-mostlyclean-autoconf -mostlyclean-host: maybe-mostlyclean-automake -mostlyclean-host: maybe-mostlyclean-bash -mostlyclean-host: maybe-mostlyclean-bfd -mostlyclean-host: maybe-mostlyclean-opcodes -mostlyclean-host: maybe-mostlyclean-binutils -mostlyclean-host: maybe-mostlyclean-bison -mostlyclean-host: maybe-mostlyclean-byacc -mostlyclean-host: maybe-mostlyclean-bzip2 -mostlyclean-host: maybe-mostlyclean-dejagnu -mostlyclean-host: maybe-mostlyclean-diff -mostlyclean-host: maybe-mostlyclean-dosutils -mostlyclean-host: maybe-mostlyclean-etc -mostlyclean-host: maybe-mostlyclean-fastjar -mostlyclean-host: maybe-mostlyclean-fileutils -mostlyclean-host: maybe-mostlyclean-findutils -mostlyclean-host: maybe-mostlyclean-find -mostlyclean-host: maybe-mostlyclean-fixincludes -mostlyclean-host: maybe-mostlyclean-flex -mostlyclean-host: maybe-mostlyclean-gas -mostlyclean-host: maybe-mostlyclean-gcc -mostlyclean-host: maybe-mostlyclean-gawk -mostlyclean-host: maybe-mostlyclean-gettext -mostlyclean-host: maybe-mostlyclean-gnuserv -mostlyclean-host: maybe-mostlyclean-gprof -mostlyclean-host: maybe-mostlyclean-gzip -mostlyclean-host: maybe-mostlyclean-hello -mostlyclean-host: maybe-mostlyclean-indent -mostlyclean-host: maybe-mostlyclean-intl -mostlyclean-host: maybe-mostlyclean-tcl -mostlyclean-host: maybe-mostlyclean-itcl -mostlyclean-host: maybe-mostlyclean-ld -mostlyclean-host: maybe-mostlyclean-libcpp -mostlyclean-host: maybe-mostlyclean-libdecnumber -mostlyclean-host: maybe-mostlyclean-libgui -mostlyclean-host: maybe-mostlyclean-libiberty -mostlyclean-host: maybe-mostlyclean-libtool -mostlyclean-host: maybe-mostlyclean-m4 -mostlyclean-host: maybe-mostlyclean-make -mostlyclean-host: maybe-mostlyclean-mmalloc -mostlyclean-host: maybe-mostlyclean-patch -mostlyclean-host: maybe-mostlyclean-perl -mostlyclean-host: maybe-mostlyclean-prms -mostlyclean-host: maybe-mostlyclean-rcs -mostlyclean-host: maybe-mostlyclean-readline -mostlyclean-host: maybe-mostlyclean-release -mostlyclean-host: maybe-mostlyclean-recode -mostlyclean-host: maybe-mostlyclean-sed -mostlyclean-host: maybe-mostlyclean-send-pr -mostlyclean-host: maybe-mostlyclean-shellutils -mostlyclean-host: maybe-mostlyclean-sid -mostlyclean-host: maybe-mostlyclean-sim -mostlyclean-host: maybe-mostlyclean-tar -mostlyclean-host: maybe-mostlyclean-texinfo -mostlyclean-host: maybe-mostlyclean-textutils -mostlyclean-host: maybe-mostlyclean-time -mostlyclean-host: maybe-mostlyclean-uudecode -mostlyclean-host: maybe-mostlyclean-wdiff -mostlyclean-host: maybe-mostlyclean-zip -mostlyclean-host: maybe-mostlyclean-zlib -mostlyclean-host: maybe-mostlyclean-gdb -mostlyclean-host: maybe-mostlyclean-expect -mostlyclean-host: maybe-mostlyclean-guile -mostlyclean-host: maybe-mostlyclean-tk -mostlyclean-host: maybe-mostlyclean-libtermcap -mostlyclean-host: maybe-mostlyclean-utils -mostlyclean-host: maybe-mostlyclean-gnattools +mostlyclean-host: \ + maybe-mostlyclean-ash \ + maybe-mostlyclean-autoconf \ + maybe-mostlyclean-automake \ + maybe-mostlyclean-bash \ + maybe-mostlyclean-bfd \ + maybe-mostlyclean-opcodes \ + maybe-mostlyclean-binutils \ + maybe-mostlyclean-bison \ + maybe-mostlyclean-byacc \ + maybe-mostlyclean-bzip2 \ + maybe-mostlyclean-dejagnu \ + maybe-mostlyclean-diff \ + maybe-mostlyclean-dosutils \ + maybe-mostlyclean-etc \ + maybe-mostlyclean-fastjar \ + maybe-mostlyclean-fileutils \ + maybe-mostlyclean-findutils \ + maybe-mostlyclean-find \ + maybe-mostlyclean-fixincludes \ + maybe-mostlyclean-flex \ + maybe-mostlyclean-gas \ + maybe-mostlyclean-gcc \ + maybe-mostlyclean-gawk \ + maybe-mostlyclean-gettext \ + maybe-mostlyclean-gnuserv \ + maybe-mostlyclean-gprof \ + maybe-mostlyclean-gzip \ + maybe-mostlyclean-hello \ + maybe-mostlyclean-indent \ + maybe-mostlyclean-intl \ + maybe-mostlyclean-tcl \ + maybe-mostlyclean-itcl \ + maybe-mostlyclean-ld \ + maybe-mostlyclean-libcpp \ + maybe-mostlyclean-libdecnumber \ + maybe-mostlyclean-libgui \ + maybe-mostlyclean-libiberty \ + maybe-mostlyclean-libtool \ + maybe-mostlyclean-m4 \ + maybe-mostlyclean-make \ + maybe-mostlyclean-mmalloc \ + maybe-mostlyclean-patch \ + maybe-mostlyclean-perl \ + maybe-mostlyclean-prms \ + maybe-mostlyclean-rcs \ + maybe-mostlyclean-readline \ + maybe-mostlyclean-release \ + maybe-mostlyclean-recode \ + maybe-mostlyclean-sed \ + maybe-mostlyclean-send-pr \ + maybe-mostlyclean-shellutils \ + maybe-mostlyclean-sid \ + maybe-mostlyclean-sim \ + maybe-mostlyclean-tar \ + maybe-mostlyclean-texinfo \ + maybe-mostlyclean-textutils \ + maybe-mostlyclean-time \ + maybe-mostlyclean-uudecode \ + maybe-mostlyclean-wdiff \ + maybe-mostlyclean-zip \ + maybe-mostlyclean-zlib \ + maybe-mostlyclean-gdb \ + maybe-mostlyclean-expect \ + maybe-mostlyclean-guile \ + maybe-mostlyclean-tk \ + maybe-mostlyclean-libtermcap \ + maybe-mostlyclean-utils \ + maybe-mostlyclean-gnattools .PHONY: mostlyclean-target - -mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3 -mostlyclean-target: maybe-mostlyclean-target-libmudflap -mostlyclean-target: maybe-mostlyclean-target-libssp -mostlyclean-target: maybe-mostlyclean-target-libgcc-math -mostlyclean-target: maybe-mostlyclean-target-newlib -mostlyclean-target: maybe-mostlyclean-target-libgfortran -mostlyclean-target: maybe-mostlyclean-target-libobjc -mostlyclean-target: maybe-mostlyclean-target-libtermcap -mostlyclean-target: maybe-mostlyclean-target-winsup -mostlyclean-target: maybe-mostlyclean-target-libgloss -mostlyclean-target: maybe-mostlyclean-target-libiberty -mostlyclean-target: maybe-mostlyclean-target-gperf -mostlyclean-target: maybe-mostlyclean-target-examples -mostlyclean-target: maybe-mostlyclean-target-libffi -mostlyclean-target: maybe-mostlyclean-target-libjava -mostlyclean-target: maybe-mostlyclean-target-zlib -mostlyclean-target: maybe-mostlyclean-target-boehm-gc -mostlyclean-target: maybe-mostlyclean-target-qthreads -mostlyclean-target: maybe-mostlyclean-target-rda -mostlyclean-target: maybe-mostlyclean-target-libada -mostlyclean-target: maybe-mostlyclean-target-libgomp +mostlyclean-target: \ + maybe-mostlyclean-target-libstdc++-v3 \ + maybe-mostlyclean-target-libmudflap \ + maybe-mostlyclean-target-libssp \ + maybe-mostlyclean-target-newlib \ + maybe-mostlyclean-target-libgfortran \ + maybe-mostlyclean-target-libobjc \ + maybe-mostlyclean-target-libtermcap \ + maybe-mostlyclean-target-winsup \ + maybe-mostlyclean-target-libgloss \ + maybe-mostlyclean-target-libiberty \ + maybe-mostlyclean-target-gperf \ + maybe-mostlyclean-target-examples \ + maybe-mostlyclean-target-libffi \ + maybe-mostlyclean-target-libjava \ + maybe-mostlyclean-target-zlib \ + maybe-mostlyclean-target-boehm-gc \ + maybe-mostlyclean-target-qthreads \ + maybe-mostlyclean-target-rda \ + maybe-mostlyclean-target-libada .PHONY: do-clean do-clean: @@ -1527,99 +1477,97 @@ do-clean: .PHONY: clean-host - -clean-host: maybe-clean-ash -clean-host: maybe-clean-autoconf -clean-host: maybe-clean-automake -clean-host: maybe-clean-bash -clean-host: maybe-clean-bfd -clean-host: maybe-clean-opcodes -clean-host: maybe-clean-binutils -clean-host: maybe-clean-bison -clean-host: maybe-clean-byacc -clean-host: maybe-clean-bzip2 -clean-host: maybe-clean-dejagnu -clean-host: maybe-clean-diff -clean-host: maybe-clean-dosutils -clean-host: maybe-clean-etc -clean-host: maybe-clean-fastjar -clean-host: maybe-clean-fileutils -clean-host: maybe-clean-findutils -clean-host: maybe-clean-find -clean-host: maybe-clean-fixincludes -clean-host: maybe-clean-flex -clean-host: maybe-clean-gas -clean-host: maybe-clean-gcc -clean-host: maybe-clean-gawk -clean-host: maybe-clean-gettext -clean-host: maybe-clean-gnuserv -clean-host: maybe-clean-gprof -clean-host: maybe-clean-gzip -clean-host: maybe-clean-hello -clean-host: maybe-clean-indent -clean-host: maybe-clean-intl -clean-host: maybe-clean-tcl -clean-host: maybe-clean-itcl -clean-host: maybe-clean-ld -clean-host: maybe-clean-libcpp -clean-host: maybe-clean-libdecnumber -clean-host: maybe-clean-libgui -clean-host: maybe-clean-libiberty -clean-host: maybe-clean-libtool -clean-host: maybe-clean-m4 -clean-host: maybe-clean-make -clean-host: maybe-clean-mmalloc -clean-host: maybe-clean-patch -clean-host: maybe-clean-perl -clean-host: maybe-clean-prms -clean-host: maybe-clean-rcs -clean-host: maybe-clean-readline -clean-host: maybe-clean-release -clean-host: maybe-clean-recode -clean-host: maybe-clean-sed -clean-host: maybe-clean-send-pr -clean-host: maybe-clean-shellutils -clean-host: maybe-clean-sid -clean-host: maybe-clean-sim -clean-host: maybe-clean-tar -clean-host: maybe-clean-texinfo -clean-host: maybe-clean-textutils -clean-host: maybe-clean-time -clean-host: maybe-clean-uudecode -clean-host: maybe-clean-wdiff -clean-host: maybe-clean-zip -clean-host: maybe-clean-zlib -clean-host: maybe-clean-gdb -clean-host: maybe-clean-expect -clean-host: maybe-clean-guile -clean-host: maybe-clean-tk -clean-host: maybe-clean-libtermcap -clean-host: maybe-clean-utils -clean-host: maybe-clean-gnattools +clean-host: \ + maybe-clean-ash \ + maybe-clean-autoconf \ + maybe-clean-automake \ + maybe-clean-bash \ + maybe-clean-bfd \ + maybe-clean-opcodes \ + maybe-clean-binutils \ + maybe-clean-bison \ + maybe-clean-byacc \ + maybe-clean-bzip2 \ + maybe-clean-dejagnu \ + maybe-clean-diff \ + maybe-clean-dosutils \ + maybe-clean-etc \ + maybe-clean-fastjar \ + maybe-clean-fileutils \ + maybe-clean-findutils \ + maybe-clean-find \ + maybe-clean-fixincludes \ + maybe-clean-flex \ + maybe-clean-gas \ + maybe-clean-gcc \ + maybe-clean-gawk \ + maybe-clean-gettext \ + maybe-clean-gnuserv \ + maybe-clean-gprof \ + maybe-clean-gzip \ + maybe-clean-hello \ + maybe-clean-indent \ + maybe-clean-intl \ + maybe-clean-tcl \ + maybe-clean-itcl \ + maybe-clean-ld \ + maybe-clean-libcpp \ + maybe-clean-libdecnumber \ + maybe-clean-libgui \ + maybe-clean-libiberty \ + maybe-clean-libtool \ + maybe-clean-m4 \ + maybe-clean-make \ + maybe-clean-mmalloc \ + maybe-clean-patch \ + maybe-clean-perl \ + maybe-clean-prms \ + maybe-clean-rcs \ + maybe-clean-readline \ + maybe-clean-release \ + maybe-clean-recode \ + maybe-clean-sed \ + maybe-clean-send-pr \ + maybe-clean-shellutils \ + maybe-clean-sid \ + maybe-clean-sim \ + maybe-clean-tar \ + maybe-clean-texinfo \ + maybe-clean-textutils \ + maybe-clean-time \ + maybe-clean-uudecode \ + maybe-clean-wdiff \ + maybe-clean-zip \ + maybe-clean-zlib \ + maybe-clean-gdb \ + maybe-clean-expect \ + maybe-clean-guile \ + maybe-clean-tk \ + maybe-clean-libtermcap \ + maybe-clean-utils \ + maybe-clean-gnattools .PHONY: clean-target - -clean-target: maybe-clean-target-libstdc++-v3 -clean-target: maybe-clean-target-libmudflap -clean-target: maybe-clean-target-libssp -clean-target: maybe-clean-target-libgcc-math -clean-target: maybe-clean-target-newlib -clean-target: maybe-clean-target-libgfortran -clean-target: maybe-clean-target-libobjc -clean-target: maybe-clean-target-libtermcap -clean-target: maybe-clean-target-winsup -clean-target: maybe-clean-target-libgloss -clean-target: maybe-clean-target-libiberty -clean-target: maybe-clean-target-gperf -clean-target: maybe-clean-target-examples -clean-target: maybe-clean-target-libffi -clean-target: maybe-clean-target-libjava -clean-target: maybe-clean-target-zlib -clean-target: maybe-clean-target-boehm-gc -clean-target: maybe-clean-target-qthreads -clean-target: maybe-clean-target-rda -clean-target: maybe-clean-target-libada -clean-target: maybe-clean-target-libgomp +clean-target: \ + maybe-clean-target-libstdc++-v3 \ + maybe-clean-target-libmudflap \ + maybe-clean-target-libssp \ + maybe-clean-target-newlib \ + maybe-clean-target-libgfortran \ + maybe-clean-target-libobjc \ + maybe-clean-target-libtermcap \ + maybe-clean-target-winsup \ + maybe-clean-target-libgloss \ + maybe-clean-target-libiberty \ + maybe-clean-target-gperf \ + maybe-clean-target-examples \ + maybe-clean-target-libffi \ + maybe-clean-target-libjava \ + maybe-clean-target-zlib \ + maybe-clean-target-boehm-gc \ + maybe-clean-target-qthreads \ + maybe-clean-target-rda \ + maybe-clean-target-libada .PHONY: do-distclean do-distclean: @@ -1631,99 +1579,97 @@ do-distclean: .PHONY: distclean-host - -distclean-host: maybe-distclean-ash -distclean-host: maybe-distclean-autoconf -distclean-host: maybe-distclean-automake -distclean-host: maybe-distclean-bash -distclean-host: maybe-distclean-bfd -distclean-host: maybe-distclean-opcodes -distclean-host: maybe-distclean-binutils -distclean-host: maybe-distclean-bison -distclean-host: maybe-distclean-byacc -distclean-host: maybe-distclean-bzip2 -distclean-host: maybe-distclean-dejagnu -distclean-host: maybe-distclean-diff -distclean-host: maybe-distclean-dosutils -distclean-host: maybe-distclean-etc -distclean-host: maybe-distclean-fastjar -distclean-host: maybe-distclean-fileutils -distclean-host: maybe-distclean-findutils -distclean-host: maybe-distclean-find -distclean-host: maybe-distclean-fixincludes -distclean-host: maybe-distclean-flex -distclean-host: maybe-distclean-gas -distclean-host: maybe-distclean-gcc -distclean-host: maybe-distclean-gawk -distclean-host: maybe-distclean-gettext -distclean-host: maybe-distclean-gnuserv -distclean-host: maybe-distclean-gprof -distclean-host: maybe-distclean-gzip -distclean-host: maybe-distclean-hello -distclean-host: maybe-distclean-indent -distclean-host: maybe-distclean-intl -distclean-host: maybe-distclean-tcl -distclean-host: maybe-distclean-itcl -distclean-host: maybe-distclean-ld -distclean-host: maybe-distclean-libcpp -distclean-host: maybe-distclean-libdecnumber -distclean-host: maybe-distclean-libgui -distclean-host: maybe-distclean-libiberty -distclean-host: maybe-distclean-libtool -distclean-host: maybe-distclean-m4 -distclean-host: maybe-distclean-make -distclean-host: maybe-distclean-mmalloc -distclean-host: maybe-distclean-patch -distclean-host: maybe-distclean-perl -distclean-host: maybe-distclean-prms -distclean-host: maybe-distclean-rcs -distclean-host: maybe-distclean-readline -distclean-host: maybe-distclean-release -distclean-host: maybe-distclean-recode -distclean-host: maybe-distclean-sed -distclean-host: maybe-distclean-send-pr -distclean-host: maybe-distclean-shellutils -distclean-host: maybe-distclean-sid -distclean-host: maybe-distclean-sim -distclean-host: maybe-distclean-tar -distclean-host: maybe-distclean-texinfo -distclean-host: maybe-distclean-textutils -distclean-host: maybe-distclean-time -distclean-host: maybe-distclean-uudecode -distclean-host: maybe-distclean-wdiff -distclean-host: maybe-distclean-zip -distclean-host: maybe-distclean-zlib -distclean-host: maybe-distclean-gdb -distclean-host: maybe-distclean-expect -distclean-host: maybe-distclean-guile -distclean-host: maybe-distclean-tk -distclean-host: maybe-distclean-libtermcap -distclean-host: maybe-distclean-utils -distclean-host: maybe-distclean-gnattools +distclean-host: \ + maybe-distclean-ash \ + maybe-distclean-autoconf \ + maybe-distclean-automake \ + maybe-distclean-bash \ + maybe-distclean-bfd \ + maybe-distclean-opcodes \ + maybe-distclean-binutils \ + maybe-distclean-bison \ + maybe-distclean-byacc \ + maybe-distclean-bzip2 \ + maybe-distclean-dejagnu \ + maybe-distclean-diff \ + maybe-distclean-dosutils \ + maybe-distclean-etc \ + maybe-distclean-fastjar \ + maybe-distclean-fileutils \ + maybe-distclean-findutils \ + maybe-distclean-find \ + maybe-distclean-fixincludes \ + maybe-distclean-flex \ + maybe-distclean-gas \ + maybe-distclean-gcc \ + maybe-distclean-gawk \ + maybe-distclean-gettext \ + maybe-distclean-gnuserv \ + maybe-distclean-gprof \ + maybe-distclean-gzip \ + maybe-distclean-hello \ + maybe-distclean-indent \ + maybe-distclean-intl \ + maybe-distclean-tcl \ + maybe-distclean-itcl \ + maybe-distclean-ld \ + maybe-distclean-libcpp \ + maybe-distclean-libdecnumber \ + maybe-distclean-libgui \ + maybe-distclean-libiberty \ + maybe-distclean-libtool \ + maybe-distclean-m4 \ + maybe-distclean-make \ + maybe-distclean-mmalloc \ + maybe-distclean-patch \ + maybe-distclean-perl \ + maybe-distclean-prms \ + maybe-distclean-rcs \ + maybe-distclean-readline \ + maybe-distclean-release \ + maybe-distclean-recode \ + maybe-distclean-sed \ + maybe-distclean-send-pr \ + maybe-distclean-shellutils \ + maybe-distclean-sid \ + maybe-distclean-sim \ + maybe-distclean-tar \ + maybe-distclean-texinfo \ + maybe-distclean-textutils \ + maybe-distclean-time \ + maybe-distclean-uudecode \ + maybe-distclean-wdiff \ + maybe-distclean-zip \ + maybe-distclean-zlib \ + maybe-distclean-gdb \ + maybe-distclean-expect \ + maybe-distclean-guile \ + maybe-distclean-tk \ + maybe-distclean-libtermcap \ + maybe-distclean-utils \ + maybe-distclean-gnattools .PHONY: distclean-target - -distclean-target: maybe-distclean-target-libstdc++-v3 -distclean-target: maybe-distclean-target-libmudflap -distclean-target: maybe-distclean-target-libssp -distclean-target: maybe-distclean-target-libgcc-math -distclean-target: maybe-distclean-target-newlib -distclean-target: maybe-distclean-target-libgfortran -distclean-target: maybe-distclean-target-libobjc -distclean-target: maybe-distclean-target-libtermcap -distclean-target: maybe-distclean-target-winsup -distclean-target: maybe-distclean-target-libgloss -distclean-target: maybe-distclean-target-libiberty -distclean-target: maybe-distclean-target-gperf -distclean-target: maybe-distclean-target-examples -distclean-target: maybe-distclean-target-libffi -distclean-target: maybe-distclean-target-libjava -distclean-target: maybe-distclean-target-zlib -distclean-target: maybe-distclean-target-boehm-gc -distclean-target: maybe-distclean-target-qthreads -distclean-target: maybe-distclean-target-rda -distclean-target: maybe-distclean-target-libada -distclean-target: maybe-distclean-target-libgomp +distclean-target: \ + maybe-distclean-target-libstdc++-v3 \ + maybe-distclean-target-libmudflap \ + maybe-distclean-target-libssp \ + maybe-distclean-target-newlib \ + maybe-distclean-target-libgfortran \ + maybe-distclean-target-libobjc \ + maybe-distclean-target-libtermcap \ + maybe-distclean-target-winsup \ + maybe-distclean-target-libgloss \ + maybe-distclean-target-libiberty \ + maybe-distclean-target-gperf \ + maybe-distclean-target-examples \ + maybe-distclean-target-libffi \ + maybe-distclean-target-libjava \ + maybe-distclean-target-zlib \ + maybe-distclean-target-boehm-gc \ + maybe-distclean-target-qthreads \ + maybe-distclean-target-rda \ + maybe-distclean-target-libada .PHONY: do-maintainer-clean do-maintainer-clean: @@ -1735,99 +1681,97 @@ do-maintainer-clean: .PHONY: maintainer-clean-host - -maintainer-clean-host: maybe-maintainer-clean-ash -maintainer-clean-host: maybe-maintainer-clean-autoconf -maintainer-clean-host: maybe-maintainer-clean-automake -maintainer-clean-host: maybe-maintainer-clean-bash -maintainer-clean-host: maybe-maintainer-clean-bfd -maintainer-clean-host: maybe-maintainer-clean-opcodes -maintainer-clean-host: maybe-maintainer-clean-binutils -maintainer-clean-host: maybe-maintainer-clean-bison -maintainer-clean-host: maybe-maintainer-clean-byacc -maintainer-clean-host: maybe-maintainer-clean-bzip2 -maintainer-clean-host: maybe-maintainer-clean-dejagnu -maintainer-clean-host: maybe-maintainer-clean-diff -maintainer-clean-host: maybe-maintainer-clean-dosutils -maintainer-clean-host: maybe-maintainer-clean-etc -maintainer-clean-host: maybe-maintainer-clean-fastjar -maintainer-clean-host: maybe-maintainer-clean-fileutils -maintainer-clean-host: maybe-maintainer-clean-findutils -maintainer-clean-host: maybe-maintainer-clean-find -maintainer-clean-host: maybe-maintainer-clean-fixincludes -maintainer-clean-host: maybe-maintainer-clean-flex -maintainer-clean-host: maybe-maintainer-clean-gas -maintainer-clean-host: maybe-maintainer-clean-gcc -maintainer-clean-host: maybe-maintainer-clean-gawk -maintainer-clean-host: maybe-maintainer-clean-gettext -maintainer-clean-host: maybe-maintainer-clean-gnuserv -maintainer-clean-host: maybe-maintainer-clean-gprof -maintainer-clean-host: maybe-maintainer-clean-gzip -maintainer-clean-host: maybe-maintainer-clean-hello -maintainer-clean-host: maybe-maintainer-clean-indent -maintainer-clean-host: maybe-maintainer-clean-intl -maintainer-clean-host: maybe-maintainer-clean-tcl -maintainer-clean-host: maybe-maintainer-clean-itcl -maintainer-clean-host: maybe-maintainer-clean-ld -maintainer-clean-host: maybe-maintainer-clean-libcpp -maintainer-clean-host: maybe-maintainer-clean-libdecnumber -maintainer-clean-host: maybe-maintainer-clean-libgui -maintainer-clean-host: maybe-maintainer-clean-libiberty -maintainer-clean-host: maybe-maintainer-clean-libtool -maintainer-clean-host: maybe-maintainer-clean-m4 -maintainer-clean-host: maybe-maintainer-clean-make -maintainer-clean-host: maybe-maintainer-clean-mmalloc -maintainer-clean-host: maybe-maintainer-clean-patch -maintainer-clean-host: maybe-maintainer-clean-perl -maintainer-clean-host: maybe-maintainer-clean-prms -maintainer-clean-host: maybe-maintainer-clean-rcs -maintainer-clean-host: maybe-maintainer-clean-readline -maintainer-clean-host: maybe-maintainer-clean-release -maintainer-clean-host: maybe-maintainer-clean-recode -maintainer-clean-host: maybe-maintainer-clean-sed -maintainer-clean-host: maybe-maintainer-clean-send-pr -maintainer-clean-host: maybe-maintainer-clean-shellutils -maintainer-clean-host: maybe-maintainer-clean-sid -maintainer-clean-host: maybe-maintainer-clean-sim -maintainer-clean-host: maybe-maintainer-clean-tar -maintainer-clean-host: maybe-maintainer-clean-texinfo -maintainer-clean-host: maybe-maintainer-clean-textutils -maintainer-clean-host: maybe-maintainer-clean-time -maintainer-clean-host: maybe-maintainer-clean-uudecode -maintainer-clean-host: maybe-maintainer-clean-wdiff -maintainer-clean-host: maybe-maintainer-clean-zip -maintainer-clean-host: maybe-maintainer-clean-zlib -maintainer-clean-host: maybe-maintainer-clean-gdb -maintainer-clean-host: maybe-maintainer-clean-expect -maintainer-clean-host: maybe-maintainer-clean-guile -maintainer-clean-host: maybe-maintainer-clean-tk -maintainer-clean-host: maybe-maintainer-clean-libtermcap -maintainer-clean-host: maybe-maintainer-clean-utils -maintainer-clean-host: maybe-maintainer-clean-gnattools +maintainer-clean-host: \ + maybe-maintainer-clean-ash \ + maybe-maintainer-clean-autoconf \ + maybe-maintainer-clean-automake \ + maybe-maintainer-clean-bash \ + maybe-maintainer-clean-bfd \ + maybe-maintainer-clean-opcodes \ + maybe-maintainer-clean-binutils \ + maybe-maintainer-clean-bison \ + maybe-maintainer-clean-byacc \ + maybe-maintainer-clean-bzip2 \ + maybe-maintainer-clean-dejagnu \ + maybe-maintainer-clean-diff \ + maybe-maintainer-clean-dosutils \ + maybe-maintainer-clean-etc \ + maybe-maintainer-clean-fastjar \ + maybe-maintainer-clean-fileutils \ + maybe-maintainer-clean-findutils \ + maybe-maintainer-clean-find \ + maybe-maintainer-clean-fixincludes \ + maybe-maintainer-clean-flex \ + maybe-maintainer-clean-gas \ + maybe-maintainer-clean-gcc \ + maybe-maintainer-clean-gawk \ + maybe-maintainer-clean-gettext \ + maybe-maintainer-clean-gnuserv \ + maybe-maintainer-clean-gprof \ + maybe-maintainer-clean-gzip \ + maybe-maintainer-clean-hello \ + maybe-maintainer-clean-indent \ + maybe-maintainer-clean-intl \ + maybe-maintainer-clean-tcl \ + maybe-maintainer-clean-itcl \ + maybe-maintainer-clean-ld \ + maybe-maintainer-clean-libcpp \ + maybe-maintainer-clean-libdecnumber \ + maybe-maintainer-clean-libgui \ + maybe-maintainer-clean-libiberty \ + maybe-maintainer-clean-libtool \ + maybe-maintainer-clean-m4 \ + maybe-maintainer-clean-make \ + maybe-maintainer-clean-mmalloc \ + maybe-maintainer-clean-patch \ + maybe-maintainer-clean-perl \ + maybe-maintainer-clean-prms \ + maybe-maintainer-clean-rcs \ + maybe-maintainer-clean-readline \ + maybe-maintainer-clean-release \ + maybe-maintainer-clean-recode \ + maybe-maintainer-clean-sed \ + maybe-maintainer-clean-send-pr \ + maybe-maintainer-clean-shellutils \ + maybe-maintainer-clean-sid \ + maybe-maintainer-clean-sim \ + maybe-maintainer-clean-tar \ + maybe-maintainer-clean-texinfo \ + maybe-maintainer-clean-textutils \ + maybe-maintainer-clean-time \ + maybe-maintainer-clean-uudecode \ + maybe-maintainer-clean-wdiff \ + maybe-maintainer-clean-zip \ + maybe-maintainer-clean-zlib \ + maybe-maintainer-clean-gdb \ + maybe-maintainer-clean-expect \ + maybe-maintainer-clean-guile \ + maybe-maintainer-clean-tk \ + maybe-maintainer-clean-libtermcap \ + maybe-maintainer-clean-utils \ + maybe-maintainer-clean-gnattools .PHONY: maintainer-clean-target - -maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3 -maintainer-clean-target: maybe-maintainer-clean-target-libmudflap -maintainer-clean-target: maybe-maintainer-clean-target-libssp -maintainer-clean-target: maybe-maintainer-clean-target-libgcc-math -maintainer-clean-target: maybe-maintainer-clean-target-newlib -maintainer-clean-target: maybe-maintainer-clean-target-libgfortran -maintainer-clean-target: maybe-maintainer-clean-target-libobjc -maintainer-clean-target: maybe-maintainer-clean-target-libtermcap -maintainer-clean-target: maybe-maintainer-clean-target-winsup -maintainer-clean-target: maybe-maintainer-clean-target-libgloss -maintainer-clean-target: maybe-maintainer-clean-target-libiberty -maintainer-clean-target: maybe-maintainer-clean-target-gperf -maintainer-clean-target: maybe-maintainer-clean-target-examples -maintainer-clean-target: maybe-maintainer-clean-target-libffi -maintainer-clean-target: maybe-maintainer-clean-target-libjava -maintainer-clean-target: maybe-maintainer-clean-target-zlib -maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc -maintainer-clean-target: maybe-maintainer-clean-target-qthreads -maintainer-clean-target: maybe-maintainer-clean-target-rda -maintainer-clean-target: maybe-maintainer-clean-target-libada -maintainer-clean-target: maybe-maintainer-clean-target-libgomp +maintainer-clean-target: \ + maybe-maintainer-clean-target-libstdc++-v3 \ + maybe-maintainer-clean-target-libmudflap \ + maybe-maintainer-clean-target-libssp \ + maybe-maintainer-clean-target-newlib \ + maybe-maintainer-clean-target-libgfortran \ + maybe-maintainer-clean-target-libobjc \ + maybe-maintainer-clean-target-libtermcap \ + maybe-maintainer-clean-target-winsup \ + maybe-maintainer-clean-target-libgloss \ + maybe-maintainer-clean-target-libiberty \ + maybe-maintainer-clean-target-gperf \ + maybe-maintainer-clean-target-examples \ + maybe-maintainer-clean-target-libffi \ + maybe-maintainer-clean-target-libjava \ + maybe-maintainer-clean-target-zlib \ + maybe-maintainer-clean-target-boehm-gc \ + maybe-maintainer-clean-target-qthreads \ + maybe-maintainer-clean-target-rda \ + maybe-maintainer-clean-target-libada # Here are the targets which correspond to the do-X targets. @@ -1967,7 +1911,6 @@ check-target: \ maybe-check-target-libstdc++-v3 \ maybe-check-target-libmudflap \ maybe-check-target-libssp \ - maybe-check-target-libgcc-math \ maybe-check-target-newlib \ maybe-check-target-libgfortran \ maybe-check-target-libobjc \ @@ -1983,8 +1926,7 @@ check-target: \ maybe-check-target-boehm-gc \ maybe-check-target-qthreads \ maybe-check-target-rda \ - maybe-check-target-libada \ - maybe-check-target-libgomp + maybe-check-target-libada do-check: @: $(MAKE); $(unstage) @@ -2168,7 +2110,6 @@ install-target: \ maybe-install-target-libstdc++-v3 \ maybe-install-target-libmudflap \ maybe-install-target-libssp \ - maybe-install-target-libgcc-math \ maybe-install-target-newlib \ maybe-install-target-libgfortran \ maybe-install-target-libobjc \ @@ -2184,8 +2125,7 @@ install-target: \ maybe-install-target-boehm-gc \ maybe-install-target-qthreads \ maybe-install-target-rda \ - maybe-install-target-libada \ - maybe-install-target-libgomp + maybe-install-target-libada uninstall: @echo "the uninstall target is not supported in this tree" @@ -2255,12 +2195,12 @@ TAGS: do-TAGS maybe-configure-build-libiberty: @if build-libiberty maybe-configure-build-libiberty: configure-build-libiberty -configure-build-libiberty: +configure-build-libiberty: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \ + @test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/libiberty; \ cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \ @@ -2303,12 +2243,12 @@ all-build-libiberty: configure-build-libiberty maybe-configure-build-bison: @if build-bison maybe-configure-build-bison: configure-build-bison -configure-build-bison: +configure-build-bison: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \ + @test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/bison; \ cd "$(BUILD_SUBDIR)/bison" || exit 1; \ @@ -2351,12 +2291,12 @@ all-build-bison: configure-build-bison maybe-configure-build-byacc: @if build-byacc maybe-configure-build-byacc: configure-build-byacc -configure-build-byacc: +configure-build-byacc: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \ + @test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/byacc; \ cd "$(BUILD_SUBDIR)/byacc" || exit 1; \ @@ -2399,12 +2339,12 @@ all-build-byacc: configure-build-byacc maybe-configure-build-flex: @if build-flex maybe-configure-build-flex: configure-build-flex -configure-build-flex: +configure-build-flex: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \ + @test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/flex; \ cd "$(BUILD_SUBDIR)/flex" || exit 1; \ @@ -2447,12 +2387,12 @@ all-build-flex: configure-build-flex maybe-configure-build-m4: @if build-m4 maybe-configure-build-m4: configure-build-m4 -configure-build-m4: +configure-build-m4: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \ + @test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/m4; \ cd "$(BUILD_SUBDIR)/m4" || exit 1; \ @@ -2495,12 +2435,12 @@ all-build-m4: configure-build-m4 maybe-configure-build-texinfo: @if build-texinfo maybe-configure-build-texinfo: configure-build-texinfo -configure-build-texinfo: +configure-build-texinfo: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \ + @test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/texinfo; \ cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \ @@ -2543,12 +2483,12 @@ all-build-texinfo: configure-build-texinfo maybe-configure-build-fixincludes: @if build-fixincludes maybe-configure-build-fixincludes: configure-build-fixincludes -configure-build-fixincludes: +configure-build-fixincludes: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \ + @test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/fixincludes; \ cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \ @@ -2596,12 +2536,12 @@ all-build-fixincludes: configure-build-fixincludes maybe-configure-ash: @if ash maybe-configure-ash: configure-ash -configure-ash: +configure-ash: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/ash; \ cd "$(HOST_SUBDIR)/ash" || exit 1; \ @@ -2933,12 +2873,12 @@ maintainer-clean-ash: maybe-configure-autoconf: @if autoconf maybe-configure-autoconf: configure-autoconf -configure-autoconf: +configure-autoconf: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/autoconf; \ cd "$(HOST_SUBDIR)/autoconf" || exit 1; \ @@ -3270,12 +3210,12 @@ maintainer-clean-autoconf: maybe-configure-automake: @if automake maybe-configure-automake: configure-automake -configure-automake: +configure-automake: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/automake; \ cd "$(HOST_SUBDIR)/automake" || exit 1; \ @@ -3607,12 +3547,12 @@ maintainer-clean-automake: maybe-configure-bash: @if bash maybe-configure-bash: configure-bash -configure-bash: +configure-bash: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bash ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/bash; \ cd "$(HOST_SUBDIR)/bash" || exit 1; \ @@ -3944,16 +3884,12 @@ maintainer-clean-bash: maybe-configure-bfd: @if bfd maybe-configure-bfd: configure-bfd -configure-bfd: -@endif bfd -@if bfd-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif bfd-bootstrap -@if bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ +configure-bfd: + @test -f stage_last && exit 0; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/bfd; \ cd "$(HOST_SUBDIR)/bfd" || exit 1; \ @@ -3976,10 +3912,8 @@ maybe-configure-stage1-bfd: @if bfd-bootstrap maybe-configure-stage1-bfd: configure-stage1-bfd configure-stage1-bfd: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \ @@ -4002,10 +3936,8 @@ maybe-configure-stage2-bfd: @if bfd-bootstrap maybe-configure-stage2-bfd: configure-stage2-bfd configure-stage2-bfd: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -4029,10 +3961,8 @@ maybe-configure-stage3-bfd: @if bfd-bootstrap maybe-configure-stage3-bfd: configure-stage3-bfd configure-stage3-bfd: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -4056,10 +3986,8 @@ maybe-configure-stage4-bfd: @if bfd-bootstrap maybe-configure-stage4-bfd: configure-stage4-bfd configure-stage4-bfd: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -4083,10 +4011,8 @@ maybe-configure-stageprofile-bfd: @if bfd-bootstrap maybe-configure-stageprofile-bfd: configure-stageprofile-bfd configure-stageprofile-bfd: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -4110,10 +4036,8 @@ maybe-configure-stagefeedback-bfd: @if bfd-bootstrap maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd configure-stagefeedback-bfd: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -4142,12 +4066,8 @@ maybe-all-bfd: TARGET-bfd=all maybe-all-bfd: all-bfd all-bfd: configure-bfd -@endif bfd -@if bfd-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif bfd-bootstrap -@if bfd - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bfd && \ @@ -4165,12 +4085,12 @@ maybe-all-stage1-bfd: all-stage1-bfd all-stage1: all-stage1-bfd TARGET-stage1-bfd = $(TARGET-bfd) all-stage1-bfd: configure-stage1-bfd - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" \ $(TARGET-stage1-bfd) maybe-clean-stage1-bfd: clean-stage1-bfd @@ -4178,10 +4098,10 @@ clean-stage1: clean-stage1-bfd clean-stage1-bfd: @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean + CFLAGS="$(STAGE1_CFLAGS)" clean @endif bfd-bootstrap @@ -4194,7 +4114,7 @@ maybe-all-stage2-bfd: all-stage2-bfd all-stage2: all-stage2-bfd TARGET-stage2-bfd = $(TARGET-bfd) all-stage2-bfd: configure-stage2-bfd - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -4208,7 +4128,7 @@ clean-stage2: clean-stage2-bfd clean-stage2-bfd: @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -4225,7 +4145,7 @@ maybe-all-stage3-bfd: all-stage3-bfd all-stage3: all-stage3-bfd TARGET-stage3-bfd = $(TARGET-bfd) all-stage3-bfd: configure-stage3-bfd - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -4239,7 +4159,7 @@ clean-stage3: clean-stage3-bfd clean-stage3-bfd: @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -4256,7 +4176,7 @@ maybe-all-stage4-bfd: all-stage4-bfd all-stage4: all-stage4-bfd TARGET-stage4-bfd = $(TARGET-bfd) all-stage4-bfd: configure-stage4-bfd - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -4270,7 +4190,7 @@ clean-stage4: clean-stage4-bfd clean-stage4-bfd: @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -4287,7 +4207,7 @@ maybe-all-stageprofile-bfd: all-stageprofile-bfd all-stageprofile: all-stageprofile-bfd TARGET-stageprofile-bfd = $(TARGET-bfd) all-stageprofile-bfd: configure-stageprofile-bfd - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -4301,7 +4221,7 @@ clean-stageprofile: clean-stageprofile-bfd clean-stageprofile-bfd: @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -4318,7 +4238,7 @@ maybe-all-stagefeedback-bfd: all-stagefeedback-bfd all-stagefeedback: all-stagefeedback-bfd TARGET-stagefeedback-bfd = $(TARGET-bfd) all-stagefeedback-bfd: configure-stagefeedback-bfd - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -4332,7 +4252,7 @@ clean-stagefeedback: clean-stagefeedback-bfd clean-stagefeedback-bfd: @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -4628,16 +4548,12 @@ maintainer-clean-bfd: maybe-configure-opcodes: @if opcodes maybe-configure-opcodes: configure-opcodes -configure-opcodes: -@endif opcodes -@if opcodes-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif opcodes-bootstrap -@if opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ +configure-opcodes: + @test -f stage_last && exit 0; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/opcodes; \ cd "$(HOST_SUBDIR)/opcodes" || exit 1; \ @@ -4660,10 +4576,8 @@ maybe-configure-stage1-opcodes: @if opcodes-bootstrap maybe-configure-stage1-opcodes: configure-stage1-opcodes configure-stage1-opcodes: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \ @@ -4686,10 +4600,8 @@ maybe-configure-stage2-opcodes: @if opcodes-bootstrap maybe-configure-stage2-opcodes: configure-stage2-opcodes configure-stage2-opcodes: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -4713,10 +4625,8 @@ maybe-configure-stage3-opcodes: @if opcodes-bootstrap maybe-configure-stage3-opcodes: configure-stage3-opcodes configure-stage3-opcodes: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -4740,10 +4650,8 @@ maybe-configure-stage4-opcodes: @if opcodes-bootstrap maybe-configure-stage4-opcodes: configure-stage4-opcodes configure-stage4-opcodes: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -4767,10 +4675,8 @@ maybe-configure-stageprofile-opcodes: @if opcodes-bootstrap maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes configure-stageprofile-opcodes: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -4794,10 +4700,8 @@ maybe-configure-stagefeedback-opcodes: @if opcodes-bootstrap maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes configure-stagefeedback-opcodes: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -4826,12 +4730,8 @@ maybe-all-opcodes: TARGET-opcodes=all maybe-all-opcodes: all-opcodes all-opcodes: configure-opcodes -@endif opcodes -@if opcodes-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif opcodes-bootstrap -@if opcodes - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/opcodes && \ @@ -4849,12 +4749,12 @@ maybe-all-stage1-opcodes: all-stage1-opcodes all-stage1: all-stage1-opcodes TARGET-stage1-opcodes = $(TARGET-opcodes) all-stage1-opcodes: configure-stage1-opcodes - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" \ $(TARGET-stage1-opcodes) maybe-clean-stage1-opcodes: clean-stage1-opcodes @@ -4862,10 +4762,10 @@ clean-stage1: clean-stage1-opcodes clean-stage1-opcodes: @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean + CFLAGS="$(STAGE1_CFLAGS)" clean @endif opcodes-bootstrap @@ -4878,7 +4778,7 @@ maybe-all-stage2-opcodes: all-stage2-opcodes all-stage2: all-stage2-opcodes TARGET-stage2-opcodes = $(TARGET-opcodes) all-stage2-opcodes: configure-stage2-opcodes - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -4892,7 +4792,7 @@ clean-stage2: clean-stage2-opcodes clean-stage2-opcodes: @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -4909,7 +4809,7 @@ maybe-all-stage3-opcodes: all-stage3-opcodes all-stage3: all-stage3-opcodes TARGET-stage3-opcodes = $(TARGET-opcodes) all-stage3-opcodes: configure-stage3-opcodes - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -4923,7 +4823,7 @@ clean-stage3: clean-stage3-opcodes clean-stage3-opcodes: @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -4940,7 +4840,7 @@ maybe-all-stage4-opcodes: all-stage4-opcodes all-stage4: all-stage4-opcodes TARGET-stage4-opcodes = $(TARGET-opcodes) all-stage4-opcodes: configure-stage4-opcodes - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -4954,7 +4854,7 @@ clean-stage4: clean-stage4-opcodes clean-stage4-opcodes: @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -4971,7 +4871,7 @@ maybe-all-stageprofile-opcodes: all-stageprofile-opcodes all-stageprofile: all-stageprofile-opcodes TARGET-stageprofile-opcodes = $(TARGET-opcodes) all-stageprofile-opcodes: configure-stageprofile-opcodes - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -4985,7 +4885,7 @@ clean-stageprofile: clean-stageprofile-opcodes clean-stageprofile-opcodes: @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -5002,7 +4902,7 @@ maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes all-stagefeedback: all-stagefeedback-opcodes TARGET-stagefeedback-opcodes = $(TARGET-opcodes) all-stagefeedback-opcodes: configure-stagefeedback-opcodes - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -5016,7 +4916,7 @@ clean-stagefeedback: clean-stagefeedback-opcodes clean-stagefeedback-opcodes: @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -5312,16 +5212,12 @@ maintainer-clean-opcodes: maybe-configure-binutils: @if binutils maybe-configure-binutils: configure-binutils -configure-binutils: -@endif binutils -@if binutils-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif binutils-bootstrap -@if binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ +configure-binutils: + @test -f stage_last && exit 0; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/binutils; \ cd "$(HOST_SUBDIR)/binutils" || exit 1; \ @@ -5344,10 +5240,8 @@ maybe-configure-stage1-binutils: @if binutils-bootstrap maybe-configure-stage1-binutils: configure-stage1-binutils configure-stage1-binutils: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \ @@ -5370,10 +5264,8 @@ maybe-configure-stage2-binutils: @if binutils-bootstrap maybe-configure-stage2-binutils: configure-stage2-binutils configure-stage2-binutils: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -5397,10 +5289,8 @@ maybe-configure-stage3-binutils: @if binutils-bootstrap maybe-configure-stage3-binutils: configure-stage3-binutils configure-stage3-binutils: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -5424,10 +5314,8 @@ maybe-configure-stage4-binutils: @if binutils-bootstrap maybe-configure-stage4-binutils: configure-stage4-binutils configure-stage4-binutils: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -5451,10 +5339,8 @@ maybe-configure-stageprofile-binutils: @if binutils-bootstrap maybe-configure-stageprofile-binutils: configure-stageprofile-binutils configure-stageprofile-binutils: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -5478,10 +5364,8 @@ maybe-configure-stagefeedback-binutils: @if binutils-bootstrap maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils configure-stagefeedback-binutils: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -5510,12 +5394,8 @@ maybe-all-binutils: TARGET-binutils=all maybe-all-binutils: all-binutils all-binutils: configure-binutils -@endif binutils -@if binutils-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif binutils-bootstrap -@if binutils - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/binutils && \ @@ -5533,12 +5413,12 @@ maybe-all-stage1-binutils: all-stage1-binutils all-stage1: all-stage1-binutils TARGET-stage1-binutils = $(TARGET-binutils) all-stage1-binutils: configure-stage1-binutils - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" \ $(TARGET-stage1-binutils) maybe-clean-stage1-binutils: clean-stage1-binutils @@ -5546,10 +5426,10 @@ clean-stage1: clean-stage1-binutils clean-stage1-binutils: @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean + CFLAGS="$(STAGE1_CFLAGS)" clean @endif binutils-bootstrap @@ -5562,7 +5442,7 @@ maybe-all-stage2-binutils: all-stage2-binutils all-stage2: all-stage2-binutils TARGET-stage2-binutils = $(TARGET-binutils) all-stage2-binutils: configure-stage2-binutils - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -5576,7 +5456,7 @@ clean-stage2: clean-stage2-binutils clean-stage2-binutils: @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -5593,7 +5473,7 @@ maybe-all-stage3-binutils: all-stage3-binutils all-stage3: all-stage3-binutils TARGET-stage3-binutils = $(TARGET-binutils) all-stage3-binutils: configure-stage3-binutils - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -5607,7 +5487,7 @@ clean-stage3: clean-stage3-binutils clean-stage3-binutils: @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -5624,7 +5504,7 @@ maybe-all-stage4-binutils: all-stage4-binutils all-stage4: all-stage4-binutils TARGET-stage4-binutils = $(TARGET-binutils) all-stage4-binutils: configure-stage4-binutils - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -5638,7 +5518,7 @@ clean-stage4: clean-stage4-binutils clean-stage4-binutils: @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -5655,7 +5535,7 @@ maybe-all-stageprofile-binutils: all-stageprofile-binutils all-stageprofile: all-stageprofile-binutils TARGET-stageprofile-binutils = $(TARGET-binutils) all-stageprofile-binutils: configure-stageprofile-binutils - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -5669,7 +5549,7 @@ clean-stageprofile: clean-stageprofile-binutils clean-stageprofile-binutils: @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -5686,7 +5566,7 @@ maybe-all-stagefeedback-binutils: all-stagefeedback-binutils all-stagefeedback: all-stagefeedback-binutils TARGET-stagefeedback-binutils = $(TARGET-binutils) all-stagefeedback-binutils: configure-stagefeedback-binutils - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -5700,7 +5580,7 @@ clean-stagefeedback: clean-stagefeedback-binutils clean-stagefeedback-binutils: @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -5996,12 +5876,12 @@ maintainer-clean-binutils: maybe-configure-bison: @if bison maybe-configure-bison: configure-bison -configure-bison: +configure-bison: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/bison; \ cd "$(HOST_SUBDIR)/bison" || exit 1; \ @@ -6336,12 +6216,12 @@ maintainer-clean-bison: maybe-configure-byacc: @if byacc maybe-configure-byacc: configure-byacc -configure-byacc: +configure-byacc: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/byacc; \ cd "$(HOST_SUBDIR)/byacc" || exit 1; \ @@ -6676,12 +6556,12 @@ maintainer-clean-byacc: maybe-configure-bzip2: @if bzip2 maybe-configure-bzip2: configure-bzip2 -configure-bzip2: +configure-bzip2: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/bzip2; \ cd "$(HOST_SUBDIR)/bzip2" || exit 1; \ @@ -7013,12 +6893,12 @@ maintainer-clean-bzip2: maybe-configure-dejagnu: @if dejagnu maybe-configure-dejagnu: configure-dejagnu -configure-dejagnu: +configure-dejagnu: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/dejagnu; \ cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \ @@ -7350,12 +7230,12 @@ maintainer-clean-dejagnu: maybe-configure-diff: @if diff maybe-configure-diff: configure-diff -configure-diff: +configure-diff: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/diff ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/diff; \ cd "$(HOST_SUBDIR)/diff" || exit 1; \ @@ -7687,12 +7567,12 @@ maintainer-clean-diff: maybe-configure-dosutils: @if dosutils maybe-configure-dosutils: configure-dosutils -configure-dosutils: +configure-dosutils: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/dosutils; \ cd "$(HOST_SUBDIR)/dosutils" || exit 1; \ @@ -8018,12 +7898,12 @@ maintainer-clean-dosutils: maybe-configure-etc: @if etc maybe-configure-etc: configure-etc -configure-etc: +configure-etc: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/etc; \ cd "$(HOST_SUBDIR)/etc" || exit 1; \ @@ -8355,12 +8235,12 @@ maintainer-clean-etc: maybe-configure-fastjar: @if fastjar maybe-configure-fastjar: configure-fastjar -configure-fastjar: +configure-fastjar: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/fastjar; \ cd "$(HOST_SUBDIR)/fastjar" || exit 1; \ @@ -8695,12 +8575,12 @@ maintainer-clean-fastjar: maybe-configure-fileutils: @if fileutils maybe-configure-fileutils: configure-fileutils -configure-fileutils: +configure-fileutils: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fileutils ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/fileutils; \ cd "$(HOST_SUBDIR)/fileutils" || exit 1; \ @@ -9032,12 +8912,12 @@ maintainer-clean-fileutils: maybe-configure-findutils: @if findutils maybe-configure-findutils: configure-findutils -configure-findutils: +configure-findutils: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/findutils; \ cd "$(HOST_SUBDIR)/findutils" || exit 1; \ @@ -9369,12 +9249,12 @@ maintainer-clean-findutils: maybe-configure-find: @if find maybe-configure-find: configure-find -configure-find: +configure-find: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/find ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/find; \ cd "$(HOST_SUBDIR)/find" || exit 1; \ @@ -9706,12 +9586,12 @@ maintainer-clean-find: maybe-configure-fixincludes: @if fixincludes maybe-configure-fixincludes: configure-fixincludes -configure-fixincludes: +configure-fixincludes: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/fixincludes; \ cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \ @@ -9962,12 +9842,12 @@ maintainer-clean-fixincludes: maybe-configure-flex: @if flex maybe-configure-flex: configure-flex -configure-flex: +configure-flex: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/flex; \ cd "$(HOST_SUBDIR)/flex" || exit 1; \ @@ -10302,16 +10182,12 @@ maintainer-clean-flex: maybe-configure-gas: @if gas maybe-configure-gas: configure-gas -configure-gas: -@endif gas -@if gas-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif gas-bootstrap -@if gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ +configure-gas: + @test -f stage_last && exit 0; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gas; \ cd "$(HOST_SUBDIR)/gas" || exit 1; \ @@ -10334,10 +10210,8 @@ maybe-configure-stage1-gas: @if gas-bootstrap maybe-configure-stage1-gas: configure-stage1-gas configure-stage1-gas: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \ @@ -10360,10 +10234,8 @@ maybe-configure-stage2-gas: @if gas-bootstrap maybe-configure-stage2-gas: configure-stage2-gas configure-stage2-gas: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -10387,10 +10259,8 @@ maybe-configure-stage3-gas: @if gas-bootstrap maybe-configure-stage3-gas: configure-stage3-gas configure-stage3-gas: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -10414,10 +10284,8 @@ maybe-configure-stage4-gas: @if gas-bootstrap maybe-configure-stage4-gas: configure-stage4-gas configure-stage4-gas: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -10441,10 +10309,8 @@ maybe-configure-stageprofile-gas: @if gas-bootstrap maybe-configure-stageprofile-gas: configure-stageprofile-gas configure-stageprofile-gas: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -10468,10 +10334,8 @@ maybe-configure-stagefeedback-gas: @if gas-bootstrap maybe-configure-stagefeedback-gas: configure-stagefeedback-gas configure-stagefeedback-gas: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -10500,12 +10364,8 @@ maybe-all-gas: TARGET-gas=all maybe-all-gas: all-gas all-gas: configure-gas -@endif gas -@if gas-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif gas-bootstrap -@if gas - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gas && \ @@ -10523,12 +10383,12 @@ maybe-all-stage1-gas: all-stage1-gas all-stage1: all-stage1-gas TARGET-stage1-gas = $(TARGET-gas) all-stage1-gas: configure-stage1-gas - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" \ $(TARGET-stage1-gas) maybe-clean-stage1-gas: clean-stage1-gas @@ -10536,10 +10396,10 @@ clean-stage1: clean-stage1-gas clean-stage1-gas: @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean + CFLAGS="$(STAGE1_CFLAGS)" clean @endif gas-bootstrap @@ -10552,7 +10412,7 @@ maybe-all-stage2-gas: all-stage2-gas all-stage2: all-stage2-gas TARGET-stage2-gas = $(TARGET-gas) all-stage2-gas: configure-stage2-gas - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -10566,7 +10426,7 @@ clean-stage2: clean-stage2-gas clean-stage2-gas: @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -10583,7 +10443,7 @@ maybe-all-stage3-gas: all-stage3-gas all-stage3: all-stage3-gas TARGET-stage3-gas = $(TARGET-gas) all-stage3-gas: configure-stage3-gas - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -10597,7 +10457,7 @@ clean-stage3: clean-stage3-gas clean-stage3-gas: @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -10614,7 +10474,7 @@ maybe-all-stage4-gas: all-stage4-gas all-stage4: all-stage4-gas TARGET-stage4-gas = $(TARGET-gas) all-stage4-gas: configure-stage4-gas - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -10628,7 +10488,7 @@ clean-stage4: clean-stage4-gas clean-stage4-gas: @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -10645,7 +10505,7 @@ maybe-all-stageprofile-gas: all-stageprofile-gas all-stageprofile: all-stageprofile-gas TARGET-stageprofile-gas = $(TARGET-gas) all-stageprofile-gas: configure-stageprofile-gas - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -10659,7 +10519,7 @@ clean-stageprofile: clean-stageprofile-gas clean-stageprofile-gas: @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -10676,7 +10536,7 @@ maybe-all-stagefeedback-gas: all-stagefeedback-gas all-stagefeedback: all-stagefeedback-gas TARGET-stagefeedback-gas = $(TARGET-gas) all-stagefeedback-gas: configure-stagefeedback-gas - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -10690,7 +10550,7 @@ clean-stagefeedback: clean-stagefeedback-gas clean-stagefeedback-gas: @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -10986,16 +10846,12 @@ maintainer-clean-gas: maybe-configure-gcc: @if gcc maybe-configure-gcc: configure-gcc -configure-gcc: -@endif gcc -@if gcc-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif gcc-bootstrap -@if gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ +configure-gcc: + @test -f stage_last && exit 0; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gcc; \ cd "$(HOST_SUBDIR)/gcc" || exit 1; \ @@ -11018,10 +10874,8 @@ maybe-configure-stage1-gcc: @if gcc-bootstrap maybe-configure-stage1-gcc: configure-stage1-gcc configure-stage1-gcc: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \ @@ -11044,10 +10898,8 @@ maybe-configure-stage2-gcc: @if gcc-bootstrap maybe-configure-stage2-gcc: configure-stage2-gcc configure-stage2-gcc: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -11071,10 +10923,8 @@ maybe-configure-stage3-gcc: @if gcc-bootstrap maybe-configure-stage3-gcc: configure-stage3-gcc configure-stage3-gcc: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -11098,10 +10948,8 @@ maybe-configure-stage4-gcc: @if gcc-bootstrap maybe-configure-stage4-gcc: configure-stage4-gcc configure-stage4-gcc: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -11125,10 +10973,8 @@ maybe-configure-stageprofile-gcc: @if gcc-bootstrap maybe-configure-stageprofile-gcc: configure-stageprofile-gcc configure-stageprofile-gcc: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -11152,10 +10998,8 @@ maybe-configure-stagefeedback-gcc: @if gcc-bootstrap maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc configure-stagefeedback-gcc: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -11184,12 +11028,8 @@ maybe-all-gcc: TARGET-gcc=`if [ -f stage_last ]; then echo quickstrap ; else echo all; fi` maybe-all-gcc: all-gcc all-gcc: configure-gcc -@endif gcc -@if gcc-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif gcc-bootstrap -@if gcc - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gcc && \ @@ -11207,12 +11047,12 @@ maybe-all-stage1-gcc: all-stage1-gcc all-stage1: all-stage1-gcc TARGET-stage1-gcc = $(TARGET-gcc) all-stage1-gcc: configure-stage1-gcc - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \ $(TARGET-stage1-gcc) maybe-clean-stage1-gcc: clean-stage1-gcc @@ -11220,10 +11060,10 @@ clean-stage1: clean-stage1-gcc clean-stage1-gcc: @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean + CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap @@ -11236,7 +11076,7 @@ maybe-all-stage2-gcc: all-stage2-gcc all-stage2: all-stage2-gcc TARGET-stage2-gcc = $(TARGET-gcc) all-stage2-gcc: configure-stage2-gcc - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -11250,7 +11090,7 @@ clean-stage2: clean-stage2-gcc clean-stage2-gcc: @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -11267,7 +11107,7 @@ maybe-all-stage3-gcc: all-stage3-gcc all-stage3: all-stage3-gcc TARGET-stage3-gcc = $(TARGET-gcc) all-stage3-gcc: configure-stage3-gcc - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -11281,7 +11121,7 @@ clean-stage3: clean-stage3-gcc clean-stage3-gcc: @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -11298,7 +11138,7 @@ maybe-all-stage4-gcc: all-stage4-gcc all-stage4: all-stage4-gcc TARGET-stage4-gcc = $(TARGET-gcc) all-stage4-gcc: configure-stage4-gcc - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -11312,7 +11152,7 @@ clean-stage4: clean-stage4-gcc clean-stage4-gcc: @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -11329,7 +11169,7 @@ maybe-all-stageprofile-gcc: all-stageprofile-gcc all-stageprofile: all-stageprofile-gcc TARGET-stageprofile-gcc = $(TARGET-gcc) all-stageprofile-gcc: configure-stageprofile-gcc - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -11343,7 +11183,7 @@ clean-stageprofile: clean-stageprofile-gcc clean-stageprofile-gcc: @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -11360,7 +11200,7 @@ maybe-all-stagefeedback-gcc: all-stagefeedback-gcc all-stagefeedback: all-stagefeedback-gcc TARGET-stagefeedback-gcc = $(TARGET-gcc) all-stagefeedback-gcc: configure-stagefeedback-gcc - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -11374,7 +11214,7 @@ clean-stagefeedback: clean-stagefeedback-gcc clean-stagefeedback-gcc: @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -11670,12 +11510,12 @@ maintainer-clean-gcc: maybe-configure-gawk: @if gawk maybe-configure-gawk: configure-gawk -configure-gawk: +configure-gawk: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gawk; \ cd "$(HOST_SUBDIR)/gawk" || exit 1; \ @@ -12007,12 +11847,12 @@ maintainer-clean-gawk: maybe-configure-gettext: @if gettext maybe-configure-gettext: configure-gettext -configure-gettext: +configure-gettext: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gettext; \ cd "$(HOST_SUBDIR)/gettext" || exit 1; \ @@ -12344,12 +12184,12 @@ maintainer-clean-gettext: maybe-configure-gnuserv: @if gnuserv maybe-configure-gnuserv: configure-gnuserv -configure-gnuserv: +configure-gnuserv: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gnuserv; \ cd "$(HOST_SUBDIR)/gnuserv" || exit 1; \ @@ -12681,12 +12521,12 @@ maintainer-clean-gnuserv: maybe-configure-gprof: @if gprof maybe-configure-gprof: configure-gprof -configure-gprof: +configure-gprof: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gprof; \ cd "$(HOST_SUBDIR)/gprof" || exit 1; \ @@ -13018,12 +12858,12 @@ maintainer-clean-gprof: maybe-configure-gzip: @if gzip maybe-configure-gzip: configure-gzip -configure-gzip: +configure-gzip: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gzip; \ cd "$(HOST_SUBDIR)/gzip" || exit 1; \ @@ -13355,12 +13195,12 @@ maintainer-clean-gzip: maybe-configure-hello: @if hello maybe-configure-hello: configure-hello -configure-hello: +configure-hello: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/hello; \ cd "$(HOST_SUBDIR)/hello" || exit 1; \ @@ -13692,12 +13532,12 @@ maintainer-clean-hello: maybe-configure-indent: @if indent maybe-configure-indent: configure-indent -configure-indent: +configure-indent: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/indent; \ cd "$(HOST_SUBDIR)/indent" || exit 1; \ @@ -14029,16 +13869,12 @@ maintainer-clean-indent: maybe-configure-intl: @if intl maybe-configure-intl: configure-intl -configure-intl: -@endif intl -@if intl-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif intl-bootstrap -@if intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ +configure-intl: + @test -f stage_last && exit 0; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/intl; \ cd "$(HOST_SUBDIR)/intl" || exit 1; \ @@ -14061,10 +13897,8 @@ maybe-configure-stage1-intl: @if intl-bootstrap maybe-configure-stage1-intl: configure-stage1-intl configure-stage1-intl: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \ @@ -14087,10 +13921,8 @@ maybe-configure-stage2-intl: @if intl-bootstrap maybe-configure-stage2-intl: configure-stage2-intl configure-stage2-intl: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -14114,10 +13946,8 @@ maybe-configure-stage3-intl: @if intl-bootstrap maybe-configure-stage3-intl: configure-stage3-intl configure-stage3-intl: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -14141,10 +13971,8 @@ maybe-configure-stage4-intl: @if intl-bootstrap maybe-configure-stage4-intl: configure-stage4-intl configure-stage4-intl: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -14168,10 +13996,8 @@ maybe-configure-stageprofile-intl: @if intl-bootstrap maybe-configure-stageprofile-intl: configure-stageprofile-intl configure-stageprofile-intl: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -14195,10 +14021,8 @@ maybe-configure-stagefeedback-intl: @if intl-bootstrap maybe-configure-stagefeedback-intl: configure-stagefeedback-intl configure-stagefeedback-intl: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -14227,12 +14051,8 @@ maybe-all-intl: TARGET-intl=all maybe-all-intl: all-intl all-intl: configure-intl -@endif intl -@if intl-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif intl-bootstrap -@if intl - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/intl && \ @@ -14250,12 +14070,12 @@ maybe-all-stage1-intl: all-stage1-intl all-stage1: all-stage1-intl TARGET-stage1-intl = $(TARGET-intl) all-stage1-intl: configure-stage1-intl - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" \ $(TARGET-stage1-intl) maybe-clean-stage1-intl: clean-stage1-intl @@ -14263,10 +14083,10 @@ clean-stage1: clean-stage1-intl clean-stage1-intl: @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean + CFLAGS="$(STAGE1_CFLAGS)" clean @endif intl-bootstrap @@ -14279,7 +14099,7 @@ maybe-all-stage2-intl: all-stage2-intl all-stage2: all-stage2-intl TARGET-stage2-intl = $(TARGET-intl) all-stage2-intl: configure-stage2-intl - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -14293,7 +14113,7 @@ clean-stage2: clean-stage2-intl clean-stage2-intl: @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -14310,7 +14130,7 @@ maybe-all-stage3-intl: all-stage3-intl all-stage3: all-stage3-intl TARGET-stage3-intl = $(TARGET-intl) all-stage3-intl: configure-stage3-intl - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -14324,7 +14144,7 @@ clean-stage3: clean-stage3-intl clean-stage3-intl: @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -14341,7 +14161,7 @@ maybe-all-stage4-intl: all-stage4-intl all-stage4: all-stage4-intl TARGET-stage4-intl = $(TARGET-intl) all-stage4-intl: configure-stage4-intl - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -14355,7 +14175,7 @@ clean-stage4: clean-stage4-intl clean-stage4-intl: @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -14372,7 +14192,7 @@ maybe-all-stageprofile-intl: all-stageprofile-intl all-stageprofile: all-stageprofile-intl TARGET-stageprofile-intl = $(TARGET-intl) all-stageprofile-intl: configure-stageprofile-intl - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -14386,7 +14206,7 @@ clean-stageprofile: clean-stageprofile-intl clean-stageprofile-intl: @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -14403,7 +14223,7 @@ maybe-all-stagefeedback-intl: all-stagefeedback-intl all-stagefeedback: all-stagefeedback-intl TARGET-stagefeedback-intl = $(TARGET-intl) all-stagefeedback-intl: configure-stagefeedback-intl - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -14417,7 +14237,7 @@ clean-stagefeedback: clean-stagefeedback-intl clean-stagefeedback-intl: @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -14713,12 +14533,12 @@ maintainer-clean-intl: maybe-configure-tcl: @if tcl maybe-configure-tcl: configure-tcl -configure-tcl: +configure-tcl: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/tcl; \ cd "$(HOST_SUBDIR)/tcl" || exit 1; \ @@ -15035,12 +14855,12 @@ maintainer-clean-tcl: maybe-configure-itcl: @if itcl maybe-configure-itcl: configure-itcl -configure-itcl: +configure-itcl: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/itcl; \ cd "$(HOST_SUBDIR)/itcl" || exit 1; \ @@ -15372,16 +15192,12 @@ maintainer-clean-itcl: maybe-configure-ld: @if ld maybe-configure-ld: configure-ld -configure-ld: -@endif ld -@if ld-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif ld-bootstrap -@if ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ +configure-ld: + @test -f stage_last && exit 0; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/ld; \ cd "$(HOST_SUBDIR)/ld" || exit 1; \ @@ -15404,10 +15220,8 @@ maybe-configure-stage1-ld: @if ld-bootstrap maybe-configure-stage1-ld: configure-stage1-ld configure-stage1-ld: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \ @@ -15430,10 +15244,8 @@ maybe-configure-stage2-ld: @if ld-bootstrap maybe-configure-stage2-ld: configure-stage2-ld configure-stage2-ld: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -15457,10 +15269,8 @@ maybe-configure-stage3-ld: @if ld-bootstrap maybe-configure-stage3-ld: configure-stage3-ld configure-stage3-ld: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -15484,10 +15294,8 @@ maybe-configure-stage4-ld: @if ld-bootstrap maybe-configure-stage4-ld: configure-stage4-ld configure-stage4-ld: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -15511,10 +15319,8 @@ maybe-configure-stageprofile-ld: @if ld-bootstrap maybe-configure-stageprofile-ld: configure-stageprofile-ld configure-stageprofile-ld: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -15538,10 +15344,8 @@ maybe-configure-stagefeedback-ld: @if ld-bootstrap maybe-configure-stagefeedback-ld: configure-stagefeedback-ld configure-stagefeedback-ld: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -15570,12 +15374,8 @@ maybe-all-ld: TARGET-ld=all maybe-all-ld: all-ld all-ld: configure-ld -@endif ld -@if ld-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif ld-bootstrap -@if ld - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/ld && \ @@ -15593,12 +15393,12 @@ maybe-all-stage1-ld: all-stage1-ld all-stage1: all-stage1-ld TARGET-stage1-ld = $(TARGET-ld) all-stage1-ld: configure-stage1-ld - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" \ $(TARGET-stage1-ld) maybe-clean-stage1-ld: clean-stage1-ld @@ -15606,10 +15406,10 @@ clean-stage1: clean-stage1-ld clean-stage1-ld: @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean + CFLAGS="$(STAGE1_CFLAGS)" clean @endif ld-bootstrap @@ -15622,7 +15422,7 @@ maybe-all-stage2-ld: all-stage2-ld all-stage2: all-stage2-ld TARGET-stage2-ld = $(TARGET-ld) all-stage2-ld: configure-stage2-ld - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -15636,7 +15436,7 @@ clean-stage2: clean-stage2-ld clean-stage2-ld: @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -15653,7 +15453,7 @@ maybe-all-stage3-ld: all-stage3-ld all-stage3: all-stage3-ld TARGET-stage3-ld = $(TARGET-ld) all-stage3-ld: configure-stage3-ld - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -15667,7 +15467,7 @@ clean-stage3: clean-stage3-ld clean-stage3-ld: @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -15684,7 +15484,7 @@ maybe-all-stage4-ld: all-stage4-ld all-stage4: all-stage4-ld TARGET-stage4-ld = $(TARGET-ld) all-stage4-ld: configure-stage4-ld - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -15698,7 +15498,7 @@ clean-stage4: clean-stage4-ld clean-stage4-ld: @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -15715,7 +15515,7 @@ maybe-all-stageprofile-ld: all-stageprofile-ld all-stageprofile: all-stageprofile-ld TARGET-stageprofile-ld = $(TARGET-ld) all-stageprofile-ld: configure-stageprofile-ld - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -15729,7 +15529,7 @@ clean-stageprofile: clean-stageprofile-ld clean-stageprofile-ld: @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -15746,7 +15546,7 @@ maybe-all-stagefeedback-ld: all-stagefeedback-ld all-stagefeedback: all-stagefeedback-ld TARGET-stagefeedback-ld = $(TARGET-ld) all-stagefeedback-ld: configure-stagefeedback-ld - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -15760,7 +15560,7 @@ clean-stagefeedback: clean-stagefeedback-ld clean-stagefeedback-ld: @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -16056,16 +15856,12 @@ maintainer-clean-ld: maybe-configure-libcpp: @if libcpp maybe-configure-libcpp: configure-libcpp -configure-libcpp: -@endif libcpp -@if libcpp-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libcpp-bootstrap -@if libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ +configure-libcpp: + @test -f stage_last && exit 0; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libcpp; \ cd "$(HOST_SUBDIR)/libcpp" || exit 1; \ @@ -16088,10 +15884,8 @@ maybe-configure-stage1-libcpp: @if libcpp-bootstrap maybe-configure-stage1-libcpp: configure-stage1-libcpp configure-stage1-libcpp: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \ @@ -16114,10 +15908,8 @@ maybe-configure-stage2-libcpp: @if libcpp-bootstrap maybe-configure-stage2-libcpp: configure-stage2-libcpp configure-stage2-libcpp: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -16141,10 +15933,8 @@ maybe-configure-stage3-libcpp: @if libcpp-bootstrap maybe-configure-stage3-libcpp: configure-stage3-libcpp configure-stage3-libcpp: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -16168,10 +15958,8 @@ maybe-configure-stage4-libcpp: @if libcpp-bootstrap maybe-configure-stage4-libcpp: configure-stage4-libcpp configure-stage4-libcpp: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -16195,10 +15983,8 @@ maybe-configure-stageprofile-libcpp: @if libcpp-bootstrap maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp configure-stageprofile-libcpp: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -16222,10 +16008,8 @@ maybe-configure-stagefeedback-libcpp: @if libcpp-bootstrap maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp configure-stagefeedback-libcpp: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -16254,12 +16038,8 @@ maybe-all-libcpp: TARGET-libcpp=all maybe-all-libcpp: all-libcpp all-libcpp: configure-libcpp -@endif libcpp -@if libcpp-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libcpp-bootstrap -@if libcpp - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libcpp && \ @@ -16277,12 +16057,12 @@ maybe-all-stage1-libcpp: all-stage1-libcpp all-stage1: all-stage1-libcpp TARGET-stage1-libcpp = $(TARGET-libcpp) all-stage1-libcpp: configure-stage1-libcpp - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" \ $(TARGET-stage1-libcpp) maybe-clean-stage1-libcpp: clean-stage1-libcpp @@ -16290,10 +16070,10 @@ clean-stage1: clean-stage1-libcpp clean-stage1-libcpp: @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean + CFLAGS="$(STAGE1_CFLAGS)" clean @endif libcpp-bootstrap @@ -16306,7 +16086,7 @@ maybe-all-stage2-libcpp: all-stage2-libcpp all-stage2: all-stage2-libcpp TARGET-stage2-libcpp = $(TARGET-libcpp) all-stage2-libcpp: configure-stage2-libcpp - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -16320,7 +16100,7 @@ clean-stage2: clean-stage2-libcpp clean-stage2-libcpp: @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -16337,7 +16117,7 @@ maybe-all-stage3-libcpp: all-stage3-libcpp all-stage3: all-stage3-libcpp TARGET-stage3-libcpp = $(TARGET-libcpp) all-stage3-libcpp: configure-stage3-libcpp - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -16351,7 +16131,7 @@ clean-stage3: clean-stage3-libcpp clean-stage3-libcpp: @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -16368,7 +16148,7 @@ maybe-all-stage4-libcpp: all-stage4-libcpp all-stage4: all-stage4-libcpp TARGET-stage4-libcpp = $(TARGET-libcpp) all-stage4-libcpp: configure-stage4-libcpp - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -16382,7 +16162,7 @@ clean-stage4: clean-stage4-libcpp clean-stage4-libcpp: @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -16399,7 +16179,7 @@ maybe-all-stageprofile-libcpp: all-stageprofile-libcpp all-stageprofile: all-stageprofile-libcpp TARGET-stageprofile-libcpp = $(TARGET-libcpp) all-stageprofile-libcpp: configure-stageprofile-libcpp - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -16413,7 +16193,7 @@ clean-stageprofile: clean-stageprofile-libcpp clean-stageprofile-libcpp: @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -16430,7 +16210,7 @@ maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp all-stagefeedback: all-stagefeedback-libcpp TARGET-stagefeedback-libcpp = $(TARGET-libcpp) all-stagefeedback-libcpp: configure-stagefeedback-libcpp - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -16444,7 +16224,7 @@ clean-stagefeedback: clean-stagefeedback-libcpp clean-stagefeedback-libcpp: @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -16740,16 +16520,12 @@ maintainer-clean-libcpp: maybe-configure-libdecnumber: @if libdecnumber maybe-configure-libdecnumber: configure-libdecnumber -configure-libdecnumber: -@endif libdecnumber -@if libdecnumber-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libdecnumber-bootstrap -@if libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ +configure-libdecnumber: + @test -f stage_last && exit 0; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libdecnumber; \ cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \ @@ -16772,10 +16548,8 @@ maybe-configure-stage1-libdecnumber: @if libdecnumber-bootstrap maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber configure-stage1-libdecnumber: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \ @@ -16798,10 +16572,8 @@ maybe-configure-stage2-libdecnumber: @if libdecnumber-bootstrap maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber configure-stage2-libdecnumber: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -16825,10 +16597,8 @@ maybe-configure-stage3-libdecnumber: @if libdecnumber-bootstrap maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber configure-stage3-libdecnumber: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -16852,10 +16622,8 @@ maybe-configure-stage4-libdecnumber: @if libdecnumber-bootstrap maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber configure-stage4-libdecnumber: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -16879,10 +16647,8 @@ maybe-configure-stageprofile-libdecnumber: @if libdecnumber-bootstrap maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber configure-stageprofile-libdecnumber: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -16906,10 +16672,8 @@ maybe-configure-stagefeedback-libdecnumber: @if libdecnumber-bootstrap maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber configure-stagefeedback-libdecnumber: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -16938,12 +16702,8 @@ maybe-all-libdecnumber: TARGET-libdecnumber=all maybe-all-libdecnumber: all-libdecnumber all-libdecnumber: configure-libdecnumber -@endif libdecnumber -@if libdecnumber-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libdecnumber-bootstrap -@if libdecnumber - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libdecnumber && \ @@ -16961,12 +16721,12 @@ maybe-all-stage1-libdecnumber: all-stage1-libdecnumber all-stage1: all-stage1-libdecnumber TARGET-stage1-libdecnumber = $(TARGET-libdecnumber) all-stage1-libdecnumber: configure-stage1-libdecnumber - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" \ $(TARGET-stage1-libdecnumber) maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber @@ -16974,10 +16734,10 @@ clean-stage1: clean-stage1-libdecnumber clean-stage1-libdecnumber: @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean + CFLAGS="$(STAGE1_CFLAGS)" clean @endif libdecnumber-bootstrap @@ -16990,7 +16750,7 @@ maybe-all-stage2-libdecnumber: all-stage2-libdecnumber all-stage2: all-stage2-libdecnumber TARGET-stage2-libdecnumber = $(TARGET-libdecnumber) all-stage2-libdecnumber: configure-stage2-libdecnumber - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -17004,7 +16764,7 @@ clean-stage2: clean-stage2-libdecnumber clean-stage2-libdecnumber: @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -17021,7 +16781,7 @@ maybe-all-stage3-libdecnumber: all-stage3-libdecnumber all-stage3: all-stage3-libdecnumber TARGET-stage3-libdecnumber = $(TARGET-libdecnumber) all-stage3-libdecnumber: configure-stage3-libdecnumber - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -17035,7 +16795,7 @@ clean-stage3: clean-stage3-libdecnumber clean-stage3-libdecnumber: @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -17052,7 +16812,7 @@ maybe-all-stage4-libdecnumber: all-stage4-libdecnumber all-stage4: all-stage4-libdecnumber TARGET-stage4-libdecnumber = $(TARGET-libdecnumber) all-stage4-libdecnumber: configure-stage4-libdecnumber - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -17066,7 +16826,7 @@ clean-stage4: clean-stage4-libdecnumber clean-stage4-libdecnumber: @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -17083,7 +16843,7 @@ maybe-all-stageprofile-libdecnumber: all-stageprofile-libdecnumber all-stageprofile: all-stageprofile-libdecnumber TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber) all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -17097,7 +16857,7 @@ clean-stageprofile: clean-stageprofile-libdecnumber clean-stageprofile-libdecnumber: @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -17114,7 +16874,7 @@ maybe-all-stagefeedback-libdecnumber: all-stagefeedback-libdecnumber all-stagefeedback: all-stagefeedback-libdecnumber TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber) all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -17128,7 +16888,7 @@ clean-stagefeedback: clean-stagefeedback-libdecnumber clean-stagefeedback-libdecnumber: @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -17424,12 +17184,12 @@ maintainer-clean-libdecnumber: maybe-configure-libgui: @if libgui maybe-configure-libgui: configure-libgui -configure-libgui: +configure-libgui: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libgui; \ cd "$(HOST_SUBDIR)/libgui" || exit 1; \ @@ -17761,16 +17521,12 @@ maintainer-clean-libgui: maybe-configure-libiberty: @if libiberty maybe-configure-libiberty: configure-libiberty -configure-libiberty: -@endif libiberty -@if libiberty-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libiberty-bootstrap -@if libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ +configure-libiberty: + @test -f stage_last && exit 0; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libiberty; \ cd "$(HOST_SUBDIR)/libiberty" || exit 1; \ @@ -17793,10 +17549,8 @@ maybe-configure-stage1-libiberty: @if libiberty-bootstrap maybe-configure-stage1-libiberty: configure-stage1-libiberty configure-stage1-libiberty: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \ @@ -17819,10 +17573,8 @@ maybe-configure-stage2-libiberty: @if libiberty-bootstrap maybe-configure-stage2-libiberty: configure-stage2-libiberty configure-stage2-libiberty: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -17846,10 +17598,8 @@ maybe-configure-stage3-libiberty: @if libiberty-bootstrap maybe-configure-stage3-libiberty: configure-stage3-libiberty configure-stage3-libiberty: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -17873,10 +17623,8 @@ maybe-configure-stage4-libiberty: @if libiberty-bootstrap maybe-configure-stage4-libiberty: configure-stage4-libiberty configure-stage4-libiberty: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -17900,10 +17648,8 @@ maybe-configure-stageprofile-libiberty: @if libiberty-bootstrap maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty configure-stageprofile-libiberty: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -17927,10 +17673,8 @@ maybe-configure-stagefeedback-libiberty: @if libiberty-bootstrap maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty configure-stagefeedback-libiberty: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -17959,12 +17703,8 @@ maybe-all-libiberty: TARGET-libiberty=all maybe-all-libiberty: all-libiberty all-libiberty: configure-libiberty -@endif libiberty -@if libiberty-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libiberty-bootstrap -@if libiberty - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libiberty && \ @@ -17982,12 +17722,12 @@ maybe-all-stage1-libiberty: all-stage1-libiberty all-stage1: all-stage1-libiberty TARGET-stage1-libiberty = $(TARGET-libiberty) all-stage1-libiberty: configure-stage1-libiberty - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" \ $(TARGET-stage1-libiberty) maybe-clean-stage1-libiberty: clean-stage1-libiberty @@ -17995,10 +17735,10 @@ clean-stage1: clean-stage1-libiberty clean-stage1-libiberty: @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean + CFLAGS="$(STAGE1_CFLAGS)" clean @endif libiberty-bootstrap @@ -18011,7 +17751,7 @@ maybe-all-stage2-libiberty: all-stage2-libiberty all-stage2: all-stage2-libiberty TARGET-stage2-libiberty = $(TARGET-libiberty) all-stage2-libiberty: configure-stage2-libiberty - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -18025,7 +17765,7 @@ clean-stage2: clean-stage2-libiberty clean-stage2-libiberty: @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -18042,7 +17782,7 @@ maybe-all-stage3-libiberty: all-stage3-libiberty all-stage3: all-stage3-libiberty TARGET-stage3-libiberty = $(TARGET-libiberty) all-stage3-libiberty: configure-stage3-libiberty - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -18056,7 +17796,7 @@ clean-stage3: clean-stage3-libiberty clean-stage3-libiberty: @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -18073,7 +17813,7 @@ maybe-all-stage4-libiberty: all-stage4-libiberty all-stage4: all-stage4-libiberty TARGET-stage4-libiberty = $(TARGET-libiberty) all-stage4-libiberty: configure-stage4-libiberty - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -18087,7 +17827,7 @@ clean-stage4: clean-stage4-libiberty clean-stage4-libiberty: @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -18104,7 +17844,7 @@ maybe-all-stageprofile-libiberty: all-stageprofile-libiberty all-stageprofile: all-stageprofile-libiberty TARGET-stageprofile-libiberty = $(TARGET-libiberty) all-stageprofile-libiberty: configure-stageprofile-libiberty - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -18118,7 +17858,7 @@ clean-stageprofile: clean-stageprofile-libiberty clean-stageprofile-libiberty: @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -18135,7 +17875,7 @@ maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty all-stagefeedback: all-stagefeedback-libiberty TARGET-stagefeedback-libiberty = $(TARGET-libiberty) all-stagefeedback-libiberty: configure-stagefeedback-libiberty - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -18149,7 +17889,7 @@ clean-stagefeedback: clean-stagefeedback-libiberty clean-stagefeedback-libiberty: @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -18445,12 +18185,12 @@ maintainer-clean-libiberty: maybe-configure-libtool: @if libtool maybe-configure-libtool: configure-libtool -configure-libtool: +configure-libtool: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libtool; \ cd "$(HOST_SUBDIR)/libtool" || exit 1; \ @@ -18782,12 +18522,12 @@ maintainer-clean-libtool: maybe-configure-m4: @if m4 maybe-configure-m4: configure-m4 -configure-m4: +configure-m4: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/m4; \ cd "$(HOST_SUBDIR)/m4" || exit 1; \ @@ -19119,12 +18859,12 @@ maintainer-clean-m4: maybe-configure-make: @if make maybe-configure-make: configure-make -configure-make: +configure-make: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/make; \ cd "$(HOST_SUBDIR)/make" || exit 1; \ @@ -19456,12 +19196,12 @@ maintainer-clean-make: maybe-configure-mmalloc: @if mmalloc maybe-configure-mmalloc: configure-mmalloc -configure-mmalloc: +configure-mmalloc: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mmalloc ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/mmalloc; \ cd "$(HOST_SUBDIR)/mmalloc" || exit 1; \ @@ -19787,12 +19527,12 @@ maintainer-clean-mmalloc: maybe-configure-patch: @if patch maybe-configure-patch: configure-patch -configure-patch: +configure-patch: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/patch; \ cd "$(HOST_SUBDIR)/patch" || exit 1; \ @@ -20124,12 +19864,12 @@ maintainer-clean-patch: maybe-configure-perl: @if perl maybe-configure-perl: configure-perl -configure-perl: +configure-perl: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/perl ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/perl; \ cd "$(HOST_SUBDIR)/perl" || exit 1; \ @@ -20461,12 +20201,12 @@ maintainer-clean-perl: maybe-configure-prms: @if prms maybe-configure-prms: configure-prms -configure-prms: +configure-prms: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/prms ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/prms; \ cd "$(HOST_SUBDIR)/prms" || exit 1; \ @@ -20798,12 +20538,12 @@ maintainer-clean-prms: maybe-configure-rcs: @if rcs maybe-configure-rcs: configure-rcs -configure-rcs: +configure-rcs: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/rcs ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/rcs; \ cd "$(HOST_SUBDIR)/rcs" || exit 1; \ @@ -21135,12 +20875,12 @@ maintainer-clean-rcs: maybe-configure-readline: @if readline maybe-configure-readline: configure-readline -configure-readline: +configure-readline: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/readline; \ cd "$(HOST_SUBDIR)/readline" || exit 1; \ @@ -21472,12 +21212,12 @@ maintainer-clean-readline: maybe-configure-release: @if release maybe-configure-release: configure-release -configure-release: +configure-release: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/release ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/release; \ cd "$(HOST_SUBDIR)/release" || exit 1; \ @@ -21797,12 +21537,12 @@ maintainer-clean-release: maybe-configure-recode: @if recode maybe-configure-recode: configure-recode -configure-recode: +configure-recode: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/recode ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/recode; \ cd "$(HOST_SUBDIR)/recode" || exit 1; \ @@ -22134,12 +21874,12 @@ maintainer-clean-recode: maybe-configure-sed: @if sed maybe-configure-sed: configure-sed -configure-sed: +configure-sed: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sed ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/sed; \ cd "$(HOST_SUBDIR)/sed" || exit 1; \ @@ -22471,12 +22211,12 @@ maintainer-clean-sed: maybe-configure-send-pr: @if send-pr maybe-configure-send-pr: configure-send-pr -configure-send-pr: +configure-send-pr: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/send-pr ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/send-pr; \ cd "$(HOST_SUBDIR)/send-pr" || exit 1; \ @@ -22808,12 +22548,12 @@ maintainer-clean-send-pr: maybe-configure-shellutils: @if shellutils maybe-configure-shellutils: configure-shellutils -configure-shellutils: +configure-shellutils: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/shellutils ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/shellutils; \ cd "$(HOST_SUBDIR)/shellutils" || exit 1; \ @@ -23145,12 +22885,12 @@ maintainer-clean-shellutils: maybe-configure-sid: @if sid maybe-configure-sid: configure-sid -configure-sid: +configure-sid: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/sid; \ cd "$(HOST_SUBDIR)/sid" || exit 1; \ @@ -23482,12 +23222,12 @@ maintainer-clean-sid: maybe-configure-sim: @if sim maybe-configure-sim: configure-sim -configure-sim: +configure-sim: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/sim; \ cd "$(HOST_SUBDIR)/sim" || exit 1; \ @@ -23819,12 +23559,12 @@ maintainer-clean-sim: maybe-configure-tar: @if tar maybe-configure-tar: configure-tar -configure-tar: +configure-tar: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tar ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/tar; \ cd "$(HOST_SUBDIR)/tar" || exit 1; \ @@ -24156,12 +23896,12 @@ maintainer-clean-tar: maybe-configure-texinfo: @if texinfo maybe-configure-texinfo: configure-texinfo -configure-texinfo: +configure-texinfo: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/texinfo; \ cd "$(HOST_SUBDIR)/texinfo" || exit 1; \ @@ -24487,12 +24227,12 @@ maintainer-clean-texinfo: maybe-configure-textutils: @if textutils maybe-configure-textutils: configure-textutils -configure-textutils: +configure-textutils: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/textutils ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/textutils; \ cd "$(HOST_SUBDIR)/textutils" || exit 1; \ @@ -24824,12 +24564,12 @@ maintainer-clean-textutils: maybe-configure-time: @if time maybe-configure-time: configure-time -configure-time: +configure-time: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/time ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/time; \ cd "$(HOST_SUBDIR)/time" || exit 1; \ @@ -25161,12 +24901,12 @@ maintainer-clean-time: maybe-configure-uudecode: @if uudecode maybe-configure-uudecode: configure-uudecode -configure-uudecode: +configure-uudecode: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/uudecode ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/uudecode; \ cd "$(HOST_SUBDIR)/uudecode" || exit 1; \ @@ -25498,12 +25238,12 @@ maintainer-clean-uudecode: maybe-configure-wdiff: @if wdiff maybe-configure-wdiff: configure-wdiff -configure-wdiff: +configure-wdiff: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/wdiff ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/wdiff; \ cd "$(HOST_SUBDIR)/wdiff" || exit 1; \ @@ -25835,12 +25575,12 @@ maintainer-clean-wdiff: maybe-configure-zip: @if zip maybe-configure-zip: configure-zip -configure-zip: +configure-zip: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zip ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/zip; \ cd "$(HOST_SUBDIR)/zip" || exit 1; \ @@ -26175,16 +25915,12 @@ maintainer-clean-zip: maybe-configure-zlib: @if zlib maybe-configure-zlib: configure-zlib -configure-zlib: -@endif zlib -@if zlib-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif zlib-bootstrap -@if zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ +configure-zlib: + @test -f stage_last && exit 0; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/zlib; \ cd "$(HOST_SUBDIR)/zlib" || exit 1; \ @@ -26207,10 +25943,8 @@ maybe-configure-stage1-zlib: @if zlib-bootstrap maybe-configure-stage1-zlib: configure-stage1-zlib configure-stage1-zlib: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \ @@ -26233,10 +25967,8 @@ maybe-configure-stage2-zlib: @if zlib-bootstrap maybe-configure-stage2-zlib: configure-stage2-zlib configure-stage2-zlib: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -26260,10 +25992,8 @@ maybe-configure-stage3-zlib: @if zlib-bootstrap maybe-configure-stage3-zlib: configure-stage3-zlib configure-stage3-zlib: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -26287,10 +26017,8 @@ maybe-configure-stage4-zlib: @if zlib-bootstrap maybe-configure-stage4-zlib: configure-stage4-zlib configure-stage4-zlib: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -26314,10 +26042,8 @@ maybe-configure-stageprofile-zlib: @if zlib-bootstrap maybe-configure-stageprofile-zlib: configure-stageprofile-zlib configure-stageprofile-zlib: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -26341,10 +26067,8 @@ maybe-configure-stagefeedback-zlib: @if zlib-bootstrap maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib configure-stagefeedback-zlib: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ @@ -26373,12 +26097,8 @@ maybe-all-zlib: TARGET-zlib=all maybe-all-zlib: all-zlib all-zlib: configure-zlib -@endif zlib -@if zlib-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif zlib-bootstrap -@if zlib - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/zlib && \ @@ -26396,12 +26116,12 @@ maybe-all-stage1-zlib: all-stage1-zlib all-stage1: all-stage1-zlib TARGET-stage1-zlib = $(TARGET-zlib) all-stage1-zlib: configure-stage1-zlib - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" \ $(TARGET-stage1-zlib) maybe-clean-stage1-zlib: clean-stage1-zlib @@ -26409,10 +26129,10 @@ clean-stage1: clean-stage1-zlib clean-stage1-zlib: @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ + @[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean + CFLAGS="$(STAGE1_CFLAGS)" clean @endif zlib-bootstrap @@ -26425,7 +26145,7 @@ maybe-all-stage2-zlib: all-stage2-zlib all-stage2: all-stage2-zlib TARGET-stage2-zlib = $(TARGET-zlib) all-stage2-zlib: configure-stage2-zlib - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -26439,7 +26159,7 @@ clean-stage2: clean-stage2-zlib clean-stage2-zlib: @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ + @[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -26456,7 +26176,7 @@ maybe-all-stage3-zlib: all-stage3-zlib all-stage3: all-stage3-zlib TARGET-stage3-zlib = $(TARGET-zlib) all-stage3-zlib: configure-stage3-zlib - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -26470,7 +26190,7 @@ clean-stage3: clean-stage3-zlib clean-stage3-zlib: @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ + @[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -26487,7 +26207,7 @@ maybe-all-stage4-zlib: all-stage4-zlib all-stage4: all-stage4-zlib TARGET-stage4-zlib = $(TARGET-zlib) all-stage4-zlib: configure-stage4-zlib - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -26501,7 +26221,7 @@ clean-stage4: clean-stage4-zlib clean-stage4-zlib: @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ + @[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -26518,7 +26238,7 @@ maybe-all-stageprofile-zlib: all-stageprofile-zlib all-stageprofile: all-stageprofile-zlib TARGET-stageprofile-zlib = $(TARGET-zlib) all-stageprofile-zlib: configure-stageprofile-zlib - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -26532,7 +26252,7 @@ clean-stageprofile: clean-stageprofile-zlib clean-stageprofile-zlib: @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ + @[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -26549,7 +26269,7 @@ maybe-all-stagefeedback-zlib: all-stagefeedback-zlib all-stagefeedback: all-stagefeedback-zlib TARGET-stagefeedback-zlib = $(TARGET-zlib) all-stagefeedback-zlib: configure-stagefeedback-zlib - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -26563,7 +26283,7 @@ clean-stagefeedback: clean-stagefeedback-zlib clean-stagefeedback-zlib: @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ + @[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(FLAGS_TO_PASS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ @@ -26847,12 +26567,12 @@ maintainer-clean-zlib: maybe-configure-gdb: @if gdb maybe-configure-gdb: configure-gdb -configure-gdb: +configure-gdb: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gdb; \ cd "$(HOST_SUBDIR)/gdb" || exit 1; \ @@ -27184,12 +26904,12 @@ maintainer-clean-gdb: maybe-configure-expect: @if expect maybe-configure-expect: configure-expect -configure-expect: +configure-expect: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/expect; \ cd "$(HOST_SUBDIR)/expect" || exit 1; \ @@ -27521,12 +27241,12 @@ maintainer-clean-expect: maybe-configure-guile: @if guile maybe-configure-guile: configure-guile -configure-guile: +configure-guile: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/guile; \ cd "$(HOST_SUBDIR)/guile" || exit 1; \ @@ -27858,12 +27578,12 @@ maintainer-clean-guile: maybe-configure-tk: @if tk maybe-configure-tk: configure-tk -configure-tk: +configure-tk: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/tk; \ cd "$(HOST_SUBDIR)/tk" || exit 1; \ @@ -28195,12 +27915,12 @@ maintainer-clean-tk: maybe-configure-libtermcap: @if libtermcap maybe-configure-libtermcap: configure-libtermcap -configure-libtermcap: +configure-libtermcap: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libtermcap; \ cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \ @@ -28466,12 +28186,12 @@ maintainer-clean-libtermcap: maybe-configure-utils: @if utils maybe-configure-utils: configure-utils -configure-utils: +configure-utils: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/utils; \ cd "$(HOST_SUBDIR)/utils" || exit 1; \ @@ -28797,12 +28517,12 @@ maintainer-clean-utils: maybe-configure-gnattools: @if gnattools maybe-configure-gnattools: configure-gnattools -configure-gnattools: +configure-gnattools: @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \ + @test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gnattools; \ cd "$(HOST_SUBDIR)/gnattools" || exit 1; \ @@ -29141,7 +28861,7 @@ maintainer-clean-gnattools: maybe-configure-target-libstdc++-v3: @if target-libstdc++-v3 maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3 -configure-target-libstdc++-v3: +configure-target-libstdc++-v3: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -29157,9 +28877,11 @@ configure-target-libstdc++-v3: fi; \ else \ mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \ cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \ @@ -29495,7 +29217,7 @@ maintainer-clean-target-libstdc++-v3: maybe-configure-target-libmudflap: @if target-libmudflap maybe-configure-target-libmudflap: configure-target-libmudflap -configure-target-libmudflap: +configure-target-libmudflap: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -29511,9 +29233,11 @@ configure-target-libmudflap: fi; \ else \ mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libmudflap; \ cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \ @@ -29849,7 +29573,7 @@ maintainer-clean-target-libmudflap: maybe-configure-target-libssp: @if target-libssp maybe-configure-target-libssp: configure-target-libssp -configure-target-libssp: +configure-target-libssp: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -29865,9 +29589,11 @@ configure-target-libssp: fi; \ else \ mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libssp; \ cd "$(TARGET_SUBDIR)/libssp" || exit 1; \ @@ -30199,365 +29925,11 @@ maintainer-clean-target-libssp: -.PHONY: configure-target-libgcc-math maybe-configure-target-libgcc-math -maybe-configure-target-libgcc-math: -@if target-libgcc-math -maybe-configure-target-libgcc-math: configure-target-libgcc-math -configure-target-libgcc-math: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libgcc-math..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc-math ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc-math/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libgcc-math/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libgcc-math/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libgcc-math/Makefile; \ - mv $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libgcc-math/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc-math ; \ - $(NORMAL_TARGET_EXPORTS) \ - echo Configuring in $(TARGET_SUBDIR)/libgcc-math; \ - cd "$(TARGET_SUBDIR)/libgcc-math" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libgcc-math/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libgcc-math"; \ - libsrcdir="$$s/libgcc-math"; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif target-libgcc-math - - - - - -.PHONY: all-target-libgcc-math maybe-all-target-libgcc-math -maybe-all-target-libgcc-math: -@if target-libgcc-math -TARGET-target-libgcc-math=all -maybe-all-target-libgcc-math: all-target-libgcc-math -all-target-libgcc-math: configure-target-libgcc-math - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgcc-math)) -@endif target-libgcc-math - - - - - -.PHONY: check-target-libgcc-math maybe-check-target-libgcc-math -maybe-check-target-libgcc-math: -@if target-libgcc-math -maybe-check-target-libgcc-math: check-target-libgcc-math - -check-target-libgcc-math: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) check) - -@endif target-libgcc-math - -.PHONY: install-target-libgcc-math maybe-install-target-libgcc-math -maybe-install-target-libgcc-math: -@if target-libgcc-math -maybe-install-target-libgcc-math: install-target-libgcc-math - -install-target-libgcc-math: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install) - -@endif target-libgcc-math - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-target-libgcc-math info-target-libgcc-math -maybe-info-target-libgcc-math: -@if target-libgcc-math -maybe-info-target-libgcc-math: info-target-libgcc-math - -info-target-libgcc-math: \ - configure-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-dvi-target-libgcc-math dvi-target-libgcc-math -maybe-dvi-target-libgcc-math: -@if target-libgcc-math -maybe-dvi-target-libgcc-math: dvi-target-libgcc-math - -dvi-target-libgcc-math: \ - configure-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-html-target-libgcc-math html-target-libgcc-math -maybe-html-target-libgcc-math: -@if target-libgcc-math -maybe-html-target-libgcc-math: html-target-libgcc-math - -html-target-libgcc-math: \ - configure-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-TAGS-target-libgcc-math TAGS-target-libgcc-math -maybe-TAGS-target-libgcc-math: -@if target-libgcc-math -maybe-TAGS-target-libgcc-math: TAGS-target-libgcc-math - -TAGS-target-libgcc-math: \ - configure-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-install-info-target-libgcc-math install-info-target-libgcc-math -maybe-install-info-target-libgcc-math: -@if target-libgcc-math -maybe-install-info-target-libgcc-math: install-info-target-libgcc-math - -install-info-target-libgcc-math: \ - configure-target-libgcc-math \ - info-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-installcheck-target-libgcc-math installcheck-target-libgcc-math -maybe-installcheck-target-libgcc-math: -@if target-libgcc-math -maybe-installcheck-target-libgcc-math: installcheck-target-libgcc-math - -installcheck-target-libgcc-math: \ - configure-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-mostlyclean-target-libgcc-math mostlyclean-target-libgcc-math -maybe-mostlyclean-target-libgcc-math: -@if target-libgcc-math -maybe-mostlyclean-target-libgcc-math: mostlyclean-target-libgcc-math - -mostlyclean-target-libgcc-math: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-clean-target-libgcc-math clean-target-libgcc-math -maybe-clean-target-libgcc-math: -@if target-libgcc-math -maybe-clean-target-libgcc-math: clean-target-libgcc-math - -clean-target-libgcc-math: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-distclean-target-libgcc-math distclean-target-libgcc-math -maybe-distclean-target-libgcc-math: -@if target-libgcc-math -maybe-distclean-target-libgcc-math: distclean-target-libgcc-math - -distclean-target-libgcc-math: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-maintainer-clean-target-libgcc-math maintainer-clean-target-libgcc-math -maybe-maintainer-clean-target-libgcc-math: -@if target-libgcc-math -maybe-maintainer-clean-target-libgcc-math: maintainer-clean-target-libgcc-math - -maintainer-clean-target-libgcc-math: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif target-libgcc-math - - - - - .PHONY: configure-target-newlib maybe-configure-target-newlib maybe-configure-target-newlib: @if target-newlib maybe-configure-target-newlib: configure-target-newlib -configure-target-newlib: +configure-target-newlib: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -30573,9 +29945,11 @@ configure-target-newlib: fi; \ else \ mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/newlib; \ cd "$(TARGET_SUBDIR)/newlib" || exit 1; \ @@ -30911,7 +30285,7 @@ maintainer-clean-target-newlib: maybe-configure-target-libgfortran: @if target-libgfortran maybe-configure-target-libgfortran: configure-target-libgfortran -configure-target-libgfortran: +configure-target-libgfortran: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -30927,9 +30301,11 @@ configure-target-libgfortran: fi; \ else \ mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgfortran; \ cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \ @@ -31265,7 +30641,7 @@ maintainer-clean-target-libgfortran: maybe-configure-target-libobjc: @if target-libobjc maybe-configure-target-libobjc: configure-target-libobjc -configure-target-libobjc: +configure-target-libobjc: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -31281,9 +30657,11 @@ configure-target-libobjc: fi; \ else \ mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libobjc; \ cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \ @@ -31619,7 +30997,7 @@ maintainer-clean-target-libobjc: maybe-configure-target-libtermcap: @if target-libtermcap maybe-configure-target-libtermcap: configure-target-libtermcap -configure-target-libtermcap: +configure-target-libtermcap: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -31635,9 +31013,11 @@ configure-target-libtermcap: fi; \ else \ mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libtermcap; \ cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \ @@ -31908,7 +31288,7 @@ maintainer-clean-target-libtermcap: maybe-configure-target-winsup: @if target-winsup maybe-configure-target-winsup: configure-target-winsup -configure-target-winsup: +configure-target-winsup: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -31924,9 +31304,11 @@ configure-target-winsup: fi; \ else \ mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/winsup; \ cd "$(TARGET_SUBDIR)/winsup" || exit 1; \ @@ -32262,7 +31644,7 @@ maintainer-clean-target-winsup: maybe-configure-target-libgloss: @if target-libgloss maybe-configure-target-libgloss: configure-target-libgloss -configure-target-libgloss: +configure-target-libgloss: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -32278,9 +31660,11 @@ configure-target-libgloss: fi; \ else \ mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgloss; \ cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \ @@ -32611,7 +31995,7 @@ maintainer-clean-target-libgloss: maybe-configure-target-libiberty: @if target-libiberty maybe-configure-target-libiberty: configure-target-libiberty -configure-target-libiberty: +configure-target-libiberty: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -32627,9 +32011,11 @@ configure-target-libiberty: fi; \ else \ mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libiberty; \ cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \ @@ -32965,7 +32351,7 @@ maintainer-clean-target-libiberty: maybe-configure-target-gperf: @if target-gperf maybe-configure-target-gperf: configure-target-gperf -configure-target-gperf: +configure-target-gperf: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -32981,9 +32367,11 @@ configure-target-gperf: fi; \ else \ mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/gperf; \ cd "$(TARGET_SUBDIR)/gperf" || exit 1; \ @@ -33319,7 +32707,7 @@ maintainer-clean-target-gperf: maybe-configure-target-examples: @if target-examples maybe-configure-target-examples: configure-target-examples -configure-target-examples: +configure-target-examples: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -33335,9 +32723,11 @@ configure-target-examples: fi; \ else \ mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/examples; \ cd "$(TARGET_SUBDIR)/examples" || exit 1; \ @@ -33663,7 +33053,7 @@ maintainer-clean-target-examples: maybe-configure-target-libffi: @if target-libffi maybe-configure-target-libffi: configure-target-libffi -configure-target-libffi: +configure-target-libffi: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -33679,9 +33069,11 @@ configure-target-libffi: fi; \ else \ mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libffi; \ cd "$(TARGET_SUBDIR)/libffi" || exit 1; \ @@ -34017,7 +33409,7 @@ maintainer-clean-target-libffi: maybe-configure-target-libjava: @if target-libjava maybe-configure-target-libjava: configure-target-libjava -configure-target-libjava: +configure-target-libjava: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -34033,9 +33425,11 @@ configure-target-libjava: fi; \ else \ mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libjava; \ cd "$(TARGET_SUBDIR)/libjava" || exit 1; \ @@ -34371,7 +33765,7 @@ maintainer-clean-target-libjava: maybe-configure-target-zlib: @if target-zlib maybe-configure-target-zlib: configure-target-zlib -configure-target-zlib: +configure-target-zlib: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -34387,9 +33781,11 @@ configure-target-zlib: fi; \ else \ mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/zlib; \ cd "$(TARGET_SUBDIR)/zlib" || exit 1; \ @@ -34725,7 +34121,7 @@ maintainer-clean-target-zlib: maybe-configure-target-boehm-gc: @if target-boehm-gc maybe-configure-target-boehm-gc: configure-target-boehm-gc -configure-target-boehm-gc: +configure-target-boehm-gc: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -34741,9 +34137,11 @@ configure-target-boehm-gc: fi; \ else \ mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \ cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \ @@ -35079,7 +34477,7 @@ maintainer-clean-target-boehm-gc: maybe-configure-target-qthreads: @if target-qthreads maybe-configure-target-qthreads: configure-target-qthreads -configure-target-qthreads: +configure-target-qthreads: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -35095,9 +34493,11 @@ configure-target-qthreads: fi; \ else \ mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/qthreads; \ cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \ @@ -35433,7 +34833,7 @@ maintainer-clean-target-qthreads: maybe-configure-target-rda: @if target-rda maybe-configure-target-rda: configure-target-rda -configure-target-rda: +configure-target-rda: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -35449,9 +34849,11 @@ configure-target-rda: fi; \ else \ mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/rda; \ cd "$(TARGET_SUBDIR)/rda" || exit 1; \ @@ -35787,7 +35189,7 @@ maintainer-clean-target-rda: maybe-configure-target-libada: @if target-libada maybe-configure-target-libada: configure-target-libada -configure-target-libada: +configure-target-libada: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -35803,9 +35205,11 @@ configure-target-libada: fi; \ else \ mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \ + fi + @test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libada; \ cd "$(TARGET_SUBDIR)/libada" || exit 1; \ @@ -36135,360 +35539,6 @@ maintainer-clean-target-libada: - - -.PHONY: configure-target-libgomp maybe-configure-target-libgomp -maybe-configure-target-libgomp: -@if target-libgomp -maybe-configure-target-libgomp: configure-target-libgomp -configure-target-libgomp: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libgomp..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \ - mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ - $(NORMAL_TARGET_EXPORTS) \ - echo Configuring in $(TARGET_SUBDIR)/libgomp; \ - cd "$(TARGET_SUBDIR)/libgomp" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libgomp"; \ - libsrcdir="$$s/libgomp"; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif target-libgomp - - - - - -.PHONY: all-target-libgomp maybe-all-target-libgomp -maybe-all-target-libgomp: -@if target-libgomp -TARGET-target-libgomp=all -maybe-all-target-libgomp: all-target-libgomp -all-target-libgomp: configure-target-libgomp - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgomp)) -@endif target-libgomp - - - - - -.PHONY: check-target-libgomp maybe-check-target-libgomp -maybe-check-target-libgomp: -@if target-libgomp -maybe-check-target-libgomp: check-target-libgomp - -check-target-libgomp: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) check) - -@endif target-libgomp - -.PHONY: install-target-libgomp maybe-install-target-libgomp -maybe-install-target-libgomp: -@if target-libgomp -maybe-install-target-libgomp: install-target-libgomp - -install-target-libgomp: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install) - -@endif target-libgomp - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-target-libgomp info-target-libgomp -maybe-info-target-libgomp: -@if target-libgomp -maybe-info-target-libgomp: info-target-libgomp - -info-target-libgomp: \ - configure-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-dvi-target-libgomp dvi-target-libgomp -maybe-dvi-target-libgomp: -@if target-libgomp -maybe-dvi-target-libgomp: dvi-target-libgomp - -dvi-target-libgomp: \ - configure-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-html-target-libgomp html-target-libgomp -maybe-html-target-libgomp: -@if target-libgomp -maybe-html-target-libgomp: html-target-libgomp - -html-target-libgomp: \ - configure-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-TAGS-target-libgomp TAGS-target-libgomp -maybe-TAGS-target-libgomp: -@if target-libgomp -maybe-TAGS-target-libgomp: TAGS-target-libgomp - -TAGS-target-libgomp: \ - configure-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-install-info-target-libgomp install-info-target-libgomp -maybe-install-info-target-libgomp: -@if target-libgomp -maybe-install-info-target-libgomp: install-info-target-libgomp - -install-info-target-libgomp: \ - configure-target-libgomp \ - info-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-installcheck-target-libgomp installcheck-target-libgomp -maybe-installcheck-target-libgomp: -@if target-libgomp -maybe-installcheck-target-libgomp: installcheck-target-libgomp - -installcheck-target-libgomp: \ - configure-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-mostlyclean-target-libgomp mostlyclean-target-libgomp -maybe-mostlyclean-target-libgomp: -@if target-libgomp -maybe-mostlyclean-target-libgomp: mostlyclean-target-libgomp - -mostlyclean-target-libgomp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-clean-target-libgomp clean-target-libgomp -maybe-clean-target-libgomp: -@if target-libgomp -maybe-clean-target-libgomp: clean-target-libgomp - -clean-target-libgomp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-distclean-target-libgomp distclean-target-libgomp -maybe-distclean-target-libgomp: -@if target-libgomp -maybe-distclean-target-libgomp: distclean-target-libgomp - -distclean-target-libgomp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-maintainer-clean-target-libgomp maintainer-clean-target-libgomp -maybe-maintainer-clean-target-libgomp: -@if target-libgomp -maybe-maintainer-clean-target-libgomp: maintainer-clean-target-libgomp - -maintainer-clean-target-libgomp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif target-libgomp - - - # ---------- # GCC module # ---------- @@ -36614,12 +35664,10 @@ gcc-no-fixedincludes: unstage = : stage = : -current_stage = "" @if gcc-bootstrap unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start -stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi -current_stage = "`cat stage_current 2> /dev/null`" +stage = [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : @endif gcc-bootstrap .PHONY: unstage stage @@ -36628,9 +35676,6 @@ unstage: stage: @: $(MAKE); $(stage) -# Disable commands for lean bootstrap. -LEAN = false - # We name the build directories for the various stages "stage1-gcc", # "stage2-gcc","stage3-gcc", etc. @@ -36662,8 +35707,6 @@ POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ STAGE_PREFIX=$$r/prev-gcc/ \ CFLAGS="$(BOOT_CFLAGS)" \ - LIBCFLAGS="$(BOOT_CFLAGS)" \ - LDFLAGS="$(BOOT_LDFLAGS)" \ ADAC="\$$(CC)" # For stage 1: @@ -36686,122 +35729,146 @@ stage1-start:: @if bfd @cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \ mkdir stage1-bfd; \ - mv stage1-bfd bfd + set stage1-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes @cd $(HOST_SUBDIR); [ -d stage1-opcodes ] || \ mkdir stage1-opcodes; \ - mv stage1-opcodes opcodes + set stage1-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils @cd $(HOST_SUBDIR); [ -d stage1-binutils ] || \ mkdir stage1-binutils; \ - mv stage1-binutils binutils + set stage1-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ @endif binutils @if gas @cd $(HOST_SUBDIR); [ -d stage1-gas ] || \ mkdir stage1-gas; \ - mv stage1-gas gas + set stage1-gas gas ; \ + @CREATE_LINK_TO_DIR@ @endif gas @if gcc @cd $(HOST_SUBDIR); [ -d stage1-gcc ] || \ mkdir stage1-gcc; \ - mv stage1-gcc gcc + set stage1-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ @endif gcc @if intl @cd $(HOST_SUBDIR); [ -d stage1-intl ] || \ mkdir stage1-intl; \ - mv stage1-intl intl + set stage1-intl intl ; \ + @CREATE_LINK_TO_DIR@ @endif intl @if ld @cd $(HOST_SUBDIR); [ -d stage1-ld ] || \ mkdir stage1-ld; \ - mv stage1-ld ld + set stage1-ld ld ; \ + @CREATE_LINK_TO_DIR@ @endif ld @if libcpp @cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \ mkdir stage1-libcpp; \ - mv stage1-libcpp libcpp + set stage1-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ @endif libcpp @if libdecnumber @cd $(HOST_SUBDIR); [ -d stage1-libdecnumber ] || \ mkdir stage1-libdecnumber; \ - mv stage1-libdecnumber libdecnumber + set stage1-libdecnumber libdecnumber ; \ + @CREATE_LINK_TO_DIR@ @endif libdecnumber @if libiberty @cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \ mkdir stage1-libiberty; \ - mv stage1-libiberty libiberty + set stage1-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib @cd $(HOST_SUBDIR); [ -d stage1-zlib ] || \ mkdir stage1-zlib; \ - mv stage1-zlib zlib + set stage1-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ @endif zlib @[ -d stage1-$(TARGET_SUBDIR) ] || \ mkdir stage1-$(TARGET_SUBDIR); \ - mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) + set stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ -stage1-end:: +stage1-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage1-bfd ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set bfd stage1-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage1-opcodes ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set opcodes stage1-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage1-binutils ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set binutils stage1-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage1-gas ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gas stage1-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage1-gcc ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gcc stage1-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage1-intl ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set intl stage1-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage1-ld ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set ld stage1-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage1-libcpp ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libcpp stage1-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libcpp @if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libdecnumber stage1-libdecnumber ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage1-libiberty ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libiberty stage1-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage1-zlib ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set zlib stage1-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif zlib @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; \ + set $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ ; \ fi - rm -f stage_current # Bubble a bugfix through all the stages up to stage 1. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -36848,146 +35915,194 @@ stage2-start:: @if bfd @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \ mkdir stage2-bfd; \ - mv stage2-bfd bfd ; \ - mv stage1-bfd prev-bfd || test -f stage1-lean + set stage2-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-bfd prev-bfd ; \ + @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \ mkdir stage2-opcodes; \ - mv stage2-opcodes opcodes ; \ - mv stage1-opcodes prev-opcodes || test -f stage1-lean + set stage2-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-opcodes prev-opcodes ; \ + @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \ mkdir stage2-binutils; \ - mv stage2-binutils binutils ; \ - mv stage1-binutils prev-binutils || test -f stage1-lean + set stage2-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-binutils prev-binutils ; \ + @CREATE_LINK_TO_DIR@ @endif binutils @if gas @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \ mkdir stage2-gas; \ - mv stage2-gas gas ; \ - mv stage1-gas prev-gas || test -f stage1-lean + set stage2-gas gas ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-gas prev-gas ; \ + @CREATE_LINK_TO_DIR@ @endif gas @if gcc @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \ mkdir stage2-gcc; \ - mv stage2-gcc gcc ; \ - mv stage1-gcc prev-gcc || test -f stage1-lean + set stage2-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-gcc prev-gcc ; \ + @CREATE_LINK_TO_DIR@ @endif gcc @if intl @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \ mkdir stage2-intl; \ - mv stage2-intl intl ; \ - mv stage1-intl prev-intl || test -f stage1-lean + set stage2-intl intl ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-intl prev-intl ; \ + @CREATE_LINK_TO_DIR@ @endif intl @if ld @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \ mkdir stage2-ld; \ - mv stage2-ld ld ; \ - mv stage1-ld prev-ld || test -f stage1-lean + set stage2-ld ld ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-ld prev-ld ; \ + @CREATE_LINK_TO_DIR@ @endif ld @if libcpp @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \ mkdir stage2-libcpp; \ - mv stage2-libcpp libcpp ; \ - mv stage1-libcpp prev-libcpp || test -f stage1-lean + set stage2-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-libcpp prev-libcpp ; \ + @CREATE_LINK_TO_DIR@ @endif libcpp @if libdecnumber @cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \ mkdir stage2-libdecnumber; \ - mv stage2-libdecnumber libdecnumber ; \ - mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean + set stage2-libdecnumber libdecnumber ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-libdecnumber prev-libdecnumber ; \ + @CREATE_LINK_TO_DIR@ @endif libdecnumber @if libiberty @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \ mkdir stage2-libiberty; \ - mv stage2-libiberty libiberty ; \ - mv stage1-libiberty prev-libiberty || test -f stage1-lean + set stage2-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-libiberty prev-libiberty ; \ + @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \ mkdir stage2-zlib; \ - mv stage2-zlib zlib ; \ - mv stage1-zlib prev-zlib || test -f stage1-lean + set stage2-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-zlib prev-zlib ; \ + @CREATE_LINK_TO_DIR@ @endif zlib @[ -d stage2-$(TARGET_SUBDIR) ] || \ mkdir stage2-$(TARGET_SUBDIR); \ - mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ - mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean + set stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ -stage2-end:: +stage2-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage2-bfd ; \ - mv prev-bfd stage1-bfd ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set bfd stage2-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage1-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage2-opcodes ; \ - mv prev-opcodes stage1-opcodes ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set opcodes stage2-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage1-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage2-binutils ; \ - mv prev-binutils stage1-binutils ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set binutils stage2-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage1-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage2-gas ; \ - mv prev-gas stage1-gas ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gas stage2-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage1-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage2-gcc ; \ - mv prev-gcc stage1-gcc ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gcc stage2-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage1-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage2-intl ; \ - mv prev-intl stage1-intl ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set intl stage2-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage1-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage2-ld ; \ - mv prev-ld stage1-ld ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set ld stage2-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage1-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage2-libcpp ; \ - mv prev-libcpp stage1-libcpp ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libcpp stage2-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage1-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libcpp @if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber ; \ - mv prev-libdecnumber stage1-libdecnumber ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libdecnumber stage2-libdecnumber ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libdecnumber stage1-libdecnumber ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage2-libiberty ; \ - mv prev-libiberty stage1-libiberty ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libiberty stage2-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage1-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage2-zlib ; \ - mv prev-zlib stage1-zlib ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set zlib stage2-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage1-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif zlib @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; : ; \ + set $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ ; \ fi - rm -f stage_current # Bubble a bugfix through all the stages up to stage 2. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -37012,7 +36127,7 @@ do-clean: clean-stage2 -.PHONY: bootstrap2 bootstrap2-lean +.PHONY: bootstrap2 bootstrap2: echo stage2 > stage_final @r=`${PWD_COMMAND}`; export r; \ @@ -37023,16 +36138,6 @@ bootstrap2: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target -bootstrap2-lean: - echo stage2 > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage2-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target - # Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stage1:: distclean-stage2 @@ -37055,165 +36160,210 @@ stage3-start:: @if bfd @cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \ mkdir stage3-bfd; \ - mv stage3-bfd bfd ; \ - mv stage2-bfd prev-bfd || test -f stage2-lean + set stage3-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-bfd prev-bfd ; \ + @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes @cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \ mkdir stage3-opcodes; \ - mv stage3-opcodes opcodes ; \ - mv stage2-opcodes prev-opcodes || test -f stage2-lean + set stage3-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-opcodes prev-opcodes ; \ + @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils @cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \ mkdir stage3-binutils; \ - mv stage3-binutils binutils ; \ - mv stage2-binutils prev-binutils || test -f stage2-lean + set stage3-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-binutils prev-binutils ; \ + @CREATE_LINK_TO_DIR@ @endif binutils @if gas @cd $(HOST_SUBDIR); [ -d stage3-gas ] || \ mkdir stage3-gas; \ - mv stage3-gas gas ; \ - mv stage2-gas prev-gas || test -f stage2-lean + set stage3-gas gas ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-gas prev-gas ; \ + @CREATE_LINK_TO_DIR@ @endif gas @if gcc @cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \ mkdir stage3-gcc; \ - mv stage3-gcc gcc ; \ - mv stage2-gcc prev-gcc || test -f stage2-lean + set stage3-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-gcc prev-gcc ; \ + @CREATE_LINK_TO_DIR@ @endif gcc @if intl @cd $(HOST_SUBDIR); [ -d stage3-intl ] || \ mkdir stage3-intl; \ - mv stage3-intl intl ; \ - mv stage2-intl prev-intl || test -f stage2-lean + set stage3-intl intl ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-intl prev-intl ; \ + @CREATE_LINK_TO_DIR@ @endif intl @if ld @cd $(HOST_SUBDIR); [ -d stage3-ld ] || \ mkdir stage3-ld; \ - mv stage3-ld ld ; \ - mv stage2-ld prev-ld || test -f stage2-lean + set stage3-ld ld ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-ld prev-ld ; \ + @CREATE_LINK_TO_DIR@ @endif ld @if libcpp @cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \ mkdir stage3-libcpp; \ - mv stage3-libcpp libcpp ; \ - mv stage2-libcpp prev-libcpp || test -f stage2-lean + set stage3-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-libcpp prev-libcpp ; \ + @CREATE_LINK_TO_DIR@ @endif libcpp @if libdecnumber @cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \ mkdir stage3-libdecnumber; \ - mv stage3-libdecnumber libdecnumber ; \ - mv stage2-libdecnumber prev-libdecnumber || test -f stage2-lean + set stage3-libdecnumber libdecnumber ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-libdecnumber prev-libdecnumber ; \ + @CREATE_LINK_TO_DIR@ @endif libdecnumber @if libiberty @cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \ mkdir stage3-libiberty; \ - mv stage3-libiberty libiberty ; \ - mv stage2-libiberty prev-libiberty || test -f stage2-lean + set stage3-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-libiberty prev-libiberty ; \ + @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib @cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \ mkdir stage3-zlib; \ - mv stage3-zlib zlib ; \ - mv stage2-zlib prev-zlib || test -f stage2-lean + set stage3-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-zlib prev-zlib ; \ + @CREATE_LINK_TO_DIR@ @endif zlib @[ -d stage3-$(TARGET_SUBDIR) ] || \ mkdir stage3-$(TARGET_SUBDIR); \ - mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ - mv stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage2-lean + set stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ -stage3-end:: +stage3-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage3-bfd ; \ - mv prev-bfd stage2-bfd ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set bfd stage3-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage2-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage3-opcodes ; \ - mv prev-opcodes stage2-opcodes ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set opcodes stage3-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage2-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage3-binutils ; \ - mv prev-binutils stage2-binutils ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set binutils stage3-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage2-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage3-gas ; \ - mv prev-gas stage2-gas ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gas stage3-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage2-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage3-gcc ; \ - mv prev-gcc stage2-gcc ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gcc stage3-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage2-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage3-intl ; \ - mv prev-intl stage2-intl ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set intl stage3-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage2-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage3-ld ; \ - mv prev-ld stage2-ld ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set ld stage3-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage2-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage3-libcpp ; \ - mv prev-libcpp stage2-libcpp ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libcpp stage3-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage2-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libcpp @if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber ; \ - mv prev-libdecnumber stage2-libdecnumber ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libdecnumber stage3-libdecnumber ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libdecnumber stage2-libdecnumber ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage3-libiberty ; \ - mv prev-libiberty stage2-libiberty ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libiberty stage3-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage2-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage3-zlib ; \ - mv prev-zlib stage2-zlib ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set zlib stage3-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage2-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif zlib @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; : ; \ + set $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ ; \ fi - rm -f stage_current # Bubble a bugfix through all the stages up to stage 3. They are # remade, but not reconfigured. The next stage (if any) will not be # reconfigured as well. .PHONY: stage3-bubble stage3-bubble:: stage2-bubble + @bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ if test -f stage3-lean || test -f stage2-lean ; then \ echo Skipping rebuild of stage3 ; \ else \ $(MAKE) stage3-start; \ - if $(LEAN); then \ - rm -rf stage1-* ; \ - $(STAMP) stage1-lean ; \ - fi; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \ fi - $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare + $(MAKE) compare .PHONY: all-stage3 clean-stage3 do-clean: clean-stage3 @@ -37231,7 +36381,6 @@ compare: fi; \ : $(MAKE); $(stage); \ rm -f .bad_compare ; \ - echo Comparing stages 2 and 3 ; \ cd stage3-gcc; \ files=`find . -name "*$(objext)" -print` ; \ cd .. ; \ @@ -37252,17 +36401,14 @@ compare: cat .bad_compare; \ exit 1; \ else \ - echo Comparison successful.; \ + true; \ fi ; \ $(STAMP) compare - if $(LEAN); then \ - rm -rf stage2-*; \ - $(STAMP) stage2-lean; \ - fi + @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean -.PHONY: bootstrap bootstrap-lean +.PHONY: bootstrap bootstrap: echo stage3 > stage_final @r=`${PWD_COMMAND}`; export r; \ @@ -37273,16 +36419,6 @@ bootstrap: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target -bootstrap-lean: - echo stage3 > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage3-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target - # Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stage2:: distclean-stage3 @@ -37308,165 +36444,210 @@ stage4-start:: @if bfd @cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \ mkdir stage4-bfd; \ - mv stage4-bfd bfd ; \ - mv stage3-bfd prev-bfd || test -f stage3-lean + set stage4-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-bfd prev-bfd ; \ + @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes @cd $(HOST_SUBDIR); [ -d stage4-opcodes ] || \ mkdir stage4-opcodes; \ - mv stage4-opcodes opcodes ; \ - mv stage3-opcodes prev-opcodes || test -f stage3-lean + set stage4-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-opcodes prev-opcodes ; \ + @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils @cd $(HOST_SUBDIR); [ -d stage4-binutils ] || \ mkdir stage4-binutils; \ - mv stage4-binutils binutils ; \ - mv stage3-binutils prev-binutils || test -f stage3-lean + set stage4-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-binutils prev-binutils ; \ + @CREATE_LINK_TO_DIR@ @endif binutils @if gas @cd $(HOST_SUBDIR); [ -d stage4-gas ] || \ mkdir stage4-gas; \ - mv stage4-gas gas ; \ - mv stage3-gas prev-gas || test -f stage3-lean + set stage4-gas gas ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-gas prev-gas ; \ + @CREATE_LINK_TO_DIR@ @endif gas @if gcc @cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \ mkdir stage4-gcc; \ - mv stage4-gcc gcc ; \ - mv stage3-gcc prev-gcc || test -f stage3-lean + set stage4-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-gcc prev-gcc ; \ + @CREATE_LINK_TO_DIR@ @endif gcc @if intl @cd $(HOST_SUBDIR); [ -d stage4-intl ] || \ mkdir stage4-intl; \ - mv stage4-intl intl ; \ - mv stage3-intl prev-intl || test -f stage3-lean + set stage4-intl intl ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-intl prev-intl ; \ + @CREATE_LINK_TO_DIR@ @endif intl @if ld @cd $(HOST_SUBDIR); [ -d stage4-ld ] || \ mkdir stage4-ld; \ - mv stage4-ld ld ; \ - mv stage3-ld prev-ld || test -f stage3-lean + set stage4-ld ld ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-ld prev-ld ; \ + @CREATE_LINK_TO_DIR@ @endif ld @if libcpp @cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \ mkdir stage4-libcpp; \ - mv stage4-libcpp libcpp ; \ - mv stage3-libcpp prev-libcpp || test -f stage3-lean + set stage4-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-libcpp prev-libcpp ; \ + @CREATE_LINK_TO_DIR@ @endif libcpp @if libdecnumber @cd $(HOST_SUBDIR); [ -d stage4-libdecnumber ] || \ mkdir stage4-libdecnumber; \ - mv stage4-libdecnumber libdecnumber ; \ - mv stage3-libdecnumber prev-libdecnumber || test -f stage3-lean + set stage4-libdecnumber libdecnumber ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-libdecnumber prev-libdecnumber ; \ + @CREATE_LINK_TO_DIR@ @endif libdecnumber @if libiberty @cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \ mkdir stage4-libiberty; \ - mv stage4-libiberty libiberty ; \ - mv stage3-libiberty prev-libiberty || test -f stage3-lean + set stage4-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-libiberty prev-libiberty ; \ + @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib @cd $(HOST_SUBDIR); [ -d stage4-zlib ] || \ mkdir stage4-zlib; \ - mv stage4-zlib zlib ; \ - mv stage3-zlib prev-zlib || test -f stage3-lean + set stage4-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-zlib prev-zlib ; \ + @CREATE_LINK_TO_DIR@ @endif zlib @[ -d stage4-$(TARGET_SUBDIR) ] || \ mkdir stage4-$(TARGET_SUBDIR); \ - mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ - mv stage3-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage3-lean + set stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ -stage4-end:: +stage4-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage4-bfd ; \ - mv prev-bfd stage3-bfd ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set bfd stage4-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage3-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage4-opcodes ; \ - mv prev-opcodes stage3-opcodes ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set opcodes stage4-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage3-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage4-binutils ; \ - mv prev-binutils stage3-binutils ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set binutils stage4-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage3-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage4-gas ; \ - mv prev-gas stage3-gas ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gas stage4-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage3-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage4-gcc ; \ - mv prev-gcc stage3-gcc ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gcc stage4-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage3-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage4-intl ; \ - mv prev-intl stage3-intl ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set intl stage4-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage3-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage4-ld ; \ - mv prev-ld stage3-ld ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set ld stage4-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage3-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage4-libcpp ; \ - mv prev-libcpp stage3-libcpp ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libcpp stage4-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage3-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libcpp @if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber ; \ - mv prev-libdecnumber stage3-libdecnumber ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libdecnumber stage4-libdecnumber ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libdecnumber stage3-libdecnumber ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage4-libiberty ; \ - mv prev-libiberty stage3-libiberty ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libiberty stage4-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage3-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage4-zlib ; \ - mv prev-zlib stage3-zlib ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set zlib stage4-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage3-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif zlib @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; : ; \ + set $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ ; \ fi - rm -f stage_current # Bubble a bugfix through all the stages up to stage 4. They are # remade, but not reconfigured. The next stage (if any) will not be # reconfigured as well. .PHONY: stage4-bubble stage4-bubble:: stage3-bubble + @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ if test -f stage4-lean || test -f stage3-lean ; then \ echo Skipping rebuild of stage4 ; \ else \ $(MAKE) stage4-start; \ - if $(LEAN); then \ - rm -rf stage2-* ; \ - $(STAMP) stage2-lean ; \ - fi; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \ fi - $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3 + $(MAKE) compare3 .PHONY: all-stage4 clean-stage4 do-clean: clean-stage4 @@ -37484,7 +36665,6 @@ compare3: fi; \ : $(MAKE); $(stage); \ rm -f .bad_compare ; \ - echo Comparing stages 3 and 4 ; \ cd stage4-gcc; \ files=`find . -name "*$(objext)" -print` ; \ cd .. ; \ @@ -37505,17 +36685,14 @@ compare3: cat .bad_compare; \ exit 1; \ else \ - echo Comparison successful.; \ + true; \ fi ; \ $(STAMP) compare3 - if $(LEAN); then \ - rm -rf stage3-*; \ - $(STAMP) stage3-lean; \ - fi + @bootstrap_lean@-rm -rf stage3-* ; $(STAMP) stage3-lean -.PHONY: bootstrap4 bootstrap4-lean +.PHONY: bootstrap4 bootstrap4: echo stage4 > stage_final @r=`${PWD_COMMAND}`; export r; \ @@ -37526,16 +36703,6 @@ bootstrap4: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target -bootstrap4-lean: - echo stage4 > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage4-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target - # Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stage3:: distclean-stage4 @@ -37558,146 +36725,194 @@ stageprofile-start:: @if bfd @cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \ mkdir stageprofile-bfd; \ - mv stageprofile-bfd bfd ; \ - mv stage1-bfd prev-bfd || test -f stage1-lean + set stageprofile-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-bfd prev-bfd ; \ + @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes @cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \ mkdir stageprofile-opcodes; \ - mv stageprofile-opcodes opcodes ; \ - mv stage1-opcodes prev-opcodes || test -f stage1-lean + set stageprofile-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-opcodes prev-opcodes ; \ + @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils @cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \ mkdir stageprofile-binutils; \ - mv stageprofile-binutils binutils ; \ - mv stage1-binutils prev-binutils || test -f stage1-lean + set stageprofile-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-binutils prev-binutils ; \ + @CREATE_LINK_TO_DIR@ @endif binutils @if gas @cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \ mkdir stageprofile-gas; \ - mv stageprofile-gas gas ; \ - mv stage1-gas prev-gas || test -f stage1-lean + set stageprofile-gas gas ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-gas prev-gas ; \ + @CREATE_LINK_TO_DIR@ @endif gas @if gcc @cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \ mkdir stageprofile-gcc; \ - mv stageprofile-gcc gcc ; \ - mv stage1-gcc prev-gcc || test -f stage1-lean + set stageprofile-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-gcc prev-gcc ; \ + @CREATE_LINK_TO_DIR@ @endif gcc @if intl @cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \ mkdir stageprofile-intl; \ - mv stageprofile-intl intl ; \ - mv stage1-intl prev-intl || test -f stage1-lean + set stageprofile-intl intl ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-intl prev-intl ; \ + @CREATE_LINK_TO_DIR@ @endif intl @if ld @cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \ mkdir stageprofile-ld; \ - mv stageprofile-ld ld ; \ - mv stage1-ld prev-ld || test -f stage1-lean + set stageprofile-ld ld ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-ld prev-ld ; \ + @CREATE_LINK_TO_DIR@ @endif ld @if libcpp @cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \ mkdir stageprofile-libcpp; \ - mv stageprofile-libcpp libcpp ; \ - mv stage1-libcpp prev-libcpp || test -f stage1-lean + set stageprofile-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-libcpp prev-libcpp ; \ + @CREATE_LINK_TO_DIR@ @endif libcpp @if libdecnumber @cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \ mkdir stageprofile-libdecnumber; \ - mv stageprofile-libdecnumber libdecnumber ; \ - mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean + set stageprofile-libdecnumber libdecnumber ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-libdecnumber prev-libdecnumber ; \ + @CREATE_LINK_TO_DIR@ @endif libdecnumber @if libiberty @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \ mkdir stageprofile-libiberty; \ - mv stageprofile-libiberty libiberty ; \ - mv stage1-libiberty prev-libiberty || test -f stage1-lean + set stageprofile-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-libiberty prev-libiberty ; \ + @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib @cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \ mkdir stageprofile-zlib; \ - mv stageprofile-zlib zlib ; \ - mv stage1-zlib prev-zlib || test -f stage1-lean + set stageprofile-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-zlib prev-zlib ; \ + @CREATE_LINK_TO_DIR@ @endif zlib @[ -d stageprofile-$(TARGET_SUBDIR) ] || \ mkdir stageprofile-$(TARGET_SUBDIR); \ - mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ - mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean + set stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ -stageprofile-end:: +stageprofile-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stageprofile-bfd ; \ - mv prev-bfd stage1-bfd ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set bfd stageprofile-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage1-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stageprofile-opcodes ; \ - mv prev-opcodes stage1-opcodes ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set opcodes stageprofile-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage1-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stageprofile-binutils ; \ - mv prev-binutils stage1-binutils ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set binutils stageprofile-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage1-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stageprofile-gas ; \ - mv prev-gas stage1-gas ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gas stageprofile-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage1-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stageprofile-gcc ; \ - mv prev-gcc stage1-gcc ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gcc stageprofile-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage1-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stageprofile-intl ; \ - mv prev-intl stage1-intl ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set intl stageprofile-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage1-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stageprofile-ld ; \ - mv prev-ld stage1-ld ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set ld stageprofile-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage1-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp ; \ - mv prev-libcpp stage1-libcpp ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libcpp stageprofile-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage1-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libcpp @if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber ; \ - mv prev-libdecnumber stage1-libdecnumber ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libdecnumber stageprofile-libdecnumber ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libdecnumber stage1-libdecnumber ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty ; \ - mv prev-libiberty stage1-libiberty ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libiberty stageprofile-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage1-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stageprofile-zlib ; \ - mv prev-zlib stage1-zlib ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set zlib stageprofile-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage1-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif zlib @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; : ; \ + set $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ ; \ fi - rm -f stage_current # Bubble a bugfix through all the stages up to stage profile. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -37744,146 +36959,194 @@ stagefeedback-start:: @if bfd @cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \ mkdir stagefeedback-bfd; \ - mv stagefeedback-bfd bfd ; \ - mv stageprofile-bfd prev-bfd || test -f stageprofile-lean + set stagefeedback-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-bfd prev-bfd ; \ + @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes @cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \ mkdir stagefeedback-opcodes; \ - mv stagefeedback-opcodes opcodes ; \ - mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean + set stagefeedback-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-opcodes prev-opcodes ; \ + @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils @cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \ mkdir stagefeedback-binutils; \ - mv stagefeedback-binutils binutils ; \ - mv stageprofile-binutils prev-binutils || test -f stageprofile-lean + set stagefeedback-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-binutils prev-binutils ; \ + @CREATE_LINK_TO_DIR@ @endif binutils @if gas @cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \ mkdir stagefeedback-gas; \ - mv stagefeedback-gas gas ; \ - mv stageprofile-gas prev-gas || test -f stageprofile-lean + set stagefeedback-gas gas ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-gas prev-gas ; \ + @CREATE_LINK_TO_DIR@ @endif gas @if gcc @cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \ mkdir stagefeedback-gcc; \ - mv stagefeedback-gcc gcc ; \ - mv stageprofile-gcc prev-gcc || test -f stageprofile-lean + set stagefeedback-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-gcc prev-gcc ; \ + @CREATE_LINK_TO_DIR@ @endif gcc @if intl @cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \ mkdir stagefeedback-intl; \ - mv stagefeedback-intl intl ; \ - mv stageprofile-intl prev-intl || test -f stageprofile-lean + set stagefeedback-intl intl ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-intl prev-intl ; \ + @CREATE_LINK_TO_DIR@ @endif intl @if ld @cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \ mkdir stagefeedback-ld; \ - mv stagefeedback-ld ld ; \ - mv stageprofile-ld prev-ld || test -f stageprofile-lean + set stagefeedback-ld ld ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-ld prev-ld ; \ + @CREATE_LINK_TO_DIR@ @endif ld @if libcpp @cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \ mkdir stagefeedback-libcpp; \ - mv stagefeedback-libcpp libcpp ; \ - mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean + set stagefeedback-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-libcpp prev-libcpp ; \ + @CREATE_LINK_TO_DIR@ @endif libcpp @if libdecnumber @cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \ mkdir stagefeedback-libdecnumber; \ - mv stagefeedback-libdecnumber libdecnumber ; \ - mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean + set stagefeedback-libdecnumber libdecnumber ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-libdecnumber prev-libdecnumber ; \ + @CREATE_LINK_TO_DIR@ @endif libdecnumber @if libiberty @cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \ mkdir stagefeedback-libiberty; \ - mv stagefeedback-libiberty libiberty ; \ - mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean + set stagefeedback-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-libiberty prev-libiberty ; \ + @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib @cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \ mkdir stagefeedback-zlib; \ - mv stagefeedback-zlib zlib ; \ - mv stageprofile-zlib prev-zlib || test -f stageprofile-lean + set stagefeedback-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-zlib prev-zlib ; \ + @CREATE_LINK_TO_DIR@ @endif zlib @[ -d stagefeedback-$(TARGET_SUBDIR) ] || \ mkdir stagefeedback-$(TARGET_SUBDIR); \ - mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ - mv stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageprofile-lean + set stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ -stagefeedback-end:: +stagefeedback-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd ; \ - mv prev-bfd stageprofile-bfd ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set bfd stagefeedback-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stageprofile-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stagefeedback-opcodes ; \ - mv prev-opcodes stageprofile-opcodes ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set opcodes stagefeedback-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stageprofile-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stagefeedback-binutils ; \ - mv prev-binutils stageprofile-binutils ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set binutils stagefeedback-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stageprofile-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stagefeedback-gas ; \ - mv prev-gas stageprofile-gas ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gas stagefeedback-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stageprofile-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc ; \ - mv prev-gcc stageprofile-gcc ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set gcc stagefeedback-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stageprofile-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stagefeedback-intl ; \ - mv prev-intl stageprofile-intl ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set intl stagefeedback-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stageprofile-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stagefeedback-ld ; \ - mv prev-ld stageprofile-ld ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set ld stagefeedback-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stageprofile-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp ; \ - mv prev-libcpp stageprofile-libcpp ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libcpp stagefeedback-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stageprofile-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libcpp @if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber ; \ - mv prev-libdecnumber stageprofile-libdecnumber ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libdecnumber stagefeedback-libdecnumber ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libdecnumber stageprofile-libdecnumber ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty ; \ - mv prev-libiberty stageprofile-libiberty ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set libiberty stagefeedback-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stageprofile-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stagefeedback-zlib ; \ - mv prev-zlib stageprofile-zlib ; : ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set zlib stagefeedback-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stageprofile-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ fi @endif zlib @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; : ; \ + set $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ ; \ fi - rm -f stage_current # Bubble a bugfix through all the stages up to stage feedback. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -37908,7 +37171,7 @@ do-clean: clean-stagefeedback -.PHONY: profiledbootstrap profiledbootstrap-lean +.PHONY: profiledbootstrap profiledbootstrap: echo stagefeedback > stage_final @r=`${PWD_COMMAND}`; export r; \ @@ -37919,16 +37182,6 @@ profiledbootstrap: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target -profiledbootstrap-lean: - echo stagefeedback > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stagefeedback-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target - # Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stageprofile:: distclean-stagefeedback @@ -37957,71 +37210,51 @@ stagefeedback-start:: @if gcc-bootstrap do-distclean: distclean-stage1 - -# Provide a GCC build when we're building target libraries. This does -# not work as a dependency, just as the minimum necessary to avoid errors. -stage_last: - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble @endif gcc-bootstrap -.PHONY: restrap -restrap: - @: $(MAKE); $(stage) - rm -rf stage1-$(TARGET_SUBDIR) stage2 stage3 stage4 stageprofile stagefeedback - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all - # -------------------------------------- # Dependencies between different modules # -------------------------------------- # Generic dependencies for target modules on host stuff, especially gcc -@if gcc-bootstrap -configure-target-libstdc++-v3: stage_last -configure-target-libmudflap: stage_last -configure-target-libssp: stage_last -configure-target-libgcc-math: stage_last -configure-target-newlib: stage_last -configure-target-libgfortran: stage_last -configure-target-libobjc: stage_last -configure-target-libtermcap: stage_last -configure-target-winsup: stage_last -configure-target-libgloss: stage_last -configure-target-libiberty: stage_last -configure-target-gperf: stage_last -configure-target-examples: stage_last -configure-target-libffi: stage_last -configure-target-libjava: stage_last -configure-target-zlib: stage_last -configure-target-boehm-gc: stage_last -configure-target-qthreads: stage_last -configure-target-rda: stage_last -configure-target-libada: stage_last -configure-target-libgomp: stage_last -@endif gcc-bootstrap -@if gcc-no-bootstrap configure-target-libstdc++-v3: maybe-all-gcc + configure-target-libmudflap: maybe-all-gcc + configure-target-libssp: maybe-all-gcc -configure-target-libgcc-math: maybe-all-gcc + configure-target-newlib: maybe-all-gcc + configure-target-libgfortran: maybe-all-gcc + configure-target-libobjc: maybe-all-gcc + configure-target-libtermcap: maybe-all-gcc + configure-target-winsup: maybe-all-gcc + configure-target-libgloss: maybe-all-gcc + configure-target-libiberty: maybe-all-gcc + configure-target-gperf: maybe-all-gcc + configure-target-examples: maybe-all-gcc + configure-target-libffi: maybe-all-gcc + configure-target-libjava: maybe-all-gcc + configure-target-zlib: maybe-all-gcc + configure-target-boehm-gc: maybe-all-gcc + configure-target-qthreads: maybe-all-gcc + configure-target-rda: maybe-all-gcc + configure-target-libada: maybe-all-gcc -configure-target-libgomp: maybe-all-gcc -@endif gcc-no-bootstrap diff --git a/Makefile.tpl b/Makefile.tpl index 274474a5c..65e529588 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -6,7 +6,7 @@ in # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation +# 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -87,6 +87,8 @@ GDB_NLM_DEPS = # the libraries. RPATH_ENVVAR = @RPATH_ENVVAR@ +# This is the list of directories to be built for the build system. +BUILD_CONFIGDIRS = libiberty # Build programs are put under this directory. BUILD_SUBDIR = @build_subdir@ # This is set by the configure script to the arguments to use when configuring @@ -179,6 +181,9 @@ POSTSTAGE1_HOST_EXPORTS = \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; +# This is set by the configure script to the list of directories which +# should be built using the target tools. +TARGET_CONFIGDIRS = @target_configdirs@ # Target libraries are put under this directory: TARGET_SUBDIR = @target_subdir@ # This is set by the configure script to the arguments to use when configuring @@ -250,7 +255,6 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ # Flags to pass to stage2 and later makes. They are defined # here so that they can be overridden by Makefile fragments. BOOT_CFLAGS= -g -O2 -BOOT_LDFLAGS= BISON = @BISON@ YACC = @YACC@ @@ -280,7 +284,6 @@ DLLTOOL = @DLLTOOL@ LD = @LD@ LIPO = @LIPO@ NM = @NM@ -OBJDUMP = @OBJDUMP@ RANLIB = @RANLIB@ STRIP = @STRIP@ WINDRES = @WINDRES@ @@ -384,9 +387,8 @@ HOST_LIB_PATH_[+module+] = \ [+ ENDIF lib_path +][+ ENDFOR host_modules +] # Flags to pass down to all sub-makes. -BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \ - "`echo '[+flag+]=$([+flag+])' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"[+ ELSE optional +] \ - "[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +] \ +BASE_FLAGS_TO_PASS = [+ FOR flags_to_pass +]\ + "[+flag+]=$([+flag+])" [+ ENDFOR flags_to_pass +]\ "CONFIG_SHELL=$(SHELL)" \ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" @@ -404,7 +406,6 @@ EXTRA_HOST_FLAGS = \ 'LD=$(LD)' \ 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ - 'OBJDUMP=$(OBJDUMP)' \ 'RANLIB=$(RANLIB)' \ 'STRIP=$(STRIP)' \ 'WINDRES=$(WINDRES)' @@ -453,12 +454,18 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) # The BUILD_* variables are a special case, which are used for the gcc # cross-building scheme. EXTRA_GCC_FLAGS = \ + 'BUILD_PREFIX=$(BUILD_PREFIX)' \ + 'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ + "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" + "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ + "`echo 'STAGE1_CFLAGS=$(STAGE1_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ + "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ + "`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) @@ -492,20 +499,20 @@ all: fi .PHONY: all-build -[+ FOR build_modules +] -all-build: maybe-all-build-[+module+][+ ENDFOR build_modules +] - +all-build: [+ + FOR build_modules +] \ + maybe-all-build-[+module+][+ + ENDFOR build_modules +] .PHONY: all-host -[+ FOR host_modules +][+ IF bootstrap +] -@if [+module+]-no-bootstrap[+ ENDIF bootstrap +] -all-host: maybe-all-[+module+][+ IF bootstrap +] -@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR host_modules +] - +all-host: [+ + FOR host_modules +] \ + maybe-all-[+module+][+ + ENDFOR host_modules +] .PHONY: all-target -[+ FOR target_modules +][+ IF bootstrap +] -@if [+module+]-no-bootstrap[+ ENDIF bootstrap +] -all-target: maybe-all-target-[+module+][+ IF bootstrap +] -@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR target_modules +] +all-target: [+ + FOR target_modules +] \ + maybe-all-target-[+module+][+ + ENDFOR target_modules +] # Do a target for all the subdirectories. A ``make do-X'' will do a # ``make X'' in all subdirectories (because, in general, there is a @@ -522,12 +529,16 @@ do-[+make_target+]: .PHONY: [+make_target+]-host -[+ FOR host_modules +] -[+make_target+]-host: maybe-[+make_target+]-[+module+][+ ENDFOR host_modules +] +[+make_target+]-host: [+ + FOR host_modules +] \ + maybe-[+make_target+]-[+module+][+ + ENDFOR host_modules +] .PHONY: [+make_target+]-target -[+ FOR target_modules +] -[+make_target+]-target: maybe-[+make_target+]-target-[+module+][+ ENDFOR target_modules +] +[+make_target+]-target: [+ + FOR target_modules +] \ + maybe-[+make_target+]-target-[+module+][+ + ENDFOR target_modules +] [+ ENDFOR recursive_targets +] # Here are the targets which correspond to the do-X targets. @@ -717,17 +728,13 @@ TAGS: do-TAGS maybe-configure-[+prefix+][+module+]: @if [+prefix+][+module+] maybe-configure-[+prefix+][+module+]: configure-[+prefix+][+module+] -configure-[+prefix+][+module+]: [+ IF bootstrap +] -@endif [+prefix+][+module+] -@if [+prefix+][+module+]-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif [+prefix+][+module+]-bootstrap -@if [+prefix+][+module+][+ ELSE bootstrap +] - @: $(MAKE); $(unstage)[+ ENDIF bootstrap +] - @r=`${PWD_COMMAND}`; export r; \ +configure-[+prefix+][+module+]: + @[+ IF bootstrap +]test -f stage_last && exit 0; \ + [+ ELSE bootstrap +]: $(MAKE); $(unstage) + @[+ ENDIF bootstrap +][+ IF check_multilibs + +]r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - [+ IF check_multilibs - +]echo "Checking multilib configuration for [+module+]..."; \ + echo "Checking multilib configuration for [+module+]..."; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ $(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \ if test -r [+subdir+]/[+module+]/multilib.out; then \ @@ -739,9 +746,11 @@ configure-[+prefix+][+module+]: [+ IF bootstrap +] fi; \ else \ mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \ - fi; \ - [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ + fi + @[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ [+exports+] \ echo Configuring in [+subdir+]/[+module+]; \ cd "[+subdir+]/[+module+]" || exit 1; \ @@ -765,12 +774,12 @@ maybe-configure-stage[+id+]-[+prefix+][+module+]: @if [+prefix+][+module+]-bootstrap maybe-configure-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+] configure-stage[+id+]-[+prefix+][+module+]: - @[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start + @[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start @$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ [+ IF check_multilibs - +]echo "Checking multilib configuration for [+module+]..."; \ + +]@r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + echo "Checking multilib configuration for [+module+]..."; \ $(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \ if test -r [+subdir+]/[+module+]/multilib.out; then \ if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \ @@ -781,8 +790,8 @@ configure-stage[+id+]-[+prefix+][+module+]: fi; \ else \ mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \ - fi; \ - [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ + fi + @[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ [+exports+][+ IF prev +] \ [+poststage1_exports+][+ ENDIF prev +] \ echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \ @@ -810,14 +819,10 @@ maybe-all-[+prefix+][+module+]: TARGET-[+prefix+][+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +] maybe-all-[+prefix+][+module+]: all-[+prefix+][+module+] -all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +] -@endif [+prefix+][+module+] -@if [+prefix+][+module+]-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif [+prefix+][+module+]-bootstrap -@if [+prefix+][+module+][+ ELSE bootstrap +] - @: $(MAKE); $(unstage)[+ ENDIF bootstrap +] - @r=`${PWD_COMMAND}`; export r; \ +all-[+prefix+][+module+]: configure-[+prefix+][+module+] + @[+ IF bootstrap +]test -f stage_last && exit 0; \ + [+ ELSE bootstrap +]: $(MAKE); $(unstage) + @[+ ENDIF bootstrap +]r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ [+exports+] \ (cd [+subdir+]/[+module+] && \ @@ -835,7 +840,7 @@ maybe-all-stage[+id+]-[+prefix+][+module+]: all-stage[+id+]-[+prefix+][+module+] all-stage[+id+]: all-stage[+id+]-[+prefix+][+module+] TARGET-stage[+id+]-[+prefix+][+module+] = $(TARGET-[+prefix+][+module+]) all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+] - @[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start + @[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ [+exports+][+ IF prev +] \ @@ -851,7 +856,7 @@ clean-stage[+id+]: clean-stage[+id+]-[+prefix+][+module+] clean-stage[+id+]-[+prefix+][+module+]: @[ -f [+subdir+]/[+module+]/Makefile ] || [ -f [+subdir+]/stage[+id+]-[+module+]/Makefile ] \ || exit 0 ; \ - [ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start; \ + @[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start cd [+subdir+]/[+module+] && \ $(MAKE) [+args+] [+ IF prev +] \ [+poststage1_args+] [+ ENDIF prev +] \ @@ -1204,12 +1209,10 @@ gcc-no-fixedincludes: unstage = : stage = : -current_stage = "" @if gcc-bootstrap unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start -stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi -current_stage = "`cat stage_current 2> /dev/null`" +stage = [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : @endif gcc-bootstrap .PHONY: unstage stage @@ -1218,9 +1221,6 @@ unstage: stage: @: $(MAKE); $(stage) -# Disable commands for lean bootstrap. -LEAN = false - # We name the build directories for the various stages "stage1-gcc", # "stage2-gcc","stage3-gcc", etc. @@ -1252,8 +1252,6 @@ POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ STAGE_PREFIX=$$r/prev-gcc/ \ CFLAGS="$(BOOT_CFLAGS)" \ - LIBCFLAGS="$(BOOT_CFLAGS)" \ - LDFLAGS="$(BOOT_LDFLAGS)" \ ADAC="\$$(CC)" # For stage 1: @@ -1277,46 +1275,51 @@ stage[+id+]-start:: @if [+ module +] @cd $(HOST_SUBDIR); [ -d stage[+id+]-[+module+] ] || \ mkdir stage[+id+]-[+module+]; \ - mv stage[+id+]-[+module+] [+module+] [+ IF prev +] ; \ - mv stage[+prev+]-[+module+] prev-[+module+] || test -f stage[+prev+]-lean [+ ENDIF prev +] + set stage[+id+]-[+module+] [+module+] ; \ + @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \ + set stage[+prev+]-[+module+] prev-[+module+] ; \ + @CREATE_LINK_TO_DIR@ [+ ENDIF prev +] @endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +] @[ -d stage[+id+]-$(TARGET_SUBDIR) ] || \ mkdir stage[+id+]-$(TARGET_SUBDIR); \ - mv stage[+id+]-$(TARGET_SUBDIR) $(TARGET_SUBDIR) [+ IF prev +] ; \ - mv stage[+prev+]-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage[+prev+]-lean [+ ENDIF prev +] + set stage[+id+]-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \ + set stage[+prev+]-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) ; \ + @CREATE_LINK_TO_DIR@ [+ ENDIF prev +] -stage[+id+]-end:: [+ FOR host_modules +][+ IF bootstrap +] +stage[+id+]-end:: + @rm -f stage_current[+ FOR host_modules +][+ IF bootstrap +] @if [+ module +] - @if test -d $(HOST_SUBDIR)/[+module+] ; then \ - cd $(HOST_SUBDIR); mv [+module+] stage[+id+]-[+module+] [+ IF prev +]; \ - mv prev-[+module+] stage[+prev+]-[+module+] ; : [+ ENDIF prev +] ; \ + @if test -d $(HOST_SUBDIR) ; then \ + cd $(HOST_SUBDIR); set [+module+] stage[+id+]-[+module+] ; \ + @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \ + set prev-[+module+] stage[+prev+]-[+module+] ; \ + @UNDO_LINK_TO_DIR@ [+ ENDIF prev +] ; \ fi @endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +] @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage[+id+]-$(TARGET_SUBDIR) [+ IF prev +] ; \ - mv prev-$(TARGET_SUBDIR) stage[+prev+]-$(TARGET_SUBDIR) ; : [+ ENDIF prev +] ; \ + set $(TARGET_SUBDIR) stage[+id+]-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \ + set prev-$(TARGET_SUBDIR) stage[+prev+]-$(TARGET_SUBDIR) ; \ + @UNDO_LINK_TO_DIR@ [+ ENDIF prev +] ; \ fi - rm -f stage_current # Bubble a bugfix through all the stages up to stage [+id+]. They are # remade, but not reconfigured. The next stage (if any) will not be # reconfigured as well. .PHONY: stage[+id+]-bubble -stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +] +stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +][+IF lean +] + @bootstrap_lean@-rm -rf stage[+lean+]-* ; $(STAMP) stage[+lean+]-lean[+ ENDIF lean +] @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ if test -f stage[+id+]-lean [+ IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \ echo Skipping rebuild of stage[+id+] ; \ else \ - $(MAKE) stage[+id+]-start; \[+IF lean +] - if $(LEAN); then \ - rm -rf stage[+lean+]-* ; \ - $(STAMP) stage[+lean+]-lean ; \ - fi; \[+ ENDIF lean +] + $(MAKE) stage[+id+]-start; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \ fi[+ IF compare-target +] - $(MAKE) $(RECURSE_FLAGS_TO_PASS) [+compare-target+][+ ENDIF compare-target +] + $(MAKE) [+compare-target+][+ ENDIF compare-target +] .PHONY: all-stage[+id+] clean-stage[+id+] do-clean: clean-stage[+id+] @@ -1334,7 +1337,6 @@ do-clean: clean-stage[+id+] fi; \ : $(MAKE); $(stage); \ rm -f .bad_compare ; \ - echo Comparing stages [+prev+] and [+id+] ; \ cd stage[+id+]-gcc; \ files=`find . -name "*$(objext)" -print` ; \ cd .. ; \ @@ -1355,17 +1357,14 @@ do-clean: clean-stage[+id+] cat .bad_compare; \ exit 1; \ else \ - echo Comparison successful.; \ + true; \ fi ; \ $(STAMP) [+compare-target+][+ IF prev +] - if $(LEAN); then \ - rm -rf stage[+prev+]-*; \ - $(STAMP) stage[+prev+]-lean; \ - fi[+ ENDIF prev +] + @bootstrap_lean@-rm -rf stage[+prev+]-* ; $(STAMP) stage[+prev+]-lean[+ ENDIF prev +] [+ ENDIF compare-target +] [+ IF bootstrap-target +] -.PHONY: [+bootstrap-target+] [+bootstrap-target+]-lean +.PHONY: [+bootstrap-target+] [+bootstrap-target+]: echo stage[+id+] > stage_final @r=`${PWD_COMMAND}`; export r; \ @@ -1375,16 +1374,6 @@ do-clean: clean-stage[+id+] @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target - -[+bootstrap-target+]-lean: - echo stage[+id+] > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage[+id+]-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target [+ ENDIF bootstrap-target +] # Rules to wipe a stage and all the following ones, also used for cleanstrap @@ -1418,39 +1407,19 @@ stagefeedback-start:: @if gcc-bootstrap do-distclean: distclean-stage1 - -# Provide a GCC build when we're building target libraries. This does -# not work as a dependency, just as the minimum necessary to avoid errors. -stage_last: - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble @endif gcc-bootstrap -.PHONY: restrap -restrap: - @: $(MAKE); $(stage) - rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev - +]stage[+id+] [+ ENDIF prev +][+ ENDFOR bootstrap-stage +] - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all - # -------------------------------------- # Dependencies between different modules # -------------------------------------- # Generic dependencies for target modules on host stuff, especially gcc -@if gcc-bootstrap[+ FOR target_modules +][+ IF bootstrap - +][+ FOR bootstrap_stage +] -configure-stage[+id+]-target-[+module+]: maybe-all-stage[+id+]-gcc[+ - ENDFOR +][+ ELSE bootstrap +] -configure-target-[+module+]: stage_last[+ - ENDIF bootstrap +][+ ENDFOR target_modules +] -@endif gcc-bootstrap - -@if gcc-no-bootstrap[+ FOR target_modules +][+ IF bootstrap - +][+ ELSE +] -configure-target-[+module+]: maybe-all-gcc[+ - ENDIF bootstrap +][+ ENDFOR target_modules +] -@endif gcc-no-bootstrap - +[+ FOR target_modules +][+ IF bootstrap +] +@if gcc-bootstrap[+ FOR bootstrap_stage +] +configure-stage[+id+]-target-[+module+]: maybe-all-stage[+id+]-gcc[+ ENDFOR +] +@endif gcc-bootstrap[+ ENDIF bootstrap +] +configure-target-[+module+]: maybe-all-gcc +[+ ENDFOR target_modules +] [+ FOR lang_env_dependencies +] configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss diff --git a/config.guess b/config.guess index 17690aea3..52c01be4c 100755 --- a/config.guess +++ b/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2006-01-02' +timestamp='2005-11-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -206,9 +206,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; @@ -767,12 +764,7 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -859,7 +851,7 @@ EOF #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -878,7 +870,7 @@ EOF #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) @@ -927,9 +919,6 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; @@ -975,7 +964,7 @@ EOF LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) + #ifdef __INTEL_COMPILER LIBC=gnu #else LIBC=gnuaout @@ -985,7 +974,7 @@ EOF LIBC=dietlibc #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1274,9 +1263,6 @@ EOF i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/config.sub b/config.sub index a4e8a94a3..8e41b1c0f 100755 --- a/config.sub +++ b/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2006-01-02' +timestamp='2005-12-12' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -119,9 +119,8 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -248,7 +247,7 @@ case $basic_machine in | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -295,10 +294,10 @@ case $basic_machine in ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; - ms1) - basic_machine=mt-unknown - ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -709,7 +708,7 @@ case $basic_machine in os=-msdos ;; ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; mvs) basic_machine=i370-ibm @@ -818,12 +817,6 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -880,10 +873,6 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -1199,23 +1188,21 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) diff --git a/config/ChangeLog b/config/ChangeLog index 1ddcfd416..e98b57dcc 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,33 +1,3 @@ -2006-02-14 Paolo Bonzini <bonzini@gnu.org> - Andreas Schwab <schwab@suse.de> - - * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Use correct program name. - (ACX_CHECK_INSTALLED_TARGET_TOOL): Likewise, and always set $1. - -2006-01-26 Paolo Bonzini <bonzini@gnu.org> - - * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Test $with_build_time_tools. - (ACX_PATH_SEP): New. - (ACX_TOOL_DIRS): Move here from the gcc directory. - (ACX_CHECK_INSTALLED_TARGET_TOOL): New. - (GCC_TARGET_TOOL): Do not use a host tool if we found a target tool - with a complete path in either $with_build_time_tools or $exec_prefix. - -2006-01-02 Paolo Bonzini <bonzini@gnu.org> - - PR target/25259 - * stdint.m4: New. - -2005-12-20 Paolo Bonzini <bonzini@gnu.org> - - Revert Ada-related part of the previous change. - - * mt-ppc-aix: Delete. - -2005-12-19 Paolo Bonzini <bonzini@gnu.org> - - * mt-ppc-aix, mh-ppc-aix: New. - 2005-12-05 Paolo Bonzini <bonzini@gnu.org> * acx.m4 (GCC_TARGET_TOOL): New. diff --git a/config/acx.m4 b/config/acx.m4 index 7c4c21386..c71f39b44 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -104,7 +104,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias- #### # NCN_STRICT_CHECK_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path]) -# Like plain AC_CHECK_TOOLS, but require prefix if build!=host. +# Like plain AC_CHECK_TOOLS, but require prefix if build!=target. AC_DEFUN([NCN_STRICT_CHECK_TOOLS], [AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl @@ -135,32 +135,17 @@ fi AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOLS], [AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl -if test -n "$with_build_time_tools"; then - for ncn_progname in $2; do - AC_MSG_CHECKING([for ${ncn_progname} in $with_build_time_tools]) - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_$1=$with_build_time_tools/${ncn_progname} - AC_MSG_RESULT(yes) - break - else - AC_MSG_RESULT(no) - fi - done -fi +for ncn_progname in $2; do + if test -n "$ncn_target_tool_prefix"; then + AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}${ncn_progname}], + [${ncn_target_tool_prefix}${ncn_progname}], , [$4]) + fi + if test -z "$ac_cv_prog_$1" && test $build = $target ; then + AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4]) + fi + test -n "$ac_cv_prog_$1" && break +done -if test -z "$ac_cv_prog_$1"; then - for ncn_progname in $2; do - if test -n "$ncn_target_tool_prefix"; then - AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}${ncn_progname}], - [${ncn_target_tool_prefix}${ncn_progname}], , [$4]) - fi - if test -z "$ac_cv_prog_$1" && test $build = $target ; then - AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4]) - fi - test -n "$ac_cv_prog_$1" && break - done -fi - if test -z "$ac_cv_prog_$1" ; then ifelse([$3],[], [set dummy $2 if test $build = $target ; then @@ -170,130 +155,6 @@ if test -z "$ac_cv_prog_$1" ; then fi], [$1="$3"]) fi ]) []dnl # NCN_STRICT_CHECK_TARGET_TOOLS - - -# Backported from Autoconf 2.5x; can go away when and if -# we switch. Put the OS path separator in $PATH_SEPARATOR. -AC_DEFUN([ACX_PATH_SEP], [ -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -]) - - -AC_DEFUN([ACX_TOOL_DIRS], [ -AC_REQUIRE([ACX_PATH_SEP]) -if test "x$exec_prefix" = xNONE; then - if test "x$prefix" = xNONE; then - gcc_cv_tool_prefix=$ac_default_prefix - else - gcc_cv_tool_prefix=$prefix - fi -else - gcc_cv_tool_prefix=$exec_prefix -fi - -# If there is no compiler in the tree, use the PATH only. In any -# case, if there is no compiler in the tree nobody should use -# AS_FOR_TARGET and LD_FOR_TARGET. -if test x$host = x$build && test -f $srcdir/gcc/BASE-VER; then - gcc_version=`cat $srcdir/gcc/BASE-VER` - gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin$PATH_SEPARATOR" -else - gcc_cv_tool_dirs= -fi - -if test x$build = x$target && test -n "$md_exec_prefix"; then - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$md_exec_prefix$PATH_SEPARATOR" -fi - -]) []dnl # ACX_TOOL_DIRS - -# ACX_HAVE_GCC_FOR_TARGET -# Check if the variable GCC_FOR_TARGET really points to a GCC binary. -AC_DEFUN([ACX_HAVE_GCC_FOR_TARGET], [ -cat > conftest.c << \EOF -#ifdef __GNUC__ - gcc_yay; -#endif -EOF -if ($GCC_FOR_TARGET -E conftest.c | grep gcc_yay) > /dev/null 2>&1; then - have_gcc_for_target=yes -else - GCC_FOR_TARGET=${ncn_target_tool_prefix}gcc - have_gcc_for_target=no -fi -rm conftest.c -]) - -# ACX_CHECK_INSTALLED_TARGET_TOOL(VAR, PROG) -# Searching for installed target binutils. We need to take extra care, -# else we may find the wrong assembler, linker, etc., and lose. -# -# First try --with-build-time-tools, if specified. -# -# For build != host, we ask the installed GCC for the name of the tool it -# uses, and accept it if it is an absolute path. This is because the -# only good choice for a compiler is the same GCC version that is being -# installed (or we couldn't make target libraries), and we assume that -# on the host system we'll have not only the same GCC version, but also -# the same binutils version. -# -# For build == host, search the same directories that the installed -# compiler will search. We used to do this for the assembler, linker, -# and nm only; for simplicity of configuration, however, we extend this -# criterion to tools (such as ar and ranlib) that are never invoked by -# the compiler, to avoid mismatches. -# -# Also note we have to check MD_EXEC_PREFIX before checking the user's path -# if build == target. This makes the most sense only when bootstrapping, -# but we also do so when build != host. In this case, we hope that the -# build and host systems will have similar contents of MD_EXEC_PREFIX. -# -# If we do not find a suitable binary, then try the user's path. - -AC_DEFUN([ACX_CHECK_INSTALLED_TARGET_TOOL], [ -AC_REQUIRE([ACX_TOOL_DIRS]) -AC_REQUIRE([ACX_HAVE_GCC_FOR_TARGET]) -if test -z "$ac_cv_path_$1" ; then - if test -n "$with_build_time_tools"; then - AC_MSG_CHECKING([for $2 in $with_build_time_tools]) - if test -x $with_build_time_tools/$2; then - $1=`cd $with_build_time_tools && pwd`/$2 - ac_cv_path_$1=[$]$1 - AC_MSG_RESULT([$ac_cv_path_$1]) - else - AC_MSG_RESULT(no) - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - $1=`$GCC_FOR_TARGET --print-prog-name=$2` - test [$]$1=$2 && $1= - ac_cv_path_$1=[$]$1 - fi -fi -if test -z "$ac_cv_path_$1" ; then - AC_PATH_PROG([$1], [$2], [], [$gcc_cv_tool_dirs]) -fi -if test -z "$ac_cv_path_$1" ; then - NCN_STRICT_CHECK_TARGET_TOOLS([$1], [$2]) -else - $1=$ac_cv_path_$1 -fi -]) []dnl # ACX_CHECK_INSTALLED_TARGET_TOOL ### # AC_PROG_CPP_WERROR @@ -439,13 +300,8 @@ dnl GCC_TARGET_TOOL(PROGRAM, TARGET-VAR, HOST-VAR, IN-TREE-TOOL, LANGUAGE) AC_DEFUN([GCC_TARGET_TOOL], [AC_MSG_CHECKING(where to find the target $1) if test "x${build}" != "x${host}" ; then - if expr "x[$]$2" : "x/" > /dev/null; then - # We already found the complete path - AC_MSG_RESULT(pre-installed in `dirname [$]$2`) - else - # Canadian cross, just use what we found - AC_MSG_RESULT(pre-installed) - fi + # Canadian cross, just use what we found + AC_MSG_RESULT(pre-installed) else ifelse([$4],,, [ok=yes @@ -462,10 +318,7 @@ else # An in-tree tool is available and we can use it $2='$$r/$(HOST_SUBDIR)/$4' AC_MSG_RESULT(just compiled) - el])if expr "x[$]$2" : "x/" > /dev/null; then - # We already found the complete path - AC_MSG_RESULT(pre-installed in `dirname [$]$2`) - elif test "x$target" = "x$host"; then + el])if test "x$target" = "x$host"; then # We can use an host tool $2='$($3)' AC_MSG_RESULT(host tool) diff --git a/config/mh-ppc-aix b/config/mh-ppc-aix deleted file mode 100644 index f2bc76a0c..000000000 --- a/config/mh-ppc-aix +++ /dev/null @@ -1,8 +0,0 @@ - -# Compile Ada files with minimal-toc. The primary focus is gnatlib, so -# that the library does not use nearly the entire TOC of applications -# until gnatlib is built as a shared library on AIX. Compiling the -# compiler with -mminimal-toc does not cause any harm. -BOOT_ADAFLAGS = -mminimal-toc -BOOT_LDFLAGS = -Wl,-bbigtoc -LDFLAGS = `case $(CC) in *gcc*) echo -Wl,-bbigtoc ;; esac;` diff --git a/config/stdint.m4 b/config/stdint.m4 deleted file mode 100644 index 21ef2ec43..000000000 --- a/config/stdint.m4 +++ /dev/null @@ -1,486 +0,0 @@ -dnl @synopsis GCC_HEADER_STDINT [( HEADER-TO-GENERATE [, HEADERS-TO-CHECK])] -dnl -dnl the "ISO C9X: 7.18 Integer types <stdint.h>" section requires the -dnl existence of an include file <stdint.h> that defines a set of -dnl typedefs, especially uint8_t,int32_t,uintptr_t. -dnl Many older installations will not provide this file, but some will -dnl have the very same definitions in <inttypes.h>. In other enviroments -dnl we can use the inet-types in <sys/types.h> which would define the -dnl typedefs int8_t and u_int8_t respectivly. -dnl -dnl This macros will create a local "_stdint.h" or the headerfile given as -dnl an argument. In many cases that file will pick the definition from a -dnl "#include <stdint.h>" or "#include <inttypes.h>" statement, while -dnl in other environments it will provide the set of basic 'stdint's defined: -dnl int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t -dnl int_least32_t.. int_fast32_t.. intmax_t -dnl which may or may not rely on the definitions of other files. -dnl -dnl Sometimes the stdint.h or inttypes.h headers conflict with sys/types.h, -dnl so we test the headers together with sys/types.h and always include it -dnl into the generated header (to match the tests with the generated file). -dnl Hopefully this is not a big annoyance. -dnl -dnl If your installed header files require the stdint-types you will want to -dnl create an installable file mylib-int.h that all your other installable -dnl header may include. So, for a library package named "mylib", just use -dnl GCC_HEADER_STDINT(mylib-int.h) -dnl in configure.in and install that header file in Makefile.am along with -dnl the other headers (mylib.h). The mylib-specific headers can simply -dnl use "#include <mylib-int.h>" to obtain the stdint-types. -dnl -dnl Remember, if the system already had a valid <stdint.h>, the generated -dnl file will include it directly. No need for fuzzy HAVE_STDINT_H things... -dnl -dnl @author Guido Draheim <guidod@gmx.de>, Paolo Bonzini <bonzini@gnu.org> - -AC_DEFUN([GCC_HEADER_STDINT], -[m4_define(_GCC_STDINT_H, m4_ifval($1, $1, _stdint.h)) - -inttype_headers=`echo inttypes.h sys/inttypes.h $2 | 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, ]) - AC_CHECK_TYPE(uintmax_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h> -#include <$i>]) - AC_CHECK_TYPE(uintptr_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h> -#include <$i>]) - AC_CHECK_TYPE(int_least32_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h> -#include <$i>]) - AC_CHECK_TYPE(int_fast32_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h> -#include <$i>]) - AC_CHECK_TYPE(uint64_t,,[acx_cv_header_stdint_kind="(lacks uint64_t)"], [#include <sys/types.h> -#include <$i>]) - break -done -if test "$acx_cv_header_stdint" = stddef.h; then - acx_cv_header_stdint_kind="(lacks uintptr_t)" - for i in stdint.h $inttype_headers; do - unset ac_cv_type_uint32_t - unset ac_cv_type_uint64_t - _AS_ECHO_N([looking for an incomplete stdint.h in $i, ]) - AC_CHECK_TYPE(uint32_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h> -#include <$i>]) - AC_CHECK_TYPE(uint64_t,,[acx_cv_header_stdint_kind="(lacks uintptr_t and uint64_t)"], [#include <sys/types.h> -#include <$i>]) - 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, ]) - AC_CHECK_TYPE(u_int32_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h> -#include <$i>]) - AC_CHECK_TYPE(u_int64_t,,[acx_cv_header_stdint_kind="(u_intXX_t style, lacks u_int64_t)"], [#include <sys/types.h> -#include <$i>]) - 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 - -AC_MSG_CHECKING([what to include in _GCC_STDINT_H]) - -case `AS_BASENAME(_GCC_STDINT_H)` in - stdint.h) AC_MSG_WARN([are you sure you want it there?]) ;; - inttypes.h) AC_MSG_WARN([are you sure you want it there?]) ;; - *) ;; -esac - -AC_MSG_RESULT($acx_cv_header_stdint $acx_cv_header_stdint_kind) - -# ----------------- 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) AC_CHECK_SIZEOF(void *) ;; -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) AC_CHECK_SIZEOF(long) ;; -esac - -if test $acx_cv_header_stdint = stddef.h; then - # Lacking a good header? Test size of everything and deduce all types. - AC_CHECK_SIZEOF(int) - AC_CHECK_SIZEOF(short) - AC_CHECK_SIZEOF(char) - - AC_MSG_CHECKING(for type equivalent to int8_t) - case "$ac_cv_sizeof_char" in - 1) acx_cv_type_int8_t=char ;; - *) AC_MSG_ERROR(no 8-bit type, please report a bug) - esac - AC_MSG_RESULT($acx_cv_type_int8_t) - - AC_MSG_CHECKING(for type equivalent to int16_t) - case "$ac_cv_sizeof_int:$ac_cv_sizeof_short" in - 2:*) acx_cv_type_int16_t=int ;; - *:2) acx_cv_type_int16_t=short ;; - *) AC_MSG_ERROR(no 16-bit type, please report a bug) - esac - AC_MSG_RESULT($acx_cv_type_int16_t) - - AC_MSG_CHECKING(for type equivalent to int32_t) - case "$ac_cv_sizeof_int:$ac_cv_sizeof_long" in - 4:*) acx_cv_type_int32_t=int ;; - *:4) acx_cv_type_int32_t=long ;; - *) AC_MSG_ERROR(no 32-bit type, please report a bug) - esac - AC_MSG_RESULT($acx_cv_type_int32_t) -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 - AC_MSG_CHECKING(for type equivalent to int64_t) - AC_MSG_RESULT(${acx_cv_type_int64_t-'using preprocessor symbols'}) -fi - -# Now we can use the above types - -if test "$ac_cv_type_uintptr_t" != yes; then - AC_MSG_CHECKING(for type equivalent to intptr_t) - 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 ;; - *) AC_MSG_ERROR(no equivalent for intptr_t, please report a bug) - esac - AC_MSG_RESULT($acx_cv_type_intptr_t) -fi - -# ----------------- done all checks, emit header ------------- -AC_CONFIG_COMMANDS(_GCC_STDINT_H, [ -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 - typedef unsigned $acx_cv_type_int8_t uint8_t; - #endif - - #ifndef _UINT16_T - #define _UINT16_T - typedef unsigned $acx_cv_type_int16_t uint16_t; - #endif - - #ifndef _UINT32_T - #define _UINT32_T - typedef unsigned $acx_cv_type_int32_t uint32_t; - #endif - - #ifndef _INT8_T - #define _INT8_T - typedef $acx_cv_type_int8_t int8_t; - #endif - - #ifndef _INT16_T - #define _INT16_T - typedef $acx_cv_type_int16_t int16_t; - #endif - - #ifndef _INT32_T - #define _INT32_T - typedef $acx_cv_type_int32_t int32_t; - #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 - typedef u_int8_t uint8_t; - #endif - - #ifndef _UINT16_T - #define _UINT16_T - typedef u_int16_t uint16_t; - #endif - - #ifndef _UINT32_T - #define _UINT32_T - typedef u_int32_t uint32_t; - #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 - typedef u_int64_t uint64_t; - #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 - typedef $acx_cv_type_int64_t int64_t; - #endif - #ifndef _UINT64_T - #define _UINT64_T - typedef unsigned $acx_cv_type_int64_t uint64_t; - #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 - typedef long long int64_t; - #endif - #ifndef _UINT64_T - #define _UINT64_T - typedef unsigned long long uint64_t; - #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 - __extension__ typedef long long int64_t; - # endif - # ifndef _UINT64_T - # define _UINT64_T - __extension__ typedef unsigned long long uint64_t; - # endif - - #elif !defined __STRICT_ANSI__ - # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ - - # ifndef _INT64_T - # define _INT64_T - typedef __int64 int64_t; - # endif - # ifndef _UINT64_T - # define _UINT64_T - typedef unsigned __int64 uint64_t; - # 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 */ - typedef u$acx_cv_type_intptr_t uintptr_t; - typedef $acx_cv_type_intptr_t intptr_t; -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 - dnl NOTE: The following code assumes that sizeof (int) > 1. - dnl Fix when strange machines are reported. - 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 */ - #ifdef _INT64_T - typedef int64_t intmax_t; - #else - typedef long intmax_t; - #endif - #ifdef _UINT64_T - typedef uint64_t uintmax_t; - #else - typedef unsigned long uintmax_t; - #endif -EOF -fi - -sed 's/^ *//' >> tmp-stdint.h <<EOF - - #endif /* GCC_GENERATED_STDINT_H */ -EOF - -if test -r ]_GCC_STDINT_H[ && cmp -s tmp-stdint.h ]_GCC_STDINT_H[; then - rm -f tmp-stdint.h -else - mv -f tmp-stdint.h ]_GCC_STDINT_H[ -fi - -], [ -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" -]) - -]) @@ -16,8 +16,6 @@ ac_help="$ac_help ac_help="$ac_help --enable-libssp Builds libssp directory" ac_help="$ac_help - --enable-libgcc-math Builds libgcc-math directory" -ac_help="$ac_help --with-mpfr-dir=PATH Specify source directory for MPFR library" ac_help="$ac_help --with-mpfr=PATH Specify directory for installed MPFR library" @@ -29,16 +27,13 @@ ac_help="$ac_help --with-build-sysroot=sysroot use sysroot as the system root during the build" ac_help="$ac_help - --enable-bootstrap Enable bootstrapping [yes if native build]" + --enable-bootstrap[=lean] Enable bootstrapping [no]" ac_help="$ac_help --enable-serial-[{host,target,build}-]configure Force sequential configuration of sub-packages for the host, target or build machine, or all sub-packages" ac_help="$ac_help - --with-build-time-tools=path - use given path to find target tools during the build" -ac_help="$ac_help --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer" ac_help="$ac_help @@ -601,7 +596,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:605: checking host system type" >&5 +echo "configure:600: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -622,7 +617,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:626: checking target system type" >&5 +echo "configure:621: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -640,7 +635,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:644: checking build system type" >&5 +echo "configure:639: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -695,7 +690,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:699: checking for a BSD compatible install" >&5 +echo "configure:694: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -748,7 +743,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln works""... $ac_c" 1>&6 -echo "configure:752: checking whether ln works" >&5 +echo "configure:747: checking whether ln works" >&5 if eval "test \"`echo '$''{'acx_cv_prog_LN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -772,7 +767,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:776: checking whether ln -s works" >&5 +echo "configure:771: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -911,12 +906,10 @@ target_libraries="target-libiberty \ target-libstdc++-v3 \ target-libmudflap \ target-libssp \ - target-libgcc-math \ target-libgfortran \ ${libgcj} \ target-libobjc \ - target-libada \ - target-libgomp" + target-libada" # these tools are built using the target libraries, and are intended to # run only in the target environment @@ -1098,6 +1091,7 @@ else fi if test "${ENABLE_LIBADA}" != "yes" ; then + noconfigdirs="$noconfigdirs target-libada" noconfigdirs="$noconfigdirs gnattools" fi @@ -1109,24 +1103,10 @@ else ENABLE_LIBSSP=yes fi - -# Set the default so we build libgcc-math for ix86 and x86_64 -# Check whether --enable-libgcc-math or --disable-libgcc-math was given. -if test "${enable_libgcc_math+set}" = set; then - enableval="$enable_libgcc_math" - : -else - -case "${target}" in - i?86-* | x86_64-* ) - enable_libgcc_math=yes ;; - *) - enable_libgcc_math=no ;; -esac - +if test "${ENABLE_LIBSSP}" != "yes" ; then + noconfigdirs="$noconfigdirs target-libssp" fi - # Save it here so that, even in case of --enable-libgcj, if the Java # front-end isn't enabled, we still get libgcj disabled. libgcj_saved=$libgcj @@ -1144,10 +1124,16 @@ no) esac -# Disable libmudflap on some systems. -if test x$enable_libmudflap = x ; then +# Allow --disable-libmudflap to exclude target-libmudflap +case $enable_libmudflap in +yes) + ;; +no) + noconfigdirs="$noconfigdirs target-libmudflap" + ;; +"") case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu) # Enable libmudflap by default in GNU and friends. ;; *-*-freebsd*) @@ -1158,25 +1144,7 @@ if test x$enable_libmudflap = x ; then noconfigdirs="$noconfigdirs target-libmudflap" ;; esac -fi - -# Disable libgomp on non POSIX hosted systems. -if test x$enable_libgomp = x ; then - # Enable libgomp by default on hosted POSIX systems. - case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) - ;; - *-*-netbsd* | *-*-freebsd* | *-*-openbsd*) - ;; - *-*-solaris2* | *-*-sysv4* | *-*-irix* | *-*-osf* | *-*-hpux*) - ;; - *-*-darwin* | *-*-aix*) - ;; - *) - noconfigdirs="$noconfigdirs target-libgomp" - ;; - esac -fi +esac case "${target}" in @@ -1480,9 +1448,6 @@ case "${target}" in i[3456789]86-*-beos*) noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}" ;; - i[3456789]86-*-rdos*) - noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" - ;; m32r-*-*) noconfigdirs="$noconfigdirs ${libgcj}" ;; @@ -1794,12 +1759,6 @@ case "${host}" in powerpc-*-darwin*) host_makefile_frag="config/mh-ppc-darwin" ;; - powerpc-*-aix*) - host_makefile_frag="config/mh-ppc-aix" - ;; - rs6000-*-aix*) - host_makefile_frag="config/mh-ppc-aix" - ;; *-*-lynxos*) # /bin/cc is less than useful for our purposes. Always use GCC tentative_cc="/bin/gcc" @@ -1843,6 +1802,8 @@ if test "${build}" != "${host}" ; then CXX=${CXX-${host_alias}-c++} CXXFLAGS=${CXXFLAGS-"-g -O2"} CC_FOR_BUILD=${CC_FOR_BUILD-gcc} + BUILD_PREFIX=${build_alias}- + BUILD_PREFIX_1=${build_alias}- else # Set reasonable default values for some tools even if not Canadian. @@ -1854,10 +1815,13 @@ else # This is all going to change when we autoconfiscate... CC_FOR_BUILD="\$(CC)" + BUILD_PREFIX= + BUILD_PREFIX_1=loser- + # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1861: checking for $ac_word" >&5 +echo "configure:1825: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1887,7 +1851,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1891: checking for $ac_word" >&5 +echo "configure:1855: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1938,7 +1902,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1942: checking for $ac_word" >&5 +echo "configure:1906: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1970,7 +1934,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1974: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1938: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1981,12 +1945,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1985 "configure" +#line 1949 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2012,12 +1976,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2016: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1980: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2021: checking whether we are using GNU C" >&5 +echo "configure:1985: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2026,7 +1990,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2045,7 +2009,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2049: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2013: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2112,7 +2076,7 @@ fi # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args. set dummy ${ac_tool_prefix}gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2116: checking for $ac_word" >&5 +echo "configure:2080: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2144,7 +2108,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "gnatbind", so it can be a program name with args. set dummy gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2148: checking for $ac_word" >&5 +echo "configure:2112: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2177,7 +2141,7 @@ fi fi echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6 -echo "configure:2181: checking whether compiler driver understands Ada" >&5 +echo "configure:2145: checking whether compiler driver understands Ada" >&5 if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2209,7 +2173,7 @@ else fi echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6 -echo "configure:2213: checking how to compare bootstrapped objects" >&5 +echo "configure:2177: checking how to compare bootstrapped objects" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,9 +2271,9 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $gmpinc" # Check GMP actually works echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6 -echo "configure:2311: checking for correct version of gmp.h" >&5 +echo "configure:2275: checking for correct version of gmp.h" >&5 cat > conftest.$ac_ext <<EOF -#line 2313 "configure" +#line 2277 "configure" #include "confdefs.h" #include "gmp.h" int main() { @@ -2320,7 +2284,7 @@ choke me ; return 0; } EOF -if { (eval echo configure:2324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2333,12 +2297,12 @@ rm -f conftest* if test x"$have_gmp" = xyes; then echo $ac_n "checking for MPFR""... $ac_c" 1>&6 -echo "configure:2337: checking for MPFR" >&5 +echo "configure:2301: checking for MPFR" >&5 saved_LIBS="$LIBS" LIBS="$LIBS $gmplibs" cat > conftest.$ac_ext <<EOF -#line 2342 "configure" +#line 2306 "configure" #include "confdefs.h" #include <gmp.h> #include <mpfr.h> @@ -2346,7 +2310,7 @@ int main() { mpfr_t n; mpfr_init(n); ; return 0; } EOF -if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2530,14 +2494,6 @@ Recognised languages are: ${potential_languages}" 1>&2; exit 1; } ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[^ ]*//' -e 's/$/ --enable-languages='"$enable_languages"/ ` fi -# Handle --disable-<component> generically. -for dir in $configdirs $build_configdirs $target_configdirs ; do - dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g` - if eval test x\${enable_${dirname}} "=" xno ; then - noconfigdirs="$noconfigdirs $dir" - fi -done - # Remove the entries in $skipdirs and $noconfigdirs from $configdirs, # $build_configdirs and $target_configdirs. # If we have the source for $noconfigdirs entries, add them to $notsupp. @@ -2714,39 +2670,6 @@ if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then fi fi -# Set with_gnu_as and with_gnu_ld as appropriate. -# -# This is done by determining whether or not the appropriate directory -# is available, and by checking whether or not specific configurations -# have requested that this magic not happen. -# -# The command line options always override the explicit settings in -# configure.in, and the settings in configure.in override this magic. -# -# If the default for a toolchain is to use GNU as and ld, and you don't -# want to do that, then you should use the --without-gnu-as and -# --without-gnu-ld options for the configure script. - -if test x${use_gnu_as} = x && - echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then - with_gnu_as=yes - extra_host_args="$extra_host_args --with-gnu-as" -fi - -if test x${use_gnu_ld} = x && - echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then - with_gnu_ld=yes - extra_host_args="$extra_host_args --with-gnu-ld" -fi - -# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure -# can detect this case. - -if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then - with_newlib=yes - extra_host_args="$extra_host_args --with-newlib" -fi - # Handle ${copy_dirs} set fnord ${copy_dirs} shift @@ -2778,55 +2701,6 @@ while test $# != 0 ; do shift; shift done -# Determine a target-dependent exec_prefix that the installed -# gcc will search in. Keep this list sorted by triplet, with -# the *-*-osname triplets last. -md_exec_prefix= -case "${target}" in - alpha*-*-*vms*) - md_exec_prefix=/gnu/lib/gcc-lib - ;; - i3456786-pc-msdosdjgpp*) - md_exec_prefix=/dev/env/DJDIR/bin - ;; - i3456786-*-sco3.2v5*) - if test $with_gnu_as = yes; then - md_exec_prefix=/usr/gnu/bin - else - md_exec_prefix=/usr/ccs/bin/elf - fi - ;; - - mn10300-*-* | \ - powerpc-*-chorusos* | \ - powerpc*-*-eabi* | \ - powerpc*-*-sysv* | \ - powerpc*-*-kaos* | \ - s390x-ibm-tpf*) - md_exec_prefix=/usr/ccs/bin - ;; - sparc64-*-elf*) - ;; - v850*-*-*) - md_exec_prefix=/usr/ccs/bin - ;; - xtensa-*-elf*) - ;; - - *-*-beos* | \ - *-*-elf* | \ - *-*-hpux* | \ - *-*-netware* | \ - *-*-nto-qnx* | \ - *-*-rtems* | \ - *-*-solaris2* | \ - *-*-sysv45* | \ - *-*-vxworks* | \ - *-wrs-windiss) - md_exec_prefix=/usr/ccs/bin - ;; -esac - extra_arflags_for_target= extra_nmflags_for_target= extra_ranlibflags_for_target= @@ -2884,6 +2758,39 @@ case "${enable_target_optspace}:${target}" in ;; esac +# Set with_gnu_as and with_gnu_ld as appropriate. +# +# This is done by determining whether or not the appropriate directory +# is available, and by checking whether or not specific configurations +# have requested that this magic not happen. +# +# The command line options always override the explicit settings in +# configure.in, and the settings in configure.in override this magic. +# +# If the default for a toolchain is to use GNU as and ld, and you don't +# want to do that, then you should use the --without-gnu-as and +# --without-gnu-ld options for the configure script. + +if test x${use_gnu_as} = x && + echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then + with_gnu_as=yes + extra_host_args="$extra_host_args --with-gnu-as" +fi + +if test x${use_gnu_ld} = x && + echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then + with_gnu_ld=yes + extra_host_args="$extra_host_args --with-gnu-ld" +fi + +# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure +# can detect this case. + +if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then + with_newlib=yes + extra_host_args="$extra_host_args --with-newlib" +fi + # Default to using --with-stabs for certain targets. if test x${with_stabs} = x ; then case "${target}" in @@ -3054,17 +2961,17 @@ case "$have_compiler:$host:$target:$enable_bootstrap" in enable_bootstrap=no ;; # We have a compiler and we are in a native configuration, bootstrap is ok - yes:$build:$build:yes) + yes:$build:$build:yes | yes:$build:$build:lean) ;; # Other configurations, but we have a compiler. Assume the user knows # what he's doing. - yes:*:*:yes) + yes:*:*:yes | yes:*:*:lean) echo "configure: warning: trying to bootstrap a cross compiler" 1>&2 ;; # No compiler: if they passed --enable-bootstrap explicitly, fail - no:*:*:yes) + no:*:*:yes | no:*:*:lean) { echo "configure: error: cannot bootstrap without a compiler" 1>&2; exit 1; } ;; # Fail if wrong command line @@ -3076,11 +2983,16 @@ esac # Adjust the toplevel makefile according to whether bootstrap was selected. case "$enable_bootstrap" in yes) + bootstrap_lean='#' + bootstrap_suffix=bootstrap ;; + lean) + bootstrap_lean='' bootstrap_suffix=bootstrap ;; no) bootstrap_suffix=no-bootstrap ;; esac + for module in ${build_configdirs} ; do if test -z "${no_recursion}" \ && test -f ${build_subdir}/${module}/Makefile; then @@ -3094,13 +3006,10 @@ for module in ${build_configdirs} ; do /^@endif build-$module-$bootstrap_suffix\$/d" done for module in ${configdirs} ; do - if test -z "${no_recursion}"; then - for file in stage*-${module}/Makefile ${module}/Makefile; do - if test -f ${file}; then - echo 1>&2 "*** removing ${file} to force reconfigure" - rm -f ${file} - fi - done + if test -z "${no_recursion}" \ + && test -f ${module}/Makefile; then + echo 1>&2 "*** removing ${module}/Makefile to force reconfigure" + rm -f ${module}/Makefile fi extrasub="$extrasub /^@if $module\$/d @@ -3371,6 +3280,8 @@ done + + # Build module lists & subconfigure args. @@ -3397,7 +3308,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3401: checking for $ac_word" >&5 +echo "configure:3312: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3437,7 +3348,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3441: checking for $ac_word" >&5 +echo "configure:3352: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3476,7 +3387,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3480: checking for $ac_word" >&5 +echo "configure:3391: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3515,7 +3426,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3519: checking for $ac_word" >&5 +echo "configure:3430: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3555,7 +3466,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3559: checking for $ac_word" >&5 +echo "configure:3470: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3594,7 +3505,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3598: checking for $ac_word" >&5 +echo "configure:3509: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3647,7 +3558,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3651: checking for $ac_word" >&5 +echo "configure:3562: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_EXPECT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3688,7 +3599,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3692: checking for $ac_word" >&5 +echo "configure:3603: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3736,7 +3647,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias- # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3740: checking for $ac_word" >&5 +echo "configure:3651: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3767,7 +3678,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3771: checking for $ac_word" >&5 +echo "configure:3682: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3811,7 +3722,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3815: checking for $ac_word" >&5 +echo "configure:3726: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3842,7 +3753,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3846: checking for $ac_word" >&5 +echo "configure:3757: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3886,7 +3797,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3890: checking for $ac_word" >&5 +echo "configure:3801: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3917,7 +3828,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3921: checking for $ac_word" >&5 +echo "configure:3832: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3961,7 +3872,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3965: checking for $ac_word" >&5 +echo "configure:3876: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3992,7 +3903,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3996: checking for $ac_word" >&5 +echo "configure:3907: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4036,7 +3947,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4040: checking for $ac_word" >&5 +echo "configure:3951: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4067,7 +3978,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4071: checking for $ac_word" >&5 +echo "configure:3982: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4111,7 +4022,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4115: checking for $ac_word" >&5 +echo "configure:4026: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4142,7 +4053,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4146: checking for $ac_word" >&5 +echo "configure:4057: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4186,7 +4097,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4190: checking for $ac_word" >&5 +echo "configure:4101: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4217,7 +4128,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4221: checking for $ac_word" >&5 +echo "configure:4132: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4256,7 +4167,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4260: checking for $ac_word" >&5 +echo "configure:4171: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4287,7 +4198,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4291: checking for $ac_word" >&5 +echo "configure:4202: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4326,7 +4237,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4330: checking for $ac_word" >&5 +echo "configure:4241: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4357,7 +4268,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4361: checking for $ac_word" >&5 +echo "configure:4272: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4401,7 +4312,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4405: checking for $ac_word" >&5 +echo "configure:4316: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4432,7 +4343,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4436: checking for $ac_word" >&5 +echo "configure:4347: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4476,7 +4387,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4480: checking for $ac_word" >&5 +echo "configure:4391: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4507,7 +4418,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4511: checking for $ac_word" >&5 +echo "configure:4422: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4553,1070 +4464,607 @@ fi # Target tools. -# Check whether --with-build-time-tools or --without-build-time-tools was given. -if test "${with_build_time_tools+set}" = set; then - withval="$with_build_time_tools" - case x"$withval" in - x/*) ;; - *) - with_build_time_tools= - echo "configure: warning: argument to --with-build-time-tools must be an absolute path" 1>&2 - ;; - esac -else - with_build_time_tools= -fi - - - if test -n "$with_build_time_tools"; then - for ncn_progname in cc gcc; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4575: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_CC_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_CC_FOR_TARGET"; then - for ncn_progname in cc gcc; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in ar; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4592: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4473: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$CC_FOR_TARGET"; then - ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. + if test -n "$AR_FOR_TARGET"; then + ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" -if test -n "$CC_FOR_TARGET"; then - echo "$ac_t""$CC_FOR_TARGET" 1>&6 +AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" +if test -n "$AR_FOR_TARGET"; then + echo "$ac_t""$AR_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_CC_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_AR_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4623: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4504: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$CC_FOR_TARGET"; then - ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. + if test -n "$AR_FOR_TARGET"; then + ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC_FOR_TARGET="${ncn_progname}" + ac_cv_prog_AR_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" -if test -n "$CC_FOR_TARGET"; then - echo "$ac_t""$CC_FOR_TARGET" 1>&6 +AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" +if test -n "$AR_FOR_TARGET"; then + echo "$ac_t""$AR_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_CC_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then - set dummy cc gcc + fi + test -n "$ac_cv_prog_AR_FOR_TARGET" && break +done + +if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then + set dummy ar if test $build = $target ; then - CC_FOR_TARGET="$2" + AR_FOR_TARGET="$2" else - CC_FOR_TARGET="${ncn_target_tool_prefix}$2" + AR_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi - if test -n "$with_build_time_tools"; then - for ncn_progname in c++ g++ cxx gxx; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4666: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_CXX_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_CXX_FOR_TARGET"; then - for ncn_progname in c++ g++ cxx gxx; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in as; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4683: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4548: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$CXX_FOR_TARGET"; then - ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. + if test -n "$AS_FOR_TARGET"; then + ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_CXX_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_AS_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" -if test -n "$CXX_FOR_TARGET"; then - echo "$ac_t""$CXX_FOR_TARGET" 1>&6 +AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" +if test -n "$AS_FOR_TARGET"; then + echo "$ac_t""$AS_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_CXX_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_AS_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4714: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4579: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$CXX_FOR_TARGET"; then - ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. + if test -n "$AS_FOR_TARGET"; then + ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}" + ac_cv_prog_AS_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" -if test -n "$CXX_FOR_TARGET"; then - echo "$ac_t""$CXX_FOR_TARGET" 1>&6 +AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" +if test -n "$AS_FOR_TARGET"; then + echo "$ac_t""$AS_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_CXX_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then - set dummy c++ g++ cxx gxx + fi + test -n "$ac_cv_prog_AS_FOR_TARGET" && break +done + +if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then + set dummy as if test $build = $target ; then - CXX_FOR_TARGET="$2" + AS_FOR_TARGET="$2" else - CXX_FOR_TARGET="${ncn_target_tool_prefix}$2" + AS_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi - if test -n "$with_build_time_tools"; then - for ncn_progname in gcc; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4757: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_GCC_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_GCC_FOR_TARGET"; then - for ncn_progname in gcc; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in cc gcc; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4774: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4623: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GCC_FOR_TARGET"; then - ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. + if test -n "$CC_FOR_TARGET"; then + ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_CC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" -if test -n "$GCC_FOR_TARGET"; then - echo "$ac_t""$GCC_FOR_TARGET" 1>&6 +CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" +if test -n "$CC_FOR_TARGET"; then + echo "$ac_t""$CC_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_GCC_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_CC_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4805: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4654: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GCC_FOR_TARGET"; then - ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. + if test -n "$CC_FOR_TARGET"; then + ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}" + ac_cv_prog_CC_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" -if test -n "$GCC_FOR_TARGET"; then - echo "$ac_t""$GCC_FOR_TARGET" 1>&6 +CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" +if test -n "$CC_FOR_TARGET"; then + echo "$ac_t""$CC_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_GCC_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then - GCC_FOR_TARGET="${CC_FOR_TARGET}" -fi + fi + test -n "$ac_cv_prog_CC_FOR_TARGET" && break +done - if test -n "$with_build_time_tools"; then - for ncn_progname in gcj; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4843: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_GCJ_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done +if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then + set dummy cc gcc + if test $build = $target ; then + CC_FOR_TARGET="$2" + else + CC_FOR_TARGET="${ncn_target_tool_prefix}$2" + fi fi -if test -z "$ac_cv_prog_GCJ_FOR_TARGET"; then - for ncn_progname in gcj; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in c++ g++ cxx gxx; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4860: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4698: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GCJ_FOR_TARGET"; then - ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. + if test -n "$CXX_FOR_TARGET"; then + ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCJ_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_CXX_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" -if test -n "$GCJ_FOR_TARGET"; then - echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 +CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" +if test -n "$CXX_FOR_TARGET"; then + echo "$ac_t""$CXX_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_GCJ_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_CXX_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4891: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4729: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GCJ_FOR_TARGET"; then - ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. + if test -n "$CXX_FOR_TARGET"; then + ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}" + ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" -if test -n "$GCJ_FOR_TARGET"; then - echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 +CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" +if test -n "$CXX_FOR_TARGET"; then + echo "$ac_t""$CXX_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_GCJ_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then - set dummy gcj + fi + test -n "$ac_cv_prog_CXX_FOR_TARGET" && break +done + +if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then + set dummy c++ g++ cxx gxx if test $build = $target ; then - GCJ_FOR_TARGET="$2" + CXX_FOR_TARGET="$2" else - GCJ_FOR_TARGET="${ncn_target_tool_prefix}$2" + CXX_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi - if test -n "$with_build_time_tools"; then - for ncn_progname in gfortran; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4934: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_GFORTRAN_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET"; then - for ncn_progname in gfortran; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in dlltool; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4951: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4773: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GFORTRAN_FOR_TARGET"; then - ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. + if test -n "$DLLTOOL_FOR_TARGET"; then + ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" -if test -n "$GFORTRAN_FOR_TARGET"; then - echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 +DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" +if test -n "$DLLTOOL_FOR_TARGET"; then + echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4982: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4804: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GFORTRAN_FOR_TARGET"; then - ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. + if test -n "$DLLTOOL_FOR_TARGET"; then + ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}" + ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" -if test -n "$GFORTRAN_FOR_TARGET"; then - echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 +DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" +if test -n "$DLLTOOL_FOR_TARGET"; then + echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then - set dummy gfortran - if test $build = $target ; then - GFORTRAN_FOR_TARGET="$2" - else - GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2" fi -fi - - + test -n "$ac_cv_prog_DLLTOOL_FOR_TARGET" && break +done -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then + set dummy dlltool + if test $build = $target ; then + DLLTOOL_FOR_TARGET="$2" else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - -if test "x$exec_prefix" = xNONE; then - if test "x$prefix" = xNONE; then - gcc_cv_tool_prefix=$ac_default_prefix - else - gcc_cv_tool_prefix=$prefix - fi -else - gcc_cv_tool_prefix=$exec_prefix -fi - -# If there is no compiler in the tree, use the PATH only. In any -# case, if there is no compiler in the tree nobody should use -# AS_FOR_TARGET and LD_FOR_TARGET. -if test x$host = x$build && test -f $srcdir/gcc/BASE-VER; then - gcc_version=`cat $srcdir/gcc/BASE-VER` - gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin$PATH_SEPARATOR" -else - gcc_cv_tool_dirs= -fi - -if test x$build = x$target && test -n "$md_exec_prefix"; then - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$md_exec_prefix$PATH_SEPARATOR" -fi - - - -cat > conftest.c << \EOF -#ifdef __GNUC__ - gcc_yay; -#endif -EOF -if ($GCC_FOR_TARGET -E conftest.c | grep gcc_yay) > /dev/null 2>&1; then - have_gcc_for_target=yes -else - GCC_FOR_TARGET=${ncn_target_tool_prefix}gcc - have_gcc_for_target=no -fi -rm conftest.c - - - - -if test -z "$ac_cv_path_AR_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for ar in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5089: checking for ar in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/ar; then - AR_FOR_TARGET=`cd $with_build_time_tools && pwd`/ar - ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET - echo "$ac_t""$ac_cv_path_AR_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - AR_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ar` - test $AR_FOR_TARGET=ar && AR_FOR_TARGET= - ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET + DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi -if test -z "$ac_cv_path_AR_FOR_TARGET" ; then - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5107: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$AR_FOR_TARGET" in - /*) - ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_AR_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -AR_FOR_TARGET="$ac_cv_path_AR_FOR_TARGET" -if test -n "$AR_FOR_TARGET"; then - echo "$ac_t""$AR_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -fi -if test -z "$ac_cv_path_AR_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in ar; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5144: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_AR_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_AR_FOR_TARGET"; then - for ncn_progname in ar; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in gcc; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5161: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4848: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$AR_FOR_TARGET"; then - ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. + if test -n "$GCC_FOR_TARGET"; then + ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_GCC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" -if test -n "$AR_FOR_TARGET"; then - echo "$ac_t""$AR_FOR_TARGET" 1>&6 +GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" +if test -n "$GCC_FOR_TARGET"; then + echo "$ac_t""$GCC_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_AR_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_GCC_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5192: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4879: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$AR_FOR_TARGET"; then - ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. + if test -n "$GCC_FOR_TARGET"; then + ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR_FOR_TARGET="${ncn_progname}" + ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" -if test -n "$AR_FOR_TARGET"; then - echo "$ac_t""$AR_FOR_TARGET" 1>&6 +GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" +if test -n "$GCC_FOR_TARGET"; then + echo "$ac_t""$GCC_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_AR_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then - set dummy ar - if test $build = $target ; then - AR_FOR_TARGET="$2" - else - AR_FOR_TARGET="${ncn_target_tool_prefix}$2" fi -fi - -else - AR_FOR_TARGET=$ac_cv_path_AR_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_AS_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for as in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5242: checking for as in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/as; then - AS_FOR_TARGET=`cd $with_build_time_tools && pwd`/as - ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET - echo "$ac_t""$ac_cv_path_AS_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - AS_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=as` - test $AS_FOR_TARGET=as && AS_FOR_TARGET= - ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_AS_FOR_TARGET" ; then - # Extract the first word of "as", so it can be a program name with args. -set dummy as; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5260: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$AS_FOR_TARGET" in - /*) - ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_AS_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -AS_FOR_TARGET="$ac_cv_path_AS_FOR_TARGET" -if test -n "$AS_FOR_TARGET"; then - echo "$ac_t""$AS_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi + test -n "$ac_cv_prog_GCC_FOR_TARGET" && break +done -fi -if test -z "$ac_cv_path_AS_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in as; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5297: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_AS_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done +if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then + GCC_FOR_TARGET="${CC_FOR_TARGET}" fi -if test -z "$ac_cv_prog_AS_FOR_TARGET"; then - for ncn_progname in as; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in gcj; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5314: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4918: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$AS_FOR_TARGET"; then - ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. + if test -n "$GCJ_FOR_TARGET"; then + ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_GCJ_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" -if test -n "$AS_FOR_TARGET"; then - echo "$ac_t""$AS_FOR_TARGET" 1>&6 +GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" +if test -n "$GCJ_FOR_TARGET"; then + echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_AS_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_GCJ_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5345: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4949: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$AS_FOR_TARGET"; then - ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. + if test -n "$GCJ_FOR_TARGET"; then + ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS_FOR_TARGET="${ncn_progname}" + ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" -if test -n "$AS_FOR_TARGET"; then - echo "$ac_t""$AS_FOR_TARGET" 1>&6 +GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" +if test -n "$GCJ_FOR_TARGET"; then + echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_AS_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then - set dummy as + fi + test -n "$ac_cv_prog_GCJ_FOR_TARGET" && break +done + +if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then + set dummy gcj if test $build = $target ; then - AS_FOR_TARGET="$2" + GCJ_FOR_TARGET="$2" else - AS_FOR_TARGET="${ncn_target_tool_prefix}$2" + GCJ_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi -else - AS_FOR_TARGET=$ac_cv_path_AS_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for dlltool in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5395: checking for dlltool in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/dlltool; then - DLLTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/dlltool - ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET - echo "$ac_t""$ac_cv_path_DLLTOOL_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - DLLTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=dlltool` - test $DLLTOOL_FOR_TARGET=dlltool && DLLTOOL_FOR_TARGET= - ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5413: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$DLLTOOL_FOR_TARGET" in - /*) - ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_DLLTOOL_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -DLLTOOL_FOR_TARGET="$ac_cv_path_DLLTOOL_FOR_TARGET" -if test -n "$DLLTOOL_FOR_TARGET"; then - echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in dlltool; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5450: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_DLLTOOL_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET"; then - for ncn_progname in dlltool; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in gfortran; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5467: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4993: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$DLLTOOL_FOR_TARGET"; then - ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. + if test -n "$GFORTRAN_FOR_TARGET"; then + ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" -if test -n "$DLLTOOL_FOR_TARGET"; then - echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 +GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" +if test -n "$GFORTRAN_FOR_TARGET"; then + echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5498: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then +echo "configure:5024: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$DLLTOOL_FOR_TARGET"; then - ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. + if test -n "$GFORTRAN_FOR_TARGET"; then + ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}" + ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" -if test -n "$DLLTOOL_FOR_TARGET"; then - echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 +GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" +if test -n "$GFORTRAN_FOR_TARGET"; then + echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_DLLTOOL_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then - set dummy dlltool + fi + test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET" && break +done + +if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then + set dummy gfortran if test $build = $target ; then - DLLTOOL_FOR_TARGET="$2" + GFORTRAN_FOR_TARGET="$2" else - DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2" + GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi -else - DLLTOOL_FOR_TARGET=$ac_cv_path_DLLTOOL_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_LD_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for ld in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5548: checking for ld in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/ld; then - LD_FOR_TARGET=`cd $with_build_time_tools && pwd`/ld - ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET - echo "$ac_t""$ac_cv_path_LD_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - LD_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ld` - test $LD_FOR_TARGET=ld && LD_FOR_TARGET= - ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_LD_FOR_TARGET" ; then - # Extract the first word of "ld", so it can be a program name with args. -set dummy ld; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5566: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$LD_FOR_TARGET" in - /*) - ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_LD_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -LD_FOR_TARGET="$ac_cv_path_LD_FOR_TARGET" -if test -n "$LD_FOR_TARGET"; then - echo "$ac_t""$LD_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_LD_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in ld; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5603: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_LD_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_LD_FOR_TARGET"; then - for ncn_progname in ld; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in ld; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5620: checking for $ac_word" >&5 +echo "configure:5068: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5642,12 +5090,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_LD_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_LD_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5651: checking for $ac_word" >&5 +echo "configure:5099: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5673,11 +5121,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_LD_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_LD_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then set dummy ld if test $build = $target ; then @@ -5687,89 +5134,12 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then fi fi -else - LD_FOR_TARGET=$ac_cv_path_LD_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for lipo in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5701: checking for lipo in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/lipo; then - LIPO_FOR_TARGET=`cd $with_build_time_tools && pwd`/lipo - ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET - echo "$ac_t""$ac_cv_path_LIPO_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - LIPO_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=lipo` - test $LIPO_FOR_TARGET=lipo && LIPO_FOR_TARGET= - ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5719: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_LIPO_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$LIPO_FOR_TARGET" in - /*) - ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_LIPO_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -LIPO_FOR_TARGET="$ac_cv_path_LIPO_FOR_TARGET" -if test -n "$LIPO_FOR_TARGET"; then - echo "$ac_t""$LIPO_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in lipo; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5756: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_LIPO_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_LIPO_FOR_TARGET"; then - for ncn_progname in lipo; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in lipo; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5773: checking for $ac_word" >&5 +echo "configure:5143: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5795,12 +5165,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_LIPO_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_LIPO_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5804: checking for $ac_word" >&5 +echo "configure:5174: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5826,11 +5196,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_LIPO_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_LIPO_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then set dummy lipo if test $build = $target ; then @@ -5840,89 +5209,12 @@ if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then fi fi -else - LIPO_FOR_TARGET=$ac_cv_path_LIPO_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_NM_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for nm in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5854: checking for nm in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/nm; then - NM_FOR_TARGET=`cd $with_build_time_tools && pwd`/nm - ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET - echo "$ac_t""$ac_cv_path_NM_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - NM_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=nm` - test $NM_FOR_TARGET=nm && NM_FOR_TARGET= - ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_NM_FOR_TARGET" ; then - # Extract the first word of "nm", so it can be a program name with args. -set dummy nm; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5872: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$NM_FOR_TARGET" in - /*) - ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_NM_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -NM_FOR_TARGET="$ac_cv_path_NM_FOR_TARGET" -if test -n "$NM_FOR_TARGET"; then - echo "$ac_t""$NM_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_NM_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in nm; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5909: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_NM_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_NM_FOR_TARGET"; then - for ncn_progname in nm; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in nm; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5926: checking for $ac_word" >&5 +echo "configure:5218: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5948,12 +5240,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_NM_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_NM_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5957: checking for $ac_word" >&5 +echo "configure:5249: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5979,11 +5271,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_NM_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_NM_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then set dummy nm if test $build = $target ; then @@ -5993,89 +5284,12 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then fi fi -else - NM_FOR_TARGET=$ac_cv_path_NM_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for objdump in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6007: checking for objdump in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/objdump; then - OBJDUMP_FOR_TARGET=`cd $with_build_time_tools && pwd`/objdump - ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET - echo "$ac_t""$ac_cv_path_OBJDUMP_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - OBJDUMP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=objdump` - test $OBJDUMP_FOR_TARGET=objdump && OBJDUMP_FOR_TARGET= - ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6025: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$OBJDUMP_FOR_TARGET" in - /*) - ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_OBJDUMP_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -OBJDUMP_FOR_TARGET="$ac_cv_path_OBJDUMP_FOR_TARGET" -if test -n "$OBJDUMP_FOR_TARGET"; then - echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in objdump; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6062: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_OBJDUMP_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET"; then - for ncn_progname in objdump; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in objdump; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6079: checking for $ac_word" >&5 +echo "configure:5293: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6101,12 +5315,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6110: checking for $ac_word" >&5 +echo "configure:5324: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6132,11 +5346,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then set dummy objdump if test $build = $target ; then @@ -6146,89 +5359,12 @@ if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then fi fi -else - OBJDUMP_FOR_TARGET=$ac_cv_path_OBJDUMP_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for ranlib in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6160: checking for ranlib in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/ranlib; then - RANLIB_FOR_TARGET=`cd $with_build_time_tools && pwd`/ranlib - ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET - echo "$ac_t""$ac_cv_path_RANLIB_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - RANLIB_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ranlib` - test $RANLIB_FOR_TARGET=ranlib && RANLIB_FOR_TARGET= - ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6178: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$RANLIB_FOR_TARGET" in - /*) - ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_RANLIB_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -RANLIB_FOR_TARGET="$ac_cv_path_RANLIB_FOR_TARGET" -if test -n "$RANLIB_FOR_TARGET"; then - echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in ranlib; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6215: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_RANLIB_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_RANLIB_FOR_TARGET"; then - for ncn_progname in ranlib; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in ranlib; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6232: checking for $ac_word" >&5 +echo "configure:5368: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6254,12 +5390,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6263: checking for $ac_word" >&5 +echo "configure:5399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6285,103 +5421,20 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_RANLIB_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then - set dummy ranlib - if test $build = $target ; then - RANLIB_FOR_TARGET="$2" - else - RANLIB_FOR_TARGET="${ncn_target_tool_prefix}$2" - fi -fi - -else - RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for strip in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6313: checking for strip in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/strip; then - STRIP_FOR_TARGET=`cd $with_build_time_tools && pwd`/strip - ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET - echo "$ac_t""$ac_cv_path_STRIP_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - STRIP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=strip` - test $STRIP_FOR_TARGET=strip && STRIP_FOR_TARGET= - ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET fi -fi -if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6331: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$STRIP_FOR_TARGET" in - /*) - ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_STRIP_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -STRIP_FOR_TARGET="$ac_cv_path_STRIP_FOR_TARGET" -if test -n "$STRIP_FOR_TARGET"; then - echo "$ac_t""$STRIP_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi + test -n "$ac_cv_prog_RANLIB_FOR_TARGET" && break +done -fi -if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in strip; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6368: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_STRIP_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done +if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then + RANLIB_FOR_TARGET=":" fi -if test -z "$ac_cv_prog_STRIP_FOR_TARGET"; then - for ncn_progname in strip; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in strip; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6385: checking for $ac_word" >&5 +echo "configure:5438: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6407,12 +5460,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_STRIP_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_STRIP_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6416: checking for $ac_word" >&5 +echo "configure:5469: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6438,11 +5491,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_STRIP_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_STRIP_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then set dummy strip if test $build = $target ; then @@ -6452,89 +5504,12 @@ if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then fi fi -else - STRIP_FOR_TARGET=$ac_cv_path_STRIP_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for windres in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6466: checking for windres in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/windres; then - WINDRES_FOR_TARGET=`cd $with_build_time_tools && pwd`/windres - ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET - echo "$ac_t""$ac_cv_path_WINDRES_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - WINDRES_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=windres` - test $WINDRES_FOR_TARGET=windres && WINDRES_FOR_TARGET= - ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6484: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_WINDRES_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$WINDRES_FOR_TARGET" in - /*) - ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_WINDRES_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -WINDRES_FOR_TARGET="$ac_cv_path_WINDRES_FOR_TARGET" -if test -n "$WINDRES_FOR_TARGET"; then - echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in windres; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6521: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_WINDRES_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_WINDRES_FOR_TARGET"; then - for ncn_progname in windres; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in windres; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6538: checking for $ac_word" >&5 +echo "configure:5513: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6560,12 +5535,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6569: checking for $ac_word" >&5 +echo "configure:5544: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6591,11 +5566,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_WINDRES_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_WINDRES_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then set dummy windres if test $build = $target ; then @@ -6605,23 +5579,14 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then fi fi -else - WINDRES_FOR_TARGET=$ac_cv_path_WINDRES_FOR_TARGET -fi - RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET" echo $ac_n "checking where to find the target ar""... $ac_c" 1>&6 -echo "configure:6617: checking where to find the target ar" >&5 +echo "configure:5587: checking where to find the target ar" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6633,9 +5598,6 @@ else # An in-tree tool is available and we can use it AR_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ar' echo "$ac_t""just compiled" 1>&6 - elif expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool AR_FOR_TARGET='$(AR)' @@ -6646,15 +5608,10 @@ else fi fi echo $ac_n "checking where to find the target as""... $ac_c" 1>&6 -echo "configure:6650: checking where to find the target as" >&5 +echo "configure:5612: checking where to find the target as" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6666,9 +5623,6 @@ else # An in-tree tool is available and we can use it AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gas/as-new' echo "$ac_t""just compiled" 1>&6 - elif expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool AS_FOR_TARGET='$(AS)' @@ -6679,15 +5633,10 @@ else fi fi echo $ac_n "checking where to find the target cc""... $ac_c" 1>&6 -echo "configure:6683: checking where to find the target cc" >&5 +echo "configure:5637: checking where to find the target cc" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6699,9 +5648,6 @@ else # An in-tree tool is available and we can use it CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/' echo "$ac_t""just compiled" 1>&6 - elif expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool CC_FOR_TARGET='$(CC)' @@ -6712,15 +5658,10 @@ else fi fi echo $ac_n "checking where to find the target c++""... $ac_c" 1>&6 -echo "configure:6716: checking where to find the target c++" >&5 +echo "configure:5662: checking where to find the target c++" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6735,9 +5676,6 @@ else # An in-tree tool is available and we can use it CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' echo "$ac_t""just compiled" 1>&6 - elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool CXX_FOR_TARGET='$(CXX)' @@ -6748,15 +5686,10 @@ else fi fi echo $ac_n "checking where to find the target c++ for libstdc++""... $ac_c" 1>&6 -echo "configure:6752: checking where to find the target c++ for libstdc++" >&5 +echo "configure:5690: checking where to find the target c++ for libstdc++" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6771,9 +5704,6 @@ else # An in-tree tool is available and we can use it RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' echo "$ac_t""just compiled" 1>&6 - elif expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool RAW_CXX_FOR_TARGET='$(CXX)' @@ -6784,15 +5714,10 @@ else fi fi echo $ac_n "checking where to find the target dlltool""... $ac_c" 1>&6 -echo "configure:6788: checking where to find the target dlltool" >&5 +echo "configure:5718: checking where to find the target dlltool" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6804,9 +5729,6 @@ else # An in-tree tool is available and we can use it DLLTOOL_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/dlltool' echo "$ac_t""just compiled" 1>&6 - elif expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool DLLTOOL_FOR_TARGET='$(DLLTOOL)' @@ -6817,15 +5739,10 @@ else fi fi echo $ac_n "checking where to find the target gcc""... $ac_c" 1>&6 -echo "configure:6821: checking where to find the target gcc" >&5 +echo "configure:5743: checking where to find the target gcc" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6837,9 +5754,6 @@ else # An in-tree tool is available and we can use it GCC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/' echo "$ac_t""just compiled" 1>&6 - elif expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool GCC_FOR_TARGET='$()' @@ -6850,15 +5764,10 @@ else fi fi echo $ac_n "checking where to find the target gcj""... $ac_c" 1>&6 -echo "configure:6854: checking where to find the target gcj" >&5 +echo "configure:5768: checking where to find the target gcj" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6873,9 +5782,6 @@ else # An in-tree tool is available and we can use it GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/' echo "$ac_t""just compiled" 1>&6 - elif expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool GCJ_FOR_TARGET='$(GCJ)' @@ -6886,15 +5792,10 @@ else fi fi echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6 -echo "configure:6890: checking where to find the target gfortran" >&5 +echo "configure:5796: checking where to find the target gfortran" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6909,9 +5810,6 @@ else # An in-tree tool is available and we can use it GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/' echo "$ac_t""just compiled" 1>&6 - elif expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool GFORTRAN_FOR_TARGET='$(GFORTRAN)' @@ -6922,15 +5820,10 @@ else fi fi echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6 -echo "configure:6926: checking where to find the target ld" >&5 +echo "configure:5824: checking where to find the target ld" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6942,9 +5835,6 @@ else # An in-tree tool is available and we can use it LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/ld/ld-new' echo "$ac_t""just compiled" 1>&6 - elif expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool LD_FOR_TARGET='$(LD)' @@ -6955,20 +5845,12 @@ else fi fi echo $ac_n "checking where to find the target lipo""... $ac_c" 1>&6 -echo "configure:6959: checking where to find the target lipo" >&5 +echo "configure:5849: checking where to find the target lipo" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else - if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6 - elif test "x$target" = "x$host"; then + if test "x$target" = "x$host"; then # We can use an host tool LIPO_FOR_TARGET='$(LIPO)' echo "$ac_t""host tool" 1>&6 @@ -6978,15 +5860,10 @@ else fi fi echo $ac_n "checking where to find the target nm""... $ac_c" 1>&6 -echo "configure:6982: checking where to find the target nm" >&5 +echo "configure:5864: checking where to find the target nm" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6998,9 +5875,6 @@ else # An in-tree tool is available and we can use it NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/nm-new' echo "$ac_t""just compiled" 1>&6 - elif expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool NM_FOR_TARGET='$(NM)' @@ -7011,15 +5885,10 @@ else fi fi echo $ac_n "checking where to find the target objdump""... $ac_c" 1>&6 -echo "configure:7015: checking where to find the target objdump" >&5 +echo "configure:5889: checking where to find the target objdump" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -7031,9 +5900,6 @@ else # An in-tree tool is available and we can use it OBJDUMP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/objdump' echo "$ac_t""just compiled" 1>&6 - elif expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool OBJDUMP_FOR_TARGET='$(OBJDUMP)' @@ -7044,15 +5910,10 @@ else fi fi echo $ac_n "checking where to find the target ranlib""... $ac_c" 1>&6 -echo "configure:7048: checking where to find the target ranlib" >&5 +echo "configure:5914: checking where to find the target ranlib" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -7064,9 +5925,6 @@ else # An in-tree tool is available and we can use it RANLIB_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ranlib' echo "$ac_t""just compiled" 1>&6 - elif expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool RANLIB_FOR_TARGET='$(RANLIB)' @@ -7077,15 +5935,10 @@ else fi fi echo $ac_n "checking where to find the target strip""... $ac_c" 1>&6 -echo "configure:7081: checking where to find the target strip" >&5 +echo "configure:5939: checking where to find the target strip" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -7097,9 +5950,6 @@ else # An in-tree tool is available and we can use it STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip' echo "$ac_t""just compiled" 1>&6 - elif expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool STRIP_FOR_TARGET='$(STRIP)' @@ -7110,15 +5960,10 @@ else fi fi echo $ac_n "checking where to find the target windres""... $ac_c" 1>&6 -echo "configure:7114: checking where to find the target windres" >&5 +echo "configure:5964: checking where to find the target windres" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -7130,9 +5975,6 @@ else # An in-tree tool is available and we can use it WINDRES_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/windres' echo "$ac_t""just compiled" 1>&6 - elif expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool WINDRES_FOR_TARGET='$(WINDRES)' @@ -7171,7 +6013,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:7175: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:6017: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -7214,6 +6056,42 @@ case $build in esac +# It makes debugging easier if we create as symlinks the stage directories +# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not +# possible, however, we can resort to mv. +echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6 +echo "configure:6064: checking if symbolic links between directories work" >&5 +if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "${LN_S}" = "ln -s" \ + && mkdir confdir.s1 \ + && ln -s confdir.s1 confdir.s2 \ + && echo timestamp1 > confdir.s1/conftest.1 \ + && cmp confdir.s1/conftest.1 confdir.s2/conftest.1 \ + && echo timestamp2 > confdir.s2/conftest.2 \ + && cmp confdir.s1/conftest.2 confdir.s1/conftest.2 \ + && rm -f confdir.s2; then + gcc_cv_prog_ln_s_dir=yes +else + gcc_cv_prog_ln_s_dir=no +fi +rm -rf confdir.s1 confdir.s2 +fi + +echo "$ac_t""$gcc_cv_prog_ln_s_dir" 1>&6 + +case ${gcc_cv_prog_ln_s_dir} in + yes) + CREATE_LINK_TO_DIR='ln -s $$1 $$2' + UNDO_LINK_TO_DIR='rm -f $$1' ;; + *) + CREATE_LINK_TO_DIR='mv $$1 $$2' + UNDO_LINK_TO_DIR='mv $$1 $$2' ;; +esac + + + # Enable -Werror in bootstrap stage2 and later. # Change the default to "no" on release branches. # Check whether --enable-werror or --disable-werror was given. @@ -7406,6 +6284,7 @@ s%@gmplibs@%$gmplibs%g s%@gmpinc@%$gmpinc%g s%@stage1_languages@%$stage1_languages%g s%@SYSROOT_CFLAGS_FOR_TARGET@%$SYSROOT_CFLAGS_FOR_TARGET%g +s%@bootstrap_lean@%$bootstrap_lean%g /@serialization_dependencies@/r $serialization_dependencies s%@serialization_dependencies@%%g /@host_makefile_frag@/r $host_makefile_frag @@ -7417,6 +6296,8 @@ s%@alphaieee_frag@%%g /@ospace_frag@/r $ospace_frag s%@ospace_frag@%%g s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g +s%@BUILD_PREFIX@%$BUILD_PREFIX%g +s%@BUILD_PREFIX_1@%$BUILD_PREFIX_1%g s%@tooldir@%$tooldir%g s%@build_tooldir@%$build_tooldir%g s%@CONFIGURE_GDB_TK@%$CONFIGURE_GDB_TK%g @@ -7427,6 +6308,7 @@ s%@build_configdirs@%$build_configdirs%g s%@host_configargs@%$host_configargs%g s%@configdirs@%$configdirs%g s%@target_configargs@%$target_configargs%g +s%@target_configdirs@%$target_configdirs%g s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g s%@config_shell@%$config_shell%g s%@YACC@%$YACC%g @@ -7450,14 +6332,14 @@ s%@OBJCOPY@%$OBJCOPY%g s%@OBJDUMP@%$OBJDUMP%g s%@CXX@%$CXX%g s%@CFLAGS_FOR_BUILD@%$CFLAGS_FOR_BUILD%g +s%@AR_FOR_TARGET@%$AR_FOR_TARGET%g +s%@AS_FOR_TARGET@%$AS_FOR_TARGET%g s%@CC_FOR_TARGET@%$CC_FOR_TARGET%g s%@CXX_FOR_TARGET@%$CXX_FOR_TARGET%g +s%@DLLTOOL_FOR_TARGET@%$DLLTOOL_FOR_TARGET%g s%@GCC_FOR_TARGET@%$GCC_FOR_TARGET%g s%@GCJ_FOR_TARGET@%$GCJ_FOR_TARGET%g s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g -s%@AR_FOR_TARGET@%$AR_FOR_TARGET%g -s%@AS_FOR_TARGET@%$AS_FOR_TARGET%g -s%@DLLTOOL_FOR_TARGET@%$DLLTOOL_FOR_TARGET%g s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g s%@LIPO_FOR_TARGET@%$LIPO_FOR_TARGET%g s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g @@ -7474,6 +6356,8 @@ s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g s%@stage1_cflags@%$stage1_cflags%g +s%@CREATE_LINK_TO_DIR@%$CREATE_LINK_TO_DIR%g +s%@UNDO_LINK_TO_DIR@%$UNDO_LINK_TO_DIR%g s%@stage2_werror_flag@%$stage2_werror_flag%g CEOF diff --git a/configure.in b/configure.in index da7c63f4f..53973528c 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, +# 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -148,12 +148,10 @@ target_libraries="target-libiberty \ target-libstdc++-v3 \ target-libmudflap \ target-libssp \ - target-libgcc-math \ target-libgfortran \ ${libgcj} \ target-libobjc \ - target-libada \ - target-libgomp" + target-libada" # these tools are built using the target libraries, and are intended to # run only in the target environment @@ -305,6 +303,7 @@ AC_ARG_ENABLE(libada, ENABLE_LIBADA=$enableval, ENABLE_LIBADA=yes) if test "${ENABLE_LIBADA}" != "yes" ; then + noconfigdirs="$noconfigdirs target-libada" noconfigdirs="$noconfigdirs gnattools" fi @@ -312,18 +311,9 @@ AC_ARG_ENABLE(libssp, [ --enable-libssp Builds libssp directory], ENABLE_LIBSSP=$enableval, ENABLE_LIBSSP=yes) - -# Set the default so we build libgcc-math for ix86 and x86_64 -AC_ARG_ENABLE(libgcc-math, -[ --enable-libgcc-math Builds libgcc-math directory],, -[ -case "${target}" in - i?86-* | x86_64-* ) - enable_libgcc_math=yes ;; - *) - enable_libgcc_math=no ;; -esac -]) +if test "${ENABLE_LIBSSP}" != "yes" ; then + noconfigdirs="$noconfigdirs target-libssp" +fi # Save it here so that, even in case of --enable-libgcj, if the Java # front-end isn't enabled, we still get libgcj disabled. @@ -342,10 +332,16 @@ no) esac -# Disable libmudflap on some systems. -if test x$enable_libmudflap = x ; then +# Allow --disable-libmudflap to exclude target-libmudflap +case $enable_libmudflap in +yes) + ;; +no) + noconfigdirs="$noconfigdirs target-libmudflap" + ;; +"") case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu) # Enable libmudflap by default in GNU and friends. ;; *-*-freebsd*) @@ -356,25 +352,7 @@ if test x$enable_libmudflap = x ; then noconfigdirs="$noconfigdirs target-libmudflap" ;; esac -fi - -# Disable libgomp on non POSIX hosted systems. -if test x$enable_libgomp = x ; then - # Enable libgomp by default on hosted POSIX systems. - case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) - ;; - *-*-netbsd* | *-*-freebsd* | *-*-openbsd*) - ;; - *-*-solaris2* | *-*-sysv4* | *-*-irix* | *-*-osf* | *-*-hpux*) - ;; - *-*-darwin* | *-*-aix*) - ;; - *) - noconfigdirs="$noconfigdirs target-libgomp" - ;; - esac -fi +esac case "${target}" in @@ -678,9 +656,6 @@ case "${target}" in i[[3456789]]86-*-beos*) noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}" ;; - i[[3456789]]86-*-rdos*) - noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" - ;; m32r-*-*) noconfigdirs="$noconfigdirs ${libgcj}" ;; @@ -992,12 +967,6 @@ case "${host}" in powerpc-*-darwin*) host_makefile_frag="config/mh-ppc-darwin" ;; - powerpc-*-aix*) - host_makefile_frag="config/mh-ppc-aix" - ;; - rs6000-*-aix*) - host_makefile_frag="config/mh-ppc-aix" - ;; *-*-lynxos*) # /bin/cc is less than useful for our purposes. Always use GCC tentative_cc="/bin/gcc" @@ -1041,6 +1010,8 @@ if test "${build}" != "${host}" ; then CXX=${CXX-${host_alias}-c++} CXXFLAGS=${CXXFLAGS-"-g -O2"} CC_FOR_BUILD=${CC_FOR_BUILD-gcc} + BUILD_PREFIX=${build_alias}- + BUILD_PREFIX_1=${build_alias}- else # Set reasonable default values for some tools even if not Canadian. @@ -1052,6 +1023,9 @@ else # This is all going to change when we autoconfiscate... CC_FOR_BUILD="\$(CC)" + BUILD_PREFIX= + BUILD_PREFIX_1=loser- + AC_PROG_CC # We must set the default linker to the linker used by gcc for the correct @@ -1318,14 +1292,6 @@ Recognised languages are: ${potential_languages}]) ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[[^ ]]*//' -e 's/$/ --enable-languages='"$enable_languages"/ ` fi -# Handle --disable-<component> generically. -for dir in $configdirs $build_configdirs $target_configdirs ; do - dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g` - if eval test x\${enable_${dirname}} "=" xno ; then - noconfigdirs="$noconfigdirs $dir" - fi -done - # Remove the entries in $skipdirs and $noconfigdirs from $configdirs, # $build_configdirs and $target_configdirs. # If we have the source for $noconfigdirs entries, add them to $notsupp. @@ -1499,39 +1465,6 @@ if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then fi fi -# Set with_gnu_as and with_gnu_ld as appropriate. -# -# This is done by determining whether or not the appropriate directory -# is available, and by checking whether or not specific configurations -# have requested that this magic not happen. -# -# The command line options always override the explicit settings in -# configure.in, and the settings in configure.in override this magic. -# -# If the default for a toolchain is to use GNU as and ld, and you don't -# want to do that, then you should use the --without-gnu-as and -# --without-gnu-ld options for the configure script. - -if test x${use_gnu_as} = x && - echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then - with_gnu_as=yes - extra_host_args="$extra_host_args --with-gnu-as" -fi - -if test x${use_gnu_ld} = x && - echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then - with_gnu_ld=yes - extra_host_args="$extra_host_args --with-gnu-ld" -fi - -# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure -# can detect this case. - -if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then - with_newlib=yes - extra_host_args="$extra_host_args --with-newlib" -fi - # Handle ${copy_dirs} set fnord ${copy_dirs} shift @@ -1563,55 +1496,6 @@ while test $# != 0 ; do shift; shift done -# Determine a target-dependent exec_prefix that the installed -# gcc will search in. Keep this list sorted by triplet, with -# the *-*-osname triplets last. -md_exec_prefix= -case "${target}" in - alpha*-*-*vms*) - md_exec_prefix=/gnu/lib/gcc-lib - ;; - i[34567]86-pc-msdosdjgpp*) - md_exec_prefix=/dev/env/DJDIR/bin - ;; - i[34567]86-*-sco3.2v5*) - if test $with_gnu_as = yes; then - md_exec_prefix=/usr/gnu/bin - else - md_exec_prefix=/usr/ccs/bin/elf - fi - ;; - - mn10300-*-* | \ - powerpc-*-chorusos* | \ - powerpc*-*-eabi* | \ - powerpc*-*-sysv* | \ - powerpc*-*-kaos* | \ - s390x-ibm-tpf*) - md_exec_prefix=/usr/ccs/bin - ;; - sparc64-*-elf*) - ;; - v850*-*-*) - md_exec_prefix=/usr/ccs/bin - ;; - xtensa-*-elf*) - ;; - - *-*-beos* | \ - *-*-elf* | \ - *-*-hpux* | \ - *-*-netware* | \ - *-*-nto-qnx* | \ - *-*-rtems* | \ - *-*-solaris2* | \ - *-*-sysv[45]* | \ - *-*-vxworks* | \ - *-wrs-windiss) - md_exec_prefix=/usr/ccs/bin - ;; -esac - extra_arflags_for_target= extra_nmflags_for_target= extra_ranlibflags_for_target= @@ -1669,6 +1553,39 @@ case "${enable_target_optspace}:${target}" in ;; esac +# Set with_gnu_as and with_gnu_ld as appropriate. +# +# This is done by determining whether or not the appropriate directory +# is available, and by checking whether or not specific configurations +# have requested that this magic not happen. +# +# The command line options always override the explicit settings in +# configure.in, and the settings in configure.in override this magic. +# +# If the default for a toolchain is to use GNU as and ld, and you don't +# want to do that, then you should use the --without-gnu-as and +# --without-gnu-ld options for the configure script. + +if test x${use_gnu_as} = x && + echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then + with_gnu_as=yes + extra_host_args="$extra_host_args --with-gnu-as" +fi + +if test x${use_gnu_ld} = x && + echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then + with_gnu_ld=yes + extra_host_args="$extra_host_args --with-gnu-ld" +fi + +# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure +# can detect this case. + +if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then + with_newlib=yes + extra_host_args="$extra_host_args --with-newlib" +fi + # Default to using --with-stabs for certain targets. if test x${with_stabs} = x ; then case "${target}" in @@ -1813,7 +1730,7 @@ INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g` # not to nest @if/@endif pairs, because configure will not warn you at all. AC_ARG_ENABLE([bootstrap], -[ --enable-bootstrap Enable bootstrapping [yes if native build]],, +[ --enable-bootstrap[=lean] Enable bootstrapping [no]],, enable_bootstrap=default) # Issue errors and warnings for invalid/strange bootstrap combinations. @@ -1834,17 +1751,17 @@ case "$have_compiler:$host:$target:$enable_bootstrap" in enable_bootstrap=no ;; # We have a compiler and we are in a native configuration, bootstrap is ok - yes:$build:$build:yes) + yes:$build:$build:yes | yes:$build:$build:lean) ;; # Other configurations, but we have a compiler. Assume the user knows # what he's doing. - yes:*:*:yes) + yes:*:*:yes | yes:*:*:lean) AC_MSG_WARN([trying to bootstrap a cross compiler]) ;; # No compiler: if they passed --enable-bootstrap explicitly, fail - no:*:*:yes) + no:*:*:yes | no:*:*:lean) AC_MSG_ERROR([cannot bootstrap without a compiler]) ;; # Fail if wrong command line @@ -1856,10 +1773,15 @@ esac # Adjust the toplevel makefile according to whether bootstrap was selected. case "$enable_bootstrap" in yes) + bootstrap_lean='#' + bootstrap_suffix=bootstrap ;; + lean) + bootstrap_lean='' bootstrap_suffix=bootstrap ;; no) bootstrap_suffix=no-bootstrap ;; esac +AC_SUBST(bootstrap_lean) for module in ${build_configdirs} ; do if test -z "${no_recursion}" \ @@ -1874,13 +1796,10 @@ for module in ${build_configdirs} ; do /^@endif build-$module-$bootstrap_suffix\$/d" done for module in ${configdirs} ; do - if test -z "${no_recursion}"; then - for file in stage*-${module}/Makefile ${module}/Makefile; do - if test -f ${file}; then - echo 1>&2 "*** removing ${file} to force reconfigure" - rm -f ${file} - fi - done + if test -z "${no_recursion}" \ + && test -f ${module}/Makefile; then + echo 1>&2 "*** removing ${module}/Makefile to force reconfigure" + rm -f ${module}/Makefile fi extrasub="$extrasub /^@if $module\$/d @@ -2144,6 +2063,8 @@ AC_SUBST_FILE(ospace_frag) # Miscellanea: directories, flags, etc. AC_SUBST(RPATH_ENVVAR) +AC_SUBST(BUILD_PREFIX) +AC_SUBST(BUILD_PREFIX_1) AC_SUBST(tooldir) AC_SUBST(build_tooldir) AC_SUBST(CONFIGURE_GDB_TK) @@ -2160,7 +2081,7 @@ AC_SUBST(configdirs) # Target module lists & subconfigure args. AC_SUBST(target_configargs) - +AC_SUBST(target_configdirs) # Build tools. AC_SUBST(CC_FOR_BUILD) @@ -2251,34 +2172,21 @@ AC_SUBST(CFLAGS_FOR_BUILD) AC_SUBST(CXXFLAGS) # Target tools. -AC_ARG_WITH([build-time-tools], - [ --with-build-time-tools=path - use given path to find target tools during the build], - [case x"$withval" in - x/*) ;; - *) - with_build_time_tools= - AC_MSG_WARN([argument to --with-build-time-tools must be an absolute path]) - ;; - esac], - [with_build_time_tools=]) - +NCN_STRICT_CHECK_TARGET_TOOLS(AR_FOR_TARGET, ar) +NCN_STRICT_CHECK_TARGET_TOOLS(AS_FOR_TARGET, as) NCN_STRICT_CHECK_TARGET_TOOLS(CC_FOR_TARGET, cc gcc) NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TARGET, c++ g++ cxx gxx) +NCN_STRICT_CHECK_TARGET_TOOLS(DLLTOOL_FOR_TARGET, dlltool) NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET}) NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj) NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran) - -ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar) -ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as) -ACX_CHECK_INSTALLED_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool) -ACX_CHECK_INSTALLED_TARGET_TOOL(LD_FOR_TARGET, ld) -ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo) -ACX_CHECK_INSTALLED_TARGET_TOOL(NM_FOR_TARGET, nm) -ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump) -ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib, :) -ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip) -ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres) +NCN_STRICT_CHECK_TARGET_TOOLS(LD_FOR_TARGET, ld) +NCN_STRICT_CHECK_TARGET_TOOLS(LIPO_FOR_TARGET, lipo) +NCN_STRICT_CHECK_TARGET_TOOLS(NM_FOR_TARGET, nm) +NCN_STRICT_CHECK_TARGET_TOOLS(OBJDUMP_FOR_TARGET, objdump) +NCN_STRICT_CHECK_TARGET_TOOLS(RANLIB_FOR_TARGET, ranlib, :) +NCN_STRICT_CHECK_TARGET_TOOLS(STRIP_FOR_TARGET, strip) +NCN_STRICT_CHECK_TARGET_TOOLS(WINDRES_FOR_TARGET, windres) RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET" @@ -2373,6 +2281,36 @@ case $build in esac AC_SUBST(stage1_cflags) +# It makes debugging easier if we create as symlinks the stage directories +# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not +# possible, however, we can resort to mv. +AC_CACHE_CHECK([if symbolic links between directories work], +[gcc_cv_prog_ln_s_dir], +[if test "${LN_S}" = "ln -s" \ + && mkdir confdir.s1 \ + && ln -s confdir.s1 confdir.s2 \ + && echo timestamp1 > confdir.s1/conftest.1 \ + && cmp confdir.s1/conftest.1 confdir.s2/conftest.1 \ + && echo timestamp2 > confdir.s2/conftest.2 \ + && cmp confdir.s1/conftest.2 confdir.s1/conftest.2 \ + && rm -f confdir.s2; then + gcc_cv_prog_ln_s_dir=yes +else + gcc_cv_prog_ln_s_dir=no +fi +rm -rf confdir.s1 confdir.s2]) + +case ${gcc_cv_prog_ln_s_dir} in + yes) + CREATE_LINK_TO_DIR='ln -s $$1 $$2' + UNDO_LINK_TO_DIR='rm -f $$1' ;; + *) + CREATE_LINK_TO_DIR='mv $$1 $$2' + UNDO_LINK_TO_DIR='mv $$1 $$2' ;; +esac +AC_SUBST(CREATE_LINK_TO_DIR) +AC_SUBST(UNDO_LINK_TO_DIR) + # Enable -Werror in bootstrap stage2 and later. # Change the default to "no" on release branches. AC_ARG_ENABLE(werror, diff --git a/etc/ChangeLog b/etc/ChangeLog index 64fdee6c0..35e23bec2 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,11 +1,3 @@ -2006-02-27 Carlos O'Donell <carlos@codesourcery.com> - - * Makefile.in: TEXI2HTML uses makeinfo. Define - HTMLFILES. Add html targets. - * configure.texi: Use ifnottex. Add alternative - image format specifier as jpg. - * standards.texi: Use ifnottex. - 2005-10-21 Mark Mitchell <mark@codesourcery.com> * texi2pod.pl: Substitue for @value even when part of @include. diff --git a/etc/Makefile.in b/etc/Makefile.in index df461cfd5..b99daf99b 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -39,10 +39,7 @@ MAKEINFO = `if [ -f ../texinfo/makeinfo/makeinfo ]; \ TEXI2DVI = `if [ -f ../texinfo/util/texi2dvi ]; \ then echo ../texinfo/util/texi2dvi; \ else echo texi2dvi; fi` -TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \ - then echo "../texinfo/makeinfo/makeinfo --html"; \ - else echo "makeinfo --html"; fi` - +TEXI2HTML = texi2html DVIPS = dvips # Where to find texinfo.tex to format documentation with TeX. @@ -53,7 +50,6 @@ TEXIDIR = $(srcdir)/../texinfo INFOFILES = standards.info configure.info DVIFILES = standards.dvi configure.dvi -HTMLFILES = standards.html configure.html all: info install: install-info @@ -86,18 +82,6 @@ install-info: info done; \ fi -html: - for f in $(HTMLFILES); do \ - if test -f $(srcdir)/`echo $$f | sed -e 's/.html$$/.texi/'`; then \ - if $(MAKE) "TEXI2HTML=$(TEXI2HTML)" $$f; then \ - true; \ - else \ - exit 1; \ - fi; \ - fi; \ - done - - dvi: for f in $(DVIFILES); do \ if test -f $(srcdir)/`echo $$f | sed -e 's/.dvi$$/.texi/'`; then \ @@ -112,9 +96,6 @@ dvi: standards.info: $(srcdir)/standards.texi $(srcdir)/make-stds.texi $(MAKEINFO) --no-split -I$(srcdir) -o standards.info $(srcdir)/standards.texi -standards.html: $(srcdir)/standards.texi $(srcdir)/make-stds.texi - $(TEXI2HTML) --no-split -I$(srcdir) -o standards.html $(srcdir)/standards.texi - standards.dvi: $(srcdir)/standards.texi TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/standards.texi @@ -150,15 +131,12 @@ configure.ps: configure.dvi $(srcdir)/configdev.ein $(srcdir)/configbuild.ein rm -f configdev.eps configbuild.eps configure.html: $(srcdir)/configure.texi - cp $(srcdir)/configdev.jin configdev.jpg - cp $(srcdir)/configbuild.jin configbuild.jpg - $(TEXI2HTML) --no-split -I$(srcdir) -o configure.html $(srcdir)/configure.texi + $(TEXI2HTML) -split_chapter $(srcdir)/configure.texi clean: rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs - rm -f configdev.txt configbuild.txt - rm -f configdev.eps configbuild.eps + rm -f configdev.txt configbuild.txt configdev.eps configbuild.eps rm -f configdev.jpg configbuild.jpg mostlyclean: clean @@ -167,7 +145,6 @@ distclean: clean rm -f Makefile config.status config.cache maintainer-clean realclean: distclean - rm -f *.html* rm -f *.info* Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag) diff --git a/etc/configure.texi b/etc/configure.texi index 385a7c447..d69dc414d 100644 --- a/etc/configure.texi +++ b/etc/configure.texi @@ -10,7 +10,7 @@ * configure: (configure). The GNU configure and build system @end direntry -@ifnottex +@ifinfo This file documents the GNU configure and build system. Copyright (C) 1998 Cygnus Solutions. @@ -35,7 +35,7 @@ Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. -@end ifnottex +@end ifinfo @titlepage @title The GNU configure and build system @@ -60,7 +60,7 @@ except that this permission notice may be stated in a translation approved by the Free Software Foundation. @end titlepage -@ifnottex +@ifinfo @node Top @top GNU configure and build system @@ -79,7 +79,7 @@ The GNU configure and build system. * Index:: Index. @end menu -@end ifnottex +@end ifinfo @node Introduction @chapter Introduction @@ -1085,7 +1085,7 @@ are in rectangles with rounded corners @end ifnotinfo (e.g., @samp{autoheader} is the name of a tool, not the name of a file). -@image{configdev,,,,jpg} +@image{configdev} @node Written Developer Files @subsection Written Developer Files @@ -1235,7 +1235,7 @@ Here is a picture of the files which will be created at build time. @file{config.status} is both a created file and a shell script which is run to create other files, and the picture attempts to show that. -@image{configbuild,,,,jpg} +@image{configbuild} @node Build Files Description @subsection Build Files Description diff --git a/etc/standards.texi b/etc/standards.texi index 490e15b15..5aa508e01 100644 --- a/etc/standards.texi +++ b/etc/standards.texi @@ -6,13 +6,13 @@ @set lastupdate February 14, 2002 @c %**end of header -@ifnottex +@ifinfo @format START-INFO-DIR-ENTRY * Standards: (standards). GNU coding standards. END-INFO-DIR-ENTRY @end format -@end ifnottex +@end ifinfo @c @setchapternewpage odd @setchapternewpage off @@ -28,11 +28,11 @@ END-INFO-DIR-ENTRY @iftex @set CHAPTER chapter @end iftex -@ifnottex +@ifinfo @set CHAPTER node -@end ifnottex +@end ifinfo -@ifnottex +@ifinfo GNU Coding Standards Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -43,7 +43,7 @@ with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''. -@end ifnottex +@end ifinfo @titlepage @title GNU Coding Standards @@ -63,12 +63,12 @@ A copy of the license is included in the section entitled ``GNU Free Documentation License''. @end titlepage -@ifnottex +@ifinfo @node Top, Preface, (dir), (dir) @top Version Last updated @value{lastupdate}. -@end ifnottex +@end ifinfo @menu * Preface:: About the GNU Coding Standards diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index 7457e3dbf..639e58f44 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,49 +1,3 @@ -2006-03-02 DJ Delorie <dj@redhat.com> - - * m32c/exit.S: Preserve r1. - -2006-02-24 Paul Brook <paul@codesourcery.com> - - * arm/redboot-crt0.S: Use cps in Thumb-2 mode. - -2006-02-22 Nathan Sidwell <nathan@codesourcery.com> - - * m68k/Makefile.in (CF_SCRIPTS): New. - (all): Add CF_SCRIPTS. - (m5208evb.ld, m5213evb.ld, m5235evb.ld, m5272c3.ld, - m5282evb.ld): New targets - (install): Iterate over CF_SCRIPTS. - * m68k/crt0.S: Don't use dbra on any cf chips. - * m68k/dbug-cf.sc: New. - -2006-02-07 Paul Brook <paul@codesourcery.com> - - * arm/crt0.S: Add Thumb-2 startup code. - * arm/redboot-crt0.S: Ditto. - * arm/libcfunc.c (do_AngelSWI): Use AngelSWIInsn. - * arm/swi.h (AngelSWIInsn, AngelSWIAsm): Define. - * arm/trap.S: Disable for Thumb-2. - -2006-01-18 Nathan Sidwell <nathan@codesourcery.com> - - * mt/ms2.ld (.sram): Correct typo in section names. - -2006-01-16 Nathan Sidwell <nathan@codesourcery.com> - - * mt/Makefile.in (SCRIPTS, CRT0): Add ms2 files. - (crt0-ms2.o): New target. - * mt/crt0-ms2.S, mt/exit-ms2.c, mt/ms2.ld, mt/startup-ms2.S: New. - -2006-01-04 Paul Brook <paul@codesourcery.com> - - * m68k/bcc.ld: Add .got.plt and .got - * m68k/idp.ld: Ditto. - * m68k/idpgdb: Ditto. - * m68k/mvme135.ld: Ditto. - * m68k/sbc5204.ld: Ditto. - * m68k/sbc5206.ld: Ditto. - * m68k/sim.ld: Ditto. - 2005-12-13 DJ Delorie <dj@redhat.com> * m32c/crt0.S: Add support for preinit, init, and fini arrays, and diff --git a/libgloss/arm/crt0.S b/libgloss/arm/crt0.S index 823f409a4..bea289277 100644 --- a/libgloss/arm/crt0.S +++ b/libgloss/arm/crt0.S @@ -18,26 +18,15 @@ /* .text is used instead of .section .text so it works with arm-aout too. */ .text -#if defined(__thumb2__) - .syntax unified - .thumb -.macro FUNC_START name - .global \name - .thumb_func -\name: -.endm -#else .code 32 -.macro FUNC_START name - .global \name -\name: -.endm -#endif .align 0 - FUNC_START _mainCRTStartup - FUNC_START _start - FUNC_START start + .global _mainCRTStartup + .global _start + .global start +start: +_start: +_mainCRTStartup: #if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__) /* Annotation for EABI unwinding tables. */ .fnstart @@ -56,12 +45,7 @@ /* Issue Angel SWI to read stack info */ mov r0, #AngelSWI_Reason_HeapInfo adr r1, .LC0 /* point at ptr to 4 words to receive data */ -#if defined(__thumb2__) - bkpt AngelSWI -#else - /* We are always in ARM mode for startup */ - AngelSWIAsm AngelSWI_ARM -#endif + swi AngelSWI_ARM /* We are always in ARM mode for startup */ ldr r0, .LC0 /* point at values read */ ldr sp, [r0, #8] ldr sl, [r0, #12] @@ -140,8 +124,8 @@ sub a3, a3, a1 /* Third arg: length of block */ -#if defined(__thumb__) && !defined(__thumb2__) - /* Enter Thumb mode.... */ +#ifdef __thumb__ /* Enter Thumb mode.... */ + add a4, pc, #1 /* Get the address of the Thumb block */ bx a4 /* Go there and start Thumb decoding */ @@ -181,7 +165,7 @@ __change_mode: #else mov r0, #AngelSWI_Reason_GetCmdLine adr r1, .LC30 /* Space for command line */ - AngelSWIAsm AngelSWI + swi AngelSWI ldr r1, .LC30 #endif /* Parse string at r1 */ @@ -303,7 +287,7 @@ __change_mode: bl FUNCTION (exit) /* Should not return. */ -#if defined(__thumb__) && !defined(__thumb2__) +#ifdef __thumb__ /* Come out of Thumb mode. This code should be redundant. */ mov a4, pc diff --git a/libgloss/arm/libcfunc.c b/libgloss/arm/libcfunc.c index 4f131939a..ffad2e7e0 100644 --- a/libgloss/arm/libcfunc.c +++ b/libgloss/arm/libcfunc.c @@ -15,7 +15,7 @@ static inline int do_AngelSWI (int reason, void * arg) { int value; - asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0" + asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0" : "=r" (value) /* Outputs */ : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */ : "r0", "r1", "lr" diff --git a/libgloss/arm/redboot-crt0.S b/libgloss/arm/redboot-crt0.S index 2499ac091..f2963eeb4 100644 --- a/libgloss/arm/redboot-crt0.S +++ b/libgloss/arm/redboot-crt0.S @@ -12,34 +12,18 @@ .text /* Setup the assembly entry point. */ -#ifdef __thumb2__ -.macro FUNC_START name - .global \name - .thumb_func -\name: -.endm - .syntax unified - .thumb -#else -.macro FUNC_START name - .global \name -\name: -.endm - .code 32 -#endif - FUNC_START SYM_NAME(start) - FUNC_START SYM_NAME(_start) + .code 32 + .globl SYM_NAME(start) + .globl SYM_NAME(_start) +SYM_NAME(start): +SYM_NAME(_start): mov fp, #0 /* Null frame pointer. */ mov r7, #0 /* Null frame pointer for Thumb. */ /* Enable interrupts for gdb debugging. */ -#ifdef __thumb2__ - cpsie if -#else mrs r0, cpsr bic r0, r0, #0xC0 msr cpsr, r0 -#endif mov a2, #0 /* Second arg: fill value. */ ldr a1, .LC1 /* First arg: start of memory block. */ @@ -62,7 +46,7 @@ /* Nothing to left to clear. */ #endif -#if defined(__thumb__) && !defined(__thumb2__) /* Enter Thumb mode. */ +#ifdef __thumb__ /* Enter Thumb mode. */ add a4, pc, #1 /* Get the address of the Thumb block. */ bx a4 /* Go there and start Thumb decoding. */ diff --git a/libgloss/arm/swi.h b/libgloss/arm/swi.h index f5c910313..15c3866a1 100644 --- a/libgloss/arm/swi.h +++ b/libgloss/arm/swi.h @@ -33,14 +33,6 @@ #else #define AngelSWI AngelSWI_ARM #endif -/* For Thumb-2 code use the BKPT instruction instead of SWI. */ -#ifdef __thumb2__ -#define AngelSWIInsn "bkpt" -#define AngelSWIAsm bkpt -#else -#define AngelSWIInsn "swi" -#define AngelSWIAsm swi -#endif /* The reason codes: */ #define AngelSWI_Reason_Open 0x01 diff --git a/libgloss/arm/syscalls.c b/libgloss/arm/syscalls.c index a6d2f747e..456b68129 100644 --- a/libgloss/arm/syscalls.c +++ b/libgloss/arm/syscalls.c @@ -99,7 +99,7 @@ static inline int do_AngelSWI (int reason, void * arg) { int value; - asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0" + asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0" : "=r" (value) /* Outputs */ : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */ : "r0", "r1", "r2", "r3", "ip", "lr", "memory", "cc" diff --git a/libgloss/arm/trap.S b/libgloss/arm/trap.S index 21b6937f9..328fabca5 100644 --- a/libgloss/arm/trap.S +++ b/libgloss/arm/trap.S @@ -1,5 +1,4 @@ /* Run-time exception support */ -#if !defined(__thumb2__) #include "swi.h" /* .text is used instead of .section .text so it works with arm-aout too. */ @@ -92,4 +91,3 @@ __rt_stkovf_split_big: @ We now know how much extra stack the function requires. @ Terminate the program for the moment: swi SWI_Exit -#endif diff --git a/libgloss/m32c/exit.S b/libgloss/m32c/exit.S index e27d73d30..7279d13a1 100644 --- a/libgloss/m32c/exit.S +++ b/libgloss/m32c/exit.S @@ -34,7 +34,5 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .global __exit __exit: - push.w r1 jsr.a __m32c_fini - pop.w r1 SYSCALL(SYS_exit) diff --git a/libgloss/m68k/Makefile.in b/libgloss/m68k/Makefile.in index 8faf5ffcf..5df402288 100644 --- a/libgloss/m68k/Makefile.in +++ b/libgloss/m68k/Makefile.in @@ -123,8 +123,6 @@ IDPGDB_OBJS= leds.o idp-inbyte.o idp-gdb-outbyte.o mc68ec.o DBUG_BSP= libdbug.a DBUG_OBJS= dbug-exit.o dbug-inbyte.o dbug-outbyte.o -CF_SCRIPTS= m5208evb.ld m5213evb.ld m5235evb.ld m5272c3.ld m5282evb.ld - # Host specific makefile fragment comes in here. @host_makefile_frag@ @@ -132,7 +130,7 @@ CF_SCRIPTS= m5208evb.ld m5213evb.ld m5235evb.ld m5272c3.ld m5282evb.ld # build a test program for each target board. Just trying to get # it to link is a good test, so we ignore all the errors for now. # -all: ${SIM_CRT0} ${SIM_BSP} ${CRT0} ${BCC_BSP} ${IDP_BSP} ${IDPGDB_BSP} ${MVME135_BSP} ${MVME162_BSP} ${DBUG_BSP} ${CF_SCRIPTS} +all: ${SIM_CRT0} ${SIM_BSP} ${CRT0} ${BCC_BSP} ${IDP_BSP} ${IDPGDB_BSP} ${MVME135_BSP} ${MVME162_BSP} ${DBUG_BSP} # # here's where we build the board support packages for each target @@ -165,21 +163,6 @@ ${MVME162_BSP}: $(OBJS) ${MVME162_OBJS} ${AR} ${ARFLAGS} $@ $(OBJS) ${MVME162_OBJS} ${RANLIB} $@ -m5208evb.ld: dbug-cf.sc Makefile - RAMSTART=1024M RAMSIZE=16M RAMDBUG=128K ${SHELL} $< > $@ - -m5213evb.ld: dbug-cf.sc Makefile - RAMSTART=512M RAMSIZE=32K RAMDBUG=8K ${SHELL} $< > $@ - -m5235evb.ld: dbug-cf.sc Makefile - RAMSTART=0M RAMSIZE=16M RAMDBUG=64K ${SHELL} $< > $@ - -m5272c3.ld: dbug-cf.sc Makefile - RAMSTART=0M RAMSIZE=4M RAMDBUG=128K ${SHELL} $< > $@ - -m5282evb.ld: dbug-cf.sc Makefile - RAMSTART=0M RAMSIZE=16M RAMDBUG=64K ${SHELL} $< > $@ - leds.o: ${srcdir}/leds.c $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $< @@ -300,9 +283,6 @@ install: $(INSTALL_PROGRAM) $(DBUG_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(DBUG_BSP) $(INSTALL_DATA) ${srcdir}/sbc5204.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/sbc5204.ld $(INSTALL_DATA) ${srcdir}/sbc5206.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/sbc5206.ld - for script in $(CF_SCRIPTS) ; \ - do $(INSTALL_DATA) $$script $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$script ; \ - done # target specific makefile fragment comes in here. @target_makefile_frag@ diff --git a/libgloss/m68k/bcc.ld b/libgloss/m68k/bcc.ld index b9acfb365..562a79a3f 100644 --- a/libgloss/m68k/bcc.ld +++ b/libgloss/m68k/bcc.ld @@ -99,7 +99,6 @@ SECTIONS .data : { - *(.got.plt) *(.got) *(.shdata) *(.data .data.*) _edata = .; diff --git a/libgloss/m68k/crt0.S b/libgloss/m68k/crt0.S index 1aa0dd6bb..321b97f03 100644 --- a/libgloss/m68k/crt0.S +++ b/libgloss/m68k/crt0.S @@ -84,7 +84,7 @@ SYM (start): subql IMM(1), d0 2: clrb (a0)+ -#if !defined(__mcoldfire__) +#if !defined(__mcoldfire__) && !defined(__mcf5200__) dbra d0, 2b clrw d0 subql IMM(1), d0 diff --git a/libgloss/m68k/dbug-cf.sc b/libgloss/m68k/dbug-cf.sc deleted file mode 100644 index 0342ed1fd..000000000 --- a/libgloss/m68k/dbug-cf.sc +++ /dev/null @@ -1,112 +0,0 @@ -# a linker script template. -# RAMSTART - start of board's ram -# RAMSIZE - size of board's ram -# RAMDBUG - bytes at start of RAM for DBUG use - -cat <<EOF -STARTUP(crt0.o) -OUTPUT_ARCH(m68k) -/* DBUG loads SREC files */ -/*OUTPUT_FORMAT(srec)*/ -ENTRY(start) -SEARCH_DIR(.) -GROUP(-ldbug -lc -lgcc -ldbug) -__DYNAMIC = 0; - -MEMORY -{ - ram (rwx) : ORIGIN = ${RAMSTART} + ${RAMDBUG:-0}, - LENGTH = ${RAMSIZE} - ${RAMDBUG:-0} -} - -PROVIDE (__stack = ${RAMSTART} + ${RAMSIZE}); - -/* - * Initalize some symbols to be zero so we can reference them in the - * crt0 without core dumping. These functions are all optional, but - * we do this so we can have our crt0 always use them if they exist. - * This is so BSPs work better when using the crt0 installed gcc. - * We have to initalize them twice, so we cover a.out (which prepends - * an underscore) and coff object file formats. - */ -PROVIDE (hardware_init_hook = 0); -PROVIDE (_hardware_init_hook = 0); -PROVIDE (software_init_hook = 0); -PROVIDE (_software_init_hook = 0); -/* - * stick everything in ram (of course) - */ -SECTIONS -{ - .text : - { - CREATE_OBJECT_SYMBOLS - *(.text .text.*) - - . = ALIGN(0x4); - /* These are for running static constructors and destructors under ELF. */ - KEEP (*crtbegin.o(.ctors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - - *(.rodata .rodata.*) - - . = ALIGN(0x4); - *(.gcc_except_table) - - . = ALIGN(0x4); - *(.eh_frame) - - . = ALIGN(0x4); - __INIT_SECTION__ = . ; - LONG (0x4e560000) /* linkw %fp,#0 */ - *(.init) - SHORT (0x4e5e) /* unlk %fp */ - SHORT (0x4e75) /* rts */ - - . = ALIGN(0x4); - __FINI_SECTION__ = . ; - LONG (0x4e560000) /* linkw %fp,#0 */ - *(.fini) - SHORT (0x4e5e) /* unlk %fp */ - SHORT (0x4e75) /* rts */ - - _etext = .; - *(.lit) - } > ram - - .data : - { - *(.got.plt) *(.got) - *(.shdata) - *(.data .data.*) - _edata = .; - } > ram - - .bss : - { - . = ALIGN(0x4); - __bss_start = . ; - *(.shbss) - *(.bss .bss.*) - *(COMMON) - _end = ALIGN (0x8); - __end = _end; - } > ram - - .stab 0 (NOLOAD) : - { - *(.stab) - } - - .stabstr 0 (NOLOAD) : - { - *(.stabstr) - } -} -EOF diff --git a/libgloss/m68k/idp.ld b/libgloss/m68k/idp.ld index 73597832d..fca2809c7 100644 --- a/libgloss/m68k/idp.ld +++ b/libgloss/m68k/idp.ld @@ -118,7 +118,6 @@ SECTIONS .data : { - *(.got.plt) *(.got) *(.shdata) *(.data .data.*) _edata = .; diff --git a/libgloss/m68k/idpgdb.ld b/libgloss/m68k/idpgdb.ld index a8a13ee02..53b56b70c 100644 --- a/libgloss/m68k/idpgdb.ld +++ b/libgloss/m68k/idpgdb.ld @@ -118,7 +118,6 @@ SECTIONS .data : { - *(.got.plt) *(.got) *(.shdata) *(.data .data.*) _edata = .; diff --git a/libgloss/m68k/mvme135.ld b/libgloss/m68k/mvme135.ld index fd52e4e3f..8b6563005 100644 --- a/libgloss/m68k/mvme135.ld +++ b/libgloss/m68k/mvme135.ld @@ -100,7 +100,6 @@ SECTIONS .data : { - *(.got.plt) *(.got) *(.shdata) *(.data .data.*) _edata = .; diff --git a/libgloss/m68k/mvme162.ld b/libgloss/m68k/mvme162.ld index 18d5f62d2..6d1bf875b 100644 --- a/libgloss/m68k/mvme162.ld +++ b/libgloss/m68k/mvme162.ld @@ -101,7 +101,6 @@ SECTIONS .data : { - *(.got.plt) *(.got) *(.shdata) *(.data .data.*) _edata = .; diff --git a/libgloss/m68k/sbc5204.ld b/libgloss/m68k/sbc5204.ld index da10fe811..f95f5a2d0 100644 --- a/libgloss/m68k/sbc5204.ld +++ b/libgloss/m68k/sbc5204.ld @@ -99,7 +99,6 @@ SECTIONS .data : { - *(.got.plt) *(.got) *(.shdata) *(.data .data.*) _edata = .; diff --git a/libgloss/m68k/sbc5206.ld b/libgloss/m68k/sbc5206.ld index e0707d8a2..aa24be169 100644 --- a/libgloss/m68k/sbc5206.ld +++ b/libgloss/m68k/sbc5206.ld @@ -99,7 +99,6 @@ SECTIONS .data : { - *(.got.plt) *(.got) *(.shdata) *(.data .data.*) _edata = .; diff --git a/libgloss/m68k/sim.ld b/libgloss/m68k/sim.ld index 57a41d0cf..edc049063 100644 --- a/libgloss/m68k/sim.ld +++ b/libgloss/m68k/sim.ld @@ -59,7 +59,6 @@ SECTIONS .data : { - *(.got.plt) *(.got) *(.shdata) *(.data .data.*) _edata = .; diff --git a/libgloss/mt/Makefile.in b/libgloss/mt/Makefile.in index 031c864ba..d8d9fa182 100644 --- a/libgloss/mt/Makefile.in +++ b/libgloss/mt/Makefile.in @@ -56,10 +56,10 @@ OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \ then echo ${objroot}/../binutils/objcopy ; \ else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi` -SCRIPTS = 16-002.ld 16-003.ld 64-001.ld ms2.ld -CRT0 = crt0.o crt0-64-001.o crt0-16-002.o crt0-16-003.o crt0-ms2.o \ - startup-64-001.o startup-16-002.o startup-16-003.o startup-ms2.o \ - exit.o exit-64-001.o exit-16-002.o exit-16-003.o exit-ms2.o +SCRIPTS = 16-002.ld 16-003.ld 64-001.ld +CRT0 = crt0.o crt0-64-001.o crt0-16-002.o crt0-16-003.o \ + startup-64-001.o startup-16-002.o startup-16-003.o \ + exit.o exit-64-001.o exit-16-002.o exit-16-003.o SIM_BSP = libsim.a SIM_OBJS = access.o chmod.o close.o \ @@ -97,7 +97,6 @@ crt0.o: $(srcdir)/crt0.S crt0-16-002.o: $(srcdir)/crt0-16-002.S crt0-16-003.o: $(srcdir)/crt0-16-003.S crt0-64-001.o: $(srcdir)/crt0-64-001.S -crt0-ms2.o: $(srcdir)/crt0-ms2.S trap.o: $(srcdir)/trap.S diff --git a/libgloss/mt/crt0-ms2.S b/libgloss/mt/crt0-ms2.S deleted file mode 100644 index 2efaebdea..000000000 --- a/libgloss/mt/crt0-ms2.S +++ /dev/null @@ -1,121 +0,0 @@ -; crt0.s - Startup code for the ms2. This code initializes the C -; run-time model. -; -; -; Copyright 2001, 2002, 2003, 2004 Morpho Technologies -; - - ; Create a label for the start of the eh_frame section. - .section .eh_frame -__eh_frame_begin: - - .text - .global _start -_start: - ;; Initialize the stack pointer - ldui sp, #%hi16(__stack) - addui sp, sp, #%lo16(__stack) - or fp, sp, sp - ;; Zero the bss space - ldui r9, #%hi16(__bss_start) - addui r9, r9, #%lo16(__bss_start) - ldui r10, #%hi16(__bss_end) - addui r10, r10, #%lo16(__bss_end) - or r0, r0, r0 - brle r10, r9, .Lnext1 - or r0, r0, r0 -.Lcpy0: - stw r0, r9, #0 - addi r9, r9, #4 - or r0, r0, r0 ; nop - brle r9, r10, .Lcpy0 - or r0, r0, r0 ; nop - -.Lnext1: - ;; Copy data from ROM to Frame Buffer (on-chip memory) - ldui r9, #%hi16(_fbdata_start) - ori r9, r9, #%lo16(_fbdata_start) - ldui r10, #%hi16(_fbdata_end) - ori r10, r10, #%lo16(_fbdata_end) - ldui r11, #%hi16(_fbdata_vma) - brle r10, r9, .Lnext2 - ori r11, r11, #%lo16(_fbdata_vma) -.Lcpy1: - ldw r5, r9, #$0 - addi r9, r9, #$4 - stw r5, r11, #$0 - brlt r9, r10, .Lcpy1 - addi r11, r11, #$4 - -.Lnext2: - ;; Zero the frame buffer bss section - ldui r9, #%hi16(_fbbss_start) - ori r9, r9, #%lo16(_fbbss_start) - ldui r10, #%hi16(_fbbss_end) - ori r10, r10, #%lo16(_fbbss_end) - or r0, r0, r0 - brle r10, r9, .Lnext3 - or r0, r0, r0 -.Lcpy2: - stw r0, r9, #$0 - addi r9, r9, #$4 - or r0, r0, r0 - brle r9, r10, .Lcpy2 - or r0, r0, r0 - -.Lnext3: - ;; Copy data from ROM to SRAM (another on-chip memory) - ldui r9, #%hi16(_sram_data_start) - ori r9, r9, #%lo16(_sram_data_start) - ldui r10, #%hi16(_sram_data_end) - ori r10, r10, #%lo16(_sram_data_end) - ldui r11, #%hi16(_sram_data_vma) - brle r10, r9, .Lnext4 - ori r11, r11, #%lo16(_sram_data_vma) -.Lcpy3: - ldw r5, r9, #$0 - addi r9, r9, #$4 - stw r5, r11, #$0 - brlt r9, r10, .Lcpy3 - addi r11, r11, #$4 - -.Lnext4: - ;; Call global and static constructors - ldui r10, #%hi16(_init) - ori r10, r10, #%lo16(_init) - or r0, r0, r0 ; nop - or r0, r0, r0 ; nop, added 06Sep05 - jal r14, r10 - or r0, r0, r0 ; nop - - ;; Call main - ldui r10, #%hi16(main) - ori r10, r10, #%lo16(main) - or r0, r0, r0 ; nop - or r0, r0, r0 ; nop, added 06Sep05 - jal r14, r10 - or r0, r0, r0 ; nop - - ;; DJK - Added 12Nov01. Pass main's return value to exit. - or r1, r11, r0 - - ;; Jump to exit - ldui r10, #%hi16(exit) - ori r10, r10, #%lo16(exit) - or r0, r0, r0 ; nop - or r0, r0, r0 ; nop, added 06Sep05 - jal r14, r10 - or r0, r0, r0 ; nop - - ;; Exit does not return, however, this code is to catch an - ;; error if it does. Set the processor into sleep mode. - ori r1, r0, #$1 - stw r1, r0, #%lo16(_DEBUG_HALT_REG) - or r0, r0, r0 - or r0, r0, r0 - or r0, r0, r0 - or r0, r0, r0 - or r0, r0, r0 -.Lend: - jmp .Lend - or r0, r0, r0 diff --git a/libgloss/mt/exit-ms2.c b/libgloss/mt/exit-ms2.c deleted file mode 100644 index 93a3f852b..000000000 --- a/libgloss/mt/exit-ms2.c +++ /dev/null @@ -1,12 +0,0 @@ -#include <_ansi.h> -#include <sys/types.h> -#include <sys/stat.h> - - -void _exit (n) -{ - // Set bit #0 in the _DEBUG_HALT_REG to trigger program exit to - // the simulator. (The simulator will return a SIGQUIT signal.) - asm("ori r1, r0, #$1\n"); - asm("stw r1, r0, #$fffff300\n"); -} // exit diff --git a/libgloss/mt/ms2.ld b/libgloss/mt/ms2.ld deleted file mode 100644 index 3dac307af..000000000 --- a/libgloss/mt/ms2.ld +++ /dev/null @@ -1,271 +0,0 @@ -OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt") -OUTPUT_ARCH(mt) -ENTRY(__boot_start) - -/* Do we need any of these for elf? - __DYNAMIC = 0; */ -MEMORY -{ - ram (rwx) : ORIGIN = 0x0, LENGTH = 16M - sram (wx) : ORIGIN = 0xfef00000, LENGTH = 64K - frame-buffer (w) : ORIGIN = 0xff000000, LENGTH = 80K - dma-ram (w) : ORIGIN = 0x1000000, LENGTH = 32M - ports (w) : ORIGIN = 0xfffff000, LENGTH = 4K -} -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - . = 0x0; - PROVIDE(__executable_start = 0x0); - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) } - .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) } - .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } - .rel.data.rel.ro : { *(.rel.data.rel.ro*) } - .rela.data.rel.ro : { *(.rela.data.rel.ro*) } - .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) } - .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } - .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } - .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } - .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } - .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) } - .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) } - .rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) } - .rela.sbss : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) } - .rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) } - .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) } - .rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) } - .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } - .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } - .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - - .startup : { *startup-16-003.o(.startup) } >ram =0 - . = 0x40; - - .init : { KEEP (*(.init)) } >ram =0 - .plt : { *(.plt) } >ram - .text : - { - *startup-16-004.o(.text); - *(.text .stub .text.* .gnu.linkonce.t.*) - KEEP (*(.text.*personality*)) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - } >ram =0 - .fini : { KEEP (*(.fini)) } >ram =0 - PROVIDE (__etext = .); - PROVIDE (_etext = .); - PROVIDE (etext = .); - .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } >ram - .rodata1 : { *(.rodata1) } >ram - .sdata2 : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } >ram - .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } >ram - .eh_frame_hdr : { *(.eh_frame_hdr) } >ram - .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) } >ram - .gcc_except_table : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - . = ALIGN(256) + (. & (256 - 1)); - /* Exception handling */ - .eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) } >ram - .gcc_except_table : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram - /* Thread Local Storage sections */ - .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } >ram - .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } >ram - /* Ensure the __preinit_array_start label is properly aligned. We - could instead move the label definition inside the section, but - the linker would then create the section even if it turns out to - be empty, which isn't pretty. */ - . = ALIGN(32 / 8); - PROVIDE (__preinit_array_start = .); - .preinit_array : { *(.preinit_array) } >ram - PROVIDE (__preinit_array_end = .); - PROVIDE (__init_array_start = .); - .init_array : { *(.init_array) } >ram - PROVIDE (__init_array_end = .); - PROVIDE (__fini_array_start = .); - .fini_array : { *(.fini_array) } >ram - PROVIDE (__fini_array_end = .); - .ctors : - { - /* gcc uses crtbegin.o to find the start of - the constructors, so we make sure it is - first. Because this is a wildcard, it - doesn't matter if the user does not - actually link against crtbegin.o; the - linker won't look for a file to match a - wildcard. The wildcard also means that it - doesn't matter which directory crtbegin.o - is in. */ - KEEP (*crtbegin.o(.ctors)) - /* We don't want to include the .ctor section from - from the crtend.o file until after the sorted ctors. - The .ctor section from the crtend file contains the - end of ctors marker and it must be last */ - KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - } >ram - .dtors : - { - KEEP (*crtbegin*.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - } >ram - .jcr : { KEEP (*(.jcr)) } >ram - .data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro*) } >ram - .dynamic : { *(.dynamic) } >ram - - /* DJK - Re-align the data section from the read-only section. */ - . = ALIGN(16) + (. & (16 - 1)); - PROVIDE (_data = .); - .data : - { - *(.data .data.* .gnu.linkonce.d.*) - KEEP (*(.gnu.linkonce.d.*personality*)) - SORT(CONSTRUCTORS) - } >ram - .data1 : { *(.data1) } >ram - .got : { *(.got.plt) *(.got) } >ram - - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ - .sdata : { *(.sdata .sdata.* .gnu.linkonce.s.*) } >ram - _edata = .; - PROVIDE ( edata = . ); - .sbss : - { - PROVIDE (__sbss_start = .); - PROVIDE (___sbss_start = .); - *(.dynsbss) - *(.sbss .sbss.* .gnu.linkonce.sb.*) - *(.scommon) - PROVIDE (__sbss_end = .); - PROVIDE (___sbss_end = .); - } >ram - .bss : - { - *(.dynbss) - *(.bss .bss.* .gnu.linkonce.b.*) - *(COMMON) - /* Align here to ensure that the .bss section occupies space up to - _end. Align after .bss to ensure correct alignment even if the - .bss section disappears because there are no input sections. */ - . = ALIGN(32 / 8); - } >ram - . = ALIGN(32 / 8); - __bss_start = ADDR ( .sbss ) ; - __bss_end = __bss_start + SIZEOF ( .sbss ) + SIZEOF ( .bss ) - 4 ; - _end = .; - PROVIDE (end = .); - - /* DJK - Initialized frame buffer data is copied from RAM to FB. */ - .auxbss : AT (ADDR(.bss) + SIZEOF(.bss)) { *(.auxbss) } >frame-buffer - .auxdata : AT (LOADADDR(.auxbss) + SIZEOF(.auxbss)) - { - *(.auxdata.bank0) - . = ALIGN(0x4000); - *(.auxdata.bank1) - . = ALIGN(0x4000); - *(.auxdata.bank2) - . = ALIGN(0x4000); - *(.auxdata.bank3) - . = ALIGN(0x4000); - *(.auxdata.bank4) - *(.auxdata) - } >frame-buffer - - _fbbss_start = ADDR ( .auxbss ); - _fbbss_end = _fbbss_start + SIZEOF ( .auxbss ) - 4; - _fbdata_start = LOADADDR ( .auxdata ); - _fbdata_end = _fbdata_start + SIZEOF ( .auxdata ) ; - _fbdata_vma = ADDR ( .auxdata ); - - PROVIDE (__FRAME_BUFFER_START = ADDR(.auxbss) ); - PROVIDE (__FRAME_BUFFER_SIZE = 0x14000); - PROVIDE (__FRAME_BUFFER_END = __FRAME_BUFFER_START + __FRAME_BUFFER_SIZE); - - /* For now, locate data ahead of code in onchip sram/memory. */ - .sram : AT (LOADADDR(.auxdata) + SIZEOF(.auxdata)) - { - *(.sram.data) - . = ALIGN(4) ; /* Make sure that instructions are aligned... */ - *(.sram.text) - } >sram - - _sram_data_start = LOADADDR ( .sram ); - _sram_data_end = _sram_data_start + SIZEOF ( .sram ) ; - _sram_data_vma = ADDR ( .sram ); - - .dma : { _dma_start = .; *(.dma) _dma_end = .; } >dma-ram - .internal_io (NOLOAD) : { *(.internal_io) } >ports - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - - /* In a multi-core environment, each core is given its own stack space - equal to __stack_size, growing downwards. */ - PROVIDE (__stack = 0x97ff0); - PROVIDE (__stack_size = 0x800); - - .stack (DEFINED(__stack) ? __stack : 0x007ffff0) : - { - __stack = .; - *(.stack) - LONG(0xdeaddead) - } - /DISCARD/ : { *(.note.GNU-stack) } -} diff --git a/libgloss/mt/startup-ms2.S b/libgloss/mt/startup-ms2.S deleted file mode 100644 index f11e3fa6a..000000000 --- a/libgloss/mt/startup-ms2.S +++ /dev/null @@ -1,840 +0,0 @@ -/* - * - * interrupt_vectors.s -- the interrupt handler jump table. - * - * - * There are a total of 32 interrupt vector possible, however, only - * 11 of those are currently used (the others are reserved). The - * order of vectors is as follows: - * - * 1. Boot Vector. Vector for power-on/reset. - * 2. Software Vector. Vector for handling the SI instruction (an - * explicit interrupt caused by software). - * 3. Break Vector. Vector for handling the Break instruction. - * 4. Device 0 Vector. Service vector for device zero. - * 5. Device 1 Vector. Service vector for device one. - * 6. Device 2 Vector. Service vector for device two. - * 7. Device 3 Vector. Service vector for device three. - * 8. Device 4 Vector. Service vector for device four. - * 9. Device 5 Vector. Service vector for device five. - * 10. Device 6 Vector. Service vector for device six. - * 11. Device 7 Vector. Service vector for device seven. - * - * The rest of the interrupt vectors are reserved for future use. - * - * - * Each jump table entry consists of the following two instructions: - * - * jmp Label ; Label as appropriate - * nop ; implemented as or r0,r0,r0 - * - * The following labels are reserved for the vectors named above, - * respectively: - * - * _BOOTIVEC, _SOFTIVEC, _BRKIVEC, _DEV0IVEC, _DEV1IVEC, _DEV2IVEC, - * _DEV3IVEC, _DEV4IVEC, _DEV5IVEC, _DEV6IVEC, _DEV7IVEC - * - * 28Apr05 (DJK) Added support for the overflow vector. - * - * XXXXXXX (DJK) Modified for the MS2 target - * - * 09Jan04 (DJK) Modified internal I/O port definitions for the - * MS1-16-003. - * - * 10Oct01 (DJK) The memory map is finalized and the first 4K of address - * space is now reserved for memory-mapped I/O devices. - * (There is over 2K unused, reserved space in this area.) - * - * 26Sep01 (DJK) The memory map is changed and the device interrupts are - * now memory-mapped. - * - * - * - * Copyright (c) 2001, 2002, 2003, 2004 Morpho Technologies - * - */ - - .section .startup, "a", @progbits - .global __boot_start -__boot_start: -_INTERRUPT_VECTOR_TABLE: - jmp _BOOTIVEC ; Boot vector - or r0, r0, r0 - jmp _SOFTIVEC ; Vector for SI instruction - or r0, r0, r0 - jmp _BRKIVEC ; Vector for Break instruction - or r0, r0, r0 - ; The illegal instruction trap is not implemented. -_RESERVED1_IVEC: - jmp _RESERVED1_IVEC - or r0, r0, r0 - jmp _OVFIVEC - or r0, r0, r0 -_RESERVED2_IVEC: - jmp _RESERVED2_IVEC - or r0, r0, r0 -_RESERVED3_IVEC: - jmp _RESERVED3_IVEC - or r0, r0, r0 -_RESERVED4_IVEC: - jmp _RESERVED4_IVEC - or r0, r0, r0 - - - .text - - .equ SI_IOPORT_ADR, _DEBUG_SW_SYSREQ_REG - .equ SI_IOPORT_BIT, 0x1 - .equ BRK_IOPORT_ADR, _DEBUG_BREAK_REG - .equ BRK_IOPORT_BIT, 0x1 - - .global _BOOTIVEC -_BOOTIVEC: - ; Initialize the interrupt controller's interrupt vector registers - ldui r1, #%hi16(_IVEC_DEFAULT) - ori r1, r1, #%lo16(_IVEC_DEFAULT) - stw r1, r0, #%lo16(_DEV0_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV1_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV2_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV3_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV4_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV5_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV6_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV7_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV8_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV9_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV10_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV11_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV12_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV13_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV14_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV15_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV16_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV17_INTERRUPT_REG) - stw r1, r0, #%lo16(_DEV18_INTERRUPT_REG) - - ; Statically initialized data must be copied from ROM to RAM. - ; This is done in the C run-time start-up code (crt0.o). - - ; Jump to the beginning of the application and enable interrupts. - jmp _start - ei - - - ; Handler for the SI instruction. To perform a system call, the - ; C model uses a trapping mechanism which executes an SI instruction. - ; The Morpho Technologies simulator simply performs a branch to - ; this vector to simulate the SI instruction (this is as the hardware - ; behaves). In order to trigger the simulator that a system call - ; is needed a write into the I/O register at address $40005 to - ; set bit #2 (0x4) is necessary. - ; - ; The above address has been changed to 0x00031C and the bit number - ; is zero. (The manifest constants have been changed to reflect this.) - .global _SOFTIVEC -_SOFTIVEC: - ; Build a frame to save registers. - subi sp, sp, #$8 - stw r9, sp, #$4 - ldui r9, #%hi16(SI_IOPORT_ADR) - stw r10, sp, #$0 - ori r9, r9, #%lo16(SI_IOPORT_ADR) - ori r10, r0, #SI_IOPORT_BIT - stw r10, r9, #$0 - ; SYS_call is handled by simulator here... - or r0, r0, r0 - ldw r10, sp, #$0 - or r0, r0, r0 - ldw r9, sp, #$4 - reti r14 - addi sp, sp, #$8 - - - - .global _BRKIVEC -_BRKIVEC: - ; Build a frame to save registers. - subi sp, sp, #$8 - stw r9, sp, #$4 - ldui r9, #%hi16(BRK_IOPORT_ADR) - stw r10, sp, #$0 - ori r9, r9, #%lo16(BRK_IOPORT_ADR) - ori r10, r0, #BRK_IOPORT_BIT - stw r10, r9, #$0 - or r0, r0, r0 - or r0, r0, r0 - or r0, r0, r0 - or r0, r0, r0 - or r0, r0, r0 - ldw r10, sp, #$0 - ldw r9, sp, #$4 - reti r15 - addi sp, sp, #$8 - - - .global _OVFIVEC -_OVFIVEC: - addi r15, r15, #$4 - or r0, r0, r0 - or r0, r0, r0 ; added 06Sep05 - reti r15 - or r0, r0, r0 - - - .global _IVEC_DEFAULT -_IVEC_DEFAULT: - reti r15 - or r0, r0, r0 - - - .section .internal_io, "a", @progbits - .fill 256 ; Fill the first page. - - ; This is the memory-mapped I/O region. - - ; Hardware Interrupt Registers - ;.org 0xfffff100 - .global _DEV0_INTERRUPT_REG -_DEV0_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV1_INTERRUPT_REG -_DEV1_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV2_INTERRUPT_REG -_DEV2_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV3_INTERRUPT_REG -_DEV3_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV4_INTERRUPT_REG -_DEV4_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV5_INTERRUPT_REG -_DEV5_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV6_INTERRUPT_REG -_DEV6_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV7_INTERRUPT_REG -_DEV7_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV8_INTERRUPT_REG -_DEV8_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV9_INTERRUPT_REG -_DEV9_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV10_INTERRUPT_REG -_DEV10_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV11_INTERRUPT_REG -_DEV11_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV12_INTERRUPT_REG -_DEV12_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV13_INTERRUPT_REG -_DEV13_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV14_INTERRUPT_REG -_DEV14_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV15_INTERRUPT_REG -_DEV15_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV16_INTERRUPT_REG -_DEV16_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV17_INTERRUPT_REG -_DEV17_INTERRUPT_REG: - .word 0x00000000 - - .global _DEV18_INTERRUPT_REG -_DEV18_INTERRUPT_REG: - .word 0x00000000 - - ; 128 bytes minus nineteen registers (four bytes per register) - .fill (128 - 19 * 4) - - .global _INTERRUPT_MASK_REG -_INTERRUPT_MASK_REG: - .word 0x00000000 - - .global _INTERRUPT_PENDING_REG -_INTERRUPT_PENDING_REG: - .word 0x00000000 - - ; 16 bytes minus two registers (four bytes per register) - .fill (16 - 2 * 4) - - .global _DEV0_INTERRUPT_LEVEL_REG -_DEV0_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV1_INTERRUPT_LEVEL_REG -_DEV1_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV2_INTERRUPT_LEVEL_REG -_DEV2_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV3_INTERRUPT_LEVEL_REG -_DEV3_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV4_INTERRUPT_LEVEL_REG -_DEV4_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV5_INTERRUPT_LEVEL_REG -_DEV5_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV6_INTERRUPT_LEVEL_REG -_DEV6_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV7_INTERRUPT_LEVEL_REG -_DEV7_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV8_INTERRUPT_LEVEL_REG -_DEV8_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV9_INTERRUPT_LEVEL_REG -_DEV9_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV10_INTERRUPT_LEVEL_REG -_DEV10_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV11_INTERRUPT_LEVEL_REG -_DEV11_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV12_INTERRUPT_LEVEL_REG -_DEV12_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV13_INTERRUPT_LEVEL_REG -_DEV13_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV14_INTERRUPT_LEVEL_REG -_DEV14_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV15_INTERRUPT_LEVEL_REG -_DEV15_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV16_INTERRUPT_LEVEL_REG -_DEV16_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV17_INTERRUPT_LEVEL_REG -_DEV17_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - .global _DEV18_INTERRUPT_LEVEL_REG -_DEV18_INTERRUPT_LEVEL_REG: - .word 0x00000000 - - ; 128 bytes minus twenty-three registers (four bytes per register) - .fill (128 - 23 * 4) - - - ;.org 0xfffff200 - ; MorphoSys Decoder Registers - .global _MS_DEC_CIRC_BUFF_SEL_REG -_MS_DEC_CIRC_BUFF_SEL_REG: - .word 0x00000000 - - .global _MS_DEC_SKIP_FACTOR_REG -_MS_DEC_SKIP_FACTOR_REG: - .word 0x00000000 - - .global _MS_DEC_CUSTOM_PERM_REG -_MS_DEC_CUSTOM_PERM_REG: - .word 0x00000000 - - .global _MS_DEC_CTXT_BASE_REG -_MS_DEC_CTXT_BASE_REG: - .word 0x00000000 - - .global _MS_DEC_LOOKUP_TBL_REG -_MS_DEC_LOOKUP_TBL_REG: - .word 0x00000000 - - .global _MS_CIRC_BUFF0_I_REG -_MS_CIRC_BUFF0_I_REG: - .word (__FRAME_BUFFER_END) - - .global _MS_CIRC_BUFF0_P_REG -_MS_CIRC_BUFF0_P_REG: - .word __FRAME_BUFFER_SIZE - - .global _MS_DATA_BUFF0_B_REG -_MS_DATA_BUFF0_B_REG: - .word 0x00000000 - - .global _MS_DATA_BUFF0_S_REG -_MS_DATA_BUFF0_S_REG: - .word 0x00000000 - - .global _MS_CIRC_BUFF1_I_REG -_MS_CIRC_BUFF1_I_REG: - .word (__FRAME_BUFFER_END) - - .global _MS_CIRC_BUFF1_P_REG -_MS_CIRC_BUFF1_P_REG: - .word __FRAME_BUFFER_SIZE - - .global _MS_DATA_BUFF1_B_REG -_MS_DATA_BUFF1_B_REG: - .word 0x00000000 - - .global _MS_DATA_BUFF1_S_REG -_MS_DATA_BUFF1_S_REG: - .word 0x00000000 - - .global _MS_CIRC_BUFF2_I_REG -_MS_CIRC_BUFF2_I_REG: - .word (__FRAME_BUFFER_END) - - .global _MS_CIRC_BUFF2_P_REG -_MS_CIRC_BUFF2_P_REG: - .word __FRAME_BUFFER_SIZE - - .global _MS_DATA_BUFF2_B_REG -_MS_DATA_BUFF2_B_REG: - .word 0x00000000 - - .global _MS_DATA_BUFF2_S_REG -_MS_DATA_BUFF2_S_REG: - .word 0x00000000 - - .global _MS_CIRC_BUFF3_I_REG -_MS_CIRC_BUFF3_I_REG: - .word (__FRAME_BUFFER_END) - - .global _MS_CIRC_BUFF3_P_REG -_MS_CIRC_BUFF3_P_REG: - .word __FRAME_BUFFER_SIZE - - .global _MS_DATA_BUFF3_B_REG -_MS_DATA_BUFF3_B_REG: - .word 0x00000000 - - .global _MS_DATA_BUFF3_S_REG -_MS_DATA_BUFF3_S_REG: - .word 0x00000000 - - .global _MS_CIRC_BUFF4_I_REG -_MS_CIRC_BUFF4_I_REG: - .word (__FRAME_BUFFER_END) - - .global _MS_CIRC_BUFF4_P_REG -_MS_CIRC_BUFF4_P_REG: - .word __FRAME_BUFFER_SIZE - - .global _MS_DATA_BUFF4_B_REG -_MS_DATA_BUFF4_B_REG: - .word 0x00000000 - - .global _MS_DATA_BUFF4_S_REG -_MS_DATA_BUFF4_S_REG: - .word 0x00000000 - - .global _MS_CIRC_BUFF5_I_REG -_MS_CIRC_BUFF5_I_REG: - .word (__FRAME_BUFFER_END) - - .global _MS_CIRC_BUFF5_P_REG -_MS_CIRC_BUFF5_P_REG: - .word __FRAME_BUFFER_SIZE - - .global _MS_DATA_BUFF5_B_REG -_MS_DATA_BUFF5_B_REG: - .word 0x00000000 - - .global _MS_DATA_BUFF5_S_REG -_MS_DATA_BUFF5_S_REG: - .word 0x00000000 - - .global _MS_CIRC_BUFF6_I_REG -_MS_CIRC_BUFF6_I_REG: - .word (__FRAME_BUFFER_END) - - .global _MS_CIRC_BUFF6_P_REG -_MS_CIRC_BUFF6_P_REG: - .word __FRAME_BUFFER_SIZE - - .global _MS_DATA_BUFF6_B_REG -_MS_DATA_BUFF6_B_REG: - .word 0x00000000 - - .global _MS_DATA_BUFF6_S_REG -_MS_DATA_BUFF6_S_REG: - .word 0x00000000 - - .global _MS_CIRC_BUFF7_I_REG -_MS_CIRC_BUFF7_I_REG: - .word (__FRAME_BUFFER_END) - - .global _MS_CIRC_BUFF7_P_REG -_MS_CIRC_BUFF7_P_REG: - .word __FRAME_BUFFER_SIZE - - .global _MS_DATA_BUFF7_B_REG -_MS_DATA_BUFF7_B_REG: - .word 0x00000000 - - .global _MS_DATA_BUFF7_S_REG -_MS_DATA_BUFF7_S_REG: - .word 0x00000000 - - .global _MS_OMEGA_PERM1_REG -_MS_OMEGA_PERM1_REG: - .word 0x00000000 - - .global _MS_WRITE_FB_ADDR_REG -_MS_WRITE_FB_ADDR_REG: - .word 0x00000000 - - .global _MS_OMEGA_PERM2_REG -_MS_OMEGA_PERM2_REG: - .word 0x00000000 - - - ; 256 bytes minus forty registers (four bytes per register) - .fill (256 - 40 * 4) - - - - ;.org 0xfffff300 - ; Debug Registers - .global _DEBUG_HALT_REG -_DEBUG_HALT_REG: - .word 0x00000000 - - .global _DEBUG_BREAK_REG -_DEBUG_BREAK_REG: - .word 0x00000000 - - .global _DEBUG_CRITICAL_REG -_DEBUG_OWNERSHIP_REG: - .word 0x00000000 - - .global _DEBUG_KERNEL_ID_REG -_DEBUG_KERNEL_ID_REG: - .word 0x00000000 - - .global _DEBUG_IRQ_STATUS_REG -_DEBUG_IRQ_STATUS_REG: - .word 0x00000000 - - ; There are two reserved registers. - .fill (2 * 4) - - .global _DEBUG_SW_SYSREQ_REG -_DEBUG_SW_SYSREQ_REG: - .word 0x00000000 - - ; 128 bytes minus eight registers (four bytes per register) - .fill (128 - 8 * 4) - - .global _EXTENDED_GP0_REG -_EXTENDED_GP0_REG: - .word 0x00000000 - - .global _EXTENDED_GP1_REG -_EXTENDED_GP1_REG: - .word 0x00000000 - - .global _EXTENDED_GP2_REG -_EXTENDED_GP2_REG: - .word 0x00000000 - - .global _EXTENDED_GP3_REG -_EXTENDED_GP3_REG: - .word 0x00000000 - - .global _EXTENDED_GP4_REG -_EXTENDED_GP4_REG: - .word 0x00000000 - - .global _EXTENDED_GP5_REG -_EXTENDED_GP5_REG: - .word 0x00000000 - - .global _EXTENDED_GP6_REG -_EXTENDED_GP6_REG: - .word 0x00000000 - - .global _EXTENDED_GP7_REG -_EXTENDED_GP7_REG: - .word 0x00000000 - - .global _MEM_CTRL_EN_NC_MEM_REG -_MEM_CTRL_EN_NC_MEM_REG: - .word 0x00000000 - - .global _MEM_CTRL_BASE0_ADDR_REG -_MEM_CTRL_BASE0_ADDR_REG: - .word 0x00000000 - - .global _MEM_CTRL_MASK0_ADDR_REG -_MEM_CTRL_MASK0_ADDR_REG: - .word 0x00000000 - - .global _MEM_CTRL_BASE1_ADDR_REG -_MEM_CTRL_BASE1_ADDR_REG: - .word 0x00000000 - - .global _MEM_CTRL_MASK1_ADDR_REG -_MEM_CTRL_MASK1_ADDR_REG: - .word 0x00000000 - - .global _MEM_CTRL_BASE2_ADDR_REG -_MEM_CTRL_BASE2_ADDR_REG: - .word 0x00000000 - - .global _MEM_CTRL_MASK2_ADDR_REG -_MEM_CTRL_MASK2_ADDR_REG: - .word 0x00000000 - - .global _MEM_CTRL_BASE3_ADDR_REG -_MEM_CTRL_BASE3_ADDR_REG: - .word 0x00000000 - - .global _MEM_CTRL_MASK3_ADDR_REG -_MEM_CTRL_MASK3_ADDR_REG: - .word 0x00000000 - - ; 128 bytes minus seventeen registers (four bytes per register) - .fill (128 - 17 * 4) - - - - ; Reserved memory-map space - .fill (256 + 256) - - - - ;.org 0xfffff600 - ; Timer Registers - .global _TIMER0_VAL_REG -_TIMER0_VAL_REG: - .word 0x00000000 - - .global _TIMER1_VAL_REG -_TIMER1_VAL_REG: - .word 0x00000000 - - .global _TIMER2_VAL_REG -_TIMER2_VAL_REG: - .word 0x00000000 - - .global _TIMER3_VAL_REG -_TIMER3_VAL_REG: - .word 0x00000000 - - ; 256 bytes minus four registers (four bytes per register) - .fill (256 - 4 * 4) - - - - ;.org 0xfffff700 - ; Output Line Control Registers - .global _OUTPUT0_CTRL -_OUTPUT0_CTRL: - .word 0x00000000 - - .global _OUTPUT1_CTRL -_OUTPUT1_CTRL: - .word 0x00000000 - - .global _OUTPUT2_CTRL -_OUTPUT2_CTRL: - .word 0x00000000 - - .global _OUTPUT3_CTRL -_OUTPUT3_CTRL: - .word 0x00000000 - - .global _OUTPUT4_CTRL -_OUTPUT4_CTRL: - .word 0x00000000 - - .global _OUTPUT5_CTRL -_OUTPUT5_CTRL: - .word 0x00000000 - - .global _OUTPUT6_CTRL -_OUTPUT6_CTRL: - .word 0x00000000 - - ; 128 bytes minus seven registers (four bytes per register) - .fill (128 - 7 * 4) - - .global _INPUT0_CTRL -_INPUT0_CTRL: - .word 0x00000000 - - ; 128 bytes minus one register (four bytes per register) - .fill (128 - 1 * 4) - - - - ;.org 0xfffff800 - ; IQ Buffer Registers - .global _IQ_BUFF_CTRL_REG -_IQ_BUFF_CTRL_REG: - .word 0x00000000 - - .global _IQ_BUFF_STATUS_REG -_IQ_BUFF_STATUS_REG: - .word 0x00000000 - - .global _IQ_BUFF_PARAMETER1_REG -_IQ_BUFF_PARAMETER1_REG: - .word 0x00000000 - - .global _IQ_BUFF_TRANSFER_SIZE1_REG -_IQ_BUFF_TRANSFER_SIZE1_REG: - .word 0x00000000 - - .global _IQ_BUFF_FB_BASE1_REG -_IQ_BUFF_FB_BASE1_REG: - .word 0x00000000 - - .global _IQ_BUFF_FB_SIZE1_REG -_IQ_BUFF_FB_SIZE1_REG: - .word 0x00000000 - - .global _IQ_BUFF_PARAMETER2_REG -_IQ_BUFF_PARAMETER2_REG: - .word 0x00000000 - - .global _IQ_BUFF_TRANSFER_SIZE2_REG -_IQ_BUFF_TRANSFER_SIZE2_REG: - .word 0x00000000 - - .global _IQ_BUFF_FB_BASE2_REG -_IQ_BUFF_FB_BASE2_REG: - .word 0x00000000 - - .global _IQ_BUFF_FB_SIZE2_REG -_IQ_BUFF_FB_SIZE2_REG: - .word 0x00000000 - - ; 256 bytes minus ten registers (four bytes per register) - .fill (256 - 10 * 4) - - - - ;.org 0xfffff900 - ; DMA Controller - .global _DMA_CTRL_REG -_DMA_CTRL_REG: - .word 0x00000000 - - .global _DMA_STATUS_REG -_DMA_STATUS_REG: - .word 0x00000000 - - .global _DMA_CH0_EADDR_REG -_DMA_CH0_EADDR_REG: - .word 0x00000000 - - .global _DMA_CH0_IADDR_REG -_DMA_CH0_IADDR_REG: - .word 0x00000000 - - .global _DMA_CH0_SIZE_REG -_DMA_CH0_SIZE_REG: - .word 0x00000000 - - .global _DMA_CH1_EADDR_REG -_DMA_CH1_EADDR_REG: - .word 0x00000000 - - .global _DMA_CH1_IADDR_REG -_DMA_CH1_IADDR_REG: - .word 0x00000000 - - .global _DMA_CH1_SIZE_REG -_DMA_CH1_SIZE_REG: - .word 0x00000000 - - .global _DMA_CH2_EADDR_REG -_DMA_CH2_EADDR_REG: - .word 0x00000000 - - .global _DMA_CH2_IADDR_REG -_DMA_CH2_IADDR_REG: - .word 0x00000000 - - .global _DMA_CH2_SIZE_REG -_DMA_CH2_SIZE_REG: - .word 0x00000000 - - .global _DMA_CH3_EADDR_REG -_DMA_CH3_EADDR_REG: - .word 0x00000000 - - .global _DMA_CH3_IADDR_REG -_DMA_CH3_IADDR_REG: - .word 0x00000000 - - .global _DMA_CH3_SIZE_REG -_DMA_CH3_SIZE_REG: - .word 0x00000000 - - ; 256 bytes minus fourteen registers (four bytes per register) - .fill (256 - 14 * 4) - - - - ;.org 0xfffffa00 - ; Sequence Generator - .global _SEQ_GEN_CTRL_STATUS_REG -_SEQ_GEN_CTRL_STATUS_REG: - .word 0x00000000 - - .global _SEQ_GEN_MASK_REGS -_SEQ_GEN_MASK_REGS: - .fill (302 * 4) - - .global _SEQ_GEN_SHIFT_REG -_SEQ_GEN_SHIFT_REG: - .word 0x00000000 - - ; 256 bytes minus seven registers (four bytes per register) - .fill (256 - 48 * 4) - - - - ; Reserved memory-map space - .fill (0x1000 - 0xf00) diff --git a/libtool.m4 b/libtool.m4 index cbd74d571..85f74ee17 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -103,8 +103,6 @@ AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl -AC_LIBTOOL_SYS_MAX_CMD_LEN - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -191,48 +189,6 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" @@ -281,65 +237,6 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], esac ]) - -# AC_LIBTOOL_SYS_MAX_CMD_LEN -# -------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -[# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for *BSD - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - esac -]) -if test -n "$lt_cv_sys_max_cmd_len" ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -])# AC_LIBTOOL_SYS_MAX_CMD_LEN - - # AC_LIBTOOL_DLOPEN - enable checks for dlopen support AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) @@ -668,7 +565,6 @@ cygwin* | mingw* |pw32*) ;; darwin* | rhapsody*) - # this will be overwritten by pass_all, but leave it in just in case lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in @@ -679,7 +575,6 @@ darwin* | rhapsody*) lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' ;; esac - lt_cv_deplibs_check_method=pass_all ;; freebsd* | kfreebsd*-gnu) @@ -740,7 +635,14 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - lt_cv_deplibs_check_method=pass_all + case $host_cpu in + alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* ) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd* | knetbsd*-gnu) @@ -836,9 +738,8 @@ AC_DEFUN([AC_CHECK_LIBM], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cygwin* | *-*-pw32*) # These system don't have libm - # on darwin the libm is a symbolic link to libSystem.dylib ;; *-ncr-sysv4.3*) AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") @@ -3550,7 +3550,7 @@ EOF # Now hardcode the library paths rpath= hardcode_libdirs= - for libdir in $compile_rpath; do + for libdir in $compile_rpath $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then diff --git a/newlib/ChangeLog b/newlib/ChangeLog index fec04f0b7..73ffd7102 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,213 +1,3 @@ -2006-03-20 Mark Mitchell <mark@codesourcery.com> - - * acconfig.h (_ATEXIT_DYNAMIC_ALLOC): Undef. - * configure.in (--disable-newlib-atexit-dynamic-alloc): New - option. - * configure: Regenerated. - * newlib.hin: Regenerated. - * libc/stdlib/__atexit.c (__register_exitproc): Don't call malloc - if _ATEXIT_DYNAMIC_ALLOC is undefined. - * libc/stdlib/__call_atexit.c (__call_exitprocs): Don't call free - if _ATEXIT_DYNAMIC_ALLOC is undefined. - -2006-03-17 Jeff Johnston <jjohnstn@redhat.com> - - * libc/sys/linux/linuxthreads/config.h: Remove definition - of UINT32_C. - -2006-03-15 Jeff Johnston <jjohnstn@redhat.com> - - * libc/stdio/wsetup.c (__swsetup): Don't make a buffer - for a string I/O file that isn't using the asprintf family. - -2006-03-07 Eric Blake <ebb9@byu.net> - - * libc/stdio/freopen.c (_freopen_r) [HAVE_FCNTL]: For NULL - filename, allow read-only or write-only FILE atop O_RDWR file - descriptor. - * libc/stdio64/freopen64.c (_freopen64_r) [HAVE_FCNTL]: Likewise. - -2006-03-07 Jeff Johnston <jjohnstn@redhat.com> - - * libm/common/sf_isinf.c[_DOUBLE_IS_32BITS]: Undef isinf. - * libm/common/sf_isnan.c[_DOUBLE_IS_32BITS]: Undef isnan. - -2006-03-02 Jeff Johnston <jjohnstn@redhat.com> - - * libm/math/math.tex: Fix reference to sisnan.def which - is now in common subdirectory. - * libm/mathfp/mathfp.tex: Ditto. - -2006-02-27 Jeff Johnston <jjohnstn@redhat.com> - - * Makefile.am (MATHOBJS_IN_LIBC): Add s_isinfd, sf_isinff, - s_isnand, and sf_isnanf object files. - * Makefile.in: Regenerated. - * libc/include/ieeefp.h: Undef isnan and isinf to avoid - conflict if <math.h> has previously been included. - * libc/include/math.h - * libc/include/math.h: Make isnan and isinf macros to - conform to C99. - (__isinfd, __isinff, __isnand, __isnanf): New functions. - * libm/common/Makefile.am: Add new s_isinfd, s_isnand, sf_isinff, - and sf_isnanf files. Also support s_isnan, sf_isnan, s_isinf, and - sf_isinf files which have been moved from math/mathfp directories. - * libm/common/Makefile.in: Regenerated. - * libm/common/s_isinfd.c: New file. - * libm/common/s_isnand.c: Ditto. - * libm/common/sf_isinff.c: Ditto. - * libm/common/sf_isnanf.c: Ditto. - * libm/common/s_isinf.c: Moved from libm/math directory. - * libm/common/s_isnan.c: Ditto. - * libm/common/sf_isinf.c: Ditto. - * libm/common/sf_isnan.c: Ditto. - * libm/math/Makefile.am: Remove isinf and isnan family functions - which have been moved into common directory. - * libm/mathfp/Makefile.am: Ditto. - * libm/math/Makefile.in: Regenerated. - * libm/mathfp/Makefile.in: Ditto. - * libm/math/s_isinf.c: Removed. - * libm/math/s_isnan.c: Ditto. - * libm/math/sf_isinf.c: Ditto. - * libm/math/sf_isnan.c: Ditto. - * libm/mathfp/s_isinf.c: Ditto. - * libm/mathfp/s_isnan.c: Ditto. - * libm/mathfp/sf_isinf.c: Ditto. - * libm/mathfp/sf_isnan.c: Ditto. - -2006-02-20 Jeff Johnston <jjohnstn@redhat.com> - - * libc/stdio/fflush.c (fflush): For an fflush on a read-only - stream, turn off fseek/rewind optimization as per POSIX/SUSv3. - * libc/stdio/fseek.c (_fseek_r): After a successful unoptimized - seek, turn off the __SNPT no-optimization flag. - -2006-02-16 Jeff Johnston <jjohnstn@redhat.com> - - * libc/sys/linux/aio.c: Define _GNU_SOURCE so struct aioinit - will be defined. - * libc/sys/linux/sys/types.h: Move <sys/config.h> ahead of - <features.h> to preset special flags. - -2006-02-15 Corinna Vinschen <corinna@vinschen.de> - - * libc/include/sys/time.h (struct timeval): Change member types - according to SUSv3. - * libc/include/sys/types.h (useconds_t): Change to unsigned - according to SUSv3. - (suseconds_t): Define type. - -2006-02-13 Jeff Johnston <jjohnstn@redhat.com> - David Carne <davidcarne@gmail.com> - - * libc/string/strndup_r.c (_strndup_r): Use strnlen logic - instead of strlen to determine number of bytes to copy. - * libc/string/strnlen.c (strnlen): Fix so check for max limit occurs - before looking at storage location. - -2006-02-07 Paul Brook <paul@codesourcery.com> - - * libc/machine/arm/setjmp.S: Add Thumb-2 support. - * libc/sys/arm/crt0.S: Add Thumb-2 startup code. - * libc/sys/arm/libcfunc.c (do_AngelSWI): Use AngelSWIInsn. - * libc/sys/arm/swi.h (AngelSWIInsn, AngelSWIAsm): Define. - * libc/sys/arm/trap.S: Disable for Thumb-2. - -2006-01-31 Leif Ekblad <leif@rdos.net> - - * configure.host: RDOS support added - * libc/include/sys/config.h: Ditto. - * libc/sys/rdos/Makefile.am, libc/sys/rdos/Makefile.in: New files. - * libc/sys/rdos/aclocal.m4, libc/sys/rdos/chown.c: Ditto. - * libc/sys/rdos/close.c, libc/sys/rdos/config.h: Ditto. - * libc/sys/rdos/configure, libc/sys/rdos/configure.in: Ditto. - * libc/sys/rdos/crt0.S, libc/sys/rdos/execve.c: Ditto. - * libc/sys/rdos/fork.c, libc/sys/rdos/fstat.c: Ditto. - * libc/sys/rdos/getenv.c, libc/sys/rdos/getpid.c: Ditto. - * libc/sys/rdos/gettod.c, libc/sys/rdos/isatty.c: Ditto. - * libc/sys/rdos/kill.c, libc/sys/rdos/link.c: Ditto. - * libc/sys/rdos/lseek.c, libc/sys/rdos/open.c: Ditto. - * libc/sys/rdos/rdos.S, libc/sys/rdos/rdos.h: Ditto. - * libc/sys/rdos/rdoshelp.c, libc/sys/rdos/read.c: Ditto. - * libc/sys/rdos/readlink.c, libc/sys/rdos/sbrk.c: Ditto. - * libc/sys/rdos/stat.c, libc/sys/rdos/symlink.c: Ditto. - * libc/sys/rdos/times.c, libc/sys/rdos/unlink.c: Ditto. - * libc/sys/rdos/user.def, libc/sys/rdos/wait.c: Ditto. - * libc/sys/rdos/write.c: Ditto. - -2006-01-24 Jeff Johnston <jjohnstn@redhat.com> - - * acinclude.m4: Add nodefine to AM_INIT_AUTOMAKE macro invocation - so as not to define PACKAGE and VERSION in newlib.h. - * aclocal.m4: Regenerated. - * configure: Ditto. - * newlib.hin: Ditto. - -2006-01-20 Jeff Johnston <jjohnstn@redhat.com> - - * acconfig.h: New file to generate newlib.hin from. - * newlib.hin: Regenerated. - * stamp-h.in: Regenerated. - * Makefile.am: Add ACLOCAL_AMFLAGS so aclocal can be - called automatically. - * Makefile.in: Regenerated. - * acinclude.m4: Add proper comment for hack in previous change. - * aclocal.m4 */aclocal.m4: Regenerated. - * configure */configure: Regenerated. - -2006-01-11 Jeff Johnston <jjohnstn@redhat.com> - - * acinclude.m4: Add hack to prevent INSTALL in subdirs - from being set to "../". - * Makefile.am: Pass INSTALL in AM_MAKEFLAGS. - * aclocal.m4: Regenerated. - * configure: Ditto. - * Makefile.in: Ditto. - * doc/aclocal.m4: Ditto. - * doc/configure: Ditto. - * iconvdata/aclocal.m4: Ditto. - * iconvdata/configure: Ditto. - * libc/*/aclocal.m4: Ditto. - * libc/*/configure: Ditto. - * libc/libc.texinfo: Ditto. - * libm/*/aclocal.m4: Ditto. - * libm/*/configure: Ditto. - -2006-01-10 Eric Blake <ebb9@byu.net> - - * libc/stdio/freopen.c (_freopen_r): Fix use of oflags. - * libc/stdio64/freopen64.c (_freopen64_r): Likewise. - -2006-01-10 Jeff Johnston <jjohnstn@redhat.com> - - * libm/mathfp/s_frexp.c: Check for special values on - the original input, not the manipulated output value. - * libm/mathfp/sf_frexp.c: Ditto. - * libm/mathfp/s_atangent.c: Don't use local value branch - when checking for quadrant. - * libm/mathfp/sf_atangent.c: Ditto. - -2006-01-09 Jeff Johnston <jjohnstn@redhat.com> - - * libc/stdio/freopen.c: Switch to use isatty instead of _isatty. - * libc/stdio64/freopen64.c: Ditto. - -2006-01-09 Eric Blake <ebb9@byu.net> - - * libc/stdio/freopen.c (_freopen_r): Accept NULL filename. - * libc/stdio64/freopen64.c (_freopen64_r): Likewise. - -2006-01-06 Jeff Johnston <jjohnstn@redhat.com> - - * libc/sys/linux/include/getopt.h: Add macros needed by - new version of getopt.c in libc/stdlib. - -2006-01-04 Gregory Pietsch <gpietsch@comcast.net> - - * libc/stdlib/getopt.c: Replaced with version - that adds getopt_long and getopt_long_only support. - * libc/include/getopt.h: New file. - 2005-12-16 Jeff Johnston <jjohnstn@redhat.com> * NEWS: Update with 1.14.0 info. diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 9da9349cb..db574a2ab 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -1,7 +1,6 @@ ## Process this file with automake to generate Makefile.in AUTOMAKE_OPTIONS = cygnus dejagnu -ACLOCAL_AMFLAGS = -I . # Multilib support variables. MULTISRCTOP = @@ -28,7 +27,6 @@ AM_MAKEFLAGS = \ "CFLAGS=$(CFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ - "INSTALL=$(INSTALL)" \ "LDFLAGS=$(LDFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ @@ -91,8 +89,6 @@ toollib_DATA = $(CRT0) $(CRT1) MATHOBJS_IN_LIBC = \ s_isinf.$(oext) sf_isinf.$(oext) \ s_isnan.$(oext) sf_isnan.$(oext) \ - s_isinfd.$(oext) sf_isinff.$(oext) \ - s_isnand.$(oext) sf_isnanf.$(oext) \ s_nan.$(oext) sf_nan.$(oext) \ s_ldexp.$(oext) sf_ldexp.$(oext) \ s_frexp.$(oext) sf_frexp.$(oext) \ diff --git a/newlib/Makefile.in b/newlib/Makefile.in index ce3f148b7..0e4e5a7c4 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -112,7 +112,6 @@ oext = @oext@ sys_dir = @sys_dir@ AUTOMAKE_OPTIONS = cygnus dejagnu -ACLOCAL_AMFLAGS = -I . # Multilib support variables. MULTISRCTOP = @@ -129,7 +128,7 @@ LIBTOOL_VERSION_INFO = 0:0:0 # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and # friends when we are called from the top level Makefile. -AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CFLAGS=$(CFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "EXPECT=$(EXPECT)" "RUNTEST=$(RUNTEST)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "top_toollibdir=$(toollibdir)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC_FOR_NEWLIB)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "NM=$(NM)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "DESTDIR=$(DESTDIR)" +AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CFLAGS=$(CFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "EXPECT=$(EXPECT)" "RUNTEST=$(RUNTEST)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "top_toollibdir=$(toollibdir)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC_FOR_NEWLIB)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "NM=$(NM)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "DESTDIR=$(DESTDIR)" FLAGS_TO_PASS = $(AM_MAKEFLAGS) @@ -154,7 +153,7 @@ toollib_DATA = $(CRT0) $(CRT1) # The functions ldexp, frexp and modf are traditionally supplied in # both libc.a and libm.a. We build them in libm.a and copy them over, # along with some required supporting routines. -MATHOBJS_IN_LIBC = s_isinf.$(oext) sf_isinf.$(oext) s_isnan.$(oext) sf_isnan.$(oext) s_isinfd.$(oext) sf_isinff.$(oext) s_isnand.$(oext) sf_isnanf.$(oext) s_nan.$(oext) sf_nan.$(oext) s_ldexp.$(oext) sf_ldexp.$(oext) s_frexp.$(oext) sf_frexp.$(oext) s_modf.$(oext) sf_modf.$(oext) s_scalbn.$(oext) sf_scalbn.$(oext) s_finite.$(oext) sf_finite.$(oext) s_copysign.$(oext) sf_copysign.$(oext) s_infconst.$(oext) +MATHOBJS_IN_LIBC = s_isinf.$(oext) sf_isinf.$(oext) s_isnan.$(oext) sf_isnan.$(oext) s_nan.$(oext) sf_nan.$(oext) s_ldexp.$(oext) sf_ldexp.$(oext) s_frexp.$(oext) sf_frexp.$(oext) s_modf.$(oext) sf_modf.$(oext) s_scalbn.$(oext) sf_scalbn.$(oext) s_finite.$(oext) sf_finite.$(oext) s_copysign.$(oext) sf_copysign.$(oext) s_infconst.$(oext) LIBC_OBJECTLISTS = $(POSIX_OBJECTLIST) $(SIGNAL_OBJECTLIST) $(SYSCALL_OBJECTLIST) $(UNIX_OBJECTLIST) $(STDIO64_OBJECTLIST) libc/argz/objectlist.awk.in libc/stdlib/objectlist.awk.in libc/time/objectlist.awk.in libc/ctype/objectlist.awk.in libc/search/objectlist.awk.in libc/string/objectlist.awk.in libc/locale/objectlist.awk.in libc/misc/objectlist.awk.in libc/reent/objectlist.awk.in libc/errno/objectlist.awk.in libc/stdio/objectlist.awk.in $(MACHINE_OBJECTLIST) $(SYS_OBJECTLIST) $(SYS_MACH_OBJECTLIST) @@ -212,8 +211,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DATA = $(noinst_DATA) $(toollib_DATA) DIST_COMMON = README ./stamp-h.in ChangeLog Makefile.am Makefile.in \ -NEWS acconfig.h acinclude.m4 aclocal.m4 configure configure.in \ -newlib.hin +NEWS acinclude.m4 aclocal.m4 configure configure.in newlib.hin DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -236,9 +234,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 \ - ./acinclude.m4 ./aclocal.m4 ./libtool.m4 - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 + cd $(srcdir) && $(ACLOCAL) config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -260,7 +257,7 @@ $(srcdir)/newlib.hin: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in rm -f $(srcdir)/stamp-h.in; \ $(MAKE) $(srcdir)/stamp-h.in; \ else :; fi -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h +$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOHEADER) @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null diff --git a/newlib/acconfig.h b/newlib/acconfig.h deleted file mode 100644 index 86f484ec4..000000000 --- a/newlib/acconfig.h +++ /dev/null @@ -1,153 +0,0 @@ -#ifndef __NEWLIB_H__ - -#define __NEWLIB_H__ 1 -@TOP@ - -/* EL/IX level */ -#undef _ELIX_LEVEL - -/* Newlib version */ -#undef _NEWLIB_VERSION - -/* long long type support in IO functions like printf/scanf enabled */ -#undef _WANT_IO_LONG_LONG - -/* long double type support in IO functions like printf/scanf enabled */ -#undef _WANT_IO_LONG_DOUBLE - -/* Positional argument support in printf functions enabled. */ -#undef _WANT_IO_POS_ARGS - -/* Multibyte supported */ -#undef _MB_CAPABLE - -/* MB_LEN_MAX */ -#undef _MB_LEN_MAX - -/* ICONV enabled */ -#undef _ICONV_ENABLED - -/* Enable ICONV external CCS files loading capabilities */ -#undef _ICONV_ENABLE_EXTERNAL_CCS - -/* Define if the linker supports .preinit_array/.init_array/.fini_array - * sections. */ -#undef HAVE_INITFINI_ARRAY - -/* True if atexit() may dynamically allocate space for cleanup - functions. */ -#undef _ATEXIT_DYNAMIC_ALLOC - -/* Define if the compiler supports aliasing an array to an address. */ -#undef _HAVE_ARRAY_ALIASING -@BOTTOM@ -/* - * Iconv encodings enabled ("to" direction) - */ -#undef _ICONV_TO_ENCODING_BIG5 -#undef _ICONV_TO_ENCODING_CP775 -#undef _ICONV_TO_ENCODING_CP850 -#undef _ICONV_TO_ENCODING_CP852 -#undef _ICONV_TO_ENCODING_CP855 -#undef _ICONV_TO_ENCODING_CP866 -#undef _ICONV_TO_ENCODING_EUC_JP -#undef _ICONV_TO_ENCODING_EUC_TW -#undef _ICONV_TO_ENCODING_EUC_KR -#undef _ICONV_TO_ENCODING_ISO_8859_1 -#undef _ICONV_TO_ENCODING_ISO_8859_10 -#undef _ICONV_TO_ENCODING_ISO_8859_11 -#undef _ICONV_TO_ENCODING_ISO_8859_13 -#undef _ICONV_TO_ENCODING_ISO_8859_14 -#undef _ICONV_TO_ENCODING_ISO_8859_15 -#undef _ICONV_TO_ENCODING_ISO_8859_2 -#undef _ICONV_TO_ENCODING_ISO_8859_3 -#undef _ICONV_TO_ENCODING_ISO_8859_4 -#undef _ICONV_TO_ENCODING_ISO_8859_5 -#undef _ICONV_TO_ENCODING_ISO_8859_6 -#undef _ICONV_TO_ENCODING_ISO_8859_7 -#undef _ICONV_TO_ENCODING_ISO_8859_8 -#undef _ICONV_TO_ENCODING_ISO_8859_9 -#undef _ICONV_TO_ENCODING_ISO_IR_111 -#undef _ICONV_TO_ENCODING_KOI8_R -#undef _ICONV_TO_ENCODING_KOI8_RU -#undef _ICONV_TO_ENCODING_KOI8_U -#undef _ICONV_TO_ENCODING_KOI8_UNI -#undef _ICONV_TO_ENCODING_UCS_2 -#undef _ICONV_TO_ENCODING_UCS_2_INTERNAL -#undef _ICONV_TO_ENCODING_UCS_2BE -#undef _ICONV_TO_ENCODING_UCS_2LE -#undef _ICONV_TO_ENCODING_UCS_4 -#undef _ICONV_TO_ENCODING_UCS_4_INTERNAL -#undef _ICONV_TO_ENCODING_UCS_4BE -#undef _ICONV_TO_ENCODING_UCS_4LE -#undef _ICONV_TO_ENCODING_US_ASCII -#undef _ICONV_TO_ENCODING_UTF_16 -#undef _ICONV_TO_ENCODING_UTF_16BE -#undef _ICONV_TO_ENCODING_UTF_16LE -#undef _ICONV_TO_ENCODING_UTF_8 -#undef _ICONV_TO_ENCODING_WIN_1250 -#undef _ICONV_TO_ENCODING_WIN_1251 -#undef _ICONV_TO_ENCODING_WIN_1252 -#undef _ICONV_TO_ENCODING_WIN_1253 -#undef _ICONV_TO_ENCODING_WIN_1254 -#undef _ICONV_TO_ENCODING_WIN_1255 -#undef _ICONV_TO_ENCODING_WIN_1256 -#undef _ICONV_TO_ENCODING_WIN_1257 -#undef _ICONV_TO_ENCODING_WIN_1258 - -/* - * Iconv encodings enabled ("from" direction) - */ -#undef _ICONV_FROM_ENCODING_BIG5 -#undef _ICONV_FROM_ENCODING_CP775 -#undef _ICONV_FROM_ENCODING_CP850 -#undef _ICONV_FROM_ENCODING_CP852 -#undef _ICONV_FROM_ENCODING_CP855 -#undef _ICONV_FROM_ENCODING_CP866 -#undef _ICONV_FROM_ENCODING_EUC_JP -#undef _ICONV_FROM_ENCODING_EUC_TW -#undef _ICONV_FROM_ENCODING_EUC_KR -#undef _ICONV_FROM_ENCODING_ISO_8859_1 -#undef _ICONV_FROM_ENCODING_ISO_8859_10 -#undef _ICONV_FROM_ENCODING_ISO_8859_11 -#undef _ICONV_FROM_ENCODING_ISO_8859_13 -#undef _ICONV_FROM_ENCODING_ISO_8859_14 -#undef _ICONV_FROM_ENCODING_ISO_8859_15 -#undef _ICONV_FROM_ENCODING_ISO_8859_2 -#undef _ICONV_FROM_ENCODING_ISO_8859_3 -#undef _ICONV_FROM_ENCODING_ISO_8859_4 -#undef _ICONV_FROM_ENCODING_ISO_8859_5 -#undef _ICONV_FROM_ENCODING_ISO_8859_6 -#undef _ICONV_FROM_ENCODING_ISO_8859_7 -#undef _ICONV_FROM_ENCODING_ISO_8859_8 -#undef _ICONV_FROM_ENCODING_ISO_8859_9 -#undef _ICONV_FROM_ENCODING_ISO_IR_111 -#undef _ICONV_FROM_ENCODING_KOI8_R -#undef _ICONV_FROM_ENCODING_KOI8_RU -#undef _ICONV_FROM_ENCODING_KOI8_U -#undef _ICONV_FROM_ENCODING_KOI8_UNI -#undef _ICONV_FROM_ENCODING_UCS_2 -#undef _ICONV_FROM_ENCODING_UCS_2_INTERNAL -#undef _ICONV_FROM_ENCODING_UCS_2BE -#undef _ICONV_FROM_ENCODING_UCS_2LE -#undef _ICONV_FROM_ENCODING_UCS_4 -#undef _ICONV_FROM_ENCODING_UCS_4_INTERNAL -#undef _ICONV_FROM_ENCODING_UCS_4BE -#undef _ICONV_FROM_ENCODING_UCS_4LE -#undef _ICONV_FROM_ENCODING_US_ASCII -#undef _ICONV_FROM_ENCODING_UTF_16 -#undef _ICONV_FROM_ENCODING_UTF_16BE -#undef _ICONV_FROM_ENCODING_UTF_16LE -#undef _ICONV_FROM_ENCODING_UTF_8 -#undef _ICONV_FROM_ENCODING_WIN_1250 -#undef _ICONV_FROM_ENCODING_WIN_1251 -#undef _ICONV_FROM_ENCODING_WIN_1252 -#undef _ICONV_FROM_ENCODING_WIN_1253 -#undef _ICONV_FROM_ENCODING_WIN_1254 -#undef _ICONV_FROM_ENCODING_WIN_1255 -#undef _ICONV_FROM_ENCODING_WIN_1256 -#undef _ICONV_FROM_ENCODING_WIN_1257 -#undef _ICONV_FROM_ENCODING_WIN_1258 - -#endif /* !__NEWLIB_H__ */ - diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4 index 0b6b8edbd..123c3cbaa 100644 --- a/newlib/acinclude.m4 +++ b/newlib/acinclude.m4 @@ -105,7 +105,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0, nodefine) +AM_INIT_AUTOMAKE(newlib, 1.14.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -153,9 +153,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/aclocal.m4 b/newlib/aclocal.m4 index 5303ae452..ed1940d64 100644 --- a/newlib/aclocal.m4 +++ b/newlib/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0, nodefine) +AM_INIT_AUTOMAKE(newlib, 1.14.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/configure b/newlib/configure index ce9246a31..d562d8621 100755 --- a/newlib/configure +++ b/newlib/configure @@ -28,8 +28,6 @@ ac_help="$ac_help ac_help="$ac_help --enable-newlib-iconv-external-ccs enable capabilities to load external CCS files for iconv" ac_help="$ac_help - --disable-newlib-atexit-alloc disable dynamic allocation of atexit entries" -ac_help="$ac_help --enable-multilib build many library versions (default)" ac_help="$ac_help --enable-target-optspace optimize for space" @@ -694,20 +692,6 @@ else newlib_iconv_external_ccs=${newlib_iconv_external_ccs} fi -# Check whether --enable-newlib-atexit-dynamic-alloc or --disable-newlib-atexit-dynamic-alloc was given. -if test "${enable_newlib_atexit_dynamic_alloc+set}" = set; then - enableval="$enable_newlib_atexit_dynamic_alloc" - if test "${newlib_atexit_dynamic_alloc+set}" != set; then - case "${enableval}" in - yes) newlib_atexit_dynamic_alloc=yes ;; - no) newlib_atexit_dynamic_alloc=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-atexit-dynamic-alloc option" 1>&2; exit 1; } ;; - esac - fi -else - newlib_atexit_dynamic_alloc=yes -fi - am__api_version="1.4" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -721,7 +705,7 @@ am__api_version="1.4" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:725: checking for a BSD compatible install" >&5 +echo "configure:709: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -774,7 +758,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:778: checking whether build environment is sane" >&5 +echo "configure:762: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -831,7 +815,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:835: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:819: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -864,12 +848,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:868: checking for Cygwin environment" >&5 +echo "configure:852: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 873 "configure" +#line 857 "configure" #include "confdefs.h" int main() { @@ -880,7 +864,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -897,19 +881,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:901: checking for mingw32 environment" >&5 +echo "configure:885: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 906 "configure" +#line 890 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1079,7 +1063,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1083: checking host system type" >&5 +echo "configure:1067: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1100,7 +1084,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1104: checking target system type" >&5 +echo "configure:1088: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1118,7 +1102,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1122: checking build system type" >&5 +echo "configure:1106: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1149,12 +1133,19 @@ VERSION=1.14.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } fi +cat >> confdefs.h <<EOF +#define PACKAGE "$PACKAGE" +EOF + +cat >> confdefs.h <<EOF +#define VERSION "$VERSION" +EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 -echo "configure:1158: checking for working aclocal-${am__api_version}" >&5 +echo "configure:1149: checking for working aclocal-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1167,7 +1158,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1171: checking for working autoconf" >&5 +echo "configure:1162: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1180,7 +1171,7 @@ else fi echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 -echo "configure:1184: checking for working automake-${am__api_version}" >&5 +echo "configure:1175: checking for working automake-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1193,7 +1184,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1197: checking for working autoheader" >&5 +echo "configure:1188: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1206,7 +1197,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1210: checking for working makeinfo" >&5 +echo "configure:1201: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1231,7 +1222,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1235: checking for $ac_word" >&5 +echo "configure:1226: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1261,7 +1252,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1265: checking for $ac_word" >&5 +echo "configure:1256: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1310,7 +1301,7 @@ fi fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1314: checking whether we are using GNU C" >&5 +echo "configure:1305: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1319,7 +1310,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1334,7 +1325,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1338: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1329: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1365,7 +1356,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1369: checking for $ac_word" >&5 +echo "configure:1360: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1397,7 +1388,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1401: checking for $ac_word" >&5 +echo "configure:1392: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1429,7 +1420,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1433: checking for $ac_word" >&5 +echo "configure:1424: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1461,7 +1452,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1465: checking for $ac_word" >&5 +echo "configure:1456: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1506,7 +1497,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1510: checking for a BSD compatible install" >&5 +echo "configure:1501: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1559,11 +1550,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1567: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1555: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1597,7 +1585,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1601: checking for executable suffix" >&5 +echo "configure:1589: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1607,7 +1595,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1782,7 +1770,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1786: checking for $ac_word" >&5 +echo "configure:1774: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1812,7 +1800,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1816: checking for $ac_word" >&5 +echo "configure:1804: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1863,7 +1851,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1867: checking for $ac_word" >&5 +echo "configure:1855: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1895,7 +1883,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1899: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1887: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1906,12 +1894,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1910 "configure" +#line 1898 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1937,12 +1925,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1941: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1929: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1946: checking whether we are using GNU C" >&5 +echo "configure:1934: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1951,7 +1939,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1970,7 +1958,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1974: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1962: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2013,7 +2001,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2017: checking for ld used by GCC" >&5 +echo "configure:2005: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -2043,10 +2031,10 @@ echo "configure:2017: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2047: checking for GNU ld" >&5 +echo "configure:2035: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2050: checking for non-GNU ld" >&5 +echo "configure:2038: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2081,7 +2069,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:2085: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:2073: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2098,7 +2086,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:2102: checking for $LD option to reload object files" >&5 +echo "configure:2090: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2110,7 +2098,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:2114: checking for BSD-compatible nm" >&5 +echo "configure:2102: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2148,7 +2136,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2152: checking whether ln -s works" >&5 +echo "configure:2140: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2169,7 +2157,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2173: checking how to recognise dependant libraries" >&5 +echo "configure:2161: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2342,13 +2330,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2346: checking for object suffix" >&5 +echo "configure:2334: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2372,7 +2360,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2376: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2364: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2434,7 +2422,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2438: checking for file" >&5 +echo "configure:2426: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2505,7 +2493,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2509: checking for $ac_word" >&5 +echo "configure:2497: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2537,7 +2525,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2541: checking for $ac_word" >&5 +echo "configure:2529: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2572,7 +2560,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2576: checking for $ac_word" >&5 +echo "configure:2564: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2604,7 +2592,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2608: checking for $ac_word" >&5 +echo "configure:2596: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2671,8 +2659,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2675 "configure"' > conftest.$ac_ext - if { (eval echo configure:2676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2663 "configure"' > conftest.$ac_ext + if { (eval echo configure:2664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2691,7 +2679,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2709,7 +2697,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2713: checking whether the C compiler needs -belf" >&5 +echo "configure:2701: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2722,14 +2710,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2726 "configure" +#line 2714 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2759,7 +2747,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2763: checking for $ac_word" >&5 +echo "configure:2751: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2791,7 +2779,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2795: checking for $ac_word" >&5 +echo "configure:2783: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2826,7 +2814,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2830: checking for $ac_word" >&5 +echo "configure:2818: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2858,7 +2846,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2862: checking for $ac_word" >&5 +echo "configure:2850: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2893,7 +2881,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2897: checking for $ac_word" >&5 +echo "configure:2885: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2925,7 +2913,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2929: checking for $ac_word" >&5 +echo "configure:2917: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2961,12 +2949,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2965: checking if libtool should supply DllMain function" >&5 +echo "configure:2953: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2970 "configure" +#line 2958 "configure" #include "confdefs.h" int main() { @@ -2974,7 +2962,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2995,19 +2983,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2999: checking how to link DLLs" >&5 +echo "configure:2987: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3004 "configure" +#line 2992 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -3116,12 +3104,12 @@ exec 5>>./config.log -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3125: checking for $ac_word" >&5 +echo "configure:3113: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3334,13 +3322,6 @@ EOF fi -if test "${newlib_atexit_dynamic_alloc}" = "yes"; then -cat >> confdefs.h <<EOF -#define _ATEXIT_DYNAMIC_ALLOC 1 -EOF - -fi - cat >> confdefs.h <<EOF #define _NEWLIB_VERSION "$VERSION" EOF @@ -3445,7 +3426,7 @@ EOF fi; echo $ac_n "checking for .preinit_array/.init_array/.fini_array support""... $ac_c" 1>&6 -echo "configure:3449: checking for .preinit_array/.init_array/.fini_array support" >&5 +echo "configure:3430: checking for .preinit_array/.init_array/.fini_array support" >&5 if eval "test \"`echo '$''{'libc_cv_initfinit_array'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3456,7 +3437,7 @@ int foo (void) { return 1; } int (*fp) (void) __attribute__ ((section (".init_array"))) = foo; EOF if { ac_try='${CC} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest conftest.c - -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then if readelf -S conftest | grep -e INIT_ARRAY > /dev/null; then libc_cv_initfinit_array=yes @@ -3479,7 +3460,7 @@ EOF fi echo $ac_n "checking for array aliasing support""... $ac_c" 1>&6 -echo "configure:3483: checking for array aliasing support" >&5 +echo "configure:3464: checking for array aliasing support" >&5 if eval "test \"`echo '$''{'libc_cv_array_aliasing'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3488,7 +3469,7 @@ char x3 = { 'a', 'b', 'c' }; extern char y2 __attribute__((alias ("x+1"))); EOF if { ac_try='${CC} $CFLAGS $CPPFLAGS -c conftest.c - 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then libc_cv_array_aliasing=yes else diff --git a/newlib/configure.host b/newlib/configure.host index d85e8ad2c..01438a2e4 100644 --- a/newlib/configure.host +++ b/newlib/configure.host @@ -362,10 +362,6 @@ case "${host}" in h8500-*-elf*) sys_dir=h8500hms ;; - i[34567]86-*-rdos*) - sys_dir=rdos - newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES" - ;; i[34567]86-*-sco*) sys_dir=sysvi386 unix_dir=unix diff --git a/newlib/configure.in b/newlib/configure.in index c8dc21176..5374d67eb 100644 --- a/newlib/configure.in +++ b/newlib/configure.in @@ -85,17 +85,6 @@ AC_ARG_ENABLE(newlib-iconv-external-ccs, esac fi], [newlib_iconv_external_ccs=${newlib_iconv_external_ccs}])dnl -dnl Support --disable-newlib-atexit-dynamic-alloc -AC_ARG_ENABLE(newlib-atexit-dynamic-alloc, -[ --disable-newlib-atexit-alloc disable dynamic allocation of atexit entries], -[if test "${newlib_atexit_dynamic_alloc+set}" != set; then - case "${enableval}" in - yes) newlib_atexit_dynamic_alloc=yes ;; - no) newlib_atexit_dynamic_alloc=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for newlib-atexit-dynamic-alloc option) ;; - esac - fi], [newlib_atexit_dynamic_alloc=yes])dnl - NEWLIB_CONFIGURE(.) dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and @@ -243,10 +232,6 @@ if test "${newlib_iconv_external_ccs}" = "yes"; then AC_DEFINE_UNQUOTED(_ICONV_ENABLE_EXTERNAL_CCS) fi -if test "${newlib_atexit_dynamic_alloc}" = "yes"; then -AC_DEFINE_UNQUOTED(_ATEXIT_DYNAMIC_ALLOC) -fi - AC_DEFINE_UNQUOTED(_NEWLIB_VERSION,"$VERSION") if test "${multilib}" = "yes"; then diff --git a/newlib/doc/aclocal.m4 b/newlib/doc/aclocal.m4 index b03b0d2ed..42dedc068 100644 --- a/newlib/doc/aclocal.m4 +++ b/newlib/doc/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/doc/configure b/newlib/doc/configure index 47e58888c..c7c97ec00 100755 --- a/newlib/doc/configure +++ b/newlib/doc/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1583,7 +1580,7 @@ if test "x$cross_compiling" = "xno"; then EXEEXT_FOR_BUILD='$(EXEEXT)' else echo $ac_n "checking for build system executable suffix""... $ac_c" 1>&6 -echo "configure:1587: checking for build system executable suffix" >&5 +echo "configure:1584: checking for build system executable suffix" >&5 if eval "test \"`echo '$''{'newlib_cv_build_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/newlib/iconvdata/aclocal.m4 b/newlib/iconvdata/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/iconvdata/aclocal.m4 +++ b/newlib/iconvdata/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/iconvdata/configure b/newlib/iconvdata/configure index a4f8cf471..ac52c517a 100755 --- a/newlib/iconvdata/configure +++ b/newlib/iconvdata/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1659: checking for $ac_word" >&5 +echo "configure:1656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1685,7 +1682,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1689: checking for $ac_word" >&5 +echo "configure:1686: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1736,7 +1733,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_word" >&5 +echo "configure:1737: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1886,7 +1883,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1954,7 +1951,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2025: checking whether ln -s works" >&5 +echo "configure:2022: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2219: checking for object suffix" >&5 +echo "configure:2216: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,7 +2304,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2311: checking for file" >&5 +echo "configure:2308: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2378,7 +2375,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_word" >&5 +echo "configure:2379: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2414: checking for $ac_word" >&5 +echo "configure:2411: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +2442,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2449: checking for $ac_word" >&5 +echo "configure:2446: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2481: checking for $ac_word" >&5 +echo "configure:2478: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_word" >&5 +echo "configure:2633: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2696,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_word" >&5 +echo "configure:2700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2735: checking for $ac_word" >&5 +echo "configure:2732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2766,7 +2763,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2770: checking for $ac_word" >&5 +echo "configure:2767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2802: checking for $ac_word" >&5 +echo "configure:2799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2834,12 +2831,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2872: checking how to link DLLs" >&5 +echo "configure:2869: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else diff --git a/newlib/libc/aclocal.m4 b/newlib/libc/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libc/aclocal.m4 +++ b/newlib/libc/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/configure b/newlib/libc/configure index ac29def3c..41480121a 100755 --- a/newlib/libc/configure +++ b/newlib/libc/configure @@ -1445,11 +1445,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1453: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1450: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1483,7 +1480,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1487: checking for executable suffix" >&5 +echo "configure:1484: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1493,7 +1490,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1669,7 +1666,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1673: checking for $ac_word" >&5 +echo "configure:1670: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1699,7 +1696,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1703: checking for $ac_word" >&5 +echo "configure:1700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1750,7 +1747,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1754: checking for $ac_word" >&5 +echo "configure:1751: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1782,7 +1779,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1786: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1783: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1793,12 +1790,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1797 "configure" +#line 1794 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1824,12 +1821,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1828: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1825: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1833: checking whether we are using GNU C" >&5 +echo "configure:1830: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1838,7 +1835,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1857,7 +1854,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1861: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1858: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1900,7 +1897,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1904: checking for ld used by GCC" >&5 +echo "configure:1901: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1930,10 +1927,10 @@ echo "configure:1904: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1934: checking for GNU ld" >&5 +echo "configure:1931: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1937: checking for non-GNU ld" >&5 +echo "configure:1934: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1968,7 +1965,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1972: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1969: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1985,7 +1982,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1989: checking for $LD option to reload object files" >&5 +echo "configure:1986: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1997,7 +1994,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:2001: checking for BSD-compatible nm" >&5 +echo "configure:1998: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2035,7 +2032,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2039: checking whether ln -s works" >&5 +echo "configure:2036: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2056,7 +2053,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2060: checking how to recognise dependant libraries" >&5 +echo "configure:2057: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2229,13 +2226,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2233: checking for object suffix" >&5 +echo "configure:2230: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2259,7 +2256,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2263: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2260: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2321,7 +2318,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2325: checking for file" >&5 +echo "configure:2322: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2392,7 +2389,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2396: checking for $ac_word" >&5 +echo "configure:2393: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2424,7 +2421,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2428: checking for $ac_word" >&5 +echo "configure:2425: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2459,7 +2456,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2463: checking for $ac_word" >&5 +echo "configure:2460: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2491,7 +2488,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2495: checking for $ac_word" >&5 +echo "configure:2492: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2558,8 +2555,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2562 "configure"' > conftest.$ac_ext - if { (eval echo configure:2563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2559 "configure"' > conftest.$ac_ext + if { (eval echo configure:2560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2578,7 +2575,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2596,7 +2593,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2600: checking whether the C compiler needs -belf" >&5 +echo "configure:2597: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2609,14 +2606,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2613 "configure" +#line 2610 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2646,7 +2643,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2650: checking for $ac_word" >&5 +echo "configure:2647: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2678,7 +2675,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2682: checking for $ac_word" >&5 +echo "configure:2679: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2713,7 +2710,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2717: checking for $ac_word" >&5 +echo "configure:2714: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2745,7 +2742,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2749: checking for $ac_word" >&5 +echo "configure:2746: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2780,7 +2777,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2784: checking for $ac_word" >&5 +echo "configure:2781: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2812,7 +2809,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2816: checking for $ac_word" >&5 +echo "configure:2813: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2848,12 +2845,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2852: checking if libtool should supply DllMain function" >&5 +echo "configure:2849: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2857 "configure" +#line 2854 "configure" #include "confdefs.h" int main() { @@ -2861,7 +2858,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2882,19 +2879,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2886: checking how to link DLLs" >&5 +echo "configure:2883: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2891 "configure" +#line 2888 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else diff --git a/newlib/libc/include/getopt.h b/newlib/libc/include/getopt.h deleted file mode 100644 index 7179298ae..000000000 --- a/newlib/libc/include/getopt.h +++ /dev/null @@ -1,136 +0,0 @@ -/**************************************************************************** - -getopt.h - Read command line options - -AUTHOR: Gregory Pietsch -CREATED Thu Jan 09 22:37:00 1997 - -DESCRIPTION: - -The getopt() function parses the command line arguments. Its arguments argc -and argv are the argument count and array as passed to the main() function -on program invocation. The argument optstring is a list of available option -characters. If such a character is followed by a colon (`:'), the option -takes an argument, which is placed in optarg. If such a character is -followed by two colons, the option takes an optional argument, which is -placed in optarg. If the option does not take an argument, optarg is NULL. - -The external variable optind is the index of the next array element of argv -to be processed; it communicates from one call to the next which element to -process. - -The getopt_long() function works like getopt() except that it also accepts -long options started by two dashes `--'. If these take values, it is either -in the form - ---arg=value - - or - ---arg value - -It takes the additional arguments longopts which is a pointer to the first -element of an array of type GETOPT_LONG_OPTION_T, defined below. The last -element of the array has to be filled with NULL for the name field. - -The longind pointer points to the index of the current long option relative -to longopts if it is non-NULL. - -The getopt() function returns the option character if the option was found -successfully, `:' if there was a missing parameter for one of the options, -`?' for an unknown option character, and EOF for the end of the option list. - -The getopt_long() function's return value is described below. - -The function getopt_long_only() is identical to getopt_long(), except that a -plus sign `+' can introduce long options as well as `--'. - -Describe how to deal with options that follow non-option ARGV-elements. - -If the caller did not specify anything, the default is REQUIRE_ORDER if the -environment variable POSIXLY_CORRECT is defined, PERMUTE otherwise. - -REQUIRE_ORDER means don't recognize them as options; stop option processing -when the first non-option is seen. This is what Unix does. This mode of -operation is selected by either setting the environment variable -POSIXLY_CORRECT, or using `+' as the first character of the optstring -parameter. - -PERMUTE is the default. We permute the contents of ARGV as we scan, so that -eventually all the non-options are at the end. This allows options to be -given in any order, even with programs that were not written to expect this. - -RETURN_IN_ORDER is an option available to programs that were written to -expect options and other ARGV-elements in any order and that care about the -ordering of the two. We describe each non-option ARGV-element as if it were -the argument of an option with character code 1. Using `-' as the first -character of the optstring parameter selects this mode of operation. - -The special argument `--' forces an end of option-scanning regardless of the -value of `ordering'. In the case of RETURN_IN_ORDER, only `--' can cause -getopt() and friends to return EOF with optind != argc. - -COPYRIGHT NOTICE AND DISCLAIMER: - -Copyright (C) 1997 Gregory Pietsch - -This file and the accompanying getopt.c implementation file are hereby -placed in the public domain without restrictions. Just give the author -credit, don't claim you wrote it or prevent anyone else from using it. - -Gregory Pietsch's current e-mail address: -gpietsch@comcast.net -****************************************************************************/ - -#ifndef GETOPT_H -#define GETOPT_H - -#include <_ansi.h> - -/* include files needed by this include file */ - -/* macros defined by this include file */ -#define NO_ARG 0 -#define REQUIRED_ARG 1 -#define OPTIONAL_ARG 2 - -/* types defined by this include file */ - -struct option -{ - char *name; /* the name of the long option */ - int has_arg; /* one of the above macros */ - int *flag; /* determines if getopt_long() returns a - * value for a long option; if it is - * non-NULL, 0 is returned as a function - * value and the value of val is stored in - * the area pointed to by flag. Otherwise, - * val is returned. */ - int val; /* determines the value to return if flag is - * NULL. */ -}; - -#ifdef __cplusplus -extern "C" -{ -#endif - - /* externally-defined variables */ - extern char *optarg; - extern int optind; - extern int opterr; - extern int optopt; - - /* function prototypes */ - int _EXFUN (getopt, (int __argc, char *const __argv[], const char *__optstring)); - int _EXFUN (getopt_long, (int __argc, char *const __argv[], const char *__shortopts, const struct option *__longopts, int *__longind)); - int _EXFUN (getopt_long_only, (int __argc, char *const __argv[], const char *__shortopts, const struct option *__longopts, int *__longind)); - -#ifdef __cplusplus -}; - -#endif - -#endif /* GETOPT_H */ - -/* END OF FILE getopt.h */ diff --git a/newlib/libc/include/ieeefp.h b/newlib/libc/include/ieeefp.h index e08fd0885..970ea4543 100644 --- a/newlib/libc/include/ieeefp.h +++ b/newlib/libc/include/ieeefp.h @@ -184,9 +184,6 @@ typedef int fp_rdi; fp_rdi _EXFUN(fpgetroundtoi,(void)); fp_rdi _EXFUN(fpsetroundtoi,(fp_rdi)); -#undef isnan -#undef isinf - int _EXFUN(isnan, (double)); int _EXFUN(isinf, (double)); int _EXFUN(finite, (double)); diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h index 41ce752b3..041e8000b 100644 --- a/newlib/libc/include/math.h +++ b/newlib/libc/include/math.h @@ -1,3 +1,4 @@ +/* math.h -- Definitions for the math floating point package. */ #ifndef _MATH_H_ #define _MATH_H_ @@ -118,10 +119,6 @@ typedef double double_t; #define FP_SUBNORMAL 3 #define FP_NORMAL 4 -extern int __isinff (float x); -extern int __isinfd (double x); -extern int __isnanf (float x); -extern int __isnand (double x); extern int __fpclassifyf (float x); extern int __fpclassifyd (double x); extern int __signbitf (float x); @@ -134,19 +131,9 @@ extern int __signbitd (double x); #define isfinite(y) \ (__extension__ ({__typeof__(y) __y = (y); \ fpclassify(__y) != FP_INFINITE && fpclassify(__y) != FP_NAN;})) - -/* Note: isinf and isnan were once functions in newlib that took double - * arguments. C99 specifies that these names are reserved for macros - * supporting multiple floating point types. Thus, they are - * now defined as macros. Implementations of the old functions - * taking double arguments still exist for compatibility purposes. */ -#define isinf(x) \ - (__extension__ ({__typeof__(x) __x = (x); \ - (sizeof (__x) == sizeof (float)) ? __isinff(__x) : __isinfd(__x);})) -#define isnan(x) \ - (__extension__ ({__typeof__(x) __x = (x); \ - (sizeof (__x) == sizeof (float)) ? __isnanf(__x) : __isnand(__x);})) -#define isnormal(y) (fpclassify(y) == FP_NORMAL) +#define isnormal(z) \ + (__extension__ ({__typeof__(z) __z = (z); \ + fpclassify(__z) == FP_NORMAL;})) #define signbit(x) \ (__extension__ ({__typeof__(x) __x = (x); \ (sizeof(__x) == sizeof(float)) ? __signbitf(__x) : __signbitd(__x);})) @@ -175,6 +162,8 @@ extern int __signbitd (double x); extern double infinity _PARAMS((void)); extern double nan _PARAMS((const char *)); +extern int isnan _PARAMS((double)); +extern int isinf _PARAMS((double)); extern int finite _PARAMS((double)); extern double copysign _PARAMS((double, double)); extern int ilogb _PARAMS((double)); diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h index c4e4dba9a..b287b5e28 100644 --- a/newlib/libc/include/sys/config.h +++ b/newlib/libc/include/sys/config.h @@ -59,7 +59,7 @@ /* in other words, go32 */ #define _FLOAT_RET double #endif -#if defined(__linux__) || defined(__RDOS__) +#ifdef __linux__ /* we want the reentrancy structure to be returned by a function */ #define __DYNAMIC_REENT__ #define HAVE_GETDATE diff --git a/newlib/libc/include/sys/time.h b/newlib/libc/include/sys/time.h index df3164941..346747aec 100644 --- a/newlib/libc/include/sys/time.h +++ b/newlib/libc/include/sys/time.h @@ -14,8 +14,8 @@ extern "C" { #ifndef _WINSOCK_H struct timeval { - time_t tv_sec; - suseconds_t tv_usec; + long tv_sec; + long tv_usec; }; struct timezone { diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h index bf08616ab..d03de7bfa 100644 --- a/newlib/libc/include/sys/types.h +++ b/newlib/libc/include/sys/types.h @@ -262,8 +262,7 @@ typedef _TIMER_T_ timer_t; #define __timer_t_defined #endif -typedef unsigned long useconds_t; -typedef long suseconds_t; +typedef long useconds_t; #include <sys/features.h> diff --git a/newlib/libc/machine/a29k/aclocal.m4 b/newlib/libc/machine/a29k/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/a29k/aclocal.m4 +++ b/newlib/libc/machine/a29k/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/a29k/configure b/newlib/libc/machine/a29k/configure index 028b7b4fa..83790719b 100755 --- a/newlib/libc/machine/a29k/configure +++ b/newlib/libc/machine/a29k/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/aclocal.m4 b/newlib/libc/machine/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libc/machine/aclocal.m4 +++ b/newlib/libc/machine/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/arm/aclocal.m4 b/newlib/libc/machine/arm/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/arm/aclocal.m4 +++ b/newlib/libc/machine/arm/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/arm/configure b/newlib/libc/machine/arm/configure index 028b7b4fa..83790719b 100755 --- a/newlib/libc/machine/arm/configure +++ b/newlib/libc/machine/arm/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/arm/setjmp.S b/newlib/libc/machine/arm/setjmp.S index 84e7cd70b..d37486090 100644 --- a/newlib/libc/machine/arm/setjmp.S +++ b/newlib/libc/machine/arm/setjmp.S @@ -51,39 +51,17 @@ Function entry is much simpler. If we are compiling for the Thumb we just switch into ARM mode and then drop through into the rest of the function. The function exit code will take care of the restore to - Thumb mode. - - For Thumb-2 do everything in Thumb mode. */ + Thumb mode. */ #ifdef __APCS_26__ #define RET movs pc, lr -#elif defined(__thumb2__) -#define RET bx lr #else #define RET tst lr, #1; \ moveq pc, lr ; \ .word 0xe12fff1e /* bx lr */ #endif -#ifdef __thumb2__ -.macro COND where when - i\where \when -.endm -#else -.macro COND where when -.endm -#endif - -#if defined(__thumb2__) -.syntax unified -.macro MODE - .thumb - .thumb_func -.endm -.macro PROLOGUE name -.endm - -#elif defined(__thumb__) +#ifdef __thumb__ #define MODE .thumb_func .macro PROLOGUE name .code 16 @@ -92,7 +70,7 @@ .code 32 SYM (.arm_start_of.\name): .endm -#else /* Arm */ +#else #define MODE .code 32 .macro PROLOGUE name .endm @@ -153,9 +131,6 @@ SYM (\name): /* Put the return value into the integer result register. But if it is zero then return 1 instead. */ movs a1, a2 -#ifdef __thumb2__ - it eq -#endif moveq a1, #1 FUNC_END longjmp diff --git a/newlib/libc/machine/configure b/newlib/libc/machine/configure index 72835683d..58b7af8ac 100755 --- a/newlib/libc/machine/configure +++ b/newlib/libc/machine/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1659: checking for $ac_word" >&5 +echo "configure:1656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1685,7 +1682,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1689: checking for $ac_word" >&5 +echo "configure:1686: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1736,7 +1733,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_word" >&5 +echo "configure:1737: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1886,7 +1883,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1954,7 +1951,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2025: checking whether ln -s works" >&5 +echo "configure:2022: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2219: checking for object suffix" >&5 +echo "configure:2216: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,7 +2304,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2311: checking for file" >&5 +echo "configure:2308: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2378,7 +2375,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_word" >&5 +echo "configure:2379: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2414: checking for $ac_word" >&5 +echo "configure:2411: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +2442,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2449: checking for $ac_word" >&5 +echo "configure:2446: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2481: checking for $ac_word" >&5 +echo "configure:2478: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_word" >&5 +echo "configure:2633: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2696,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_word" >&5 +echo "configure:2700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2735: checking for $ac_word" >&5 +echo "configure:2732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2766,7 +2763,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2770: checking for $ac_word" >&5 +echo "configure:2767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2802: checking for $ac_word" >&5 +echo "configure:2799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2834,12 +2831,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2872: checking how to link DLLs" >&5 +echo "configure:2869: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else diff --git a/newlib/libc/machine/cris/aclocal.m4 b/newlib/libc/machine/cris/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/cris/aclocal.m4 +++ b/newlib/libc/machine/cris/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/cris/configure b/newlib/libc/machine/cris/configure index 55475a5a9..cf848814a 100755 --- a/newlib/libc/machine/cris/configure +++ b/newlib/libc/machine/cris/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/crx/aclocal.m4 b/newlib/libc/machine/crx/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/crx/aclocal.m4 +++ b/newlib/libc/machine/crx/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/crx/configure b/newlib/libc/machine/crx/configure index 028b7b4fa..83790719b 100755 --- a/newlib/libc/machine/crx/configure +++ b/newlib/libc/machine/crx/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/d10v/aclocal.m4 b/newlib/libc/machine/d10v/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/d10v/aclocal.m4 +++ b/newlib/libc/machine/d10v/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/d10v/configure b/newlib/libc/machine/d10v/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/d10v/configure +++ b/newlib/libc/machine/d10v/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/d30v/aclocal.m4 b/newlib/libc/machine/d30v/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/d30v/aclocal.m4 +++ b/newlib/libc/machine/d30v/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/d30v/configure b/newlib/libc/machine/d30v/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/d30v/configure +++ b/newlib/libc/machine/d30v/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/fr30/aclocal.m4 b/newlib/libc/machine/fr30/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/fr30/aclocal.m4 +++ b/newlib/libc/machine/fr30/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/fr30/configure b/newlib/libc/machine/fr30/configure index 028b7b4fa..83790719b 100755 --- a/newlib/libc/machine/fr30/configure +++ b/newlib/libc/machine/fr30/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/frv/aclocal.m4 b/newlib/libc/machine/frv/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/frv/aclocal.m4 +++ b/newlib/libc/machine/frv/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/frv/configure b/newlib/libc/machine/frv/configure index 028b7b4fa..83790719b 100755 --- a/newlib/libc/machine/frv/configure +++ b/newlib/libc/machine/frv/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/h8300/aclocal.m4 b/newlib/libc/machine/h8300/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/h8300/aclocal.m4 +++ b/newlib/libc/machine/h8300/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/h8300/configure b/newlib/libc/machine/h8300/configure index 4a3c8cf46..bb23d869d 100755 --- a/newlib/libc/machine/h8300/configure +++ b/newlib/libc/machine/h8300/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/h8500/aclocal.m4 b/newlib/libc/machine/h8500/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/h8500/aclocal.m4 +++ b/newlib/libc/machine/h8500/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/h8500/configure b/newlib/libc/machine/h8500/configure index ec4e3cf09..e972cf17f 100755 --- a/newlib/libc/machine/h8500/configure +++ b/newlib/libc/machine/h8500/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/hppa/aclocal.m4 b/newlib/libc/machine/hppa/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/hppa/aclocal.m4 +++ b/newlib/libc/machine/hppa/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/hppa/configure b/newlib/libc/machine/hppa/configure index ec6b96e33..45e75dcaf 100755 --- a/newlib/libc/machine/hppa/configure +++ b/newlib/libc/machine/hppa/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/i386/aclocal.m4 b/newlib/libc/machine/i386/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libc/machine/i386/aclocal.m4 +++ b/newlib/libc/machine/i386/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/i386/configure b/newlib/libc/machine/i386/configure index 60bb861a8..f5718acd8 100755 --- a/newlib/libc/machine/i386/configure +++ b/newlib/libc/machine/i386/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1659: checking for $ac_word" >&5 +echo "configure:1656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1685,7 +1682,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1689: checking for $ac_word" >&5 +echo "configure:1686: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1736,7 +1733,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_word" >&5 +echo "configure:1737: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1886,7 +1883,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1954,7 +1951,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2025: checking whether ln -s works" >&5 +echo "configure:2022: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2219: checking for object suffix" >&5 +echo "configure:2216: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,7 +2304,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2311: checking for file" >&5 +echo "configure:2308: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2378,7 +2375,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_word" >&5 +echo "configure:2379: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2414: checking for $ac_word" >&5 +echo "configure:2411: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +2442,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2449: checking for $ac_word" >&5 +echo "configure:2446: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2481: checking for $ac_word" >&5 +echo "configure:2478: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_word" >&5 +echo "configure:2633: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2696,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_word" >&5 +echo "configure:2700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2735: checking for $ac_word" >&5 +echo "configure:2732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2766,7 +2763,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2770: checking for $ac_word" >&5 +echo "configure:2767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2802: checking for $ac_word" >&5 +echo "configure:2799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2834,12 +2831,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2872: checking how to link DLLs" >&5 +echo "configure:2869: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else diff --git a/newlib/libc/machine/i960/aclocal.m4 b/newlib/libc/machine/i960/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/i960/aclocal.m4 +++ b/newlib/libc/machine/i960/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/i960/configure b/newlib/libc/machine/i960/configure index 554de7e58..8d4adaef6 100755 --- a/newlib/libc/machine/i960/configure +++ b/newlib/libc/machine/i960/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/iq2000/aclocal.m4 b/newlib/libc/machine/iq2000/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/iq2000/aclocal.m4 +++ b/newlib/libc/machine/iq2000/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/iq2000/configure b/newlib/libc/machine/iq2000/configure index 028b7b4fa..83790719b 100755 --- a/newlib/libc/machine/iq2000/configure +++ b/newlib/libc/machine/iq2000/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/m32c/aclocal.m4 b/newlib/libc/machine/m32c/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/m32c/aclocal.m4 +++ b/newlib/libc/machine/m32c/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/m32c/configure b/newlib/libc/machine/m32c/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/m32c/configure +++ b/newlib/libc/machine/m32c/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/m32r/aclocal.m4 b/newlib/libc/machine/m32r/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/m32r/aclocal.m4 +++ b/newlib/libc/machine/m32r/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/m32r/configure b/newlib/libc/machine/m32r/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/m32r/configure +++ b/newlib/libc/machine/m32r/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/m68hc11/aclocal.m4 b/newlib/libc/machine/m68hc11/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/m68hc11/aclocal.m4 +++ b/newlib/libc/machine/m68hc11/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/m68hc11/configure b/newlib/libc/machine/m68hc11/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/m68hc11/configure +++ b/newlib/libc/machine/m68hc11/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/m68k/aclocal.m4 b/newlib/libc/machine/m68k/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/m68k/aclocal.m4 +++ b/newlib/libc/machine/m68k/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/m68k/configure b/newlib/libc/machine/m68k/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/m68k/configure +++ b/newlib/libc/machine/m68k/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/m88k/aclocal.m4 b/newlib/libc/machine/m88k/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/m88k/aclocal.m4 +++ b/newlib/libc/machine/m88k/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/m88k/configure b/newlib/libc/machine/m88k/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/m88k/configure +++ b/newlib/libc/machine/m88k/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/mips/aclocal.m4 b/newlib/libc/machine/mips/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/mips/aclocal.m4 +++ b/newlib/libc/machine/mips/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/mips/configure b/newlib/libc/machine/mips/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/mips/configure +++ b/newlib/libc/machine/mips/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/mn10200/aclocal.m4 b/newlib/libc/machine/mn10200/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/mn10200/aclocal.m4 +++ b/newlib/libc/machine/mn10200/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/mn10200/configure b/newlib/libc/machine/mn10200/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/mn10200/configure +++ b/newlib/libc/machine/mn10200/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/mn10300/aclocal.m4 b/newlib/libc/machine/mn10300/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/mn10300/aclocal.m4 +++ b/newlib/libc/machine/mn10300/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/mn10300/configure b/newlib/libc/machine/mn10300/configure index ec6b96e33..45e75dcaf 100755 --- a/newlib/libc/machine/mn10300/configure +++ b/newlib/libc/machine/mn10300/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/mt/aclocal.m4 b/newlib/libc/machine/mt/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/mt/aclocal.m4 +++ b/newlib/libc/machine/mt/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/mt/configure b/newlib/libc/machine/mt/configure index 028b7b4fa..83790719b 100755 --- a/newlib/libc/machine/mt/configure +++ b/newlib/libc/machine/mt/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/necv70/aclocal.m4 b/newlib/libc/machine/necv70/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/necv70/aclocal.m4 +++ b/newlib/libc/machine/necv70/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/necv70/configure b/newlib/libc/machine/necv70/configure index 58653d8be..9385ed647 100755 --- a/newlib/libc/machine/necv70/configure +++ b/newlib/libc/machine/necv70/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/powerpc/aclocal.m4 b/newlib/libc/machine/powerpc/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/powerpc/aclocal.m4 +++ b/newlib/libc/machine/powerpc/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/powerpc/configure b/newlib/libc/machine/powerpc/configure index e74aa97b6..9f4a0e622 100755 --- a/newlib/libc/machine/powerpc/configure +++ b/newlib/libc/machine/powerpc/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/sh/aclocal.m4 b/newlib/libc/machine/sh/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/sh/aclocal.m4 +++ b/newlib/libc/machine/sh/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/sh/configure b/newlib/libc/machine/sh/configure index 1eb7514bc..35662abba 100755 --- a/newlib/libc/machine/sh/configure +++ b/newlib/libc/machine/sh/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1569,7 +1566,7 @@ OBJEXT=${oext} echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1573: checking how to run the C preprocessor" >&5 +echo "configure:1570: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1584,13 +1581,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1588 "configure" +#line 1585 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1601,13 +1598,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1605 "configure" +#line 1602 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1618,13 +1615,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1622 "configure" +#line 1619 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1649,7 +1646,7 @@ fi echo "$ac_t""$CPP" 1>&6 cat > conftest.$ac_ext <<EOF -#line 1653 "configure" +#line 1650 "configure" #include "confdefs.h" #if __SH5__ diff --git a/newlib/libc/machine/sparc/aclocal.m4 b/newlib/libc/machine/sparc/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/sparc/aclocal.m4 +++ b/newlib/libc/machine/sparc/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/sparc/configure b/newlib/libc/machine/sparc/configure index 934fdab95..5eacd1985 100755 --- a/newlib/libc/machine/sparc/configure +++ b/newlib/libc/machine/sparc/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/tic4x/aclocal.m4 b/newlib/libc/machine/tic4x/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/tic4x/aclocal.m4 +++ b/newlib/libc/machine/tic4x/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/tic4x/configure b/newlib/libc/machine/tic4x/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/tic4x/configure +++ b/newlib/libc/machine/tic4x/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/tic80/aclocal.m4 b/newlib/libc/machine/tic80/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/tic80/aclocal.m4 +++ b/newlib/libc/machine/tic80/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/tic80/configure b/newlib/libc/machine/tic80/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/tic80/configure +++ b/newlib/libc/machine/tic80/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/v850/aclocal.m4 b/newlib/libc/machine/v850/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/v850/aclocal.m4 +++ b/newlib/libc/machine/v850/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/v850/configure b/newlib/libc/machine/v850/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/v850/configure +++ b/newlib/libc/machine/v850/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/w65/aclocal.m4 b/newlib/libc/machine/w65/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/w65/aclocal.m4 +++ b/newlib/libc/machine/w65/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/w65/configure b/newlib/libc/machine/w65/configure index ec4e3cf09..e972cf17f 100755 --- a/newlib/libc/machine/w65/configure +++ b/newlib/libc/machine/w65/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/xscale/aclocal.m4 b/newlib/libc/machine/xscale/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/xscale/aclocal.m4 +++ b/newlib/libc/machine/xscale/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/xscale/configure b/newlib/libc/machine/xscale/configure index 028b7b4fa..83790719b 100755 --- a/newlib/libc/machine/xscale/configure +++ b/newlib/libc/machine/xscale/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/xstormy16/aclocal.m4 b/newlib/libc/machine/xstormy16/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/xstormy16/aclocal.m4 +++ b/newlib/libc/machine/xstormy16/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/xstormy16/configure b/newlib/libc/machine/xstormy16/configure index 98bab641e..bb3b22ba4 100755 --- a/newlib/libc/machine/xstormy16/configure +++ b/newlib/libc/machine/xstormy16/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/machine/z8k/aclocal.m4 b/newlib/libc/machine/z8k/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/machine/z8k/aclocal.m4 +++ b/newlib/libc/machine/z8k/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/machine/z8k/configure b/newlib/libc/machine/z8k/configure index 8b9a4a1df..bcfc5eb65 100755 --- a/newlib/libc/machine/z8k/configure +++ b/newlib/libc/machine/z8k/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c index 05084dde0..b417e5424 100644 --- a/newlib/libc/stdio/fflush.c +++ b/newlib/libc/stdio/fflush.c @@ -72,18 +72,8 @@ _DEFUN(fflush, (fp), _flockfile (fp); t = fp->_flags; - if ((t & __SWR) == 0) + if ((t & __SWR) == 0 || (p = fp->_bf._base) == NULL) { - /* For a read stream, an fflush causes the next seek to be - unoptimized (i.e. forces a system-level seek). This conforms - to the POSIX and SUSv3 standards. */ - fp->_flags |= __SNPT; - _funlockfile (fp); - return 0; - } - if ((p = fp->_bf._base) == NULL) - { - /* Nothing to flush. */ _funlockfile (fp); return 0; } diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c index ae3444b1b..995100b27 100644 --- a/newlib/libc/stdio/freopen.c +++ b/newlib/libc/stdio/freopen.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1990, 2006 The Regents of the University of California. + * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -55,12 +55,6 @@ it). <[file]> and <[mode]> are used just as in <<fopen>>. -If <[file]> is <<NULL>>, the underlying stream is modified rather than -closed. The file cannot be given a more permissive access mode (for -example, a <[mode]> of "w" will fail on a read-only file descriptor), -but can change status such as append or binary mode. If modification -is not possible, failure occurs. - RETURNS If successful, the result is the same as the argument <[fp]>. If the file cannot be opened as specified, the result is <<NULL>>. @@ -76,7 +70,6 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>, #include <reent.h> #include <time.h> #include <stdio.h> -#include <errno.h> #include <fcntl.h> #include <stdlib.h> #include <sys/lock.h> @@ -94,8 +87,7 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp), register FILE *fp) { register int f; - int flags, oflags; - int e = 0; + int flags, oflags, e; __sfp_lock_acquire (); @@ -125,60 +117,17 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp), { if (fp->_flags & __SWR) _CAST_VOID fflush (fp); - /* - * If close is NULL, closing is a no-op, hence pointless. - * If file is NULL, the file should not be closed. - */ - if (fp->_close != NULL && file != NULL) + /* if close is NULL, closing is a no-op, hence pointless */ + if (fp->_close != NULL) _CAST_VOID (*fp->_close) (fp->_cookie); } /* - * Now get a new descriptor to refer to the new file, or reuse the - * existing file descriptor if file is NULL. + * Now get a new descriptor to refer to the new file. */ - if (file != NULL) - { - f = _open_r (ptr, (char *) file, oflags, 0666); - e = ptr->_errno; - } - else - { -#ifdef HAVE_FCNTL - int oldflags; - /* - * Reuse the file descriptor, but only if the new access mode is - * equal or less permissive than the old. F_SETFL correctly - * ignores creation flags. - */ - f = fp->_file; - if ((oldflags = _fcntl_r (ptr, f, F_GETFL, 0)) == -1 - || ! ((oldflags & O_ACCMODE) == O_RDWR - || ((oldflags ^ oflags) & O_ACCMODE) == 0) - || _fcntl_r (ptr, f, F_SETFL, oflags) == -1) - f = -1; -#else - /* We cannot modify without fcntl support. */ - f = -1; -#endif - -#ifdef __SCLE - /* - * F_SETFL doesn't change textmode. Don't mess with modes of ttys. - */ - if (0 <= f && ! isatty (f) - && setmode (f, flags & (O_BINARY | O_TEXT)) == -1) - f = -1; -#endif - - if (f < 0) - { - e = EBADF; - if (fp->_close != NULL) - _CAST_VOID (*fp->_close) (fp->_cookie); - } - } + f = _open_r (ptr, (char *) file, oflags, 0666); + e = ptr->_errno; /* * Finish closing fp. Even if the open succeeded above, diff --git a/newlib/libc/stdio/fseek.c b/newlib/libc/stdio/fseek.c index 8b189ba17..2ad98551c 100644 --- a/newlib/libc/stdio/fseek.c +++ b/newlib/libc/stdio/fseek.c @@ -359,13 +359,6 @@ dumb: fp->_r = 0; /* fp->_w = 0; *//* unnecessary (I think...) */ fp->_flags &= ~__SEOF; - /* Reset no-optimization flag after successful seek. The - no-optimization flag may be set in the case of a read - stream that is flushed which by POSIX/SUSv3 standards, - means that a corresponding seek must not optimize. The - optimization is then allowed if no subsequent flush - is performed. */ - fp->_flags &= ~__SNPT; _funlockfile (fp); return 0; } diff --git a/newlib/libc/stdio/wsetup.c b/newlib/libc/stdio/wsetup.c index cf56c2abc..bc7299678 100644 --- a/newlib/libc/stdio/wsetup.c +++ b/newlib/libc/stdio/wsetup.c @@ -58,11 +58,9 @@ _DEFUN(__swsetup, (fp), /* * Make a buffer if necessary, then set _w. - * A string I/O file should not explicitly allocate a buffer - * unless asprintf is being used. */ - if (fp->_bf._base == NULL - && (!(fp->_flags & __SSTR) || (fp->_flags & __SMBF))) + /* NOT NEEDED FOR CYGNUS SPRINTF ONLY jpg */ + if (fp->_bf._base == NULL) __smakebuf (fp); if (fp->_flags & __SLBF) diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c index 6081e03dc..b8b7974e5 100644 --- a/newlib/libc/stdio64/freopen64.c +++ b/newlib/libc/stdio64/freopen64.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1990, 2006 The Regents of the University of California. + * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -55,12 +55,6 @@ it). <[file]> and <[mode]> are used just as in <<fopen>>. -If <[file]> is <<NULL>>, the underlying stream is modified rather than -closed. The file cannot be given a more permissive access mode (for -example, a <[mode]> of "w" will fail on a read-only file descriptor), -but can change status such as append or binary mode. If modification -is not possible, failure occurs. - RETURNS If successful, the result is the same as the argument <[fp]>. If the file cannot be opened as specified, the result is <<NULL>>. @@ -74,7 +68,6 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>, #include <time.h> #include <stdio.h> -#include <errno.h> #include <fcntl.h> #include <stdlib.h> #include <sys/lock.h> @@ -94,8 +87,7 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), register FILE *fp) { register int f; - int flags, oflags; - int e = 0; + int flags, oflags, e; __sfp_lock_acquire (); @@ -125,60 +117,17 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), { if (fp->_flags & __SWR) (void) fflush (fp); - /* - * If close is NULL, closing is a no-op, hence pointless. - * If file is NULL, the file should not be closed. - */ - if (fp->_close != NULL && file != NULL) + /* if close is NULL, closing is a no-op, hence pointless */ + if (fp->_close != NULL) (void) (*fp->_close) (fp->_cookie); } /* - * Now get a new descriptor to refer to the new file, or reuse the - * existing file descriptor if file is NULL. + * Now get a new descriptor to refer to the new file. */ - if (file != NULL) - { - f = _open64_r (ptr, (char *) file, oflags, 0666); - e = ptr->_errno; - } - else - { -#ifdef HAVE_FCNTL - int oldflags; - /* - * Reuse the file descriptor, but only if the new access mode is - * equal or less permissive than the old. F_SETFL correctly - * ignores creation flags. - */ - f = fp->_file; - if ((oldflags = _fcntl_r (ptr, f, F_GETFL, 0)) == -1 - || ! ((oldflags & O_ACCMODE) == O_RDWR - || ((oldflags ^ oflags) & O_ACCMODE) == 0) - || _fcntl_r (ptr, f, F_SETFL, oflags) == -1) - f = -1; -#else - /* We cannot modify without fcntl support. */ - f = -1; -#endif - -#ifdef __SCLE - /* - * F_SETFL doesn't change textmode. Don't mess with modes of ttys. - */ - if (0 <= f && ! isatty (f) - && setmode (f, flags & (O_BINARY | O_TEXT)) == -1) - f = -1; -#endif - - if (f < 0) - { - e = EBADF; - if (fp->_close != NULL) - (void) (*fp->_close) (fp->_cookie); - } - } + f = _open64_r (ptr, (char *) file, oflags, 0666); + e = ptr->_errno; /* * Finish closing fp. Even if the open succeeded above, diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c index 49eebb37e..04f494738 100644 --- a/newlib/libc/stdlib/__atexit.c +++ b/newlib/libc/stdlib/__atexit.c @@ -35,9 +35,6 @@ _DEFUN (__register_exitproc, _GLOBAL_REENT->_atexit = p = &_GLOBAL_REENT->_atexit0; if (p->_ind >= _ATEXIT_SIZE) { -#ifndef _ATEXIT_DYNAMIC_ALLOC - return -1; -#else p = (struct _atexit *) malloc (sizeof *p); if (p == NULL) { @@ -53,7 +50,6 @@ _DEFUN (__register_exitproc, p->_on_exit_args._fntypes = 0; p->_on_exit_args._is_cxa = 0; #endif -#endif } if (type != __et_atexit) diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c index 6fa398ae2..cea569ff4 100644 --- a/newlib/libc/stdlib/__call_atexit.c +++ b/newlib/libc/stdlib/__call_atexit.c @@ -61,9 +61,6 @@ _DEFUN (__call_exitprocs, (code, d), (*((void (*)(_PTR)) fn))(args->_fnargs[n]); } -#ifndef _ATEXIT_DYNAMIC_ALLOC - break; -#else /* Move to the next block. Free empty blocks except the last one, which is part of _GLOBAL_REENT. */ if (p->_ind == 0 && p->_next) @@ -82,6 +79,5 @@ _DEFUN (__call_exitprocs, (code, d), lastp = &p->_next; p = p->_next; } -#endif } } diff --git a/newlib/libc/stdlib/getopt.c b/newlib/libc/stdlib/getopt.c index 10002ed6b..b38938d5f 100644 --- a/newlib/libc/stdlib/getopt.c +++ b/newlib/libc/stdlib/getopt.c @@ -1,406 +1,117 @@ -/**************************************************************************** +/* + * Copyright (c) 1987, 1993, 1994 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +/* static char sccsid[] = "from: @(#)getopt.c 8.2 (Berkeley) 4/2/94"; */ +static char *rcsid = "$Id$"; +#endif /* LIBC_SCCS and not lint */ -getopt.c - Read command line options - -AUTHOR: Gregory Pietsch -CREATED Fri Jan 10 21:13:05 1997 - -DESCRIPTION: - -The getopt() function parses the command line arguments. Its arguments argc -and argv are the argument count and array as passed to the main() function -on program invocation. The argument optstring is a list of available option -characters. If such a character is followed by a colon (`:'), the option -takes an argument, which is placed in optarg. If such a character is -followed by two colons, the option takes an optional argument, which is -placed in optarg. If the option does not take an argument, optarg is NULL. - -The external variable optind is the index of the next array element of argv -to be processed; it communicates from one call to the next which element to -process. - -The getopt_long() function works like getopt() except that it also accepts -long options started by two dashes `--'. If these take values, it is either -in the form - ---arg=value - - or - ---arg value - -It takes the additional arguments longopts which is a pointer to the first -element of an array of type struct option. The last element of the array -has to be filled with NULL for the name field. - -The longind pointer points to the index of the current long option relative -to longopts if it is non-NULL. - -The getopt() function returns the option character if the option was found -successfully, `:' if there was a missing parameter for one of the options, -`?' for an unknown option character, and EOF for the end of the option list. - -The getopt_long() function's return value is described in the header file. - -The function getopt_long_only() is identical to getopt_long(), except that a -plus sign `+' can introduce long options as well as `--'. - -The following describes how to deal with options that follow non-option -argv-elements. - -If the caller did not specify anything, the default is REQUIRE_ORDER if the -environment variable POSIXLY_CORRECT is defined, PERMUTE otherwise. - -REQUIRE_ORDER means don't recognize them as options; stop option processing -when the first non-option is seen. This is what Unix does. This mode of -operation is selected by either setting the environment variable -POSIXLY_CORRECT, or using `+' as the first character of the optstring -parameter. - -PERMUTE is the default. We permute the contents of ARGV as we scan, so that -eventually all the non-options are at the end. This allows options to be -given in any order, even with programs that were not written to expect this. - -RETURN_IN_ORDER is an option available to programs that were written to -expect options and other argv-elements in any order and that care about the -ordering of the two. We describe each non-option argv-element as if it were -the argument of an option with character code 1. Using `-' as the first -character of the optstring parameter selects this mode of operation. - -The special argument `--' forces an end of option-scanning regardless of the -value of ordering. In the case of RETURN_IN_ORDER, only `--' can cause -getopt() and friends to return EOF with optind != argc. - -COPYRIGHT NOTICE AND DISCLAIMER: - -Copyright (C) 1997 Gregory Pietsch - -This file and the accompanying getopt.h header file are hereby placed in the -public domain without restrictions. Just give the author credit, don't -claim you wrote it or prevent anyone else from using it. - -Gregory Pietsch's current e-mail address: -gpietsch@comcast.net -****************************************************************************/ - -/* include files */ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <getopt.h> -/* macros */ +int opterr = 1, /* if error message should be printed */ + optind = 1, /* index into parent argv vector */ + optopt, /* character checked for validity */ + optreset; /* reset getopt */ +char *optarg; /* argument associated with option */ -/* types */ -typedef enum GETOPT_ORDERING_T -{ - PERMUTE, - RETURN_IN_ORDER, - REQUIRE_ORDER -} GETOPT_ORDERING_T; - -/* globally-defined variables */ -char *optarg = NULL; -int optind = 0; -int opterr = 1; -int optopt = '?'; - -/* functions */ - -/* reverse_argv_elements: reverses num elements starting at argv */ -static void -reverse_argv_elements (char ** argv, int num) -{ - int i; - char *tmp; - - for (i = 0; i < (num >> 1); i++) - { - tmp = argv[i]; - argv[i] = argv[num - i - 1]; - argv[num - i - 1] = tmp; - } -} - -/* permute: swap two blocks of argv-elements given their lengths */ -static void -permute (char *const argv[], int len1, int len2) -{ - reverse_argv_elements ((char **)argv, len1); - reverse_argv_elements ((char **)argv, len1 + len2); - reverse_argv_elements ((char **)argv, len2); -} - -/* is_option: is this argv-element an option or the end of the option list? */ -static int -is_option (char *argv_element, int only) -{ - return ((argv_element == NULL) - || (argv_element[0] == '-') || (only && argv_element[0] == '+')); -} - -/* getopt_internal: the function that does all the dirty work */ -static int -getopt_internal (int argc, char *const argv[], const char *shortopts, - const struct option *longopts, int *longind, int only) -{ - GETOPT_ORDERING_T ordering = PERMUTE; - static size_t optwhere = 0; - size_t permute_from = 0; - int num_nonopts = 0; - int optindex = 0; - size_t match_chars = 0; - char *possible_arg = NULL; - int longopt_match = -1; - int has_arg = -1; - char *cp; - int arg_next = 0; - - /* first, deal with silly parameters and easy stuff */ - if (argc == 0 || argv == NULL || (shortopts == NULL && longopts == NULL)) - return EOF; - if (optind >= argc || argv[optind] == NULL) - return EOF; - if (strcmp (argv[optind], "--") == 0) - { - optind++; - return EOF; - } - /* if this is our first time through */ - if (optind == 0) - optind = optwhere = 1; - - /* define ordering */ - if (shortopts != NULL && (*shortopts == '-' || *shortopts == '+')) - { - ordering = (*shortopts == '-') ? RETURN_IN_ORDER : REQUIRE_ORDER; - shortopts++; - } - else - ordering = (getenv ("POSIXLY_CORRECT") != NULL) ? REQUIRE_ORDER : PERMUTE; - - /* - * based on ordering, find our next option, if we're at the beginning of - * one - */ - if (optwhere == 1) - { - switch (ordering) - { - case PERMUTE: - permute_from = optind; - num_nonopts = 0; - while (!is_option (argv[optind], only)) - { - optind++; - num_nonopts++; - } - if (argv[optind] == NULL) - { - /* no more options */ - optind = permute_from; - return EOF; - } - else if (strcmp (argv[optind], "--") == 0) - { - /* no more options, but have to get `--' out of the way */ - permute (argv + permute_from, num_nonopts, 1); - optind = permute_from + 1; - return EOF; - } - break; - case RETURN_IN_ORDER: - if (!is_option (argv[optind], only)) - { - optarg = argv[optind++]; - return (optopt = 1); - } - break; - case REQUIRE_ORDER: - if (!is_option (argv[optind], only)) - return EOF; - break; - } - } - /* we've got an option, so parse it */ - - /* first, is it a long option? */ - if (longopts != NULL - && (memcmp (argv[optind], "--", 2) == 0 - || (only && argv[optind][0] == '+')) && optwhere == 1) - { - /* handle long options */ - if (memcmp (argv[optind], "--", 2) == 0) - optwhere = 2; - longopt_match = -1; - possible_arg = strchr (argv[optind] + optwhere, '='); - if (possible_arg == NULL) - { - /* no =, so next argv might be arg */ - match_chars = strlen (argv[optind]); - possible_arg = argv[optind] + match_chars; - match_chars = match_chars - optwhere; - } - else - match_chars = (possible_arg - argv[optind]) - optwhere; - for (optindex = 0; longopts[optindex].name != NULL; optindex++) - { - if (memcmp (argv[optind] + optwhere, - longopts[optindex].name, match_chars) == 0) - { - /* do we have an exact match? */ - if (match_chars == (int) (strlen (longopts[optindex].name))) - { - longopt_match = optindex; - break; - } - /* do any characters match? */ - else - { - if (longopt_match < 0) - longopt_match = optindex; - else - { - /* we have ambiguous options */ - if (opterr) - fprintf (stderr, "%s: option `%s' is ambiguous " - "(could be `--%s' or `--%s')\n", - argv[0], - argv[optind], - longopts[longopt_match].name, - longopts[optindex].name); - return (optopt = '?'); - } - } - } - } - if (longopt_match >= 0) - has_arg = longopts[longopt_match].has_arg; - } - /* if we didn't find a long option, is it a short option? */ - if (longopt_match < 0 && shortopts != NULL) - { - cp = strchr (shortopts, argv[optind][optwhere]); - if (cp == NULL) - { - /* couldn't find option in shortopts */ - if (opterr) - fprintf (stderr, - "%s: invalid option -- `-%c'\n", - argv[0], argv[optind][optwhere]); - optwhere++; - if (argv[optind][optwhere] == '\0') - { - optind++; - optwhere = 1; - } - return (optopt = '?'); - } - has_arg = ((cp[1] == ':') - ? ((cp[2] == ':') ? OPTIONAL_ARG : REQUIRED_ARG) : NO_ARG); - possible_arg = argv[optind] + optwhere + 1; - optopt = *cp; - } - /* get argument and reset optwhere */ - arg_next = 0; - switch (has_arg) - { - case OPTIONAL_ARG: - if (*possible_arg == '=') - possible_arg++; - if (*possible_arg != '\0') - { - optarg = possible_arg; - optwhere = 1; - } - else - optarg = NULL; - break; - case REQUIRED_ARG: - if (*possible_arg == '=') - possible_arg++; - if (*possible_arg != '\0') - { - optarg = possible_arg; - optwhere = 1; - } - else if (optind + 1 >= argc) - { - if (opterr) - { - fprintf (stderr, "%s: argument required for option `", argv[0]); - if (longopt_match >= 0) - fprintf (stderr, "--%s'\n", longopts[longopt_match].name); - else - fprintf (stderr, "-%c'\n", *cp); - } - optind++; - return (optopt = ':'); - } - else - { - optarg = argv[optind + 1]; - arg_next = 1; - optwhere = 1; - } - break; - case NO_ARG: - if (longopt_match < 0) - { - optwhere++; - if (argv[optind][optwhere] == '\0') - optwhere = 1; - } - else - optwhere = 1; - optarg = NULL; - break; - } - - /* do we have to permute or otherwise modify optind? */ - if (ordering == PERMUTE && optwhere == 1 && num_nonopts != 0) - { - permute (argv + permute_from, num_nonopts, 1 + arg_next); - optind = permute_from + 1 + arg_next; - } - else if (optwhere == 1) - optind = optind + 1 + arg_next; - - /* finally return */ - if (longopt_match >= 0) - { - if (longind != NULL) - *longind = longopt_match; - if (longopts[longopt_match].flag != NULL) - { - *(longopts[longopt_match].flag) = longopts[longopt_match].val; - return 0; - } - else - return longopts[longopt_match].val; - } - else - return optopt; -} +#define BADCH (int)'?' +#define BADARG (int)':' +#define EMSG "" +/* + * getopt -- + * Parse argc/argv argument vector. + */ int -getopt (int argc, char *const argv[], const char *optstring) +getopt(nargc, nargv, ostr) + int nargc; + char * const *nargv; + const char *ostr; { - return getopt_internal (argc, argv, optstring, NULL, NULL, 0); + static char *place = EMSG; /* option letter processing */ + char *oli; /* option letter list index */ + + if (optreset || !*place) { /* update scanning pointer */ + optreset = 0; + if (optind >= nargc || *(place = nargv[optind]) != '-') { + place = EMSG; + return (-1); + } + if (place[1] && *++place == '-') { /* found "--" */ + ++optind; + place = EMSG; + return (-1); + } + } /* option letter okay? */ + if ((optopt = (int)*place++) == (int)':' || + !(oli = strchr(ostr, optopt))) { + /* + * if the user didn't specify '-' as an option, + * assume it means -1. + */ + if (optopt == (int)'-') + return (-1); + if (!*place) + ++optind; + if (opterr && *ostr != ':') + (void)fprintf(stderr, + "%s: illegal option -- %c\n", nargv[0], optopt); + return (BADCH); + } + if (*++oli != ':') { /* don't need argument */ + optarg = NULL; + if (!*place) + ++optind; + } + else { /* need an argument */ + if (*place) /* no white space */ + optarg = place; + else if (nargc <= ++optind) { /* no arg */ + place = EMSG; + if (*ostr == ':') + return (BADARG); + if (opterr) + (void)fprintf(stderr, + "%s: option requires an argument -- %c\n", + nargv[0], optopt); + return (BADCH); + } + else /* white space */ + optarg = nargv[optind]; + place = EMSG; + ++optind; + } + return (optopt); /* dump back option letter */ } - -int -getopt_long (int argc, char *const argv[], const char *shortopts, - const struct option *longopts, int *longind) -{ - return getopt_internal (argc, argv, shortopts, longopts, longind, 0); -} - -int -getopt_long_only (int argc, char *const argv[], const char *shortopts, - const struct option *longopts, int *longind) -{ - return getopt_internal (argc, argv, shortopts, longopts, longind, 1); -} - -/* end of file GETOPT.C */ diff --git a/newlib/libc/string/strndup_r.c b/newlib/libc/string/strndup_r.c index 2acf63dec..86d9eec44 100644 --- a/newlib/libc/string/strndup_r.c +++ b/newlib/libc/string/strndup_r.c @@ -2,22 +2,16 @@ #include <stdlib.h> #include <string.h> +#define MIN(a,b) ((a) < (b) ? (a) : (b)) + char * _DEFUN (_strndup_r, (reent_ptr, str, n), struct _reent *reent_ptr _AND _CONST char *str _AND size_t n) { - _CONST char *ptr = str; - size_t len; - char *copy; - - while (n-- > 0 && *ptr) - ptr++; - - len = ptr - str; - - copy = _malloc_r (reent_ptr, len + 1); + size_t len = MIN(strlen (str), n); + char *copy = _malloc_r (reent_ptr, len + 1); if (copy) { memcpy (copy, str, len); diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c index ed60e9371..92826eeb2 100644 --- a/newlib/libc/string/strnlen.c +++ b/newlib/libc/string/strnlen.c @@ -42,7 +42,7 @@ _DEFUN (strnlen, (str, n), { _CONST char *start = str; - while (n-- > 0 && *str) + while (*str && n-- > 0) str++; return str - start; diff --git a/newlib/libc/sys/a29khif/aclocal.m4 b/newlib/libc/sys/a29khif/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/a29khif/aclocal.m4 +++ b/newlib/libc/sys/a29khif/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/a29khif/configure b/newlib/libc/sys/a29khif/configure index cd8d26300..1407c65c7 100755 --- a/newlib/libc/sys/a29khif/configure +++ b/newlib/libc/sys/a29khif/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/aclocal.m4 b/newlib/libc/sys/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libc/sys/aclocal.m4 +++ b/newlib/libc/sys/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/arc/aclocal.m4 b/newlib/libc/sys/arc/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/arc/aclocal.m4 +++ b/newlib/libc/sys/arc/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/arc/configure b/newlib/libc/sys/arc/configure index 39982f1bf..143e76bf1 100755 --- a/newlib/libc/sys/arc/configure +++ b/newlib/libc/sys/arc/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/arm/aclocal.m4 b/newlib/libc/sys/arm/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/arm/aclocal.m4 +++ b/newlib/libc/sys/arm/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/arm/configure b/newlib/libc/sys/arm/configure index 1f40c98f3..a5fac283f 100755 --- a/newlib/libc/sys/arm/configure +++ b/newlib/libc/sys/arm/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/arm/crt0.S b/newlib/libc/sys/arm/crt0.S index c750ca819..8a8372a88 100644 --- a/newlib/libc/sys/arm/crt0.S +++ b/newlib/libc/sys/arm/crt0.S @@ -18,26 +18,15 @@ /* .text is used instead of .section .text so it works with arm-aout too. */ .text -#if defined(__thumb2__) - .syntax unified - .thumb -.macro FUNC_START name - .global \name - .thumb_func -\name: -.endm -#else .code 32 -.macro FUNC_START name - .global \name -\name: -.endm -#endif .align 0 - FUNC_START _mainCRTStartup - FUNC_START _start - FUNC_START start + .global _mainCRTStartup + .global _start + .global start +start: +_start: +_mainCRTStartup: #if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__) /* Annotation for EABI unwinding tables. */ .fnstart @@ -56,12 +45,7 @@ /* Issue Angel SWI to read stack info */ mov r0, #AngelSWI_Reason_HeapInfo adr r1, .LC0 /* point at ptr to 4 words to receive data */ -#if defined(__thumb2__) - bkpt AngelSWI -#else - /* We are always in ARM mode for startup */ - AngelSWIAsm AngelSWI_ARM -#endif + swi AngelSWI_ARM /* We are always in ARM mode for startup */ ldr r0, .LC0 /* point at values read */ ldr sp, [r0, #8] ldr sl, [r0, #12] @@ -91,8 +75,8 @@ sub a3, a3, a1 /* Third arg: length of block */ -#if defined(__thumb__) && !defined(__thumb2__) - /* Enter Thumb mode.... */ +#ifdef __thumb__ /* Enter Thumb mode.... */ + add a4, pc, #1 /* Get the address of the Thumb block */ bx a4 /* Go there and start Thumb decoding */ @@ -116,7 +100,7 @@ __change_mode: #else mov r0, #AngelSWI_Reason_GetCmdLine adr r1, .LC30 /* Space for command line */ - AngelSWIAsm AngelSWI + swi AngelSWI ldr r1, .LC30 #endif /* Parse string at r1 */ @@ -238,7 +222,7 @@ __change_mode: bl FUNCTION (exit) /* Should not return. */ -#if defined(__thumb__) && !defined(__thumb2__) +#ifdef __thumb__ /* Come out of Thumb mode. This code should be redundant. */ mov a4, pc diff --git a/newlib/libc/sys/arm/libcfunc.c b/newlib/libc/sys/arm/libcfunc.c index 3bf0a56f4..ddc611f34 100644 --- a/newlib/libc/sys/arm/libcfunc.c +++ b/newlib/libc/sys/arm/libcfunc.c @@ -13,7 +13,7 @@ static inline int do_AngelSWI (int reason, void * arg) { int value; - asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0" + asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0" : "=r" (value) /* Outputs */ : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */ : "r0", "r1", "lr" diff --git a/newlib/libc/sys/arm/swi.h b/newlib/libc/sys/arm/swi.h index f5c910313..15c3866a1 100644 --- a/newlib/libc/sys/arm/swi.h +++ b/newlib/libc/sys/arm/swi.h @@ -33,14 +33,6 @@ #else #define AngelSWI AngelSWI_ARM #endif -/* For Thumb-2 code use the BKPT instruction instead of SWI. */ -#ifdef __thumb2__ -#define AngelSWIInsn "bkpt" -#define AngelSWIAsm bkpt -#else -#define AngelSWIInsn "swi" -#define AngelSWIAsm swi -#endif /* The reason codes: */ #define AngelSWI_Reason_Open 0x01 diff --git a/newlib/libc/sys/arm/syscalls.c b/newlib/libc/sys/arm/syscalls.c index 529309930..e89022806 100644 --- a/newlib/libc/sys/arm/syscalls.c +++ b/newlib/libc/sys/arm/syscalls.c @@ -98,7 +98,7 @@ static inline int do_AngelSWI (int reason, void * arg) { int value; - asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0" + asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0" : "=r" (value) /* Outputs */ : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */ : "r0", "r1", "r2", "r3", "ip", "lr", "memory", "cc" diff --git a/newlib/libc/sys/arm/trap.S b/newlib/libc/sys/arm/trap.S index 21b6937f9..328fabca5 100644 --- a/newlib/libc/sys/arm/trap.S +++ b/newlib/libc/sys/arm/trap.S @@ -1,5 +1,4 @@ /* Run-time exception support */ -#if !defined(__thumb2__) #include "swi.h" /* .text is used instead of .section .text so it works with arm-aout too. */ @@ -92,4 +91,3 @@ __rt_stkovf_split_big: @ We now know how much extra stack the function requires. @ Terminate the program for the moment: swi SWI_Exit -#endif diff --git a/newlib/libc/sys/configure b/newlib/libc/sys/configure index 04436d960..a0d67d92c 100755 --- a/newlib/libc/sys/configure +++ b/newlib/libc/sys/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1654,7 +1651,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1658: checking for $ac_word" >&5 +echo "configure:1655: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1684,7 +1681,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1688: checking for $ac_word" >&5 +echo "configure:1685: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1735,7 +1732,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1739: checking for $ac_word" >&5 +echo "configure:1736: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1767,7 +1764,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1768: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1778,12 +1775,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1782 "configure" +#line 1779 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1809,12 +1806,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1810: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1818: checking whether we are using GNU C" >&5 +echo "configure:1815: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1823,7 +1820,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1842,7 +1839,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1846: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1843: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1885,7 +1882,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1889: checking for ld used by GCC" >&5 +echo "configure:1886: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1915,10 +1912,10 @@ echo "configure:1889: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1919: checking for GNU ld" >&5 +echo "configure:1916: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1922: checking for non-GNU ld" >&5 +echo "configure:1919: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1953,7 +1950,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1957: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1954: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1970,7 +1967,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1974: checking for $LD option to reload object files" >&5 +echo "configure:1971: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1982,7 +1979,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1986: checking for BSD-compatible nm" >&5 +echo "configure:1983: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2020,7 +2017,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2024: checking whether ln -s works" >&5 +echo "configure:2021: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2041,7 +2038,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2045: checking how to recognise dependant libraries" >&5 +echo "configure:2042: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2214,13 +2211,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2218: checking for object suffix" >&5 +echo "configure:2215: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2244,7 +2241,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2248: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2245: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2306,7 +2303,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2310: checking for file" >&5 +echo "configure:2307: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2377,7 +2374,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2381: checking for $ac_word" >&5 +echo "configure:2378: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2409,7 +2406,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2413: checking for $ac_word" >&5 +echo "configure:2410: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2444,7 +2441,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2448: checking for $ac_word" >&5 +echo "configure:2445: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2476,7 +2473,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2480: checking for $ac_word" >&5 +echo "configure:2477: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2543,8 +2540,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2547 "configure"' > conftest.$ac_ext - if { (eval echo configure:2548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2544 "configure"' > conftest.$ac_ext + if { (eval echo configure:2545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2563,7 +2560,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2581,7 +2578,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2585: checking whether the C compiler needs -belf" >&5 +echo "configure:2582: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2594,14 +2591,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2598 "configure" +#line 2595 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2631,7 +2628,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2635: checking for $ac_word" >&5 +echo "configure:2632: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2663,7 +2660,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2667: checking for $ac_word" >&5 +echo "configure:2664: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2698,7 +2695,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2702: checking for $ac_word" >&5 +echo "configure:2699: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2730,7 +2727,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2734: checking for $ac_word" >&5 +echo "configure:2731: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2765,7 +2762,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2769: checking for $ac_word" >&5 +echo "configure:2766: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2797,7 +2794,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2801: checking for $ac_word" >&5 +echo "configure:2798: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2833,12 +2830,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2837: checking if libtool should supply DllMain function" >&5 +echo "configure:2834: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2842 "configure" +#line 2839 "configure" #include "confdefs.h" int main() { @@ -2846,7 +2843,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2867,19 +2864,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2871: checking how to link DLLs" >&5 +echo "configure:2868: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2876 "configure" +#line 2873 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else diff --git a/newlib/libc/sys/d10v/aclocal.m4 b/newlib/libc/sys/d10v/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/d10v/aclocal.m4 +++ b/newlib/libc/sys/d10v/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/d10v/configure b/newlib/libc/sys/d10v/configure index 091e11fe7..9fe5b55ef 100755 --- a/newlib/libc/sys/d10v/configure +++ b/newlib/libc/sys/d10v/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/decstation/aclocal.m4 b/newlib/libc/sys/decstation/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/decstation/aclocal.m4 +++ b/newlib/libc/sys/decstation/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/decstation/configure b/newlib/libc/sys/decstation/configure index 58f3ec9b0..4f23fa08f 100755 --- a/newlib/libc/sys/decstation/configure +++ b/newlib/libc/sys/decstation/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/h8300hms/aclocal.m4 b/newlib/libc/sys/h8300hms/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/h8300hms/aclocal.m4 +++ b/newlib/libc/sys/h8300hms/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/h8300hms/configure b/newlib/libc/sys/h8300hms/configure index 1efee2bcc..279b68cf7 100755 --- a/newlib/libc/sys/h8300hms/configure +++ b/newlib/libc/sys/h8300hms/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/h8500hms/aclocal.m4 b/newlib/libc/sys/h8500hms/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/h8500hms/aclocal.m4 +++ b/newlib/libc/sys/h8500hms/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/h8500hms/configure b/newlib/libc/sys/h8500hms/configure index 639276001..00ead0755 100755 --- a/newlib/libc/sys/h8500hms/configure +++ b/newlib/libc/sys/h8500hms/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/linux/aclocal.m4 b/newlib/libc/sys/linux/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libc/sys/linux/aclocal.m4 +++ b/newlib/libc/sys/linux/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/aio.c b/newlib/libc/sys/linux/aio.c index 9a2e4ce57..de988ebfc 100644 --- a/newlib/libc/sys/linux/aio.c +++ b/newlib/libc/sys/linux/aio.c @@ -4,8 +4,6 @@ /* Currently asynchronous I/O is not implemented. */ -#define _GNU_SOURCE 1 - #include <sys/types.h> #include <aio.h> #include <errno.h> diff --git a/newlib/libc/sys/linux/configure b/newlib/libc/sys/linux/configure index 202a986e1..a6c44dcfa 100755 --- a/newlib/libc/sys/linux/configure +++ b/newlib/libc/sys/linux/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1659: checking for $ac_word" >&5 +echo "configure:1656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1685,7 +1682,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1689: checking for $ac_word" >&5 +echo "configure:1686: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1736,7 +1733,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_word" >&5 +echo "configure:1737: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1886,7 +1883,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1954,7 +1951,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2025: checking whether ln -s works" >&5 +echo "configure:2022: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2219: checking for object suffix" >&5 +echo "configure:2216: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,7 +2304,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2311: checking for file" >&5 +echo "configure:2308: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2378,7 +2375,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_word" >&5 +echo "configure:2379: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2414: checking for $ac_word" >&5 +echo "configure:2411: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +2442,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2449: checking for $ac_word" >&5 +echo "configure:2446: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2481: checking for $ac_word" >&5 +echo "configure:2478: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_word" >&5 +echo "configure:2633: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2696,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_word" >&5 +echo "configure:2700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2735: checking for $ac_word" >&5 +echo "configure:2732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2766,7 +2763,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2770: checking for $ac_word" >&5 +echo "configure:2767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2802: checking for $ac_word" >&5 +echo "configure:2799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2834,12 +2831,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2872: checking how to link DLLs" >&5 +echo "configure:2869: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -2994,7 +2991,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2998: checking for $ac_word" >&5 +echo "configure:2995: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/newlib/libc/sys/linux/include/getopt.h b/newlib/libc/sys/linux/include/getopt.h index 3fdf4645c..994f86001 100644 --- a/newlib/libc/sys/linux/include/getopt.h +++ b/newlib/libc/sys/linux/include/getopt.h @@ -8,11 +8,8 @@ #include <unistd.h> -enum { NO_ARG, REQUIRED_ARG, OPTIONAL_ARG }; -/* Define glibc names as well for compatibility. */ -#define no_argument NO_ARG -#define required_argument REQUIRED_ARG -#define optional_argument OPTIONAL_ARG + +enum { no_argument, required_argument, optional_argument }; struct option { const char *name; diff --git a/newlib/libc/sys/linux/linuxthreads/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libc/sys/linux/linuxthreads/aclocal.m4 +++ b/newlib/libc/sys/linux/linuxthreads/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/linuxthreads/config.h b/newlib/libc/sys/linux/linuxthreads/config.h index 05fb5ec96..99b0528a6 100644 --- a/newlib/libc/sys/linux/linuxthreads/config.h +++ b/newlib/libc/sys/linux/linuxthreads/config.h @@ -11,3 +11,4 @@ while (__result == -1L && errno == EINTR); \ __result; })) +#define UINT32_C(c) c ## U diff --git a/newlib/libc/sys/linux/linuxthreads/configure b/newlib/libc/sys/linux/linuxthreads/configure index 65714818c..d6c2c10ab 100755 --- a/newlib/libc/sys/linux/linuxthreads/configure +++ b/newlib/libc/sys/linux/linuxthreads/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1659: checking for $ac_word" >&5 +echo "configure:1656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1685,7 +1682,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1689: checking for $ac_word" >&5 +echo "configure:1686: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1736,7 +1733,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_word" >&5 +echo "configure:1737: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1886,7 +1883,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1954,7 +1951,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2025: checking whether ln -s works" >&5 +echo "configure:2022: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2219: checking for object suffix" >&5 +echo "configure:2216: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,7 +2304,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2311: checking for file" >&5 +echo "configure:2308: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2378,7 +2375,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_word" >&5 +echo "configure:2379: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2414: checking for $ac_word" >&5 +echo "configure:2411: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +2442,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2449: checking for $ac_word" >&5 +echo "configure:2446: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2481: checking for $ac_word" >&5 +echo "configure:2478: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_word" >&5 +echo "configure:2633: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2696,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_word" >&5 +echo "configure:2700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2735: checking for $ac_word" >&5 +echo "configure:2732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2766,7 +2763,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2770: checking for $ac_word" >&5 +echo "configure:2767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2802: checking for $ac_word" >&5 +echo "configure:2799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2834,12 +2831,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2872: checking how to link DLLs" >&5 +echo "configure:2869: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -2994,7 +2991,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2998: checking for $ac_word" >&5 +echo "configure:2995: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4 +++ b/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/linuxthreads/machine/configure b/newlib/libc/sys/linux/linuxthreads/machine/configure index 32cb952b1..f465b9331 100755 --- a/newlib/libc/sys/linux/linuxthreads/machine/configure +++ b/newlib/libc/sys/linux/linuxthreads/machine/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1654,7 +1651,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1658: checking for $ac_word" >&5 +echo "configure:1655: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1684,7 +1681,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1688: checking for $ac_word" >&5 +echo "configure:1685: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1735,7 +1732,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1739: checking for $ac_word" >&5 +echo "configure:1736: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1767,7 +1764,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1768: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1778,12 +1775,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1782 "configure" +#line 1779 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1809,12 +1806,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1810: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1818: checking whether we are using GNU C" >&5 +echo "configure:1815: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1823,7 +1820,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1842,7 +1839,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1846: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1843: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1885,7 +1882,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1889: checking for ld used by GCC" >&5 +echo "configure:1886: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1915,10 +1912,10 @@ echo "configure:1889: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1919: checking for GNU ld" >&5 +echo "configure:1916: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1922: checking for non-GNU ld" >&5 +echo "configure:1919: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1953,7 +1950,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1957: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1954: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1970,7 +1967,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1974: checking for $LD option to reload object files" >&5 +echo "configure:1971: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1982,7 +1979,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1986: checking for BSD-compatible nm" >&5 +echo "configure:1983: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2020,7 +2017,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2024: checking whether ln -s works" >&5 +echo "configure:2021: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2041,7 +2038,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2045: checking how to recognise dependant libraries" >&5 +echo "configure:2042: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2214,13 +2211,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2218: checking for object suffix" >&5 +echo "configure:2215: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2244,7 +2241,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2248: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2245: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2306,7 +2303,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2310: checking for file" >&5 +echo "configure:2307: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2377,7 +2374,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2381: checking for $ac_word" >&5 +echo "configure:2378: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2409,7 +2406,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2413: checking for $ac_word" >&5 +echo "configure:2410: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2444,7 +2441,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2448: checking for $ac_word" >&5 +echo "configure:2445: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2476,7 +2473,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2480: checking for $ac_word" >&5 +echo "configure:2477: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2543,8 +2540,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2547 "configure"' > conftest.$ac_ext - if { (eval echo configure:2548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2544 "configure"' > conftest.$ac_ext + if { (eval echo configure:2545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2563,7 +2560,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2581,7 +2578,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2585: checking whether the C compiler needs -belf" >&5 +echo "configure:2582: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2594,14 +2591,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2598 "configure" +#line 2595 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2631,7 +2628,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2635: checking for $ac_word" >&5 +echo "configure:2632: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2663,7 +2660,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2667: checking for $ac_word" >&5 +echo "configure:2664: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2698,7 +2695,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2702: checking for $ac_word" >&5 +echo "configure:2699: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2730,7 +2727,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2734: checking for $ac_word" >&5 +echo "configure:2731: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2765,7 +2762,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2769: checking for $ac_word" >&5 +echo "configure:2766: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2797,7 +2794,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2801: checking for $ac_word" >&5 +echo "configure:2798: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2833,12 +2830,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2837: checking if libtool should supply DllMain function" >&5 +echo "configure:2834: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2842 "configure" +#line 2839 "configure" #include "confdefs.h" int main() { @@ -2846,7 +2843,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2867,19 +2864,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2871: checking how to link DLLs" >&5 +echo "configure:2868: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2876 "configure" +#line 2873 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4 +++ b/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure b/newlib/libc/sys/linux/linuxthreads/machine/i386/configure index dfd1c9e65..7e8445331 100755 --- a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure +++ b/newlib/libc/sys/linux/linuxthreads/machine/i386/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1659: checking for $ac_word" >&5 +echo "configure:1656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1685,7 +1682,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1689: checking for $ac_word" >&5 +echo "configure:1686: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1736,7 +1733,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_word" >&5 +echo "configure:1737: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1886,7 +1883,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1954,7 +1951,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2025: checking whether ln -s works" >&5 +echo "configure:2022: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2219: checking for object suffix" >&5 +echo "configure:2216: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,7 +2304,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2311: checking for file" >&5 +echo "configure:2308: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2378,7 +2375,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_word" >&5 +echo "configure:2379: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2414: checking for $ac_word" >&5 +echo "configure:2411: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +2442,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2449: checking for $ac_word" >&5 +echo "configure:2446: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2481: checking for $ac_word" >&5 +echo "configure:2478: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_word" >&5 +echo "configure:2633: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2696,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_word" >&5 +echo "configure:2700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2735: checking for $ac_word" >&5 +echo "configure:2732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2766,7 +2763,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2770: checking for $ac_word" >&5 +echo "configure:2767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2802: checking for $ac_word" >&5 +echo "configure:2799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2834,12 +2831,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2872: checking how to link DLLs" >&5 +echo "configure:2869: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -2994,7 +2991,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2998: checking for $ac_word" >&5 +echo "configure:2995: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/newlib/libc/sys/linux/machine/aclocal.m4 b/newlib/libc/sys/linux/machine/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libc/sys/linux/machine/aclocal.m4 +++ b/newlib/libc/sys/linux/machine/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/machine/configure b/newlib/libc/sys/linux/machine/configure index 3c3167990..bd0e9315c 100755 --- a/newlib/libc/sys/linux/machine/configure +++ b/newlib/libc/sys/linux/machine/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1654,7 +1651,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1658: checking for $ac_word" >&5 +echo "configure:1655: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1684,7 +1681,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1688: checking for $ac_word" >&5 +echo "configure:1685: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1735,7 +1732,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1739: checking for $ac_word" >&5 +echo "configure:1736: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1767,7 +1764,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1768: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1778,12 +1775,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1782 "configure" +#line 1779 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1809,12 +1806,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1810: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1818: checking whether we are using GNU C" >&5 +echo "configure:1815: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1823,7 +1820,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1842,7 +1839,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1846: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1843: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1885,7 +1882,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1889: checking for ld used by GCC" >&5 +echo "configure:1886: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1915,10 +1912,10 @@ echo "configure:1889: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1919: checking for GNU ld" >&5 +echo "configure:1916: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1922: checking for non-GNU ld" >&5 +echo "configure:1919: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1953,7 +1950,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1957: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1954: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1970,7 +1967,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1974: checking for $LD option to reload object files" >&5 +echo "configure:1971: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1982,7 +1979,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1986: checking for BSD-compatible nm" >&5 +echo "configure:1983: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2020,7 +2017,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2024: checking whether ln -s works" >&5 +echo "configure:2021: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2041,7 +2038,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2045: checking how to recognise dependant libraries" >&5 +echo "configure:2042: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2214,13 +2211,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2218: checking for object suffix" >&5 +echo "configure:2215: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2244,7 +2241,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2248: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2245: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2306,7 +2303,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2310: checking for file" >&5 +echo "configure:2307: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2377,7 +2374,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2381: checking for $ac_word" >&5 +echo "configure:2378: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2409,7 +2406,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2413: checking for $ac_word" >&5 +echo "configure:2410: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2444,7 +2441,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2448: checking for $ac_word" >&5 +echo "configure:2445: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2476,7 +2473,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2480: checking for $ac_word" >&5 +echo "configure:2477: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2543,8 +2540,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2547 "configure"' > conftest.$ac_ext - if { (eval echo configure:2548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2544 "configure"' > conftest.$ac_ext + if { (eval echo configure:2545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2563,7 +2560,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2581,7 +2578,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2585: checking whether the C compiler needs -belf" >&5 +echo "configure:2582: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2594,14 +2591,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2598 "configure" +#line 2595 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2631,7 +2628,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2635: checking for $ac_word" >&5 +echo "configure:2632: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2663,7 +2660,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2667: checking for $ac_word" >&5 +echo "configure:2664: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2698,7 +2695,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2702: checking for $ac_word" >&5 +echo "configure:2699: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2730,7 +2727,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2734: checking for $ac_word" >&5 +echo "configure:2731: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2765,7 +2762,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2769: checking for $ac_word" >&5 +echo "configure:2766: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2797,7 +2794,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2801: checking for $ac_word" >&5 +echo "configure:2798: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2833,12 +2830,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2837: checking if libtool should supply DllMain function" >&5 +echo "configure:2834: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2842 "configure" +#line 2839 "configure" #include "confdefs.h" int main() { @@ -2846,7 +2843,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2867,19 +2864,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2871: checking how to link DLLs" >&5 +echo "configure:2868: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2876 "configure" +#line 2873 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else diff --git a/newlib/libc/sys/linux/machine/i386/aclocal.m4 b/newlib/libc/sys/linux/machine/i386/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libc/sys/linux/machine/i386/aclocal.m4 +++ b/newlib/libc/sys/linux/machine/i386/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/machine/i386/configure b/newlib/libc/sys/linux/machine/i386/configure index f957f6692..f76b4dcbe 100755 --- a/newlib/libc/sys/linux/machine/i386/configure +++ b/newlib/libc/sys/linux/machine/i386/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1659: checking for $ac_word" >&5 +echo "configure:1656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1685,7 +1682,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1689: checking for $ac_word" >&5 +echo "configure:1686: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1736,7 +1733,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_word" >&5 +echo "configure:1737: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1886,7 +1883,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1954,7 +1951,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2025: checking whether ln -s works" >&5 +echo "configure:2022: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2219: checking for object suffix" >&5 +echo "configure:2216: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,7 +2304,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2311: checking for file" >&5 +echo "configure:2308: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2378,7 +2375,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_word" >&5 +echo "configure:2379: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2414: checking for $ac_word" >&5 +echo "configure:2411: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +2442,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2449: checking for $ac_word" >&5 +echo "configure:2446: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2481: checking for $ac_word" >&5 +echo "configure:2478: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_word" >&5 +echo "configure:2633: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2696,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_word" >&5 +echo "configure:2700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2735: checking for $ac_word" >&5 +echo "configure:2732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2766,7 +2763,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2770: checking for $ac_word" >&5 +echo "configure:2767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2802: checking for $ac_word" >&5 +echo "configure:2799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2834,12 +2831,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2872: checking how to link DLLs" >&5 +echo "configure:2869: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -2994,7 +2991,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2998: checking for $ac_word" >&5 +echo "configure:2995: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/newlib/libc/sys/linux/sys/types.h b/newlib/libc/sys/linux/sys/types.h index ba191f072..1401b0598 100644 --- a/newlib/libc/sys/linux/sys/types.h +++ b/newlib/libc/sys/linux/sys/types.h @@ -50,8 +50,8 @@ * libc/include/sys/types.h. Repeat those here and * skip the kernel's definitions. */ -#include <sys/config.h> #include <features.h> +#include <sys/config.h> #include <machine/types.h> #include <sys/_types.h> diff --git a/newlib/libc/sys/m88kbug/aclocal.m4 b/newlib/libc/sys/m88kbug/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/m88kbug/aclocal.m4 +++ b/newlib/libc/sys/m88kbug/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/m88kbug/configure b/newlib/libc/sys/m88kbug/configure index abdfc90ff..8b4ea2b16 100755 --- a/newlib/libc/sys/m88kbug/configure +++ b/newlib/libc/sys/m88kbug/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/mmixware/aclocal.m4 b/newlib/libc/sys/mmixware/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/mmixware/aclocal.m4 +++ b/newlib/libc/sys/mmixware/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/mmixware/configure b/newlib/libc/sys/mmixware/configure index c97c3f425..891a2ac18 100755 --- a/newlib/libc/sys/mmixware/configure +++ b/newlib/libc/sys/mmixware/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/netware/aclocal.m4 b/newlib/libc/sys/netware/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/netware/aclocal.m4 +++ b/newlib/libc/sys/netware/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/netware/configure b/newlib/libc/sys/netware/configure index 8f0ed4de7..6a61bf3f8 100755 --- a/newlib/libc/sys/netware/configure +++ b/newlib/libc/sys/netware/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/rdos/Makefile.am b/newlib/libc/sys/rdos/Makefile.am deleted file mode 100644 index 825ef56c0..000000000 --- a/newlib/libc/sys/rdos/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -## Process this file with automake to generate Makefile.in - -AUTOMAKE_OPTIONS = cygnus - -INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) - -noinst_LIBRARIES = lib.a - -lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c \ - getpid.c gettod.c isatty.c kill.c link.c lseek.c open.c rdoshelp.c \ - rdos.S read.c readlink.c sbrk.c stat.c symlink.c times.c unlink.c \ - wait.c write.c - -all: crt0.o - -ACLOCAL_AMFLAGS = -I ../../.. -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host diff --git a/newlib/libc/sys/rdos/Makefile.in b/newlib/libc/sys/rdos/Makefile.in deleted file mode 100644 index 5fb59e5e2..000000000 --- a/newlib/libc/sys/rdos/Makefile.in +++ /dev/null @@ -1,376 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = . - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_alias = @build_alias@ -build_triplet = @build@ -host_alias = @host_alias@ -host_triplet = @host@ -target_alias = @target_alias@ -target_triplet = @target@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP = @CPP@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLTOOL = @DLLTOOL@ -EXEEXT = @EXEEXT@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -NEWLIB_CFLAGS = @NEWLIB_CFLAGS@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -RANLIB = @RANLIB@ -STRIP = @STRIP@ -VERSION = @VERSION@ -aext = @aext@ -libm_machine_dir = @libm_machine_dir@ -machine_dir = @machine_dir@ -newlib_basedir = @newlib_basedir@ -oext = @oext@ -sys_dir = @sys_dir@ - -AUTOMAKE_OPTIONS = cygnus - -INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) - -noinst_LIBRARIES = lib.a - -lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c getpid.c gettod.c isatty.c kill.c link.c lseek.c open.c rdoshelp.c rdos.S read.c readlink.c sbrk.c stat.c symlink.c times.c unlink.c wait.c write.c - - -ACLOCAL_AMFLAGS = -I ../../.. -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) - - -DEFS = @DEFS@ -I. -I$(srcdir) -CPPFLAGS = @CPPFLAGS@ -LIBS = @LIBS@ -lib_a_LIBADD = -lib_a_OBJECTS = chown.$(OBJEXT) close.$(OBJEXT) execve.$(OBJEXT) \ -fork.$(OBJEXT) fstat.$(OBJEXT) getenv.$(OBJEXT) getpid.$(OBJEXT) \ -gettod.$(OBJEXT) isatty.$(OBJEXT) kill.$(OBJEXT) link.$(OBJEXT) \ -lseek.$(OBJEXT) open.$(OBJEXT) rdoshelp.$(OBJEXT) rdos.$(OBJEXT) \ -read.$(OBJEXT) readlink.$(OBJEXT) sbrk.$(OBJEXT) stat.$(OBJEXT) \ -symlink.$(OBJEXT) times.$(OBJEXT) unlink.$(OBJEXT) wait.$(OBJEXT) \ -write.$(OBJEXT) -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(lib_a_SOURCES) -OBJECTS = $(lib_a_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in \ - ../../../acinclude.m4 ../../../aclocal.m4 \ - ../../../libtool.m4 - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) - -mostlyclean-noinstLIBRARIES: - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) - -distclean-noinstLIBRARIES: - -maintainer-clean-noinstLIBRARIES: - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES) - -rm -f lib.a - $(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD) - $(RANLIB) lib.a - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -distdir: $(DISTFILES) - -rm -rf $(distdir) - mkdir $(distdir) - -chmod 777 $(distdir) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: -check: check-am -installcheck-am: -installcheck: installcheck-am -install-info-am: -install-info: install-info-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ - mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am - -rm -f libtool - -distclean: distclean-am - -rm -f config.status - -maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -rm -f config.status - -.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ -clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-info-am \ -install-info install-exec-am install-exec install-data-am install-data \ -install-am install uninstall-am uninstall all-redirect all-am all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -all: crt0.o - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/newlib/libc/sys/rdos/aclocal.m4 b/newlib/libc/sys/rdos/aclocal.m4 deleted file mode 100644 index e6cbb29c0..000000000 --- a/newlib/libc/sys/rdos/aclocal.m4 +++ /dev/null @@ -1,1226 +0,0 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p6 - -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. - -dnl This provides configure definitions used by all the newlib -dnl configure.in files. - -dnl Basic newlib configury. This calls basic introductory stuff, -dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST. It also runs -dnl configure.host. The only argument is the relative path to the top -dnl newlib directory. - -AC_DEFUN(NEWLIB_CONFIGURE, -[ -dnl Default to --enable-multilib -AC_ARG_ENABLE(multilib, -[ --enable-multilib build many library versions (default)], -[case "${enableval}" in - yes) multilib=yes ;; - no) multilib=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; - esac], [multilib=yes])dnl - -dnl Support --enable-target-optspace -AC_ARG_ENABLE(target-optspace, -[ --enable-target-optspace optimize for space], -[case "${enableval}" in - yes) target_optspace=yes ;; - no) target_optspace=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;; - esac], [target_optspace=])dnl - -dnl Support --enable-malloc-debugging - currently only supported for Cygwin -AC_ARG_ENABLE(malloc-debugging, -[ --enable-malloc-debugging indicate malloc debugging requested], -[case "${enableval}" in - yes) malloc_debugging=yes ;; - no) malloc_debugging=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;; - esac], [malloc_debugging=])dnl - -dnl Support --enable-newlib-multithread -AC_ARG_ENABLE(newlib-multithread, -[ --enable-newlib-multithread enable support for multiple threads], -[case "${enableval}" in - yes) newlib_multithread=yes ;; - no) newlib_multithread=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;; - esac], [newlib_multithread=yes])dnl - -dnl Support --enable-newlib-iconv -AC_ARG_ENABLE(newlib-iconv, -[ --enable-newlib-iconv enable iconv library support], -[if test "${newlib_iconv+set}" != set; then - case "${enableval}" in - yes) newlib_iconv=yes ;; - no) newlib_iconv=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;; - esac - fi], [newlib_iconv=${newlib_iconv}])dnl - -dnl Support --enable-newlib-elix-level -AC_ARG_ENABLE(newlib-elix-level, -[ --enable-newlib-elix-level supply desired elix library level (1-4)], -[case "${enableval}" in - 0) newlib_elix_level=0 ;; - 1) newlib_elix_level=1 ;; - 2) newlib_elix_level=2 ;; - 3) newlib_elix_level=3 ;; - 4) newlib_elix_level=4 ;; - *) AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;; - esac], [newlib_elix_level=0])dnl - -dnl Support --disable-newlib-io-float -AC_ARG_ENABLE(newlib-io-float, -[ --disable-newlib-io-float disable printf/scanf family float support], -[case "${enableval}" in - yes) newlib_io_float=yes ;; - no) newlib_io_float=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;; - esac], [newlib_io_float=yes])dnl - -dnl Support --disable-newlib-supplied-syscalls -AC_ARG_ENABLE(newlib-supplied-syscalls, -[ --disable-newlib-supplied-syscalls disable newlib from supplying syscalls], -[case "${enableval}" in - yes) newlib_may_supply_syscalls=yes ;; - no) newlib_may_supply_syscalls=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;; - esac], [newlib_may_supply_syscalls=yes])dnl - -AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes) - -dnl We may get other options which we don't document: -dnl --with-target-subdir, --with-multisrctop, --with-multisubdir - -test -z "[$]{with_target_subdir}" && with_target_subdir=. - -if test "[$]{srcdir}" = "."; then - if test "[$]{with_target_subdir}" != "."; then - newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1" - else - newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1" - fi -else - newlib_basedir="[$]{srcdir}/$1" -fi -AC_SUBST(newlib_basedir) - -AC_CANONICAL_SYSTEM - -AM_INIT_AUTOMAKE(newlib, 1.14.0, nodefine) - -# FIXME: We temporarily define our own version of AC_PROG_CC. This is -# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We -# are probably using a cross compiler, which will not be able to fully -# link an executable. This should really be fixed in autoconf -# itself. - -AC_DEFUN(LIB_AC_PROG_CC, -[AC_BEFORE([$0], [AC_PROG_CPP])dnl -AC_CHECK_PROG(CC, gcc, gcc) -if test -z "$CC"; then - AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc) - test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) -fi - -AC_PROG_CC_GNU - -if test $ac_cv_prog_gcc = yes; then - GCC=yes -dnl Check whether -g works, even if CFLAGS is set, in case the package -dnl plays around with CFLAGS (such as to build both debugging and -dnl normal versions of a library), tasteless as that idea is. - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - AC_PROG_CC_G - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-O2" - fi -else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" -fi -]) - -LIB_AC_PROG_CC - -AC_CHECK_TOOL(AS, as) -AC_CHECK_TOOL(AR, ar) -AC_CHECK_TOOL(RANLIB, ranlib, :) - -AC_PROG_INSTALL - -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - -AM_MAINTAINER_MODE - -# We need AC_EXEEXT to keep automake happy in cygnus mode. However, -# at least currently, we never actually build a program, so we never -# need to use $(EXEEXT). Moreover, the test for EXEEXT normally -# fails, because we are probably configuring with a cross compiler -# which can't create executables. So we include AC_EXEEXT to keep -# automake happy, but we don't execute it, since we don't care about -# the result. -if false; then - AC_EXEEXT -fi - -. [$]{newlib_basedir}/configure.host - -newlib_cflags="[$]{newlib_cflags} -fno-builtin" - -NEWLIB_CFLAGS=${newlib_cflags} -AC_SUBST(NEWLIB_CFLAGS) - -LDFLAGS=${ldflags} -AC_SUBST(LDFLAGS) - -AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0) -AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1) -AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2) -AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3) -AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4) - -AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes) - -# Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we -# use oext, which is set in configure.host based on the target platform. -OBJEXT=${oext} - -AC_SUBST(OBJEXT) -AC_SUBST(oext) -AC_SUBST(aext) - -AC_SUBST(libm_machine_dir) -AC_SUBST(machine_dir) -AC_SUBST(sys_dir) -]) - -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. - -# serial 1 - -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) - -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi -ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) - -# Copyright 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.4-p6])]) - -# -# Check to make sure that the build environment is sane. -# - -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "[$]2" = conftestfile - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -rm -f conftest* -AC_MSG_RESULT(yes)]) - -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. -AC_DEFUN([AM_MISSING_PROG], -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) -else - $1="$3/missing $2" - AC_MSG_RESULT(missing) -fi -AC_SUBST($1)]) - -# Define a conditional. - -AC_DEFUN([AM_CONDITIONAL], -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi]) - -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering - -# serial 1 - -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT($USE_MAINTAINER_MODE) - AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - - -# serial 46 AC_PROG_LIBTOOL -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ -])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ -])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ -])])])])])]) - -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - -# Save cache, so that ltconfig can load it -AC_CACHE_SAVE - -# Actually configure libtool. ac_aux_dir is where install-sh is found. -AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ -AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ -objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ -deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \ -|| AC_MSG_ERROR([libtool configure failed]) - -# Reload cache, that may have been modified by ltconfig -AC_CACHE_LOAD - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log -]) - -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.13)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC - fi - ;; -esac - -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) - -# Check for any special flags to pass to ltconfig. -libtool_flags="--cache-file=$cache_file" -test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" -test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" -test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc" -test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" -ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], -[libtool_flags="$libtool_flags --enable-dlopen"]) -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -[libtool_flags="$libtool_flags --enable-win32-dll"]) -AC_ARG_ENABLE(libtool-lock, - [ --disable-libtool-lock avoid locking (might break parallel builds)]) -test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" -test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" - -AC_ARG_WITH(pic, - [ --with-pic try to use only PIC/non-PIC objects [default=use both]], - pic_mode="$withval", pic_mode=default) -test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic" -test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - rm -rf conftest* - ;; - -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_SAVE - AC_LANG_C - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_RESTORE]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; - -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one - AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain, - [AC_TRY_LINK([], - [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); - DllMain (0, 0, 0);], - [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])]) - - case $host/$CC in - *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) - # old mingw systems require "-dll" to link a DLL, while more recent ones - # require "-mdll" - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mdll" - AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, - [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])]) - CFLAGS="$SAVE_CFLAGS" ;; - *-*-cygwin* | *-*-pw32*) - # cygwin systems need to pass --dll to the linker, and not link - # crt.o which will require a WinMain@16 definition. - lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; - esac - ;; - ]) -esac -]) - -# AC_LIBTOOL_DLOPEN - enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) - -# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) - -# AC_ENABLE_SHARED - implement the --enable-shared flag -# Usage: AC_ENABLE_SHARED[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(shared, -changequote(<<, >>)dnl -<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case $enableval in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl -]) - -# AC_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no)]) - -# AC_ENABLE_STATIC - implement the --enable-static flag -# Usage: AC_ENABLE_STATIC[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(static, -changequote(<<, >>)dnl -<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case $enableval in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_static=AC_ENABLE_STATIC_DEFAULT)dnl -]) - -# AC_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no)]) - - -# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag -# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(fast-install, -changequote(<<, >>)dnl -<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case $enableval in -yes) enable_fast_install=yes ;; -no) enable_fast_install=no ;; -*) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl -]) - -# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no)]) - -# AC_LIBTOOL_PICMODE - implement the --with-pic flag -# Usage: AC_LIBTOOL_PICMODE[(MODE)] -# Where MODE is either `yes' or `no'. If omitted, it defaults to -# `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default)]) - - -# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in - /*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; - ?:/*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. - ;; - *) - ac_save_MAGIC_CMD="$MAGIC_CMD" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="ifelse([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - egrep "$file_magic_regex" > /dev/null; then - : - else - cat <<EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$ac_save_ifs" - MAGIC_CMD="$ac_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -]) - - -# AC_PATH_MAGIC - find a file program which can recognise a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl -AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH) - else - MAGIC_CMD=: - fi -fi -]) - - -# AC_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH(gnu-ld, -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - re_direlt=['/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$lt_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_PROG_LD_GNU -]) - -AC_DEFUN([AC_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then - lt_cv_prog_gnu_ld=yes -else - lt_cv_prog_gnu_ld=no -fi]) -with_gnu_ld=$lt_cv_prog_gnu_ld -]) - -# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker -# -- PORTME Some linkers may need a different reload flag. -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], -[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag, -[lt_cv_ld_reload_flag='-r']) -reload_flag=$lt_cv_ld_reload_flag -test -n "$reload_flag" && reload_flag=" $reload_flag" -]) - -# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies -# -- PORTME fill in with the dynamic library characteristics -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependant libraries], -lt_cv_deplibs_check_method, -[lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [regex]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given egrep regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi4*) - lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'] - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin* | mingw* |pw32*) - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[012]) - lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System' - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac - ;; - -freebsd* ) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'] - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20*|hpux11*) - case $host_cpu in - hppa*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'] - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - ia64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'] - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - esac - ;; - -irix5* | irix6*) - case $host_os in - irix5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"] - ;; - esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux-gnu*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] - else - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'] - fi - ;; - -newsos6) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so - ;; - -[sysv5uw[78]* | sysv4*uw2*)] - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - case $host_vendor in - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - motorola) - lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'] - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - esac - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -]) - - -# AC_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN([AC_PROG_NM], -[AC_MSG_CHECKING([for BSD-compatible nm]) -AC_CACHE_VAL(lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - test -z "$ac_dir" && ac_dir=. - tmp_nm=$ac_dir/${ac_tool_prefix}nm - if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then - lt_cv_path_NM="$tmp_nm -B" - break - elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - lt_cv_path_NM="$tmp_nm -p" - break - else - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - fi - fi - done - IFS="$ac_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi]) -NM="$lt_cv_path_NM" -AC_MSG_RESULT([$NM]) -]) - -# AC_CHECK_LIBM - check for math library -AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32*) - # These system don't have libm - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, main, LIBM="-lm") - ;; -esac -]) - -# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-convenience to the -# configure arguments. Note that LIBLTDL and INCLTDL are not -# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not -# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed -# with '${top_builddir}/' and INCLTDL will be prefixed with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -]) - -# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-install to the configure -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is -# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed -# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed -# with '${top_srcdir}/' (note the single quotes!). If your package is -# not flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, main, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - INCLTDL= - fi -]) - -# If this macro is not defined by Autoconf, define it here. -ifdef([AC_PROVIDE_IFELSE], - [], - [define([AC_PROVIDE_IFELSE], - [ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - -# AC_LIBTOOL_CXX - enable support for C++ libraries -AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])]) - -AC_DEFUN([_AC_LIBTOOL_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) -LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh" -lt_save_CC="$CC" -lt_save_CFLAGS="$CFLAGS" -dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC -dnl is set to the C++ compiler. -AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \ -MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ -AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ -objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ -deplibs_check_method="$deplibs_check_method" \ -file_magic_cmd="$file_magic_cmd" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \ ---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \ -|| AC_MSG_ERROR([libtool tag configuration failed]) -CC="$lt_save_CC" -CFLAGS="$lt_save_CFLAGS" - -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log -]) - -# AC_LIBTOOL_GCJ - enable support for GCJ libraries -AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])]) - -AC_DEFUN([_AC_LIBTOOL_GCJ], -[AC_REQUIRE([AC_PROG_LIBTOOL]) -AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh" -lt_save_CC="$CC" -lt_save_CFLAGS="$CFLAGS" -dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC -dnl is set to the C++ compiler. -AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \ -MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ -AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ -objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ -deplibs_check_method="$deplibs_check_method" \ -file_magic_cmd="$file_magic_cmd" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \ ---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \ -|| AC_MSG_ERROR([libtool tag configuration failed]) -CC="$lt_save_CC" -CFLAGS="$lt_save_CFLAGS" - -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log -]) - -dnl old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) - -dnl This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL])dnl - -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS) -]) - diff --git a/newlib/libc/sys/rdos/chown.c b/newlib/libc/sys/rdos/chown.c deleted file mode 100755 index 48f33f563..000000000 --- a/newlib/libc/sys/rdos/chown.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include <sys/types.h>
-
-int chown(const char *path, uid_t owner, gid_t group)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/close.c b/newlib/libc/sys/rdos/close.c deleted file mode 100644 index 7f95e24f3..000000000 --- a/newlib/libc/sys/rdos/close.c +++ /dev/null @@ -1,36 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# close.c
-# close function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include "rdos.h"
-
-int close(int fildes)
-{
- RdosCloseFile(fildes);
- return 0;
-}
diff --git a/newlib/libc/sys/rdos/config.h b/newlib/libc/sys/rdos/config.h deleted file mode 100644 index 431e26805..000000000 --- a/newlib/libc/sys/rdos/config.h +++ /dev/null @@ -1 +0,0 @@ -/* Place holder for future configuration information. */ diff --git a/newlib/libc/sys/rdos/configure b/newlib/libc/sys/rdos/configure deleted file mode 100755 index e937dd685..000000000 --- a/newlib/libc/sys/rdos/configure +++ /dev/null @@ -1,1876 +0,0 @@ -#! /bin/sh - -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: -ac_help="$ac_help - --enable-multilib build many library versions (default)" -ac_help="$ac_help - --enable-target-optspace optimize for space" -ac_help="$ac_help - --enable-malloc-debugging indicate malloc debugging requested" -ac_help="$ac_help - --enable-newlib-multithread enable support for multiple threads" -ac_help="$ac_help - --enable-newlib-iconv enable iconv library support" -ac_help="$ac_help - --enable-newlib-elix-level supply desired elix library level (1-4)" -ac_help="$ac_help - --disable-newlib-io-float disable printf/scanf family float support" -ac_help="$ac_help - --disable-newlib-supplied-syscalls disable newlib from supplying syscalls" -ac_help="$ac_help - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer" - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=close.c - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - - -ac_aux_dir= -for ac_dir in ../../../.. $srcdir/../../../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - - -am__api_version="1.4" -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:578: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:631: checking whether build environment is sane" >&5 -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - if test "$*" != "X $srcdir/configure conftestfile" \ - && test "$*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { echo "configure: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" 1>&2; exit 1; } - fi - - test "$2" = conftestfile - ) -then - # Ok. - : -else - { echo "configure: error: newly created file is older than distributed files! -Check your system clock" 1>&2; exit 1; } -fi -rm -f conftest* -echo "$ac_t""yes" 1>&6 -if test "$program_transform_name" = s,x,x,; then - program_transform_name= -else - # Double any \ or $. echo might interpret backslashes. - cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g -EOF_SED - program_transform_name="`echo $program_transform_name|sed -f conftestsed`" - rm -f conftestsed -fi -test "$program_prefix" != NONE && - program_transform_name="s,^,${program_prefix},; $program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" - -# sed with no file args requires a program. -test "$program_transform_name" = "" && program_transform_name="s,x,x," - -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftestmake <<\EOF -all: - @echo 'ac_maketemp="${MAKE}"' -EOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftestmake -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 - SET_MAKE= -else - echo "$ac_t""no" 1>&6 - SET_MAKE="MAKE=${MAKE-make}" -fi - -if test $host != $build; then - ac_tool_prefix=${host_alias}- -else - ac_tool_prefix= -fi - -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:721: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 726 "configure" -#include "confdefs.h" - -int main() { - -#ifndef __CYGWIN__ -#define __CYGWIN__ __CYGWIN32__ -#endif -return __CYGWIN__; -; return 0; } -EOF -if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:754: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 759 "configure" -#include "confdefs.h" - -int main() { -return __MINGW32__; -; return 0; } -EOF -if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes - -# Check whether --enable-multilib or --disable-multilib was given. -if test "${enable_multilib+set}" = set; then - enableval="$enable_multilib" - case "${enableval}" in - yes) multilib=yes ;; - no) multilib=no ;; - *) { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;; - esac -else - multilib=yes -fi - -# Check whether --enable-target-optspace or --disable-target-optspace was given. -if test "${enable_target_optspace+set}" = set; then - enableval="$enable_target_optspace" - case "${enableval}" in - yes) target_optspace=yes ;; - no) target_optspace=no ;; - *) { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;; - esac -else - target_optspace= -fi - -# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given. -if test "${enable_malloc_debugging+set}" = set; then - enableval="$enable_malloc_debugging" - case "${enableval}" in - yes) malloc_debugging=yes ;; - no) malloc_debugging=no ;; - *) { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;; - esac -else - malloc_debugging= -fi - -# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given. -if test "${enable_newlib_multithread+set}" = set; then - enableval="$enable_newlib_multithread" - case "${enableval}" in - yes) newlib_multithread=yes ;; - no) newlib_multithread=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;; - esac -else - newlib_multithread=yes -fi - -# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given. -if test "${enable_newlib_iconv+set}" = set; then - enableval="$enable_newlib_iconv" - if test "${newlib_iconv+set}" != set; then - case "${enableval}" in - yes) newlib_iconv=yes ;; - no) newlib_iconv=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;; - esac - fi -else - newlib_iconv=${newlib_iconv} -fi - -# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given. -if test "${enable_newlib_elix_level+set}" = set; then - enableval="$enable_newlib_elix_level" - case "${enableval}" in - 0) newlib_elix_level=0 ;; - 1) newlib_elix_level=1 ;; - 2) newlib_elix_level=2 ;; - 3) newlib_elix_level=3 ;; - 4) newlib_elix_level=4 ;; - *) { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;; - esac -else - newlib_elix_level=0 -fi - -# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given. -if test "${enable_newlib_io_float+set}" = set; then - enableval="$enable_newlib_io_float" - case "${enableval}" in - yes) newlib_io_float=yes ;; - no) newlib_io_float=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;; - esac -else - newlib_io_float=yes -fi - -# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given. -if test "${enable_newlib_supplied_syscalls+set}" = set; then - enableval="$enable_newlib_supplied_syscalls" - case "${enableval}" in - yes) newlib_may_supply_syscalls=yes ;; - no) newlib_may_supply_syscalls=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;; - esac -else - newlib_may_supply_syscalls=yes -fi - - - -if test x${newlib_may_supply_syscalls} = xyes; then - MAY_SUPPLY_SYSCALLS_TRUE= - MAY_SUPPLY_SYSCALLS_FALSE='#' -else - MAY_SUPPLY_SYSCALLS_TRUE='#' - MAY_SUPPLY_SYSCALLS_FALSE= -fi - - -test -z "${with_target_subdir}" && with_target_subdir=. - -if test "${srcdir}" = "."; then - if test "${with_target_subdir}" != "."; then - newlib_basedir="${srcdir}/${with_multisrctop}../../../.." - else - newlib_basedir="${srcdir}/${with_multisrctop}../../.." - fi -else - newlib_basedir="${srcdir}/../../.." -fi - - - -# Do some error checking and defaulting for the host and target type. -# The inputs are: -# configure --host=HOST --target=TARGET --build=BUILD NONOPT -# -# The rules are: -# 1. You are not allowed to specify --host, --target, and nonopt at the -# same time. -# 2. Host defaults to nonopt. -# 3. If nonopt is not specified, then host defaults to the current host, -# as determined by config.guess. -# 4. Target and build default to nonopt. -# 5. If nonopt is not specified, then target and build default to host. - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -case $host---$target---$nonopt in -NONE---*---* | *---NONE---* | *---*---NONE) ;; -*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; -esac - - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:936: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - -echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:957: checking target system type" >&5 - -target_alias=$target -case "$target_alias" in -NONE) - case $nonopt in - NONE) target_alias=$host_alias ;; - *) target_alias=$nonopt ;; - esac ;; -esac - -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$target" 1>&6 - -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:975: checking build system type" >&5 - -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) build_alias=$host_alias ;; - *) build_alias=$nonopt ;; - esac ;; -esac - -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 - -test "$host_alias" != "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- - - - -PACKAGE=newlib - -VERSION=1.14.0 - -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } -fi - - - -missing_dir=`cd $ac_aux_dir && pwd` -echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 -echo "configure:1011: checking for working aclocal-${am__api_version}" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal-${am__api_version} - echo "$ac_t""found" 1>&6 -else - ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1024: checking for working autoconf" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoconf --version) < /dev/null > /dev/null 2>&1; then - AUTOCONF=autoconf - echo "$ac_t""found" 1>&6 -else - AUTOCONF="$missing_dir/missing autoconf" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 -echo "configure:1037: checking for working automake-${am__api_version}" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-${am__api_version} - echo "$ac_t""found" 1>&6 -else - AUTOMAKE="$missing_dir/missing automake-${am__api_version}" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1050: checking for working autoheader" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoheader --version) < /dev/null > /dev/null 2>&1; then - AUTOHEADER=autoheader - echo "$ac_t""found" 1>&6 -else - AUTOHEADER="$missing_dir/missing autoheader" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1063: checking for working makeinfo" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (makeinfo --version) < /dev/null > /dev/null 2>&1; then - MAKEINFO=makeinfo - echo "$ac_t""found" 1>&6 -else - MAKEINFO="$missing_dir/missing makeinfo" - echo "$ac_t""missing" 1>&6 -fi - - - -# FIXME: We temporarily define our own version of AC_PROG_CC. This is -# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We -# are probably using a cross compiler, which will not be able to fully -# link an executable. This should really be fixed in autoconf -# itself. - - - -# Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1088: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1118: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -fi - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1167: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <<EOF -#ifdef __GNUC__ - yes; -#endif -EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no -fi -fi - -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -if test $ac_cv_prog_gcc = yes; then - GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1191: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes -else - ac_cv_prog_cc_g=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-O2" - fi -else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" -fi - - -# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -set dummy ${ac_tool_prefix}as; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1222: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS="${ac_tool_prefix}as" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as" -fi -fi -AS="$ac_cv_prog_AS" -if test -n "$AS"; then - echo "$ac_t""$AS" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - - -# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1254: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" -fi -fi -AR="$ac_cv_prog_AR" -if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - - -# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1286: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -if test -z "$ac_cv_prog_RANLIB"; then -if test -n "$ac_tool_prefix"; then - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1318: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -else - RANLIB=":" -fi -fi - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1363: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - -echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1420: checking whether to enable maintainer-specific portions of Makefiles" >&5 - # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then - enableval="$enable_maintainer_mode" - USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi - - echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 - - -if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - MAINT=$MAINTAINER_MODE_TRUE - - - -# We need AC_EXEEXT to keep automake happy in cygnus mode. However, -# at least currently, we never actually build a program, so we never -# need to use $(EXEEXT). Moreover, the test for EXEEXT normally -# fails, because we are probably configuring with a cross compiler -# which can't create executables. So we include AC_EXEEXT to keep -# automake happy, but we don't execute it, since we don't care about -# the result. -if false; then - - -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1454: checking for executable suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then - ac_cv_exeext=.exe -else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= - if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.$ac_ext | *.c | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done - else - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } - fi - rm -f conftest* - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no -fi -fi - -EXEEXT="" -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} -echo "$ac_t""${ac_cv_exeext}" 1>&6 -ac_exeext=$EXEEXT - -fi - -. ${newlib_basedir}/configure.host - -newlib_cflags="${newlib_cflags} -fno-builtin" - -NEWLIB_CFLAGS=${newlib_cflags} - - -LDFLAGS=${ldflags} - - - - -if test x${newlib_elix_level} = x0; then - ELIX_LEVEL_0_TRUE= - ELIX_LEVEL_0_FALSE='#' -else - ELIX_LEVEL_0_TRUE='#' - ELIX_LEVEL_0_FALSE= -fi - - -if test x${newlib_elix_level} = x1; then - ELIX_LEVEL_1_TRUE= - ELIX_LEVEL_1_FALSE='#' -else - ELIX_LEVEL_1_TRUE='#' - ELIX_LEVEL_1_FALSE= -fi - - -if test x${newlib_elix_level} = x2; then - ELIX_LEVEL_2_TRUE= - ELIX_LEVEL_2_FALSE='#' -else - ELIX_LEVEL_2_TRUE='#' - ELIX_LEVEL_2_FALSE= -fi - - -if test x${newlib_elix_level} = x3; then - ELIX_LEVEL_3_TRUE= - ELIX_LEVEL_3_FALSE='#' -else - ELIX_LEVEL_3_TRUE='#' - ELIX_LEVEL_3_FALSE= -fi - - -if test x${newlib_elix_level} = x4; then - ELIX_LEVEL_4_TRUE= - ELIX_LEVEL_4_FALSE='#' -else - ELIX_LEVEL_4_TRUE='#' - ELIX_LEVEL_4_FALSE= -fi - - - -if test x${use_libtool} = xyes; then - USE_LIBTOOL_TRUE= - USE_LIBTOOL_FALSE='#' -else - USE_LIBTOOL_TRUE='#' - USE_LIBTOOL_FALSE= -fi - -# Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we -# use oext, which is set in configure.host based on the target platform. -OBJEXT=${oext} - - - - - - - - - - -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs - - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS <<EOF -#! /bin/sh -# Generated automatically by configure. -# Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" - -trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS <<EOF - -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; - s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g -s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g -s%@newlib_basedir@%$newlib_basedir%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@target@%$target%g -s%@target_alias@%$target_alias%g -s%@target_cpu@%$target_cpu%g -s%@target_vendor@%$target_vendor%g -s%@target_os@%$target_os%g -s%@build@%$build%g -s%@build_alias@%$build_alias%g -s%@build_cpu@%$build_cpu%g -s%@build_vendor@%$build_vendor%g -s%@build_os@%$build_os%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@PACKAGE@%$PACKAGE%g -s%@VERSION@%$VERSION%g -s%@ACLOCAL@%$ACLOCAL%g -s%@AUTOCONF@%$AUTOCONF%g -s%@AUTOMAKE@%$AUTOMAKE%g -s%@AUTOHEADER@%$AUTOHEADER%g -s%@MAKEINFO@%$MAKEINFO%g -s%@SET_MAKE@%$SET_MAKE%g -s%@CC@%$CC%g -s%@AS@%$AS%g -s%@AR@%$AR%g -s%@RANLIB@%$RANLIB%g -s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g -s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g -s%@MAINT@%$MAINT%g -s%@EXEEXT@%$EXEEXT%g -s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g -s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g -s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g -s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g -s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g -s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g -s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g -s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g -s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g -s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g -s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g -s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g -s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g -s%@OBJEXT@%$OBJEXT%g -s%@oext@%$oext%g -s%@aext@%$aext%g -s%@libm_machine_dir@%$libm_machine_dir%g -s%@machine_dir@%$machine_dir%g -s%@sys_dir@%$sys_dir%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <<EOF - -CONFIG_FILES=\${CONFIG_FILES-"Makefile"} -EOF -cat >> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -EOF -cat >> $CONFIG_STATUS <<EOF - -EOF -cat >> $CONFIG_STATUS <<\EOF - -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - diff --git a/newlib/libc/sys/rdos/configure.in b/newlib/libc/sys/rdos/configure.in deleted file mode 100644 index 6a78d9997..000000000 --- a/newlib/libc/sys/rdos/configure.in +++ /dev/null @@ -1,12 +0,0 @@ -dnl This is the newlib/libc/sys/rdos configure.in file. -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.5) -AC_INIT(close.c) - -dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. -AC_CONFIG_AUX_DIR(../../../..) - -NEWLIB_CONFIGURE(../../..) - -AC_OUTPUT(Makefile) diff --git a/newlib/libc/sys/rdos/crt0.S b/newlib/libc/sys/rdos/crt0.S deleted file mode 100644 index efc3b1633..000000000 --- a/newlib/libc/sys/rdos/crt0.S +++ /dev/null @@ -1,406 +0,0 @@ -/*####################################################################### -# RDOS operating system -# Copyright (C) 1988-2006, Leif Ekblad -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# The author of this program may be contacted at leif@rdos.net -# -# crt0.S -# GCC startupcode for RDOS -# -##########################################################################*/ - -#include "user.def" - - KEY_ENTRIES = 256 - - .macro UserGate nr - .byte 0x9A - .long \nr - .word 2 - .endm - - .data - .align 8 - -_key_section: - .word 0 - -_key_ref_arr: - .long 0 - -_key_dtor_arr: - .long 0 - - .text - .align 4 - -/*########################################################################## -# -# Name : _start -# -# Purpose....: GCC startup-code -# -##########################################################################*/ - - .global _start - -_start: - call get_impure_data_size - movl %eax,%ecx - UserGate allocate_app_mem_nr - - xorl %eax,%eax - .byte 0x64 - movl %edx,(%eax) - movl %edx,%edi - rep - stosb - pushl %edx - - movl $(4 * KEY_ENTRIES),%eax - movl %eax,%ecx - UserGate allocate_app_mem_nr - movl $4,%eax - .byte 0x64 - movl %edx,(%eax) - movl %edx,%edi - xorl %eax,%eax - rep - stosb - - movl $(4 * KEY_ENTRIES),%eax - movl %eax,%ecx - UserGate allocate_app_mem_nr - movl %edx,_key_ref_arr - movl %edx,%edi - xorl %eax,%eax - rep - stosb - - movl $(4 * KEY_ENTRIES),%eax - movl %eax,%ecx - UserGate allocate_app_mem_nr - movl %edx,_key_dtor_arr - movl %edx,%edi - xorl %eax,%eax - rep - stosb - - UserGate create_user_section_nr - movw %bx,_key_section - - call __init_rdos - add $4, %esp - - movl $0x1000,%eax - UserGate allocate_app_mem_nr - - pushl %edx - UserGate get_cmd_line_nr - - xorl %ecx,%ecx - xorb %ah,%ah - -arg_loop: - movl %edi,(%edx) - addl $4,%edx - movb (%edi),%al - orb %al,%al - je arg_done - -arg_scan: - movb (%edi),%al - orb %al,%al - je next_arg - - cmpb $0x22,%al - jne arg_no_quote - - xorb $1,%ah - jmp arg_scan_next - -arg_no_quote: - orb %ah,%ah - jnz arg_scan_next - - cmpb $0x20,%al - je next_arg - - cmpb $0x8,%al - je next_arg - -arg_scan_next: - incl %edi - jmp arg_scan - -next_arg: - incl %ecx - -to_next_arg: - orb %al,%al - je arg_done - - xorb %al,%al - movb %al,(%edi) - incl %edi - movb (%edi),%al - cmpb $0x20,%al - je to_next_arg - - cmpb $0x8,%al - je to_next_arg - - jmp arg_loop - -arg_done: - int $3 - pushl %ecx - call main - add $8, %esp - - pushl %eax - call exit - -/*########################################################################## -# -# Name : _exit -# -# Purpose....: GCC exit-code -# -##########################################################################*/ - - .global _exit - -_exit: - pushl %ebp - movl %esp,%ebp - movl 8(%ebp),%eax - UserGate unload_exe_nr - -/*########################################################################## -# -# Name : __getreent -# -# Purpose....: ? -# -##########################################################################*/ - - .global __getreent - -__getreent: - xorl %eax,%eax - .byte 0x64 - movl (%eax),%eax - ret - -/*########################################################################## -# -# Name : __rdos_thread_key_create -# -# Purpose....: Emulate GCC pthread_key_create -# -# Parameters.: dtor -# -# Returns....: Key index -# -##########################################################################*/ - - .global __rdos_thread_key_create - -__rdos_thread_key_create: - int $3 - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - mov _key_section,%bx - UserGate enter_user_section_nr - - movl _key_ref_arr,%ebx - movl KEY_ENTRIES,%ecx - -rtkc_scan_loop: - movl (%ebx), %eax - orl %eax, %eax - jz rtkc_entry_found - - add $4, %ebx - loop rtkc_scan_loop - - movl $-1, %eax - jmp rtkc_leave - -rtkc_entry_found: - movb $255,3(%ebx) - subl _key_ref_arr,%ebx - addl _key_dtor_arr,%ebx - movl 8(%ebp),%eax - movl %eax,(%ebx) - subl _key_dtor_arr,%ebx - movl %ebx,%eax - -rtkc_leave: - mov _key_section, %bx - UserGate leave_user_section_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : __rdos_thread_key_delete -# -# Purpose....: Emulate GCC pthread_key_delete -# -# Parameters.: index -# -# Returns....: result -# -##########################################################################*/ - - .global __rdos_thread_key_delete - -__rdos_thread_key_delete: - int $3 - pushl %ebp - movl %esp,%ebp - pushl %ebx - - mov _key_section,%bx - UserGate enter_user_section_nr - - movl 8(%ebp),%ebx - testb $3,%bl - jnz rtkd_fail - - cmpl $(4 * KEY_ENTRIES),%ebx - jae rtkd_fail - - addl _key_ref_arr,%ebx - movb $0,3(%ebx) - mov (%ebx),%eax - orl %eax,%eax - jz rtkd_ok - - subl _key_ref_arr,%ebx - movl $0,(%ebx) - jmp rtkd_ok - -rtkd_fail: - movl $1,%eax - jmp rtkd_leave - -rtkd_ok: - xorl %eax,%eax - -rtkd_leave: - mov _key_section, %bx - UserGate leave_user_section_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : __rdos_thread_getspecific -# -# Purpose....: Emulate GCC pthread_getspecific -# -# Parameters.: index -# -# Returns....: value -# -##########################################################################*/ - - .global __rdos_thread_getspecific - -__rdos_thread_getspecific: - int $3 - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - testb $3,%bl - jnz rtg_fail - - cmpl $(4 * KEY_ENTRIES),%ebx - jae rtg_fail - - movl $4,%eax - .byte 0x64 - movl (%eax),%eax - addl %eax,%ebx - movl (%ebx),%eax - jmp rtg_done - -rtg_fail: - xorl %eax,%eax - -rtg_done: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : __rdos_thread_setspecific -# -# Purpose....: Emulate GCC pthread_setspecific -# -# Parameters.: index -# value -# -##########################################################################*/ - - .global __rdos_thread_setspecific - -__rdos_thread_setspecific: - int $3 - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movl 8(%ebp),%ebx - testb $3,%bl - jnz rts_fail - - cmpl $(4 * KEY_ENTRIES),%ebx - jae rts_fail - - movl $4,%eax - .byte 0x64 - movl (%eax),%eax - addl %eax,%ebx - - movl 12(%ebp),%eax - movl %eax,(%ebx) - xorl %eax,%eax - jmp rts_done - -rts_fail: - movl $1,%eax - -rts_done: - popl %ebx - leave - ret diff --git a/newlib/libc/sys/rdos/execve.c b/newlib/libc/sys/rdos/execve.c deleted file mode 100644 index ac7eeb25c..000000000 --- a/newlib/libc/sys/rdos/execve.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int execve( char *name, char **argv, char **env)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/fork.c b/newlib/libc/sys/rdos/fork.c deleted file mode 100755 index fc335bb41..000000000 --- a/newlib/libc/sys/rdos/fork.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int fork()
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/fstat.c b/newlib/libc/sys/rdos/fstat.c deleted file mode 100755 index c18dd78ed..000000000 --- a/newlib/libc/sys/rdos/fstat.c +++ /dev/null @@ -1,45 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# fstat.c
-# fstat function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-int fstat(int fd, struct stat *st)
-{
- if (fd < 3)
- {
- st->st_mode = S_IFCHR;
- st->st_blksize = 0;
- return 0;
- }
- else
- {
- return -1;
- }
-}
diff --git a/newlib/libc/sys/rdos/getenv.c b/newlib/libc/sys/rdos/getenv.c deleted file mode 100644 index 933ea4d76..000000000 --- a/newlib/libc/sys/rdos/getenv.c +++ /dev/null @@ -1,83 +0,0 @@ -/*####################################################################### -# RDOS operating system -# Copyright (C) 1988-2006, Leif Ekblad -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# The author of this program may be contacted at leif@rdos.net -# -# getenv.c -# getenv function implementation -# -##########################################################################*/ - -/* -FUNCTION -<<getenv>>---look up environment variable - -INDEX - getenv -INDEX - environ - -ANSI_SYNOPSIS - #include <stdlib.h> - char *getenv(const char *<[name]>); - -TRAD_SYNOPSIS - #include <stdlib.h> - char *getenv(<[name]>) - char *<[name]>; - -DESCRIPTION -<<getenv>> searches the list of environment variable names and values -(using the global pointer ``<<char **environ>>'') for a variable whose -name matches the string at <[name]>. If a variable name matches, -<<getenv>> returns a pointer to the associated value. - -RETURNS -A pointer to the (string) value of the environment variable, or -<<NULL>> if there is no such environment variable. - -PORTABILITY -<<getenv>> is ANSI, but the rules for properly forming names of environment -variables vary from one system to another. - -This function is not thread-safe, but does it need to be?? -There is an reentrant class that should be used if reentrance is required - -*/ - -#include <stdlib.h> -#include <stddef.h> -#include <string.h> -#include <rdos.h> - -static char envbuf[256]; - -char *getenv(const char *name) -{ - int handle; - char *ptr = 0; - - handle = RdosOpenSysEnv(); - if (handle) - { - if (RdosFindEnvVar(handle, name, envbuf)) - ptr = envbuf; - } - RdosCloseEnv(handle); - return ptr; -} diff --git a/newlib/libc/sys/rdos/getpid.c b/newlib/libc/sys/rdos/getpid.c deleted file mode 100644 index d84d673e6..000000000 --- a/newlib/libc/sys/rdos/getpid.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int getpid()
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/gettod.c b/newlib/libc/sys/rdos/gettod.c deleted file mode 100644 index b1801502d..000000000 --- a/newlib/libc/sys/rdos/gettod.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <errno.h>
-
-struct timeval;
-struct timezone;
-
-int gettimeofday(struct timeval *ptimeval, struct timezone *ptimezone)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/isatty.c b/newlib/libc/sys/rdos/isatty.c deleted file mode 100644 index 9862a87f8..000000000 --- a/newlib/libc/sys/rdos/isatty.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int isatty(int file)
-{
- return 0;
-}
diff --git a/newlib/libc/sys/rdos/kill.c b/newlib/libc/sys/rdos/kill.c deleted file mode 100644 index 4f77906de..000000000 --- a/newlib/libc/sys/rdos/kill.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int kill(int pid, int sig)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/link.c b/newlib/libc/sys/rdos/link.c deleted file mode 100644 index 23c0b2bee..000000000 --- a/newlib/libc/sys/rdos/link.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int link(char *existing, char *new)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/lseek.c b/newlib/libc/sys/rdos/lseek.c deleted file mode 100755 index b1cdb2178..000000000 --- a/newlib/libc/sys/rdos/lseek.c +++ /dev/null @@ -1,59 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# lseek.c
-# lseek function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <unistd.h>
-#include <errno.h>
-#include <rdos.h>
-
-off_t lseek(int file, off_t pos, int whence)
-{
- off_t temp;
-
- switch (whence)
- {
- case SEEK_CUR:
- temp = RdosGetFilePos(file);
- temp += pos;
- RdosSetFilePos(file, temp);
- return temp;
-
- case SEEK_SET:
- RdosSetFilePos(file, pos);
- return pos;
-
- case SEEK_END:
- temp = RdosGetFilePos(file);
- temp += pos;
- RdosSetFilePos(file, temp);
- return temp;
-
- default:
- errno = EINVAL;
- return - 1;
- }
-}
diff --git a/newlib/libc/sys/rdos/open.c b/newlib/libc/sys/rdos/open.c deleted file mode 100755 index e98910648..000000000 --- a/newlib/libc/sys/rdos/open.c +++ /dev/null @@ -1,59 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# open.c
-# open function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <fcntl.h>
-#include <errno.h>
-#include "rdos.h"
-#include <stdarg.h>
-
-int open(const char *file, int flags, ...)
-{
- int handle;
- int pos;
-
- if (flags & O_CREAT)
- handle = RdosCreateFile(file, flags);
- else
- handle = RdosOpenFile(file, flags);
-
- if (handle >= 0)
- {
- if (flags & O_APPEND)
- {
- pos = RdosGetFileSize(handle);
- RdosSetFilePos(handle, pos);
- }
-
- if (flags & O_TRUNC)
- RdosSetFileSize(handle, 0);
-
- return handle;
- }
- else
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/rdos.S b/newlib/libc/sys/rdos/rdos.S deleted file mode 100644 index d99be7345..000000000 --- a/newlib/libc/sys/rdos/rdos.S +++ /dev/null @@ -1,7528 +0,0 @@ -/*####################################################################### -# RDOS operating system -# Copyright (C) 1988-2006, Leif Ekblad -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# The author of this program may be contacted at leif@rdos.net -# -# rdos.S -# GCC based interface to RDOS kernel -# -##########################################################################*/ - -#include "user.def" - - .macro UserGate nr - .byte 0x9A - .long \nr - .word 2 - .endm - -/*########################################################################## -# -# Name : RdosSwapShort -# -# Purpose....: Byte reverse a short int -# -# Returns....: Result -# -##########################################################################*/ - - .global RdosSwapShort - -RdosSwapShort: - pushl %ebp - movl %esp,%ebp - movw 8(%ebp),%ax - xchgb %ah,%al - leave - ret - - -/*########################################################################## -# -# Name : RdosSwapLong -# -# Purpose....: Byte reverse a long int -# -# Returns....: Result -# -##########################################################################*/ - - .global RdosSwapLong - -RdosSwapLong: - pushl %ebp - movl %esp,%ebp - movl 8(%ebp),%eax - xchgb %ah,%al - roll $16,%eax - xchgb %ah,%al - leave - ret - - -/*########################################################################## -# -# Name : LocalToNetworkLong -# -# Purpose....: Convert a local long to network format -# -# Returns....: Network format -# -##########################################################################*/ - - .global LocalToNetworkLong - -LocalToNetworkLong: - pushl %ebp - movl %esp,%ebp - movl 8(%ebp),%eax - xchgb %ah,%al - roll $16,%eax - xchgb %ah,%al - leave - ret - -/*########################################################################## -# -# Name : NetworkToLocalLong -# -# Purpose....: Convert a network long to local format -# -# Returns....: Local format -# -##########################################################################*/ - - .global NetworkToLocalLong - -NetworkToLocalLong: - pushl %ebp - movl %esp,%ebp - movl 8(%ebp),%eax - xchgb %ah,%al - roll $16,%eax - xchgb %ah,%al - leave - ret - -/*########################################################################## -# -# Name : RdosGetThreadHandle -# -# Purpose....: Get current thread handle -# -# Returns....: Thread ID -# -##########################################################################*/ - - .global RdosGetThreadHandle - -RdosGetThreadHandle: - pushl %ebp - movl %esp,%ebp - UserGate get_thread_nr - movzx %ax,%eax - leave - ret - -/*########################################################################## -# -# Name : RdosGetThreadState -# -# Purpose....: Get thread state -# -# Parameters.: Thread # -# State buffer -# -##########################################################################*/ - - .global RdosGetThreadState - -RdosGetThreadState: - pushl %ebp - movl %esp,%ebp - push %edi - - movl 8(%ebp),%eax - movl 12(%ebp),%edx - UserGate get_thread_state_nr - jc rgtsFail - - movl $1,%eax - jmp rgtsDone - -rgtsFail: - xorl %eax,%eax - -rgtsDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosSuspendThread -# -# Purpose....: Suspend thread -# -# Parameters.: Thread # -# -##########################################################################*/ - - .global RdosSuspendThread - -RdosSuspendThread: - pushl %ebp - movl %esp,%ebp - - movl 8(%ebp),%eax - UserGate suspend_thread_nr - jc rsfFail - - movl $1,%eax - jmp rsfDone - -rsfFail: - xorl %eax,%eax - -rsfDone: - leave - ret - - -/*########################################################################## -# -# Name : RdosExec -# -# Purpose....: Execute a program -# -# Parameters.: Program -# Commandline -# -##########################################################################*/ - - .global RdosExec - -RdosExec: - pushl %ebp - movl %esp,%ebp - pushl %esi - pushl %edi - - movl 8(%ebp),%esi - movl 12(%ebp),%edi - - UserGate load_exe_nr - UserGate get_exit_code_nr - - popl %edi - popl %esi - leave - ret - -/*########################################################################## -# -# Name : RdosSpawn -# -# Purpose....: Create new process and run a program -# -# Parameters.: Program -# Commandline -# StartDir -# -##########################################################################*/ - - .global RdosSpawn - -RdosSpawn: - pushl %ebp - movl %esp,%ebp - pushl %fs - pushl %ebx - pushl %edx - pushl %esi - pushl %edi - - movw %ds,%dx - movw %dx,%fs - xorl %edx,%edx - movl 8(%ebp),%esi - movl 12(%ebp),%edi - movl 16(%ebp),%ebx - UserGate spawn_exe_nr - jc rsFail - - movzx %dx,%eax - jmp rsDone - -rsFail: - xorl %eax,%eax - -rsDone: - popl %edi - popl %esi - popl %edx - popl %ebx - popw %fs - leave - ret - -/*########################################################################## -# -# Name : RdosCpuReset -# -# Purpose....: Cpu reset -# -##########################################################################*/ - - .global RdosCpuReset - -RdosCpuReset: - pushl %ebp - movl %esp,%ebp - UserGate cpu_reset_nr - leave - ret - -/*########################################################################## -# -# Name : RdosGetVersion -# -# Purpose....: Get RDOS version -# -# Parameters.: &major -# &minor -# &release -# -##########################################################################*/ - - .global RdosGetVersion - -RdosGetVersion: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ecx - pushl %edx - pushl %edi - - UserGate get_version_nr - - movzx %dx,%edx - movl 8(%ebp),%edi - movl %edx,(%edi) - - movzx %ax,%eax - movl 12(%ebp),%edi - movl %eax,(%edi) - - movzx %cx,%eax - movl 16(%ebp),%edi - movl %eax,(%edi) - - popl %edi - popl %edx - popl %ecx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosAllocateMem -# -# Purpose....: Allocate memory -# -# Parameters.: Bytes to allocate -# -# Returns....: Memory pointer -# -##########################################################################*/ - - .global RdosAllocateMem - -RdosAllocateMem: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movl 8(%ebp),%eax - UserGate allocate_app_mem_nr - movl %edx,%eax - - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosFreeMem -# -# Purpose....: Free memory -# -# Parameters.: Memory pointer -# -##########################################################################*/ - - .global RdosFreeMem - -RdosFreeMem: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movl 8(%ebp),%edx - UserGate free_app_mem_nr - - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosAppDebug -# -# Purpose....: App debug -# -##########################################################################*/ - - .global RdosAppDebug - -RdosAppDebug: - pushl %ebp - movl %esp,%ebp - UserGate app_debug_nr - leave - ret - -/*########################################################################## -# -# Name : RdosWaitMilli -# -# Purpose....: Wait a number of milliseconds -# -# Parameters.: Milliseconds to wait -# -##########################################################################*/ - - .global RdosWaitMilli - -RdosWaitMilli: - pushl %ebp - movl %esp,%ebp - pushl %eax - - movl 8(%ebp),%eax - UserGate wait_milli_nr - - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosCreateSection -# -# Purpose....: Create section -# -# Returns....: Section handle -# -##########################################################################*/ - - .global RdosCreateSection - -RdosCreateSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate create_user_section_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDeleteSection -# -# Purpose....: Delete section -# -# Parameters.: Section handle -# -##########################################################################*/ - - .global RdosDeleteSection - -RdosDeleteSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate delete_user_section_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosEnterSection -# -# Purpose....: Enter section -# -# Parameters.: Section handle -# -##########################################################################*/ - - .global RdosEnterSection - -RdosEnterSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate enter_user_section_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosLeaveSection -# -# Purpose....: Leave section -# -# Parameters.: Section handle -# -##########################################################################*/ - - .global RdosLeaveSection - -RdosLeaveSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate leave_user_section_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateWait -# -# Purpose....: Create wait object -# -# Returns....: Wait handle -# -##########################################################################*/ - - .global RdosCreateWait - -RdosCreateWait: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate create_wait_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseWait -# -# Purpose....: Close wait -# -# Parameters.: Wait handle -# -##########################################################################*/ - - .global RdosCloseWait - -RdosCloseWait: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_wait_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCheckWait -# -# Purpose....: Check wait state -# -# Parameters.: Wait handle -# -# Returns....: Signalled ID or 0 -# -##########################################################################*/ - - .global RdosCheckWait - -RdosCheckWait: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - UserGate is_wait_idle_nr - movl %ecx,%eax - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWaitForever -# -# Purpose....: Wait forever -# -# Parameters.: Wait handle -# -# Returns....: Signalled ID or 0 -# -##########################################################################*/ - - .global RdosWaitForever - -RdosWaitForever: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - UserGate wait_no_timeout_nr - jc rwfFail - - movl %ecx,%eax - jmp rwfDone - -rwfFail: - xorl %eax,%eax - -rwfDone: - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWaitTimeout -# -# Purpose....: Wait with timeout -# -# Parameters.: Wait handle -# Timeout in ms -# -# Returns....: Signalled ID or 0 -# -##########################################################################*/ - - .global RdosWaitTimeout - -RdosWaitTimeout: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movl 12(%ebp),%eax - movl $1193,%edx - mull %edx - pushl %edx - pushl %eax - UserGate get_system_time_nr - popl %ebx - addl %ebx,%eax - popl %ebx - adcl %ebx,%edx - movw 8(%ebp),%bx - UserGate wait_timeout_nr - jc rwtFail - - movl %ecx,%eax - jmp rwtDone - -rwtFail: - xorl %eax,%eax - -rwtDone: - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosStopWait -# -# Purpose....: Stop wait -# -# Parameters.: Wait handle -# -##########################################################################*/ - - .global RdosStopWait - -RdosStopWait: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate stop_wait_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosRemoveWait -# -# Purpose....: Remove wait object from wait handle -# -# Parameters.: Wait handle -# ID -# -##########################################################################*/ - - .global RdosRemoveWait - -RdosRemoveWait: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movl 12(%ebp),%ecx - UserGate remove_wait_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateSignal -# -# Purpose....: Create signal object -# -# Returns....: Signal handle -# -##########################################################################*/ - - .global RdosCreateSignal - -RdosCreateSignal: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate create_signal_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosResetSignal -# -# Purpose....: Reset signal -# -# Parameters.: Signal handle -# -##########################################################################*/ - - .global RdosResetSignal - -RdosResetSignal: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate reset_signal_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosIsSignalled -# -# Purpose....: Check if signalled -# -# Parameters.: Signal handle -# -# Returns....: TRUE if signalled -# -##########################################################################*/ - - .global RdosIsSignalled - -RdosIsSignalled: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate is_signalled_nr - jc risdFree - - movl $1,%eax - jmp risdDone - -risdFree: - xorl %eax,%eax - -risdDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetSignal -# -# Purpose....: Set signal -# -# Parameters.: Signal handle -# -##########################################################################*/ - - .global RdosSetSignal - -RdosSetSignal: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate set_signal_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosFreeSignal -# -# Purpose....: Free signal handle -# -# Parameters.: Signal handle -# -##########################################################################*/ - - .global RdosFreeSignal - -RdosFreeSignal: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate free_signal_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForSignal -# -# Purpose....: Add signal object to wait handle -# -# Parameters.: Wait handle -# Signal handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForSignal - -RdosAddWaitForSignal: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate add_wait_for_signal_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForKeyboard -# -# Purpose....: Add keyboard to wait handle -# -# Parameters.: Wait handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForKeyboard - -RdosAddWaitForKeyboard: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movl 12(%ebp),%ecx - UserGate add_wait_for_keyboard_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForMouse -# -# Purpose....: Add mouse to wait handle -# -# Parameters.: Wait handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForMouse - -RdosAddWaitForMouse: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movl 12(%ebp),%ecx - UserGate add_wait_for_mouse_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForCom -# -# Purpose....: Add com object to wait handle -# -# Parameters.: Wait handle -# Com handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForCom - -RdosAddWaitForCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate add_wait_for_com_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForAdc -# -# Purpose....: Add ADC object to wait handle -# -# Parameters.: Wait handle -# Adc handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForAdc - -RdosAddWaitForAdc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate add_wait_for_adc_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetTextMode -# -# Purpose....: Set text mode -# -##########################################################################*/ - - .global RdosSetTextMode - -RdosSetTextMode: - pushl %ebp - movl %esp,%ebp - - movw $3,%ax - UserGate set_video_mode_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosSetVideoMode -# -# Purpose....: Set video mode -# -# Parameters.: &xres -# &yres -# &linesize -# &LFB -# -# Returns....: Bitmap handle -# -##########################################################################*/ - - .global RdosSetVideoMode - -RdosSetVideoMode: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movl 8(%ebp),%edi - movw (%edi),%ax - - movl 12(%ebp),%edi - movw (%edi),%cx - - movl 16(%ebp),%edi - movw (%edi),%dx - - UserGate get_video_mode_nr - jc set_video_fail - - UserGate set_video_mode_nr - jc set_video_fail - - pushl %edi - movl 8(%ebp),%edi - movzx %ax,%eax - movl %eax,(%edi) - - movl 12(%ebp),%edi - movzx %cx,%ecx - movl %ecx,(%edi) - - movl 16(%ebp),%edi - movzx %dx,%edx - movl %edx,(%edi) - - movl 20(%ebp),%edi - movzx %si,%esi - movl %esi,(%edi) - popl %edi - - movl 24(%ebp),%eax - movl %edi,(%eax) - - movzx %bx,%eax - jmp set_video_done - -set_video_fail: - xorl %eax,%eax - movl 8(%ebp),%edi - movl %eax,(%edi) - movl 12(%ebp),%edi - movl %eax,(%edi) - movl 16(%ebp),%edi - movl %eax,(%edi) - movl 20(%ebp),%edi - movl %eax,(%edi) - movl 24(%ebp),%edi - movl %eax,(%edi) - -set_video_done: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetClipRect -# -# Purpose....: Set clip rectangle -# -# Parameters.: Bitmap handle -# xmin, xmax, ymin, ymax -# -##########################################################################*/ - - .global RdosSetClipRect - -RdosSetClipRect: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movw 20(%ebp),%si - movw 24(%ebp),%di - UserGate set_clip_rect_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosClearClipRect -# -# Purpose....: Clear clip rectangle -# -# Parameters.: Bitmap handle -# -##########################################################################*/ - - .global RdosClearClipRect - -RdosClearClipRect: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate clear_clip_rect_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetDrawColor -# -# Purpose....: Set draw color -# -# Parameters.: Bitmap handle -# Color -# -##########################################################################*/ - - .global RdosSetDrawColor - -RdosSetDrawColor: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - - movw 8(%ebp),%bx - movl 12(%ebp),%eax - UserGate set_drawcolor_nr - - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosSetLGOP -# -# Purpose....: Set draw color -# -# Parameters.: Bitmap handle -# LGOP -# -##########################################################################*/ - - .global RdosSetLGOP - -RdosSetLGOP: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - UserGate set_lgop_nr - - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosSetHollowStyle -# -# Purpose....: Set hollow fill style -# -# Parameters.: Bitmap handle -# -##########################################################################*/ - - .global RdosSetHollowStyle - -RdosSetHollowStyle: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate set_hollow_style_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFilledStyle -# -# Purpose....: Set filled fill style -# -# Parameters.: Bitmap handle -# -##########################################################################*/ - - .global RdosSetFilledStyle - -RdosSetFilledStyle: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate set_filled_style_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenFont -# -# Purpose....: Open a font -# -# Parameters.: height -# -# Returns....: Font handle -# -##########################################################################*/ - - .global RdosOpenFont - -RdosOpenFont: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%ax - UserGate open_font_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseFont -# -# Purpose....: Close font handle -# -# Parameters.: Font handle -# -##########################################################################*/ - - .global RdosCloseFont - -RdosCloseFont: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_font_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetStringMetrics -# -# Purpose....: Get string metrics for text using font -# -# Parameters.: Font handle -# String -# &width -# &height -# -##########################################################################*/ - - .global RdosGetStringMetrics - -RdosGetStringMetrics: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - UserGate get_string_metrics_nr - - movl 16(%ebp),%edi - movzx %cx,%ecx - movl %ecx,(%edi) - - movl 20(%ebp),%edi - movzx %dx,%edx - movl %edx,(%edi) - - popl %edi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFont -# -# Purpose....: Set font -# -# Parameters.: Bitmap handle -# Font handle -# -##########################################################################*/ - - .global RdosSetFont - -RdosSetFont: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - UserGate set_font_nr - - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosGetPixel -# -# Purpose....: Get pixel -# -# Parameters.: Bitmap handle -# x, y -# -##########################################################################*/ - - .global RdosGetPixel - -RdosGetPixel: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - UserGate get_pixel_nr - - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetPixel -# -# Purpose....: Set pixel -# -# Parameters.: Bitmap handle -# x, y -# -##########################################################################*/ - - .global RdosSetPixel - -RdosSetPixel: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - UserGate set_pixel_nr - - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosBlit -# -# Purpose....: Blit -# -# Parameters.: SrcHandle -# DestHandle -# width, height -# SrcX, SrcY -# DestX, DestY -# -##########################################################################*/ - - .global RdosBlit - -RdosBlit: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi -; - movw 8(%ebp),%ax - movw 12(%ebp),%bx - movw 16(%ebp),%cx - movw 20(%ebp),%dx - movw 28(%ebp),%si - shll $16,%esi - movw 24(%ebp),%si - movw 36(%ebp),%di - shll $16,%edi - movw 32(%ebp),%di - UserGate blit_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosDrawMask -# -# Purpose....: Draw mask -# -# Parameters.: Bitmap handle -# mask -# RowSize -# width, height -# SrcX, SrcY -# DestX, DestY -# -##########################################################################*/ - - .global RdosDrawMask - -RdosDrawMask: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi -; - movw 8(%ebp),%bx - movl 12(%ebp),%edi - movw 16(%ebp),%ax - movw 24(%ebp),%si - shll $16,%esi - movw 20(%ebp),%si - movw 32(%ebp),%cx - shll $16,%ecx - movw 28(%ebp),%cx - movw 40(%ebp),%dx - shll $16,%edx - movw 36(%ebp),%dx - UserGate draw_mask_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosDrawLine -# -# Purpose....: Draw a line -# -# Parameters.: Bitmap handle -# x1, y1 -# x2, y2 -# -##########################################################################*/ - - .global RdosDrawLine - -RdosDrawLine: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi -; - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movw 20(%ebp),%si - movw 24(%ebp),%di - UserGate draw_line_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDrawString -# -# Purpose....: Draw a string -# -# Parameters.: Bitmap handle -# x, y -# string -# -##########################################################################*/ - - .global RdosDrawString - -RdosDrawString: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %edi -; - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movl 20(%ebp),%edi - UserGate draw_string_nr - - popl %edi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDrawRect -# -# Purpose....: Draw a rect -# -# Parameters.: Bitmap handle -# x, y -# width, height -# -##########################################################################*/ - - .global RdosDrawRect - -RdosDrawRect: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movw 20(%ebp),%si - movw 24(%ebp),%di - UserGate draw_rect_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDrawEllipse -# -# Purpose....: Draw an ellipse -# -# Parameters.: Bitmap handle -# x, y -# width, height -# -##########################################################################*/ - - .global RdosDrawEllipse - -RdosDrawEllipse: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movw 20(%ebp),%si - movw 24(%ebp),%di - UserGate draw_ellipse_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateBitmap -# -# Purpose....: Create a bitmap -# -# Parameters.: BitsPerPixel -# width, height -# -# Returns....: Bitmap handle -# -##########################################################################*/ - - .global RdosCreateBitmap - -RdosCreateBitmap: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%ax - movw 12(%ebp),%cx - movw 16(%ebp),%dx - UserGate create_bitmap_nr - movzx %bx,%eax -; - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDuplicateBitmapHandle -# -# Purpose....: Duplicate bitmap handle for use in another thread / object -# -# Parameters.: Bitmap handle -# -# Returns....: Bitmap handle -# -##########################################################################*/ - - .global RdosDuplicateBitmapHandle - -RdosDuplicateBitmapHandle: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate dup_bitmap_handle_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseBitmap -# -# Purpose....: Close bitmap handle -# -# Parameters.: Bitmap handle -# -##########################################################################*/ - - .global RdosCloseBitmap - -RdosCloseBitmap: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_bitmap_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateStringBitmap -# -# Purpose....: Create bitmap from string & font -# -# Parameters.: Font -# string -# -# Returns....: Bitmap handle -# -##########################################################################*/ - - .global RdosCreateStringBitmap - -RdosCreateStringBitmap: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - UserGate create_string_bitmap_nr - movzx %bx,%eax -; - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetBitmapInfo -# -# Purpose....: Get info about bitmap -# -# Parameters.: Bitmap handle -# &BitsPerPixel -# &width, &height -# &linesize -# &LFB -# -##########################################################################*/ - - .global RdosGetBitmapInfo - -RdosGetBitmapInfo: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movw 8(%ebp),%bx - UserGate get_bitmap_info_nr - jc gbiFail - - pushl %edi - movl 12(%ebp),%edi - movzx %al,%eax - movl %eax,(%edi) - - movl 16(%ebp),%edi - movzx %cx,%ecx - movl %ecx,(%edi) - - movl 20(%ebp),%edi - movzx %dx,%edx - movl %edx,(%edi) - - movl 24(%ebp),%edi - movzx %si,%esi - movl %esi,(%edi) - popl %edi - - movl 28(%ebp),%eax - movl %edi,(%eax) - jmp gbiDone - -gbiFail: - xorl %eax,%eax - movl 12(%ebp),%edi - movl %eax,(%edi) - - movl 16(%ebp),%edi - movl %eax,(%edi) - - movl 20(%ebp),%edi - movl %eax,(%edi) - - movl 24(%ebp),%edi - movl %eax,(%edi) - - movl 28(%ebp),%edi - movl %eax,(%edi) - -gbiDone: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosCreateSprite -# -# Purpose....: Create a sprite -# -# Parameters.: dest -# bitmap -# mask -# LGOP -# -# Returns....: Sprite handle -# -##########################################################################*/ - - .global RdosCreateSprite - -RdosCreateSprite: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movw 20(%ebp),%ax - UserGate create_sprite_nr - movzx %bx,%eax - - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseSprite -# -# Purpose....: Close sprite handle -# -# Parameters.: Sprite handle -# -##########################################################################*/ - - .global RdosCloseSprite - -RdosCloseSprite: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_sprite_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosShowSprite -# -# Purpose....: Show sprite -# -# Parameters.: Sprite handle -# -##########################################################################*/ - - .global RdosShowSprite - -RdosShowSprite: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate show_sprite_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosHideSprite -# -# Purpose....: Hide sprite -# -# Parameters.: Sprite handle -# -##########################################################################*/ - - .global RdosHideSprite - -RdosHideSprite: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate hide_sprite_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosMoveSprite -# -# Purpose....: Move sprite -# -# Parameters.: Sprite handle -# x, y -# -##########################################################################*/ - - .global RdosMoveSprite - -RdosMoveSprite: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - UserGate move_sprite_nr - - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetForeColor -# -# Purpose....: Set text-mode fore color -# -# Parameters.: palette index -# -##########################################################################*/ - - .global RdosSetForeColor - -RdosSetForeColor: - pushl %ebp - movl %esp,%ebp - pushl %eax - - movb 8(%ebp),%al - UserGate set_forecolor_nr - - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosSetBackColor -# -# Purpose....: Set text-mode back color -# -# Parameters.: palette index -# -##########################################################################*/ - - .global RdosSetBackColor - -RdosSetBackColor: - pushl %ebp - movl %esp,%ebp - pushl %eax - - movb 8(%ebp),%al - UserGate set_backcolor_nr - - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosGetSysTime -# -# Purpose....: Get system time -# -# Parameters.: &year, &month, &day -# &hour, &min, &sec, &ms -# -##########################################################################*/ - - .global RdosGetSysTime - -RdosGetSysTime: - pushl %ebp - movl %esp,%ebp - pushal - - UserGate get_system_time_nr - pushl %eax - UserGate binary_to_time_nr - pushl %edx - - movl 8(%ebp),%esi - movzx %dx,%edx - movl %edx,(%esi) - - movl 12(%ebp),%esi - movzx %ch,%edx - movl %edx,(%esi) - - movl 16(%ebp),%esi - movzx %cl,%edx - movl %edx,(%esi) - - movl 20(%ebp),%esi - movzx %bh,%edx - movl %edx,(%esi) - - movl 24(%ebp),%esi - movzx %bl,%edx - movl %edx,(%esi) - - movl 28(%ebp),%esi - movzx %ah,%edx - movl %edx,(%esi) - - popl %edx - UserGate time_to_binary_nr - movl %eax,%ebx - popl %eax - subl %ebx,%eax - xorl %edx,%edx - movl $1192,%ebx - divl %ebx - - movl 32(%ebp),%esi - movzx %ax,%eax - movl %eax,(%esi) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosGetTime -# -# Purpose....: Get time -# -# Parameters.: &year, &month, &day -# &hour, &min, &sec, &ms -# -##########################################################################*/ - - .global RdosGetTime - -RdosGetTime: - pushl %ebp - movl %esp,%ebp - pushal - - UserGate get_time_nr - pushl %eax - UserGate binary_to_time_nr - pushl %edx - - movl 8(%ebp),%esi - movzx %dx,%edx - movl %edx,(%esi) - - movl 12(%ebp),%esi - movzx %ch,%edx - movl %edx,(%esi) - - movl 16(%ebp),%esi - movzx %cl,%edx - movl %edx,(%esi) - - movl 20(%ebp),%esi - movzx %bh,%edx - movl %edx,(%esi) - - movl 24(%ebp),%esi - movzx %bl,%edx - movl %edx,(%esi) - - movl 28(%ebp),%esi - movzx %ah,%edx - movl %edx,(%esi) - - popl %edx - UserGate time_to_binary_nr - movl %eax,%ebx - popl %eax - subl %ebx,%eax - xorl %edx,%edx - movl $1192,%ebx - divl %ebx - - movl 32(%ebp),%esi - movzx %ax,%eax - movl %eax,(%esi) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosSetTime -# -# Purpose....: Set time -# -# Parameters.: year, month, day -# hour, min, sec, ms -# -##########################################################################*/ - - .global RdosSetTime - -RdosSetTime: - pushl %ebp - movl %esp,%ebp - pushal - - movw 8(%ebp),%dx - movb 12(%ebp),%ch - movb 16(%ebp),%cl - movb 20(%ebp),%bh - movb 24(%ebp),%bl - movb 28(%ebp),%ah - UserGate time_to_binary_nr - - movl %edx,%edi - movl %eax,%esi - - movl 32(%ebp),%eax - movl $1192,%edx - mull %edx - addl %eax,%esi - adcl $0,%edi - - UserGate get_system_time_nr - subl %eax,%esi - sbbl %edx,%edi - movl %esi,%eax - movl %edi,%edx - UserGate update_time_nr - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosTicsToRecord -# -# Purpose....: Convert tics to record format -# -# Parameters.: MSB, LSB -# &year, &month, &day -# &hour, &min, &sec, &ms -# -##########################################################################*/ - - .global RdosTicsToRecord - -RdosTicsToRecord: - pushl %ebp - movl %esp,%ebp - pushal - - movl 8(%ebp),%edx - movl 12(%ebp),%eax - addl $596,%eax - adcl $0,%edx - UserGate binary_to_time_nr - pushl %edx - - movl 16(%ebp),%esi - movzx %dx,%edx - movl %edx,(%esi) - - movl 20(%ebp),%esi - movzx %ch,%edx - movl %edx,(%esi) - - movl 24(%ebp),%esi - movzx %cl,%edx - movl %edx,(%esi) - - movl 28(%ebp),%esi - movzx %bh,%edx - movl %edx,(%esi) - - movl 32(%ebp),%esi - movzx %bl,%edx - movl %edx,(%esi) - - movl 36(%ebp),%esi - movzx %ah,%edx - movl %edx,(%esi) - - popl %edx - UserGate time_to_binary_nr - movl %eax,%ebx - movl 12(%ebp),%eax - subl %edx,%eax - xorl %edx,%edx - movl $1192,%ebx - divl %ebx - - movl 40(%ebp),%esi - cmpw %ax,1000 - jne rttrSaveMs - - decw %ax - -rttrSaveMs: - movzx %ax,%eax - movl %eax,(%esi) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosRecordToTics -# -# Purpose....: Convert from record format to tics -# -# Parameters.: &MSB, &LSB -# year, month, day -# hour, min, sec, ms -# -##########################################################################*/ - - .global RdosRecordToTics - -RdosRecordToTics: - pushl %ebp - movl %esp,%ebp - pushal - - movl 40(%ebp),%eax - movl $1192,%edx - mull %edx - pushl %eax - movw 16(%ebp),%dx - movb 20(%ebp),%ch - movb 24(%ebp),%cl - movb 28(%ebp),%bh - movb 32(%ebp),%bl - movb 36(%ebp),%ah - UserGate time_to_binary_nr - popl %ebx - addl %ebx,%eax - adcl $0,%edx - - movl 8(%ebp),%esi - movl %edx,(%esi) - - movl 12(%ebp),%esi - movl %eax,(%esi) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosDecodeMsbTics -# -# Purpose....: Decode MSB tics -# -# Parameters.: MSB -# &day, &hour -# -##########################################################################*/ - - .global RdosDecodeMsbTics - -RdosDecodeMsbTics: - pushl %ebp - movl %esp,%ebp - pushal - - movl 8(%ebp),%eax - xorl %edx,%edx - movl $24,%ecx - divl %ecx - - movl 12(%ebp),%ebx - movl %eax,(%ebx) - - movl 16(%ebp),%ebx - movl %edx,(%ebx) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosDecodeLsbTics -# -# Purpose....: Decode LSB tics -# -# Parameters.: LSB -# &min, &sec, &ms, &us -# -##########################################################################*/ - - .global RdosDecodeLsbTics - -RdosDecodeLsbTics: - pushl %ebp - movl %esp,%ebp - pushal - - movl 8(%ebp),%eax - movl $60,%edx - mull %edx - movl 12(%ebp),%ebx - movl %edx,(%ebx) - - movl $60,%edx - mull %edx - movl 16(%ebp),%ebx - movl %edx,(%ebx) - - movl $1000,%edx - mull %edx - movl 20(%ebp),%ebx - movl %edx,(%ebx) - - movl $1000,%edx - mull %edx - movl 24(%ebp),%ebx - movl %edx,(%ebx) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosDayOfWeek -# -# Purpose....: Get day of week -# -# Parameters.: year, month, day -# -# Returns....: day of week -# -##########################################################################*/ - - .global RdosDayOfWeek - -RdosDayOfWeek: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movl 8(%ebp),%edx - movb 12(%ebp),%ch - movb 16(%ebp),%cl - xorw %bx,%bx - xorb %ah,%ah - UserGate adjust_time_nr - pushw %dx - movl $365,%eax - imulw %dx - pushw %dx - pushw %ax - popl %ebx - popw %dx - UserGate passed_days_nr - decw %dx - shrw $2,%dx - incw %dx - addw %dx,%ax - addl %ebx,%eax - xorl %edx,%edx - addl $5,%eax - movl $7,%ebx - divl %ebx - movzx %dl,%eax - - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetTics -# -# Purpose....: Get system tics -# -# Parameters.: &MSB, &LSB -# -##########################################################################*/ - - .global RdosGetTics - -RdosGetTics: - pushl %ebp - movl %esp,%ebp - pushl %edx - pushl %esi - - UserGate get_time_nr - movl 8(%ebp),%esi - movl %edx,(%esi) - movl 12(%ebp),%esi - movl %eax,(%esi) - - popl %esi - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosAddTics -# -# Purpose....: Add tics to binary time -# -# Parameters.: &MSB, &LSB -# tics -# -##########################################################################*/ - - .global RdosAddTics - -RdosAddTics: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl 12(%ebp),%ebx - addl %eax,(%ebx) - movl 8(%ebp),%ebx - adcl $0,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddMilli -# -# Purpose....: Add milliseconds to binary time -# -# Parameters.: &MSB, &LSB -# milli -# -##########################################################################*/ - - .global RdosAddMilli - -RdosAddMilli: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl $1193,%edx - mull %edx - movl 12(%ebp),%ebx - addl %eax,(%ebx) - movl 8(%ebp),%ebx - adcl %edx,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddSec -# -# Purpose....: Add milliseconds to binary time -# -# Parameters.: &MSB, &LSB -# sec -# -##########################################################################*/ - - .global RdosAddSec - -RdosAddSec: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl $1193000,%edx - mull %edx - movl 12(%ebp),%ebx - addl %eax,(%ebx) - movl 8(%ebp),%ebx - adcl %edx,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddMin -# -# Purpose....: Add minutes to binary time -# -# Parameters.: &MSB, &LSB -# min -# -##########################################################################*/ - - .global RdosAddMin - -RdosAddMin: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl $71582760,%edx - mull %edx - movl 12(%ebp),%ebx - addl %eax,(%ebx) - movl 8(%ebp),%ebx - adcl %edx,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddHour -# -# Purpose....: Add hour to binary time -# -# Parameters.: &MSB, &LSB -# hour -# -##########################################################################*/ - - .global RdosAddHour - -RdosAddHour: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl 8(%ebp),%ebx - adc %eax,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddDay -# -# Purpose....: Add days to binary time -# -# Parameters.: &MSB, &LSB -# days -# -##########################################################################*/ - - .global RdosAddDay - -RdosAddDay: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl $24,%edx - mull %edx - movl 8(%ebp),%ebx - adc %eax,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSyncTime -# -# Purpose....: Synchronize time with NTP -# -# Parameters.: IP -# -##########################################################################*/ - - .global RdosSyncTime - -RdosSyncTime: - pushl %ebp - movl %esp,%ebp - pushal - - movl 8(%ebp),%edx - UserGate sync_time_nr - jc RdosSyncTimeFail - - movl $1,%eax - jmp RdosSyncTimeDone - -RdosSyncTimeFail: - xorl %eax,%eax - -RdosSyncTimeDone: - popal - leave - ret - -/*########################################################################## -# -# Name : RdosOpenCom -# -# Purpose....: Open com-port -# -# Parameters.: ID -# baudrate -# parity -# data bits -# stop bits -# SendBufferSize -# RecBufferSize -# -# Returns...: Com handle -# -##########################################################################*/ - - .global RdosOpenCom - -RdosOpenCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movb 8(%ebp),%al - movb 20(%ebp),%ah - movb 24(%ebp),%bl - movb 16(%ebp),%bh - movl 12(%ebp),%ecx - movw 28(%ebp),%si - movw 32(%ebp),%di - UserGate open_com_nr - movzx %bx,%eax - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseCom -# -# Purpose....: Close com-port -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosCloseCom - -RdosCloseCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_com_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosFlushCom -# -# Purpose....: Flush com-port -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosFlushCom - -RdosFlushCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate flush_com_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadCom -# -# Purpose....: Read com-port -# -# Parameters.: Com handle -# -# Returns....: Character -# -##########################################################################*/ - - .global RdosReadCom - -RdosReadCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate read_com_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteCom -# -# Purpose....: Write com-port -# -# Parameters.: Com handle -# char -# -# Returns....: 0 for success -# -##########################################################################*/ - - .global RdosWriteCom - -RdosWriteCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - movb 12(%ebp),%al - UserGate write_com_nr - movzx %al,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWaitForSendCompletedCom -# -# Purpose....: Wait until send buffer is empty -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosWaitForSendCompletedCom - -RdosWaitForSendCompletedCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate wait_for_send_completed_com_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosEnableCts -# -# Purpose....: Enable CTS signal -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosEnableCts - -RdosEnableCts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate enable_cts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDisableCts -# -# Purpose....: Disable CTS signal -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosDisableCts - -RdosDisableCts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate disable_cts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosEnableAutoRts -# -# Purpose....: Enable auto RTS signal generation for RS485 -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosEnableAutoRts - -RdosEnableAutoRts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate enable_auto_rts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDisableAutoRts -# -# Purpose....: Disable auto RTS signal generation for RS485 -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosDisableAutoRts - -RdosDisableAutoRts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate disable_auto_rts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetDtr -# -# Purpose....: Set DTR active -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosSetDtr - -RdosSetDtr: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate set_dtr_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosResetDtr -# -# Purpose....: Set DTR inactive -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosResetDtr - -RdosResetDtr: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate reset_dtr_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetRts -# -# Purpose....: Set RTS active -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosSetRts - -RdosSetRts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate set_rts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosResetRts -# -# Purpose....: Set RTS inactive -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosResetRts - -RdosResetRts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate reset_rts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetReceiveBufferSpace -# -# Purpose....: Get receive buffer free space -# -# Parameters.: Com handle -# -# Returns....: Free bytes -# -##########################################################################*/ - - .global RdosGetReceiveBufferSpace - -RdosGetReceiveBufferSpace: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_com_receive_space_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetSendBufferSpace -# -# Purpose....: Get send buffer free space -# -# Parameters.: Com handle -# -# Returns....: Free bytes -# -##########################################################################*/ - - .global RdosGetSendBufferSpace - -RdosGetSendBufferSpace: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_com_send_space_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenFile -# -# Purpose....: Open file -# -# Parameters.: Filename -# Access -# -# Returns...: File handle -# -##########################################################################*/ - - .global RdosOpenFile - -RdosOpenFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movb 12(%ebp),%cl - UserGate open_file_nr - jc OpenFileFailed - - movzx %bx,%eax - jmp OpenFileDone - -OpenFileFailed: - xorl %eax,%eax - -OpenFileDone: - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateFile -# -# Purpose....: Create file -# -# Parameters.: Filename -# Attribute -# -# Returns...: File handle -# -##########################################################################*/ - - .global RdosCreateFile - -RdosCreateFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movw 12(%ebp),%cx - UserGate create_file_nr - jc CreateFileFailed - - movzx %bx,%eax - jmp CreateFileDone - -CreateFileFailed: - xorl %eax,%eax - -CreateFileDone: - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseFile -# -# Purpose....: Close file -# -# Parameters.: File handle -# -##########################################################################*/ - - .global RdosCloseFile - -RdosCloseFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_file_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosIsDevice -# -# Purpose....: Check if file is device -# -# Parameters.: TRUE if device -# -##########################################################################*/ - - .global RdosIsDevice - -RdosIsDevice: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_ioctl_data_nr - testw $0x8000,%dx - jz ridFail - - movl $1,%eax - jmp ridDone - -ridFail: - xorl %eax,%eax - -ridDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDuplFile -# -# Purpose....: Duplicate file handle -# -# Parameters.: File handle -# -# Returns....: File handle -# -##########################################################################*/ - - .global RdosDuplFile - -RdosDuplFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate dupl_file_nr - jc DuplFileFailed - - movzx %bx,%eax - jmp DuplFileDone - -DuplFileFailed: - xorl %eax,%eax - -DuplFileDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetFileSize -# -# Purpose....: Get file size -# -# Parameters.: File handle -# -# Returns....: Size -# -##########################################################################*/ - - .global RdosGetFileSize - -RdosGetFileSize: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_file_size_nr - jnc GetFileSizeDone - -GetFileSizeFail: - xorl %eax,%eax - -GetFileSizeDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFileSize -# -# Purpose....: Set file size -# -# Parameters.: File handle -# Size -# -##########################################################################*/ - - .global RdosSetFileSize - -RdosSetFileSize: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - - movw 8(%ebp),%bx - movl 12(%ebp),%eax - UserGate set_file_size_nr - - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosGetFilePos -# -# Purpose....: Get file position -# -# Parameters.: File handle -# -# Returns....: Position -# -##########################################################################*/ - - .global RdosGetFilePos - -RdosGetFilePos: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_file_pos_nr - jnc GetFilePosDone - -GetFilePosFail: - xorl %eax,%eax - -GetFilePosDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFilePos -# -# Purpose....: Set file position -# -# Parameters.: File handle -# Position -# -##########################################################################*/ - - .global RdosSetFilePos - -RdosSetFilePos: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - - movw 8(%ebp),%bx - movl 12(%ebp),%eax - UserGate set_file_pos_nr - - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosGetFileTime -# -# Purpose....: Get file time & date -# -# Parameters.: File handle -# &MSB, &LSB -# -##########################################################################*/ - - .global RdosGetFileTime - -RdosGetFileTime: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movw 8(%ebp),%bx - UserGate get_file_time_nr - jc GetFileTimeDone - - movl 12(%ebp),%edi - movl %edx,(%edi) - - movl 16(%ebp),%edi - movl %eax,(%edi) - -GetFileTimeDone: - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFileTime -# -# Purpose....: Set file time & date -# -# Parameters.: File handle -# MSB, LSB -# -##########################################################################*/ - - .global RdosSetFileTime - -RdosSetFileTime: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - pushl %edx - - movw 8(%ebp),%bx - movl 12(%ebp),%edx - movl 16(%ebp),%eax - UserGate set_file_time_nr - - popl %edx - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosReadFile -# -# Purpose....: Read from file -# -# Parameters.: File handle -# buffer -# count -# -# Returns....: Read count -# -##########################################################################*/ - - .global RdosReadFile - -RdosReadFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - movl 16(%ebp),%ecx - UserGate read_file_nr - - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteFile -# -# Purpose....: Write to file -# -# Parameters.: File handle -# buffer -# count -# -# Returns....: Written count -# -##########################################################################*/ - - .global RdosWriteFile - -RdosWriteFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - movl 16(%ebp),%ecx - UserGate write_file_nr - - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateMapping -# -# Purpose....: Create file mapping -# -# Parameters.: Size -# -# Returns...: Filemap handle -# -##########################################################################*/ - - .global RdosCreateMapping - -RdosCreateMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%eax - UserGate create_mapping_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateNamedMapping -# -# Purpose....: Create named file mapping -# -# Parameters.: Name -# Size -# -# Returns...: Filemap handle -# -##########################################################################*/ - - .global RdosCreateNamedMapping - -RdosCreateNamedMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%eax - UserGate create_named_mapping_nr - movzx %bx,%eax - - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateNamedFileMapping -# -# Purpose....: Create file named file mapping -# -# Parameters.: Name -# Size -# File handle -# -# Returns...: Filemap handle -# -##########################################################################*/ - - .global RdosCreateNamedFileMapping - -RdosCreateNamedFileMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%eax - movw 16(%ebp),%bx - UserGate create_named_file_mapping_nr - movzx %bx,%eax - - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenNamedMapping -# -# Purpose....: Open named file mapping -# -# Parameters.: Name -# -# Returns...: Filemap handle -# -##########################################################################*/ - - .global RdosOpenNamedMapping - -RdosOpenNamedMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%edi - UserGate open_named_mapping_nr - movzx %bx,%eax - - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSyncMapping -# -# Purpose....: Sync file mapping -# -# Parameters.: Filemap handle -# -##########################################################################*/ - - .global RdosSyncMapping - -RdosSyncMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate sync_mapping_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseMapping -# -# Purpose....: Close file mapping -# -# Parameters.: Filemap handle -# -##########################################################################*/ - - .global RdosCloseMapping - -RdosCloseMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_mapping_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosMapView -# -# Purpose....: Map view of file into memory -# -# Parameters.: Filemap handle -# Offset -# Address -# Size -# -##########################################################################*/ - - .global RdosMapView - -RdosMapView: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%eax - movl 16(%ebp),%edi - movl 20(%ebp),%ecx - UserGate map_view_nr - - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosUnmapView -# -# Purpose....: Unmap view of file -# -# Parameters.: Filemap handle -# -##########################################################################*/ - - .global RdosUnmapView - -RdosUnmapView: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate unmap_view_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetCurDrive -# -# Purpose....: Set current drive -# -# Parameters.: Drive -# -##########################################################################*/ - - .global RdosSetCurDrive - -RdosSetCurDrive: - pushl %ebp - movl %esp,%ebp - - movb 8(%ebp),%al - UserGate set_cur_drive_nr - jc rscdrFail - - movl $1,%eax - jmp rscdrDone - -rscdrFail: - xorl %eax,%eax - -rscdrDone: - leave - ret - -/*########################################################################## -# -# Name : RdosGetCurDrive -# -# Purpose....: Get current drive -# -# Returns....: Drive -# -##########################################################################*/ - - .global RdosGetCurDrive - -RdosGetCurDrive: - pushl %ebp - movl %esp,%ebp - - xorl %eax,%eax - UserGate get_cur_drive_nr - movzx %al,%eax - - leave - ret - -/*########################################################################## -# -# Name : RdosSetCurDir -# -# Purpose....: Set current directory -# -# Parameters.: Pathname -# -##########################################################################*/ - - .global RdosSetCurDir - -RdosSetCurDir: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate set_cur_dir_nr - jc rscdFail - - movl $1,%eax - jmp rscdDone - -rscdFail: - xorl %eax,%eax - -rscdDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosGetCurDir -# -# Purpose....: Get current directory -# -# Parameters.: Drive -# Pathname -# -##########################################################################*/ - - .global RdosGetCurDir - -RdosGetCurDir: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%edi - UserGate get_cur_dir_nr - jc rgcdFail - - movl $1,%eax - jmp rgcdDone - -rgcdFail: - xorl %eax,%eax - -rgcdDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosMakeDir -# -# Purpose....: Create directory -# -# Parameters.: Pathname -# -##########################################################################*/ - - .global RdosMakeDir - -RdosMakeDir: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate make_dir_nr - jc mdFail - - movl $1,%eax - jmp mdDone - -mdFail: - xorl %eax,%eax - -mdDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosRemoveDir -# -# Purpose....: Remove directory -# -# Parameters.: Pathname -# -##########################################################################*/ - - .global RdosRemoveDir - -RdosRemoveDir: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate remove_dir_nr - jc rdFail - - movl $1,%eax - jmp rdDone - -rdFail: - xorl %eax,%eax - -rdDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosRenameFile -# -# Purpose....: Rename file -# -# Parameters.: ToName -# FromName -# -##########################################################################*/ - - .global RdosRenameFile - -RdosRenameFile: - pushl %ebp - movl %esp,%ebp - pushl %esi - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%esi - UserGate rename_file_nr - jc rfFail - - mov $1,%eax - jmp rfDone - -rfFail: - xorl %eax,%eax - -rfDone: - popl %edi - popl %esi - leave - ret - -/*########################################################################## -# -# Name : RdosDeleteFile -# -# Purpose....: Delete file -# -# Parameters.: Pathname -# -##########################################################################*/ - - .global RdosDeleteFile - -RdosDeleteFile: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate delete_file_nr - jc dfFail - - mov $1,%eax - jmp dfDone - -dfFail: - xorl %eax,%eax - -dfDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosGetFileAttribute -# -# Purpose....: Get file attribute -# -# Parameters.: Pathname -# &Attrib -# -##########################################################################*/ - - .global RdosGetFileAttribute - -RdosGetFileAttribute: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - UserGate get_file_attribute_nr - jc gfaFail - - movl 12(%ebp),%edi - movzx %cx,%ecx - movl %ecx,(%edi) - movl $1,%eax - jmp gfaDone - -gfaFail: - xorl %eax,%eax - -gfaDone: - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFileAttribute -# -# Purpose....: Set file attribute -# -# Parameters.: Pathname -# Attrib -# -##########################################################################*/ - - .global RdosSetFileAttribute - -RdosSetFileAttribute: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movw 12(%ebp),%cx - UserGate set_file_attribute_nr - jc sfaFail - - movl $1,%eax - jmp sfaDone - -sfaFail: - xorl %eax,%eax - -sfaDone: - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenDir -# -# Purpose....: Open directory -# -# Parameters.: Pathname -# -# Returns....: Dir handle -# -##########################################################################*/ - - .global RdosOpenDir - -RdosOpenDir: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%edi - UserGate open_dir_nr - jc odFail - - movzx %bx,%eax - jmp odDone - -odFail: - xorl %eax,%eax - -odDone: - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseDir -# -# Purpose....: Close directory -# -# Parameters.: Dir handle -# -##########################################################################*/ - - .global RdosCloseDir - -RdosCloseDir: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_dir_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadDir -# -# Purpose....: Read directory entry -# -# Parameters.: Dir handle -# Entry # -# MaxNameSize -# Name buffer -# &FileSize -# &Attribute -# &Msb time -# &Lsb time -# -##########################################################################*/ - - .global RdosReadDir - -RdosReadDir: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movw 12(%ebp),%dx - movw 16(%ebp),%cx - movl 20(%ebp),%edi - UserGate read_dir_nr - jc rdiFail - - movl 24(%ebp),%edi - movl %ecx,(%edi) - - movl 28(%ebp),%edi - movzx %bx,%ebx - movl %ebx,(%edi) - - movl 32(%ebp),%edi - movl %edx,(%edi) - - movl 36(%ebp),%edi - movl %eax,(%edi) - - movl $1,%eax - jmp rdiDone - -rdiFail: - xorl %eax,%eax - -rdiDone: - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFocus -# -# Purpose....: Set input focus -# -# Parameters.: Focus handle -# -##########################################################################*/ - - .global RdosSetFocus - -RdosSetFocus: - pushl %ebp - movl %esp,%ebp - - movl 8(%ebp),%eax - UserGate set_focus_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosGetFocus -# -# Purpose....: Get input focus -# -# Returns....: Focus handle -# -##########################################################################*/ - - .global RdosGetFocus - -RdosGetFocus: - pushl %ebp - movl %esp,%ebp - - UserGate get_focus_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosClearKeyboard -# -# Purpose....: Clear keyboard buffer -# -##########################################################################*/ - - .global RdosClearKeyboard - -RdosClearKeyboard: - pushl %ebp - movl %esp,%ebp - - UserGate flush_keyboard_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosPollKeyboard -# -# Purpose....: Poll keyboard buffer -# -# Returns....: TRUE if non-empty -# -##########################################################################*/ - - .global RdosPollKeyboard - -RdosPollKeyboard: - pushl %ebp - movl %esp,%ebp - - UserGate poll_keyboard_nr - jc rpkEmpty - - mov $1,%eax - jmp rpkDone - -rpkEmpty: - xorl %eax,%eax - -rpkDone: - leave - ret - -/*########################################################################## -# -# Name : RdosReadKeyboard -# -# Purpose....: Read keyboard buffer -# -# Returns....: Scan code -# -##########################################################################*/ - - .global RdosReadKeyboard - -RdosReadKeyboard: - pushl %ebp - movl %esp,%ebp - - UserGate read_keyboard_nr - movzx %ax,%eax - - leave - ret - -/*########################################################################## -# -# Name : RdosGetKeyboardState -# -# Purpose....: Get keyboard buffer -# -# Returns....: Keyboard state -# -##########################################################################*/ - - .global RdosGetKeyboardState - -RdosGetKeyboardState: - pushl %ebp - movl %esp,%ebp - - UserGate get_keyboard_state_nr - movzx %ax,%eax - - leave - ret - -/*########################################################################## -# -# Name : RdosPutKeyboard -# -# Purpose....: Put scancode in keyboard buffer -# -##########################################################################*/ - - .global RdosPutKeyboard - -RdosPutKeyboard: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movw 8(%ebp),%ax - movb 12(%ebp),%dl - movb 16(%ebp),%dh - UserGate put_keyboard_code_nr - - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosPeekKeyEvent -# -# Purpose....: Peek keyboard event -# -##########################################################################*/ - - .global RdosPeekKeyEvent - -RdosPeekKeyEvent: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi - - UserGate peek_key_event_nr - jc rpeFail - - movl 8(%ebp),%edi - movzx %ax,%eax - movl %eax,(%edi) - - movl 12(%ebp),%edi - movzx %cx,%eax - movl %eax,(%edi) - - movl 16(%ebp),%edi - movzx %dl,%eax - movl %eax,(%edi) - - movl 20(%ebp),%edi - movzx %dh,%eax - movl %eax,(%edi) - - movl $1,%eax - jmp rpeDone - -rpeFail: - xorl %eax,%eax - -rpeDone: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosReadKeyEvent -# -# Purpose....: Read keyboard event -# -##########################################################################*/ - - .global RdosReadKeyEvent - -RdosReadKeyEvent: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi - - UserGate read_key_event_nr - jc rkeFail - - movl 8(%ebp),%edi - movzx %ax,%eax - movl %eax,(%edi) - - movl 12(%ebp),%edi - movzx %cx,%eax - movl %eax,(%edi) - - movl 16(%ebp),%edi - movzx %dl,%eax - movl %eax,(%edi) - - movl 20(%ebp),%edi - movzx %dh,%eax - movl %eax,(%edi) - - movl $1,%eax - jmp rkeDone - -rkeFail: - xorl %eax,%eax - -rkeDone: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosHideMouse -# -# Purpose....: Hide mouse cursor -# -##########################################################################*/ - - .global RdosHideMouse - -RdosHideMouse: - pushl %ebp - movl %esp,%ebp - - UserGate hide_mouse_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosShowMouse -# -# Purpose....: Show mouse cursor -# -##########################################################################*/ - - .global RdosShowMouse - -RdosShowMouse: - pushl %ebp - movl %esp,%ebp - - UserGate show_mouse_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosGetMousePosition -# -# Purpose....: Get mouse position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetMousePosition - -RdosGetMousePosition: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - - UserGate get_mouse_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosSetMousePosition -# -# Purpose....: Set mouse position -# -# Parameters.: x, y -# -##########################################################################*/ - - .global RdosSetMousePosition - -RdosSetMousePosition: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - - movw 8(%ebp),%cx - movw 12(%ebp),%dx - UserGate set_mouse_position_nr - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosSetMouseWindow -# -# Purpose....: Set mouse window -# -# Parameters.: start x, start y -# end x, end y -# -##########################################################################*/ - - .global RdosSetMouseWindow - -RdosSetMouseWindow: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%ax - movw 12(%ebp),%bx - movw 16(%ebp),%cx - movw 20(%ebp),%dx - UserGate set_mouse_window_nr - - popl %edx - popl %ecx - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosSetMouseMickey -# -# Purpose....: Set mouse mickey -# -# Parameters.: x, y -# -##########################################################################*/ - - .global RdosSetMouseMickey - -RdosSetMouseMickey: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - - movw 8(%ebp),%cx - movw 12(%ebp),%dx - UserGate set_mouse_mickey_nr - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetCursorPosition -# -# Purpose....: Get cursor position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetCursorPosition - -RdosGetCursorPosition: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - - UserGate get_cursor_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosSetCursorPosition -# -# Purpose....: Set cursor position -# -# Parameters.: x, y -# -##########################################################################*/ - - .global RdosSetCursorPosition - -RdosSetCursorPosition: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - - movw 8(%ebp),%cx - movw 12(%ebp),%dx - UserGate set_cursor_position_nr - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetLeftButton -# -# Purpose....: Check if left button is pressed -# -# Returns....: TRUE if pressed -# -##########################################################################*/ - - .global RdosGetLeftButton - -RdosGetLeftButton: - pushl %ebp - movl %esp,%ebp - - UserGate get_left_button_nr - jc get_left_rel - - mov $1,%eax - jmp get_left_done - -get_left_rel: - xorl %eax,%eax - -get_left_done: - leave - ret - -/*########################################################################## -# -# Name : RdosGetRightButton -# -# Purpose....: Check if right button is pressed -# -# Returns....: TRUE if pressed -# -##########################################################################*/ - - .global RdosGetRightButton - -RdosGetRightButton: - pushl %ebp - movl %esp,%ebp - - UserGate get_right_button_nr - jc get_right_rel - - mov $1,%eax - jmp get_right_done - -get_right_rel: - xorl %eax,%eax - -get_right_done: - leave - ret - -/*########################################################################## -# -# Name : RdosGetLeftButtonPressPosition -# -# Purpose....: Get left button press position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetLeftButtonPressPosition - -RdosGetLeftButtonPressPosition: - pushl %ebp - movl %esp,%ebp - - pushl %ecx - pushl %edx - - UserGate get_left_button_press_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetRightButtonPressPosition -# -# Purpose....: Get right button press position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetRightButtonPressPosition - -RdosGetRightButtonPressPosition: - pushl %ebp - movl %esp,%ebp - - pushl %ecx - pushl %edx - - UserGate get_right_button_press_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetLeftButtonReleasePosition -# -# Purpose....: Get left button release position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetLeftButtonReleasePosition - -RdosGetLeftButtonReleasePosition: - pushl %ebp - movl %esp,%ebp - - pushl %ecx - pushl %edx - - UserGate get_left_button_release_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetRightButtonReleasePosition -# -# Purpose....: Get right button release position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetRightButtonReleasePosition - -RdosGetRightButtonReleasePosition: - pushl %ebp - movl %esp,%ebp - - pushl %ecx - pushl %edx - - UserGate get_right_button_release_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosReadLine -# -# Purpose....: Read a line from keyboard -# -# Parameters.: Buffer -# Size -# -# Returns....: Read count -# -##########################################################################*/ - - .global RdosReadLine - -RdosReadLine: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%ecx - UserGate read_con_nr - - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteChar -# -# Purpose....: Write a character to screen -# -# Parameters.: Char -# -##########################################################################*/ - - .global RdosWriteChar - -RdosWriteChar: - pushl %ebp - movl %esp,%ebp - - movb 8(%ebp),%al - UserGate write_char_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosWriteSizeString -# -# Purpose....: Write a fixed number of characters to screen -# -# Parameters.: String -# Count -# -##########################################################################*/ - - .global RdosWriteSizeString - -RdosWriteSizeString: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%ecx - UserGate write_size_string_nr - - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteString -# -# Purpose....: Write a string to screen -# -# Parameters.: String -# -##########################################################################*/ - - .global RdosWriteString - -RdosWriteString: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate write_asciiz_nr - - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosNameToIp -# -# Purpose....: Convert host name to IP address -# -# Parameters.: Name -# -# Returns....: IP -# -##########################################################################*/ - - .global RdosNameToIp - -RdosNameToIp: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate name_to_ip_nr - jc rntiFail - - movl %edx,%eax - jmp rntiDone - -rntiFail: - xorl %eax,%eax - -rntiDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosGetIp -# -# Purpose....: Get my IP -# -# Returns....: IP -# -##########################################################################*/ - - .global RdosGetIp - -RdosGetIp: - pushl %ebp - movl %esp,%ebp - - UserGate get_ip_address_nr - movl %edx,%eax - - leave - ret - -/*########################################################################## -# -# Name : RdosIpToName -# -# Purpose....: Convert IP address to host name -# -# Parameters.: IP -# Name -# Size -# -##########################################################################*/ - - .global RdosIpToName - -RdosIpToName: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi -; - movl 8(%ebp),%edx - movl 12(%ebp),%edi - movl 16(%ebp),%ecx - UserGate ip_to_name_nr - jnc ritnDone - -ritnFail: - xorl %eax,%eax - -ritnDone: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosPing -# -# Purpose....: Ping node -# -# Parameters.: IP -# Timeout -# -##########################################################################*/ - - .global RdosPing - -RdosPing: - pushl %ebp - movl %esp,%ebp - pushl %edx -; - movl 8(%ebp),%edx - movl 12(%ebp),%eax - UserGate ping_nr - jc ping_failed - - movl $1,%eax - jmp ping_done - -ping_failed: - xorl %eax,%eax - -ping_done: - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenTcpConnection -# -# Purpose....: Open an active connection over TCP -# -# Parameters.: RemoteIp -# LocalPort -# RemotePort -# Timeout in ms -# BufferSize -# -# Returns....: Conn handle -# -##########################################################################*/ - - .global RdosOpenTcpConnection - -RdosOpenTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movl 8(%ebp),%edx - movw 12(%ebp),%si - movw 16(%ebp),%di - movl 20(%ebp),%eax - movl 24(%ebp),%ecx - UserGate open_tcp_connection_nr - mov $0,%eax - jc rotcDone - - movl %ebx,%eax - -rotcDone: - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateTcpListen -# -# Purpose....: Create listen handle -# -# Parameters.: Port -# MaxConnections -# BufferSize -# -# Returns....: Listen handle -# -##########################################################################*/ - - .global RdosCreateTcpListen - -RdosCreateTcpListen: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - - movw 8(%ebp),%si - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate create_tcp_listen_nr - movzx %bx,%eax - jnc ctlDone - - xorl %eax,%eax - -ctlDone: - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetTcpListen -# -# Purpose....: Get connection from listen -# -# Parameters.: Listen handle -# -# Returns....: Conn handle -# -##########################################################################*/ - - .global RdosGetTcpListen - -RdosGetTcpListen: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_tcp_listen_nr - movzx %ax,%eax - jnc gtlDone - - xorl %eax,%eax - -gtlDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseTcpListen -# -# Purpose....: Close TCP listen -# -# Parameters.: Listen handle -# -##########################################################################*/ - - .global RdosCloseTcpListen - -RdosCloseTcpListen: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_tcp_listen_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForTcpListen -# -# Purpose....: Add wait object to tcp listen -# -# Parameters.: Wait handle -# Listen handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForTcpListen - -RdosAddWaitForTcpListen: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate add_wait_for_tcp_listen_nr - movl $1,%eax - jnc awftlDone - - xorl %eax,%eax - -awftlDone: - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWaitForTcpConnection -# -# Purpose....: Wait for Tcp connection to be established -# -# Parameters.: Conn handle -# Timeout ms -# -##########################################################################*/ - - .global RdosWaitForTcpConnection - -RdosWaitForTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - movl 12(%ebp),%eax - UserGate wait_for_tcp_connection_nr - movl $1,%eax - jnc wftcDone - - xorl %eax,%eax - -wftcDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForTcpConnection -# -# Purpose....: Add wait object to tcp connection -# -# Parameters.: Wait handle -# Conn handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForTcpConnection - -RdosAddWaitForTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate add_wait_for_tcp_connection_nr - movl $1,%eax - jnc awftcDone - - xorl %eax,%eax - -awftcDone: - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseTcpConnection -# -# Purpose....: Close Tcp connection -# -# Parameters.: Conn handle -# -##########################################################################*/ - - .global RdosCloseTcpConnection - -RdosCloseTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_tcp_connection_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDeleteTcpConnection -# -# Purpose....: Delete Tcp connection -# -# Parameters.: Conn handle -# -##########################################################################*/ - - .global RdosDeleteTcpConnection - -RdosDeleteTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate delete_tcp_connection_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAbortTcpConnection -# -# Purpose....: Abort Tcp connection -# -# Parameters.: Conn handle -# -##########################################################################*/ - - .global RdosAbortTcpConnection - -RdosAbortTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate abort_tcp_connection_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosPushTcpConnection -# -# Purpose....: Push Tcp connection -# -# Parameters.: Conn handle -# -##########################################################################*/ - - .global RdosPushTcpConnection - -RdosPushTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate push_tcp_connection_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosPollTcpConnection -# -# Purpose....: Poll Tcp connection -# -# Parameters.: Conn handle -# -# Returns....: Available bytes in receive buffer -# -##########################################################################*/ - - .global RdosPollTcpConnection - -RdosPollTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate poll_tcp_connection_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosIsTcpConnectionClosed -# -# Purpose....: Check if connection is closed -# -# Parameters.: Conn handle -# -# Returns....: TRUE if closed -# -##########################################################################*/ - - .global RdosIsTcpConnectionClosed - -RdosIsTcpConnectionClosed: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate is_tcp_connection_closed_nr - jc rptcClosed - - xorl %eax,%eax - jmp rptcDone - -rptcClosed: - movl $1,%eax - -rptcDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetRemoteTcpConnectionIp -# -# Purpose....: Get remote IP -# -# Parameters.: Conn handle -# -# Returns....: IP -# -##########################################################################*/ - - .global RdosGetRemoteTcpConnectionIp - -RdosGetRemoteTcpConnectionIp: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_remote_tcp_connection_ip_nr - jnc grtciDone - - movl $0xFFFFFFFF,%eax - -grtciDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetRemoteTcpConnectionPort -# -# Purpose....: Get remote port -# -# Parameters.: Conn handle -# -# Returns....: Port -# -##########################################################################*/ - - .global RdosGetRemoteTcpConnectionPort - -RdosGetRemoteTcpConnectionPort: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_remote_tcp_connection_port_nr - jnc grtcpDone - - movl $0,%eax - -grtcpDone: - movzx %ax,%eax - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetLocalTcpConnectionPort -# -# Purpose....: Get local port -# -# Parameters.: Conn handle -# -# Returns....: Port -# -##########################################################################*/ - - .global RdosGetLocalTcpConnectionPort - -RdosGetLocalTcpConnectionPort: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_local_tcp_connection_port_nr - jnc gltcpDone - - movl $0,%eax - -gltcpDone: - movzx %ax,%eax - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadTcpConnection -# -# Purpose....: Read data from connection -# -# Parameters.: Conn handle -# Buffer -# Size -# -# Returns....: Read bytes -# -##########################################################################*/ - - .global RdosReadTcpConnection - -RdosReadTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - movl 16(%ebp),%ecx - UserGate read_tcp_connection_nr - - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteTcpConnection -# -# Purpose....: Write data fto connection -# -# Parameters.: Conn handle -# Buffer -# Size -# -# Returns....: Written bytes -# -##########################################################################*/ - - .global RdosWriteTcpConnection - -RdosWriteTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - movl 16(%ebp),%ecx - UserGate write_tcp_connection_nr - - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetLocalMailslot -# -# Purpose....: Get local mailslot from name -# -# Parameters.: Name -# -# Returns....: Mailslot handle -# -##########################################################################*/ - - .global RdosGetLocalMailslot - -RdosGetLocalMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%edi - UserGate get_local_mailslot_nr - jc rglmFail - - movzx %bx,%eax - jmp rglmDone - -rglmFail: - xorl %eax,%eax - -rglmDone: - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetRemoteMailslot -# -# Purpose....: Get remote mailslot from name -# -# Parameters.: IP -# Name -# -# Returns....: Mailslot handle -# -##########################################################################*/ - - .global RdosGetRemoteMailslot - -RdosGetRemoteMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edx - pushl %edi - - movl 8(%ebp),%edx - movl 12(%ebp),%edi - UserGate get_remote_mailslot_nr - jc rgrmFail - - movzx %bx,%eax - jmp rgrmDone - -rgrmFail: - xorl %eax,%eax - -rgrmDone: - popl %edi - popl %edx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosFreeMailslot -# -# Purpose....: Free mailslot -# -# Parameters.: Mailslot handle -# -##########################################################################*/ - - .global RdosFreeMailslot - -RdosFreeMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate free_mailslot_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSendMailslot -# -# Purpose....: Send mailslot -# -# Parameters.: Mailslot handle -# Msg -# Size -# ReplyBuf -# MaxReplySize -# -# Returns....: Size of reply -# -##########################################################################*/ - - .global RdosSendMailslot - -RdosSendMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%esi - movl 16(%ebp),%ecx - movl 20(%ebp),%edi - movl 24(%ebp),%eax - UserGate send_mailslot_nr - jc smFail - - movl %ecx,%eax - jmp smDone - -smFail: - movl $0xFFFFFFFF,%eax - -smDone: - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDefineMailslot -# -# Purpose....: Define mailslot -# -# Parameters.: Name -# Max msg size -# -##########################################################################*/ - - .global RdosDefineMailslot - -RdosDefineMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%ecx - UserGate define_mailslot_nr - - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosReceiveMailslot -# -# Purpose....: Receive from mailslot -# -# Parameters.: Msg buffer -# -# Returns....: Msg size -# -##########################################################################*/ - - .global RdosReceiveMailslot - -RdosReceiveMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - UserGate receive_mailslot_nr - movl %ecx,%eax - - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosReplyMailslot -# -# Purpose....: Reply to mailslot -# -# Parameters.: Msg buffer -# Msg size -# -##########################################################################*/ - - .global RdosReplyMailslot - -RdosReplyMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%ecx - UserGate reply_mailslot_nr - - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetIdeDisc -# -# Purpose....: Get IDE disc -# -# Parameters.: Unit # -# -# Returns....: Disc # -# -##########################################################################*/ - - .global RdosGetIdeDisc - -RdosGetIdeDisc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movb 8(%ebp),%bl - UserGate get_ide_disc_nr - jc get_ide_disc_fail - - movzx %al,%eax - jmp get_ide_disc_done - -get_ide_disc_fail: - movl $0xFFFFFFFF,%eax - -get_ide_disc_done: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetFloppyDisc -# -# Purpose....: Get floppy disc -# -# Parameters.: Unit # -# -# Returns....: Disc # -# -##########################################################################*/ - - .global RdosGetFloppyDisc - -RdosGetFloppyDisc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movb 8(%ebp),%bl - UserGate get_floppy_disc_nr - jc get_floppy_disc_fail - - movzx %al,%eax - jmp get_floppy_disc_done - -get_floppy_disc_fail: - movl $0xFFFFFFFF,%eax - -get_floppy_disc_done: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetDiscInfo -# -# Purpose....: Get disc info -# -# Parameters.: Disc # -# Bytes / sector -# Total sectors -# BIOS sectors / cyl -# BIOS heads -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosGetDiscInfo - -RdosGetDiscInfo: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movb 8(%ebp),%al - UserGate get_disc_info_nr - jc get_disc_info_fail - - movl 12(%ebp),%ebx - movzx %cx,%ecx - movl %ecx,(%ebx) - - movl 16(%ebp),%ebx - movl %edx,(%ebx) - - movl 20(%ebp),%ebx - movzx %si,%esi - movl %esi,(%ebx) - - movl 24(%ebp),%ebx - movzx %di,%edi - movl %edi,(%ebx) - - movl $1,%eax - jmp get_disc_info_done - -get_disc_info_fail: - xorl %eax,%eax - -get_disc_info_done: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetDiscInfo -# -# Purpose....: Set disc info -# -# Parameters.: Disc # -# Bytes / sector -# Total sectors -# BIOS sectors / cyl -# BIOS heads -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosSetDiscInfo - -RdosSetDiscInfo: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%ecx - movl 16(%ebp),%edx - movl 20(%ebp),%esi - movl 24(%ebp),%edi - UserGate set_disc_info_nr - jc set_disc_info_fail - - movl $1,%eax - jmp set_disc_info_done - -set_disc_info_fail: - xorl %eax,%eax - -set_disc_info_done: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadDisc -# -# Purpose....: Read from disc -# -# Parameters.: Disc # -# Sector # -# Buffer -# Size -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosReadDisc - -RdosReadDisc: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%edx - movl 16(%ebp),%edi - movl 20(%ebp),%ecx - UserGate read_disc_nr - jc read_disc_fail - - movl $1,%eax - jmp read_disc_done - -read_disc_fail: - xorl %eax,%eax - -read_disc_done: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteDisc -# -# Purpose....: Write to disc -# -# Parameters.: Disc # -# Sector # -# Buffer -# Size -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosWriteDisc - -RdosWriteDisc: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%edx - movl 16(%ebp),%edi - movl 20(%ebp),%ecx - UserGate write_disc_nr - jc write_disc_fail - - movl $1,%eax - jmp write_disc_done - -write_disc_fail: - xorl %eax,%eax - -write_disc_done: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosAllocateFixedDrive -# -# Purpose....: Allocate fixed drive -# -# Parameters.: Drive # -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosAllocateFixedDrive - -RdosAllocateFixedDrive: - pushl %ebp - movl %esp,%ebp - - movb 8(%ebp),%al - UserGate allocate_fixed_drive_nr - jc allocate_fixed_drive_fail - - movl $1,%eax - jmp allocate_fixed_drive_done - -allocate_fixed_drive_fail: - xorl %eax,%eax - -allocate_fixed_drive_done: - leave - ret - -/*########################################################################## -# -# Name : RdosAllocateStaticDrive -# -# Purpose....: Allocate static drive -# -# Returns....: Drive # -# -##########################################################################*/ - - .global RdosAllocateStaticDrive - -RdosAllocateStaticDrive: - pushl %ebp - movl %esp,%ebp - - UserGate allocate_static_drive_nr - jc allocate_static_drive_fail - - movzx %al,%eax - jmp allocate_static_drive_done - -allocate_static_drive_fail: - xorl %eax,%eax - -allocate_static_drive_done: - leave - ret - -/*########################################################################## -# -# Name : RdosAllocateDynamicDrive -# -# Purpose....: Allocate dynamic drive -# -# Returns....: Drive # -# -##########################################################################*/ - - .global RdosAllocateDynamicDrive - -RdosAllocateDynamicDrive: - pushl %ebp - movl %esp,%ebp - - UserGate allocate_dynamic_drive_nr - jc allocate_dynamic_drive_fail - - movzx %al,%eax - jmp allocate_dynamic_drive_done - -allocate_dynamic_drive_fail: - xorl %eax,%eax - -allocate_dynamic_drive_done: - leave - ret - -/*########################################################################## -# -# Name : RdosGetRdfsInfo -# -# Purpose....: Get rdfs info -# -# Parameters.: Crypt tab -# Key tab -# Extent size tab -# -##########################################################################*/ - - .global RdosGetRdfsInfo - -RdosGetRdfsInfo: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movl 8(%ebp),%esi - movl 12(%ebp),%edi - movl 16(%ebp),%ebx - UserGate get_rdfs_info_nr - - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetDriveInfo -# -# Purpose....: Get drive info -# -# Parameters.: Drive # -# Free units -# Bytes per unit -# Total units -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosGetDriveInfo - -RdosGetDriveInfo: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movb 8(%ebp),%al - UserGate get_drive_info_nr - jc get_drive_info_fail - - movl 12(%ebp),%ebx - movl %eax,(%ebx) - - movl 16(%ebp),%ebx - movzx %cx,%ecx - movl %ecx,(%ebx) - - movl 20(%ebp),%ebx - movl %edx,(%ebx) - - movl $1,%eax - jmp get_drive_info_done - -get_drive_info_fail: - xorl %eax,%eax - -get_drive_info_done: - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDemandLoadDrive -# -# Purpose....: Demand load drive -# -# Parameters.: Drive # -# -##########################################################################*/ - - .global RdosDemandLoadDrive - -RdosDemandLoadDrive: - pushl %ebp - movl %esp,%ebp - - movb 8(%ebp),%al - UserGate demand_load_drive_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosGetDriveDiscParam -# -# Purpose....: Get drive disc parameters -# -# Parameters.: Drive # -# Disc # -# Start sector -# Total sectors -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosGetDriveDiscParam - -RdosGetDriveDiscParam: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movb 8(%ebp),%al - UserGate get_drive_disc_param_nr - jc get_drive_disc_param_fail - - movl 12(%ebp),%ebx - movzx %al,%eax - movl %eax,(%ebx) - - movl 16(%ebp),%ebx - movl %edx,(%ebx) - - movl 20(%ebp),%ebx - movl %ecx,(%ebx) - - movl $1,%eax - jmp get_drive_disc_param_done - -get_drive_disc_param_fail: - xorl %eax,%eax - -get_drive_disc_param_done: - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosFormatDrive -# -# Purpose....: Format drive -# -# Parameters.: Disc # -# Start sector -# Sectors -# FS name -# -# Returns....: Drive # -# -##########################################################################*/ - - .global RdosFormatDrive - -RdosFormatDrive: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%edx - movl 16(%ebp),%ecx - movl 20(%ebp),%edi - UserGate format_drive_nr - jc rfdFail - - movzx %al,%eax - jmp rfdDone - -rfdFail: - xorl %eax,%eax - -rfdDone: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetExeName -# -# Purpose....: Get name of executable file -# -# Returns....: Exe pathname -# -##########################################################################*/ - - .global RdosGetExeName - -RdosGetExeName: - pushl %ebp - movl %esp,%ebp - pushl %edi - - UserGate get_exe_name_nr - jc rgenFail - - movl %edi,%eax - jmp rgenDone - -rgenFail: - xorl %eax,%eax - -rgenDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosOpenAdc -# -# Purpose....: Open handle to ADC channel -# -# Parameters.: Channel # -# -# Returns....: Adc handle -# -##########################################################################*/ - - .global RdosOpenAdc - -RdosOpenAdc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%eax - UserGate open_adc_nr - movw %bx,%ax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseAdc -# -# Purpose....: Close ADC handle -# -# Parameters.: Adc handle -# -##########################################################################*/ - - .global RdosCloseAdc - -RdosCloseAdc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate close_adc_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDefineAdcTime -# -# Purpose....: Define time of next conversion -# -# Parameters.: Adc handle -# MSB time -# LSB time -# -##########################################################################*/ - - .global RdosDefineAdcTime - -RdosDefineAdcTime: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edx - - movl 8(%ebp),%ebx - movl 12(%ebp),%edx - movl 16(%ebp),%eax - UserGate define_adc_time_nr - - popl %edx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadAdc -# -# Purpose....: Read ADC -# -# Parameters.: Adc handle -# -# Returns....: Value -# -##########################################################################*/ - - .global RdosReadAdc - -RdosReadAdc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate read_adc_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadSerialLines -# -# Purpose....: Read serial lines -# -# Parameters.: Device -# &Value -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosReadSerialLines - -RdosReadSerialLines: - pushl %ebp - movl %esp,%ebp - pushl %edx - pushl %esi - - movb 8(%ebp),%dh - UserGate read_serial_lines_nr - jc rdsFail - - movzx %al,%eax - movl 12(%ebp),%esi - movl %eax,(%esi) - movl $1,%eax - jmp rdsDone - -rdsFail: - xorl %eax,%eax - -rdsDone: - popl %esi - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosToggleSerialLine -# -# Purpose....: Toggle serial line -# -# Parameters.: Device -# Line -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosToggleSerialLine - -RdosToggleSerialLine: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movb 8(%ebp),%dh - movb 12(%ebp),%dl - UserGate toggle_serial_line_nr - jc rtsFail - - movl $1,%eax - jmp rtsDone - -rtsFail: - xorl %eax,%eax - -rtsDone: - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosReadSerialVal -# -# Purpose....: Read serial value -# -# Parameters.: Device -# Line -# &Val -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosReadSerialVal - -RdosReadSerialVal: - pushl %ebp - movl %esp,%ebp - pushl %edx - pushl %esi - - movb 8(%ebp),%dh - movb 12(%ebp),%dl - UserGate read_serial_val_nr - - pushfw - shll $8,%eax - movl 16(%ebp),%esi - movl %eax,(%esi) - popfw - jc rdvFail - - movl $1,%eax - jmp rdvDone - -rdvFail: - xorl %eax,%eax - -rdvDone: - popl %esi - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteSerialVal -# -# Purpose....: Write serial value -# -# Parameters.: Device -# Line -# Val -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosWriteSerialVal - -RdosWriteSerialVal: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movb 8(%ebp),%dh - movb 12(%ebp),%dl - movl 16(%ebp),%eax - sarl $8,%eax - UserGate write_serial_val_nr - jc rwvFail - - movl $1,%eax - jmp rwvDone - -rwvFail: - xorl %eax,%eax - -rwvDone: - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosReadSerialRaw -# -# Purpose....: Read serial raw value -# -# Parameters.: Device -# Line -# &Val -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosReadSerialRaw - -RdosReadSerialRaw: - pushl %ebp - movl %esp,%ebp - pushl %edx - pushl %esi - - movb 8(%ebp),%dh - movb 12(%ebp),%dl - UserGate read_serial_val_nr - - pushfw - movl 16(%ebp),%esi - movl %eax,(%esi) - popfw - jc rdrFail - - movl $1,%eax - jmp rdrDone - -rdrFail: - xorl %eax,%eax - -rdrDone: - popl %esi - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteSerialRaw -# -# Purpose....: Write serial raw value -# -# Parameters.: Device -# Line -# Val -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosWriteSerialRaw - -RdosWriteSerialRaw: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movb 8(%ebp),%dh - movb 12(%ebp),%dl - movl 16(%ebp),%eax - UserGate write_serial_val_nr - jc rwrFail - - movl $1,%eax - jmp rwrDone - -rwrFail: - xorl %eax,%eax - -rwrDone: - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenSysEnv -# -# Purpose....: Open system environment -# -# Returns....: Env handle -# -##########################################################################*/ - - .global RdosOpenSysEnv - -RdosOpenSysEnv: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate open_sys_env_nr - jc oseFail - - movzx %bx,%eax - jmp oseDone - -oseFail: - xorl %eax,%eax - -oseDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenProcessEnv -# -# Purpose....: Open process environment -# -# Returns....: Env handle -# -##########################################################################*/ - - .global RdosOpenProcessEnv - -RdosOpenProcessEnv: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate open_proc_env_nr - jc opeFail - - movzx %bx,%eax - jmp opeDone - -opeFail: - xorl %eax,%eax - -opeDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseEnv -# -# Purpose....: Close environment -# -# Parameters.: Env handle -# -##########################################################################*/ - - .global RdosCloseEnv - -RdosCloseEnv: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate close_env_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddEnvVar -# -# Purpose....: Add environment variable -# -# Parameters.: Env handle -# var -# data -# -##########################################################################*/ - - .global RdosAddEnvVar - -RdosAddEnvVar: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - movl 16(%ebp),%edi - UserGate add_env_var_nr - - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDeleteEnvVar -# -# Purpose....: Delete environment variable -# -# Parameters.: Env handle -# var -# -##########################################################################*/ - - .global RdosDeleteEnvVar - -RdosDeleteEnvVar: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - UserGate delete_env_var_nr - - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosFindEnvVar -# -# Purpose....: Find environment variable -# -# Parameters.: Env handle -# var -# data -# -##########################################################################*/ - - .global RdosFindEnvVar - -RdosFindEnvVar: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - movl 16(%ebp),%edi - UserGate find_env_var_nr - jc fevFail - - movl $1,%eax - jmp fevDone - -fevFail: - xorl %eax,%eax - -fevDone: - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetEnvData -# -# Purpose....: Get raw environment data -# -# Parameters.: Env handle -# data -# -##########################################################################*/ - - .global RdosGetEnvData - -RdosGetEnvData: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%edi - UserGate get_env_data_nr - jnc gedDone - - xorw %ax,%ax - stosw - -gedDone: - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetEnvData -# -# Purpose....: Set raw environment data -# -# Parameters.: Env handle -# data -# -##########################################################################*/ - - .global RdosSetEnvData - -RdosSetEnvData: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%edi - UserGate set_env_data_nr - - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenSysIni -# -# Purpose....: Open system ini-file -# -# Returns....: Ini handle -# -##########################################################################*/ - - .global RdosOpenSysIni - -RdosOpenSysIni: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate open_sys_ini_nr - jc osiFail - - movzx %bx,%eax - jmp osiDone - -osiFail: - xorl %eax,%eax - -osiDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseIni -# -# Purpose....: Close ini-file -# -# Parameters.: Ini handle -# -##########################################################################*/ - - .global RdosCloseIni - -RdosCloseIni: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate close_ini_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGotoIniSection -# -# Purpose....: Goto ini section -# -# Parameters.: Ini handle -# SectionName -# -##########################################################################*/ - - .global RdosGotoIniSection - -RdosGotoIniSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%edi - UserGate goto_ini_section_nr - jc gisFail - - movl $1,%eax - jmp gisDone - -gisFail: - xorl %eax,%eax - -gisDone: - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosRemoveIniSection -# -# Purpose....: Remove current ini section -# -# Parameters.: Ini handle -# -##########################################################################*/ - - .global RdosRemoveIniSection - -RdosRemoveIniSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate remove_ini_section_nr - jc risFail - - movl $1,%eax - jmp risDone - -risFail: - xorl %eax,%eax - -risDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadIni -# -# Purpose....: Read ini var in current section -# -# Parameters.: Ini handle -# VarName -# Data -# MaxSize -# -##########################################################################*/ - - .global RdosReadIni - -RdosReadIni: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %esi - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - movl 16(%ebp),%edi - movl 20(%ebp),%ecx - UserGate read_ini_nr - jc riFail - - movl $1,%eax - jmp riDone - -riFail: - xorl %eax,%eax - -riDone: - popl %edi - popl %esi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteIni -# -# Purpose....: Write ini var in current section -# -# Parameters.: Ini handle -# VarName -# Data -# -##########################################################################*/ - - .global RdosWriteIni - -RdosWriteIni: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - movl 16(%ebp),%edi - UserGate write_ini_nr - jc wiFail - - movl $1,%eax - jmp wiDone - -wiFail: - xorl %eax,%eax - -wiDone: - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDeleteIni -# -# Purpose....: Delete ini var in current section -# -# Parameters.: Ini handle -# VarName -# -##########################################################################*/ - - .global RdosDeleteIni - -RdosDeleteIni: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - UserGate delete_ini_nr - jc diFail - - movl $1,%eax - jmp diDone - -diFail: - xorl %eax,%eax - -diDone: - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateFileDrive -# -# Purpose....: Create a new file-drive -# -# Parameters.: Drive -# Size -# FS name -# Filename -# -##########################################################################*/ - - .global RdosCreateFileDrive - -RdosCreateFileDrive: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %esi - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%ecx - movl 16(%ebp),%esi - movl 20(%ebp),%edi - UserGate create_file_drive_nr - jnc cfdOk - - xorl %eax,%eax - jmp cfdDone - -cfdOk: - movl $1,%eax - -cfdDone: - popl %edi - popl %esi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenFileDrive -# -# Purpose....: Open a new file-drive -# -# Parameters.: Drive -# Filename -# -##########################################################################*/ - - .global RdosOpenFileDrive - -RdosOpenFileDrive: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%edi - UserGate open_file_drive_nr - jnc ofdOk - - xorl %eax,%eax - jmp ofdDone - -ofdOk: - movl $1,%eax - -ofdDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosEnableStatusLed -# -# Purpose....: Enable status LED -# -##########################################################################*/ - - .global RdosEnableStatusLed - -RdosEnableStatusLed: - pushl %ebp - movl %esp,%ebp - UserGate enable_status_led_nr - leave - ret - -/*########################################################################## -# -# Name : RdosDisableStatusLed -# -# Purpose....: Disable status LED -# -##########################################################################*/ - - .global RdosDisableStatusLed - -RdosDisableStatusLed: - pushl %ebp - movl %esp,%ebp - UserGate disable_status_led_nr - leave - ret - -/*########################################################################## -# -# Name : RdosStartWatchdog -# -# Purpose....: Start watchdog -# -# Parameters.: Timeout, ms -# -##########################################################################*/ - - .global RdosStartWatchdog - -RdosStartWatchdog: - pushl %ebp - movl %esp,%ebp -; - movl 8(%ebp),%eax - UserGate start_watchdog_nr -; - leave - ret - -/*########################################################################## -# -# Name : RdosKickWatchdog -# -# Purpose....: Kick watchdog -# -##########################################################################*/ - - .global RdosKickWatchdog - -RdosKickWatchdog: - pushl %ebp - movl %esp,%ebp - UserGate kick_watchdog_nr - leave - ret - diff --git a/newlib/libc/sys/rdos/rdos.h b/newlib/libc/sys/rdos/rdos.h deleted file mode 100755 index 690500071..000000000 --- a/newlib/libc/sys/rdos/rdos.h +++ /dev/null @@ -1,344 +0,0 @@ -
-#ifndef _RDOS_H
-#define _RDOS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//#undef WIN32
-
-#define FILE_ATTRIBUTE_READONLY 0x1
-#define FILE_ATTRIBUTE_HIDDEN 0x2
-#define FILE_ATTRIBUTE_SYSTEM 0x4
-#define FILE_ATTRIBUTE_DIRECTORY 0x10
-#define FILE_ATTRIBUTE_ARCHIVE 0x20
-#define FILE_ATTRIBUTE_NORMAL 0x80
-
-#define LGOP_NULL 0
-#define LGOP_NONE 1
-#define LGOP_OR 2
-#define LGOP_AND 3
-#define LGOP_XOR 4
-#define LGOP_INVERT 5
-#define LGOP_INVERT_OR 6
-#define LGOP_INVERT_AND 7
-#define LGOP_INVERT_XOR 8
-#define LGOP_ADD 9
-#define LGOP_SUBTRACT 10
-#define LGOP_MULTIPLY 11
-
-#define getred(pgc) (((pgc)>>16)&0xFF)
-#define getgreen(pgc) (((pgc)>>8)&0xFF)
-#define getblue(pgc) ((pgc)&0xFF)
-#define mkcolor(r,g,b) (((r)<<16)|((g)<<8)|(b))
-
-typedef struct ThreadState
-{
- short int ID;
- char Name[32];
- unsigned long MsbTime;
- unsigned long LsbTime;
- char List[32];
- long Offset;
- short int Sel;
-} ThreadState;
-
-#ifdef __GNUC__
-#define __stdcall
-#else
-#if (sizeof(int) == 2)
-#define __stdcall
-#endif
-#endif
-
-short int __stdcall RdosSwapShort(short int val);
-long __stdcall RdosSwapLong(long val);
-
-void __stdcall RdosSetTextMode();
-int __stdcall RdosSetVideoMode(int *BitsPerPixel, int *xres, int *yres, int *linesize, void **buffer);
-void __stdcall RdosSetClipRect(int handle, int xmin, int ymin, int xmax, int ymax);
-void __stdcall RdosClearClipRect(int handle);
-void __stdcall RdosSetDrawColor(int handle, int color);
-void __stdcall RdosSetLGOP(int handle, int lgop);
-void __stdcall RdosSetHollowStyle(int handle);
-void __stdcall RdosSetFilledStyle(int handle);
-int __stdcall RdosOpenFont(int height);
-void __stdcall RdosCloseFont(int font);
-void __stdcall RdosGetStringMetrics(int font, const char *str, int *width, int *height);
-void __stdcall RdosSetFont(int handle, int font);
-int __stdcall RdosGetPixel(int handle, int x, int y);
-void __stdcall RdosSetPixel(int handle, int x, int y);
-void __stdcall RdosBlit(int SrcHandle, int DestHandle, int width, int height,
- int SrcX, int SrcY, int DestX, int DestY);
-void __stdcall RdosDrawMask(int handle, void *mask, int RowSize, int width, int height,
- int SrcX, int SrcY, int DestX, int DestY);
-void __stdcall RdosDrawLine(int handle, int x1, int y1, int x2, int y2);
-void __stdcall RdosDrawString(int handle, int x, int y, const char *str);
-void __stdcall RdosDrawRect(int handle, int x, int y, int width, int height);
-void __stdcall RdosDrawEllipse(int handle, int x, int y, int width, int height);
-int __stdcall RdosCreateBitmap(int BitsPerPixel, int width, int height);
-int __stdcall RdosDuplicateBitmapHandle(int handle);
-void __stdcall RdosCloseBitmap(int handle);
-int __stdcall RdosCreateStringBitmap(int font, const char *str);
-void __stdcall RdosGetBitmapInfo(int handle, int *BitPerPixel, int *width, int *height,
- int *linesize, void **buffer);
-
-int __stdcall RdosCreateSprite(int DestHandle, int BitmapHandle, int MaskHandle, int lgop);
-void __stdcall RdosCloseSprite(int handle);
-void __stdcall RdosShowSprite(int handle);
-void __stdcall RdosHideSprite(int handle);
-void __stdcall RdosMoveSprite(int handle, int x, int y);
-
-void __stdcall RdosSetForeColor(int color);
-void __stdcall RdosSetBackColor(int color);
-int __stdcall RdosGetMemSize(void *ptr);
-void *__stdcall RdosAllocateMem(int Size);
-void __stdcall RdosFreeMem(void *ptr);
-int __stdcall RdosAppDebug();
-
-int __stdcall RdosOpenCom(int ID, long BaudRate, char Parity, char DataBits, char StopBits, int SendBufSize, int RecBufSize);
-void __stdcall RdosCloseCom(int Handle);
-void __stdcall RdosFlushCom(int Handle);
-char __stdcall RdosReadCom(int Handle);
-int __stdcall RdosWriteCom(int Handle, char Val);
-void __stdcall RdosEnableCts(int Handle);
-void __stdcall RdosDisableCts(int Handle);
-void __stdcall RdosEnableAutoRts(int Handle);
-void __stdcall RdosDisableAutoRts(int Handle);
-void __stdcall RdosSetDtr(int Handle);
-void __stdcall RdosResetDtr(int Handle);
-void __stdcall RdosSetRts(int Handle);
-void __stdcall RdosResetRts(int Handle);
-int __stdcall RdosGetReceiveBufferSpace(int Handle);
-int __stdcall RdosGetSendBufferSpace(int Handle);
-void __stdcall RdosWaitForSendCompletedCom(int Handle);
-
-int __stdcall RdosOpenFile(const char *FileName, char Access);
-int __stdcall RdosCreateFile(const char *FileName, int Attrib);
-void __stdcall RdosCloseFile(int Handle);
-int __stdcall RdosIsDevice(int Handle);
-int __stdcall RdosDuplFile(int Handle);
-long __stdcall RdosGetFileSize(int Handle);
-void __stdcall RdosSetFileSize(int Handle, long Size);
-long __stdcall RdosGetFilePos(int Handle);
-void __stdcall RdosSetFilePos(int Handle, long Pos);
-int __stdcall RdosReadFile(int Handle, void *Buf, int Size);
-int __stdcall RdosWriteFile(int Handle, const void *Buf, int Size);
-void __stdcall RdosGetFileTime(int Handle, unsigned long *MsbTime, unsigned long *LsbTime);
-void __stdcall RdosSetFileTime(int Handle, unsigned long MsbTime, unsigned long LsbTime);
-
-int __stdcall RdosCreateMapping(int Size);
-int __stdcall RdosCreateNamedMapping(const char *Name, int Size);
-int __stdcall RdosCreateNamedFileMapping(const char *Name, int Size, int FileHandle);
-int __stdcall RdosOpenNamedMapping(const char *Name);
-void __stdcall RdosSyncMapping(int Handle);
-void __stdcall RdosCloseMapping(int Handle);
-void __stdcall RdosMapView(int Handle, int Offset, void *Base, int Size);
-void __stdcall RdosUnmapView(int Handle);
-
-int __stdcall RdosSetCurDrive(int Drive);
-int __stdcall RdosGetCurDrive();
-int __stdcall RdosSetCurDir(const char *PathName);
-int __stdcall RdosGetCurDir(int Drive, char *PathName);
-int __stdcall RdosMakeDir(const char *PathName);
-int __stdcall RdosRemoveDir(const char *PathName);
-int __stdcall RdosRenameFile(const char *ToName, const char *FromName);
-int __stdcall RdosDeleteFile(const char *PathName);
-int __stdcall RdosGetFileAttribute(const char *PathName, int *Attribute);
-int __stdcall RdosSetFileAttribute(const char *PathName, int Attribute);
-int __stdcall RdosOpenDir(const char *PathName);
-void __stdcall RdosCloseDir(int Handle);
-int __stdcall RdosReadDir(int Handle, int EntryNr, int MaxNameSize, char *PathName, long *FileSize, int *Attribute, unsigned long *MsbTime, unsigned long *LsbTime);
-
-int __stdcall RdosGetThreadState(int ThreadNr, ThreadState *State);
-int __stdcall RdosSuspendThread(int ThreadNr);
-
-void __stdcall RdosCpuReset();
-void __stdcall RdosGetVersion(int *Major, int *Minor, int *Release);
-void __stdcall RdosCreateThread(void (*Start)(void *Param), const char *Name, void *Param, int StackSize);
-void __stdcall RdosTerminateThread();
-int __stdcall RdosGetThreadHandle();
-int __stdcall RdosExec(const char *prog, const char *param);
-int __stdcall RdosSpawn(const char *prog, const char *param, const char *startdir);
-void __stdcall RdosWaitMilli(int ms);
-void __stdcall RdosGetTics(unsigned long *msb, unsigned long *lsb);
-void __stdcall RdosTicsToRecord(unsigned long msb, unsigned long lsb, int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);
-void __stdcall RdosRecordToTics(unsigned long *msb, unsigned long *lsb, int year, int month, int day, int hour, int min, int sec, int milli);
-int __stdcall RdosDayOfWeek(int year, int month, int day);
-void __stdcall RdosGetSysTime(int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);
-void __stdcall RdosGetTime(int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);
-void __stdcall RdosSetTime(int year, int month, int day, int hour, int min, int sec, int milli);
-void __stdcall RdosAddTics(unsigned long *msb, unsigned long *lsb, long tics);
-void __stdcall RdosAddMilli(unsigned long *msb, unsigned long *lsb, long ms);
-void __stdcall RdosAddSec(unsigned long *msb, unsigned long *lsb, long sec);
-void __stdcall RdosAddMin(unsigned long *msb, unsigned long *lsb, long min);
-void __stdcall RdosAddHour(unsigned long *msb, unsigned long *lsb, long hour);
-void __stdcall RdosAddDay(unsigned long *msb, unsigned long *lsb, long day);
-int __stdcall RdosSyncTime(long IP);
-
-void __stdcall RdosDecodeMsbTics(unsigned long msb, int *days, int *hours);
-void __stdcall RdosDecodeLsbTics(unsigned long lsb, int *min, int *sec, int *milli, int *micro);
-
-int __stdcall RdosCreateSection();
-void __stdcall RdosDeleteSection(int Handle);
-void __stdcall RdosEnterSection(int Handle);
-void __stdcall RdosLeaveSection(int Handle);
-
-int __stdcall RdosCreateWait();
-void __stdcall RdosCloseWait(int Handle);
-void * __stdcall RdosCheckWait(int Handle);
-void * __stdcall RdosWaitForever(int Handle);
-void * __stdcall RdosWaitTimeout(int Handle, int MillSec);
-void __stdcall RdosStopWait(int Handle);
-void __stdcall RdosRemoveWait(int Handle, void *ID);
-void __stdcall RdosAddWaitForKeyboard(int Handle, void *ID);
-void __stdcall RdosAddWaitForMouse(int Handle, void *ID);
-void __stdcall RdosAddWaitForCom(int Handle, int ComHandle, void *ID);
-void __stdcall RdosAddWaitForAdc(int Handle, int AdcHandle, void *ID);
-
-int __stdcall RdosCreateSignal();
-void __stdcall RdosResetSignal(int Handle);
-int __stdcall RdosIsSignalled(int Handle);
-void __stdcall RdosSetSignal(int Handle);
-void __stdcall RdosFreeSignal(int Handle);
-void __stdcall RdosAddWaitForSignal(int Handle, int SignalHandle, void *ID);
-
-long __stdcall RdosGetIp();
-int __stdcall RdosNameToIp(const char *HostName);
-int __stdcall RdosIpToName(int Ip, char *HostName, int MaxSize);
-
-int __stdcall RdosCreateTcpListen(int Port, int MaxConnections, int BufferSize);
-int __stdcall RdosGetTcpListen(int Handle);
-void __stdcall RdosCloseTcpListen(int Handle);
-void __stdcall RdosAddWaitForTcpListen(int Handle, int ConHandle, void *ID);
-
-int __stdcall RdosOpenTcpConnection(int RemoteIp, int LocalPort, int RemotePort, int Timeout, int BufferSize);
-int __stdcall RdosWaitForTcpConnection(int Handle, long Timeout);
-void __stdcall RdosAddWaitForTcpConnection(int Handle, int ConHandle, void *ID);
-void __stdcall RdosCloseTcpConnection(int Handle);
-void __stdcall RdosDeleteTcpConnection(int Handle);
-void __stdcall RdosAbortTcpConnection(int Handle);
-void __stdcall RdosPushTcpConnection(int Handle);
-int __stdcall RdosIsTcpConnectionClosed(int Handle);
-long __stdcall RdosGetRemoteTcpConnectionIP(int Handle);
-int __stdcall RdosGetRemoteTcpConnectionPort(int Handle);
-int __stdcall RdosGetLocalTcpConnectionPort(int Handle);
-int __stdcall RdosReadTcpConnection(int Handle, void *Buf, int Size);
-int __stdcall RdosWriteTcpConnection(int Handle, const void *Buf, int Size);
-int __stdcall RdosPollTcpConnection(int Handle);
-
-int __stdcall RdosGetLocalMailslot(const char *Name);
-int __stdcall RdosGetRemoteMailslot(long Ip, const char *Name);
-void __stdcall RdosFreeMailslot(int Handle);
-int __stdcall RdosSendMailslot(int Handle, const void *Msg, int Size, void *ReplyBuf, int MaxReplySize);
-
-void __stdcall RdosDefineMailslot(const char *Name, int MaxSize);
-int __stdcall RdosReceiveMailslot(void *Msg);
-void __stdcall RdosReplyMailslot(const void *Msg, int Size);
-
-void __stdcall RdosSetFocus(char FocusKey);
-char __stdcall RdosGetFocus();
-
-void __stdcall RdosClearKeyboard();
-int __stdcall RdosPollKeyboard();
-int __stdcall RdosReadKeyboard();
-int __stdcall RdosGetKeyboardState();
-int __stdcall RdosPutKeyboard(int KeyCode, int VirtualKey, int ScanCode);
-int __stdcall RdosPeekKeyEvent(int *ExtKey, int *KeyState, int *VirtualKey, int *ScanCode);
-int __stdcall RdosReadKeyEvent(int *ExtKey, int *KeyState, int *VirtualKey, int *ScanCode);
-
-void __stdcall RdosHideMouse();
-void __stdcall RdosShowMouse();
-void __stdcall RdosGetMousePosition(int *x, int *y);
-void __stdcall RdosSetMousePosition(int x, int y);
-void __stdcall RdosSetMouseWindow(int StartX, int StartY, int EndX, int EndY);
-void __stdcall RdosSetMouseMickey(int x, int y);
-int __stdcall RdosGetLeftButton();
-int __stdcall RdosGetRightButton();
-void __stdcall RdosGetLeftButtonPressPosition(int *x, int *y);
-void __stdcall RdosGetRightButtonPressPosition(int *x, int *y);
-void __stdcall RdosGetLeftButtonReleasePosition(int *x, int *y);
-void __stdcall RdosGetRightButtonReleasePosition(int *x, int *y);
-
-void __stdcall RdosGetCursorPosition(int *Row, int *Col);
-void __stdcall RdosSetCursorPosition(int Row, int Col);
-void __stdcall RdosWriteChar(char ch);
-void __stdcall RdosWriteSizeString(const char *Buf, int Size);
-void __stdcall RdosWriteString(const char *Buf);
-int __stdcall RdosReadLine(char *Buf, int MaxSize);
-
-int __stdcall RdosPing(long Node, long Timeout);
-
-int __stdcall RdosGetIdeDisc(int UnitNr);
-int __stdcall RdosGetFloppyDisc(int UnitNr);
-
-int __stdcall RdosSetDiscInfo(int DiscNr, int SectorSize, long Sectors, int BiosSectorsPerCyl, int BiosHeads);
-int __stdcall RdosGetDiscInfo(int DiscNr, int *SectorSize, long *Sectors, int *BiosSectorsPerCyl, int *BiosHeads);
-int __stdcall RdosReadDisc(int DiscNr, long Sector, char *Buf, int Size);
-int __stdcall RdosWriteDisc(int DiscNr, long Sector, const char *Buf, int Size);
-
-void __stdcall RdosGetRdfsInfo(void *CryptTab, void *KeyTab, void *ExtentSizeTab);
-void __stdcall RdosDemandLoadDrive(int DriveNr);
-int __stdcall RdosFormatDrive(int DiscNr, long StartSector, int Size, const char *FsName);
-
-int __stdcall RdosAllocateFixedDrive(int DriveNr);
-int __stdcall RdosAllocateStaticDrive();
-int __stdcall RdosAllocateDynamicDrive();
-
-int __stdcall RdosGetDriveInfo(int DriveNr, long *FreeUnits, int *BytesPerUnit, long *TotalUnits);
-int __stdcall RdosGetDriveDiscParam(int DriveNr, int *DiscNr, long *StartSector, long *TotalSectors);
-
-int __stdcall RdosCreateFileDrive(int Drive, long Size, const char *FsName, const char *FileName);
-int __stdcall RdosOpenFileDrive(int Drive, const char *FileName);
-
-int __stdcall RdosGetModuleHandle();
-const char * __stdcall RdosGetExeName();
-int __stdcall RdosLoadDll(const char *Name);
-void __stdcall RdosFreeDll(int handle);
-int __stdcall RdosReadResource(int handle, int ID, char *Buf, int Size);
-int __stdcall RdosReadBinaryResource(int handle, int ID, char *Buf, int Size);
-
-int __stdcall RdosOpenAdc(int channel);
-void __stdcall RdosCloseAdc(int handle);
-void __stdcall RdosDefineAdcTime(int handle, unsigned long msg, unsigned long lsb);
-long __stdcall RdosReadAdc(int handle);
-
-int __stdcall RdosReadSerialLines(int device, int *val);
-int __stdcall RdosToggleSerialLine(int device, int line);
-int __stdcall RdosReadSerialVal(int device, int line, int *val);
-int __stdcall RdosWriteSerialVal(int device, int line, int val);
-int __stdcall RdosReadSerialRaw(int device, int line, int *val);
-int __stdcall RdosWriteSerialRaw(int device, int line, int val);
-
-int __stdcall RdosOpenSysEnv();
-int __stdcall RdosOpenProcessEnv();
-void __stdcall RdosCloseEnv(int handle);
-void __stdcall RdosAddEnvVar(int handle, const char *var, const char *value);
-void __stdcall RdosDeleteEnvVar(int handle, const char *var);
-int __stdcall RdosFindEnvVar(int handle, const char *var, char *value);
-void __stdcall RdosGetEnvData(int handle, char *buf);
-void __stdcall RdosSetEnvData(int handle, const char *buf);
-
-int __stdcall RdosOpenSysIni();
-void __stdcall RdosCloseIni(int handle);
-int __stdcall RdosGotoIniSection(int handle, const char *name);
-int __stdcall RdosRemoveIniSection(int handle);
-int __stdcall RdosReadIni(int handle, const char *var, char *str, int maxsize);
-int __stdcall RdosWriteIni(int handle, const char *var, const char *str);
-int __stdcall RdosDeleteIni(int handle, const char *var);
-
-void __stdcall RdosEnableStatusLED();
-void __stdcall RdosDisableStatusLED();
-
-void __stdcall RdosStartWatchdog(int timeout);
-void __stdcall RdosKickWatchdog();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-
-
diff --git a/newlib/libc/sys/rdos/rdoshelp.c b/newlib/libc/sys/rdos/rdoshelp.c deleted file mode 100644 index 20d25353d..000000000 --- a/newlib/libc/sys/rdos/rdoshelp.c +++ /dev/null @@ -1,162 +0,0 @@ -/*####################################################################### -# RDOS operating system -# Copyright (C) 1988-2006, Leif Ekblad -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# The author of this program may be contacted at leif@rdos.net -# -# rdoshelp.c -# implementation of various structures and helpers -# -##########################################################################*/ - -#include <reent.h> -#include <rdos.h> -#include <stdio.h> - -char *__env[1] = { 0 }; -char **environ = __env; - -static int once_section; -static int key_section; - -/*########################################################################## -# -# Name : _get_impure_data_size -# -# Purpose....: Get size of _reent structure -# -# In params..: * -# Out params.: * -# Returns....: size -# -##########################################################################*/ -int get_impure_data_size() -{ - return sizeof(struct _reent); -} - -/*########################################################################## -# -# Name : __rdos_thread_once -# -# Purpose....: Emulate GCC pthread_once -# -# In params..: Handle initially 0 -# : function to initially call -# Out params.: * -# Returns....: result -# -##########################################################################*/ -int __rdos_thread_once (int *handle, void (*func) (void)) -{ - if (handle == 0 || func == 0) - return 0; - - RdosEnterSection(once_section); - if (*handle == 0) - (*func)(); - else - *handle = 1; - RdosLeaveSection(once_section); - return 0; -} - -/*########################################################################## -# -# Name : __rdos_thread_mutex_init -# -# Purpose....: Emulate GCC pthread_thread_mutex_init -# -# In params..: * -# Out params.: * -# Returns....: handle -# -##########################################################################*/ -int __rdos_thread_mutex_init (void) -{ - return RdosCreateSection(); -} - -/*########################################################################## -# -# Name : __rdos_thread_mutex_lock -# -# Purpose....: Emulate GCC pthread_thread_mutex_lock -# -# In params..: handle -# Out params.: * -# Returns....: * -# -##########################################################################*/ -int __rdos_thread_mutex_lock (int handle) -{ - RdosEnterSection(handle); - return 0; -} - -/*########################################################################## -# -# Name : __rdos_thread_mutex_trylock -# -# Purpose....: Emulate GCC pthread_thread_mutex_trylock -# Try is not yet implemented, and lock is used. -# -# In params..: handle -# Out params.: * -# Returns....: * -# -##########################################################################*/ -int __rdos_thread_mutex_trylock (int handle) -{ - RdosEnterSection(handle); - return 0; -} - -/*########################################################################## -# -# Name : __rdos_thread_mutex_unlock -# -# Purpose....: Emulate GCC pthread_thread_mutex_unlock -# -# In params..: handle -# Out params.: * -# Returns....: * -# -##########################################################################*/ -int __rdos_thread_mutex_unlock (int handle) -{ - RdosLeaveSection(handle); - return 0; -} - -/*########################################################################## -# -# Name : __init_rdos -# -# Purpose....: Init RDOS specific data -# -# In params..: reent structure -# Out params.: * -# Returns....: * -# -##########################################################################*/ -void __init_rdos(struct _reent *reent) -{ - once_section = RdosCreateSection(); - _REENT_INIT_PTR(reent); - __sinit(reent); -} diff --git a/newlib/libc/sys/rdos/read.c b/newlib/libc/sys/rdos/read.c deleted file mode 100644 index e9f3464f3..000000000 --- a/newlib/libc/sys/rdos/read.c +++ /dev/null @@ -1,35 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# read.c
-# read function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include "rdos.h"
-
-int read(int file, char *ptr, int len)
-{
- return RdosReadFile(file, ptr, len);
-}
diff --git a/newlib/libc/sys/rdos/readlink.c b/newlib/libc/sys/rdos/readlink.c deleted file mode 100755 index ad4c69d1c..000000000 --- a/newlib/libc/sys/rdos/readlink.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include <sys/types.h>
-
-int readlink(const char *path, char *buf, size_t bufsize)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/sbrk.c b/newlib/libc/sys/rdos/sbrk.c deleted file mode 100644 index fdcb5fba5..000000000 --- a/newlib/libc/sys/rdos/sbrk.c +++ /dev/null @@ -1,33 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# sbrk.c
-# sbrk function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_syslist.h>
-#include "rdos.h"
-
-void *sbrk (int incr)
-{
- return RdosAllocateMem(incr);
-}
diff --git a/newlib/libc/sys/rdos/stat.c b/newlib/libc/sys/rdos/stat.c deleted file mode 100755 index f1683b63a..000000000 --- a/newlib/libc/sys/rdos/stat.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-int stat(const char *file, struct stat *st)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/symlink.c b/newlib/libc/sys/rdos/symlink.c deleted file mode 100755 index 4d5fa1e6f..000000000 --- a/newlib/libc/sys/rdos/symlink.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int symlink(const char *path1, const char *path2)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/times.c b/newlib/libc/sys/rdos/times.c deleted file mode 100644 index 47a540b23..000000000 --- a/newlib/libc/sys/rdos/times.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <sys/times.h>
-#include <errno.h>
-
-clock_t times(struct tms *buf)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/unlink.c b/newlib/libc/sys/rdos/unlink.c deleted file mode 100644 index d6c3736b3..000000000 --- a/newlib/libc/sys/rdos/unlink.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int unlink(char *name)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/user.def b/newlib/libc/sys/rdos/user.def deleted file mode 100644 index f5af3066e..000000000 --- a/newlib/libc/sys/rdos/user.def +++ /dev/null @@ -1,368 +0,0 @@ - -allocate_dos_mem_nr = 0 -allocate_local_mem_nr = 1 -free_mem_nr = 2 -available_local_linear_nr = 3 -used_local_linear_nr = 4 -available_vm_linear_nr = 5 -used_vm_linear_nr = 6 - -reserve_pe_mem_nr = 7 -set_flat_linear_valid_nr = 8 -set_flat_linear_invalid_nr = 9 -set_flat_linear_read_nr = 10 -set_flat_linear_readwrite_nr = 11 - -get_raw_switch_ads_nr = 12 -raw_switch_nr = 13 -get_exception_nr = 14 -set_exception_nr = 15 -get_pm_int_nr = 16 -set_pm_int_nr = 17 -get_vm_int_nr = 18 -set_vm_int_nr = 19 -dpmi_int_nr = 20 -dpmi_call_int_nr = 21 -dpmi_call_nr = 22 -allocate_vm_callback_nr = 23 -free_vm_callback_nr = 24 - -wait_milli_nr = 25 -wait_micro_nr = 26 -wait_until_nr = 27 -create_thread_nr = 28 -terminate_thread_nr = 29 -get_thread_nr = 30 -swap_nr = 31 - -create_user_section_nr = 32 -create_blocked_user_section_nr = 33 -delete_user_section_nr = 34 -enter_user_section_nr = 35 -leave_user_section_nr = 36 - -get_local_mailslot_nr = 37 -get_remote_mailslot_nr = 38 -free_mailslot_nr = 39 -send_mailslot_nr = 40 -define_mailslot_nr = 41 -receive_mailslot_nr = 42 -reply_mailslot_nr = 43 - -load_exe_nr = 44 -spawn_exe_nr = 45 -unload_exe_nr = 46 -get_exit_code_nr = 47 -get_exe_name_nr = 48 -get_cmd_line_nr = 49 -get_env_nr = 50 -load_dll_nr = 51 -free_dll_nr = 52 -get_dll_proc_nr = 53 -get_dll_resource_nr = 54 -get_dll_name_nr = 55 -get_dll_nr = 56 -allocate_app_mem_nr = 57 -free_app_mem_nr = 58 -get_psp_sel_nr = 59 - -get_debug_tss_nr = 60 -get_debug_thread_nr = 61 -debug_trace_nr = 62 -debug_pace_nr = 63 -debug_go_nr = 64 -debug_next_nr = 65 - -wait_for_pe_debug_nr = 68 -continue_pe_debug_nr = 69 -notify_pe_exception_nr = 70 -read_thread_mem_nr = 71 -write_thread_mem_nr = 72 -get_thread_tss_nr = 73 -set_thread_tss_nr = 74 - -get_cpu_time_nr = 75 -get_system_time_nr = 76 -get_time_nr = 77 -time_to_system_time_nr = 78 -system_time_to_time_nr = 79 -days_in_month_nr = 80 -adjust_time_nr = 81 -passed_days_nr = 82 -time_to_binary_nr = 83 -binary_to_time_nr = 84 -sync_time_nr = 85 - -set_focus_nr = 86 -enable_focus_nr = 87 - -get_dns_nr = 88 -get_ppp_dns_nr = 89 -open_tcp_connection_nr = 90 -wait_for_tcp_connection_nr = 92 -close_tcp_connection_nr = 93 -delete_tcp_connection_nr = 94 -is_tcp_connection_closed_nr = 95 -abort_tcp_connection_nr = 96 -read_tcp_connection_nr = 97 -write_tcp_connection_nr = 98 -push_tcp_connection_nr = 99 -get_ip_address_nr = 100 -name_to_ip_nr = 101 -ip_to_name_nr = 102 -ping_nr = 103 - -get_disc_info_nr = 104 -format_drive_nr = 105 -get_rdfs_info_nr = 106 -read_disc_nr = 107 -write_disc_nr = 108 -get_drive_info_nr = 109 - -set_cur_drive_nr = 110 -get_cur_drive_nr = 111 -set_cur_dir_nr = 112 -get_cur_dir_nr = 113 -make_dir_nr = 114 -remove_dir_nr = 115 -rename_file_nr = 116 -delete_file_nr = 117 -get_file_attribute_nr = 118 -set_file_attribute_nr = 119 -open_dir_nr = 120 -close_dir_nr = 121 -read_dir_nr = 122 - -open_file_nr = 123 -create_file_nr = 124 -close_file_nr = 125 -dupl_file_nr = 126 -get_ioctl_data_nr = 127 -get_file_size_nr = 128 -set_file_size_nr = 129 -get_file_pos_nr = 130 -set_file_pos_nr = 131 -get_file_time_nr = 132 -set_file_time_nr = 133 -read_file_nr = 134 -write_file_nr = 135 -read_con_nr = 136 - -create_mapping_nr = 137 -create_named_mapping_nr = 138 -create_file_mapping_nr = 139 -create_named_file_mapping_nr = 140 -open_named_mapping_nr = 141 -sync_mapping_nr = 142 -close_mapping_nr = 143 -map_view_nr = 144 -unmap_view_nr = 145 - -read_keyboard_nr = 146 -poll_keyboard_nr = 147 -flush_keyboard_nr = 148 -get_keyboard_state_nr = 151 - -show_mouse_nr = 152 -hide_mouse_nr = 153 -get_mouse_position_nr = 154 -set_mouse_position_nr = 155 -set_mouse_window_nr = 156 -set_mouse_mickey_nr = 157 -get_left_button_nr = 158 -get_right_button_nr = 159 -get_left_button_press_position_nr = 160 -get_right_button_press_position_nr = 161 -get_left_button_release_position_nr = 162 -get_right_button_release_position_nr = 163 -hook_mouse_nr = 164 -unhook_mouse_nr = 165 - -lock_cd_nr = 166 -unlock_cd_nr = 167 -eject_cd_nr = 168 -insert_cd_nr = 169 - -open_com_nr = 170 -close_com_nr = 171 -flush_com_nr = 172 -add_wait_for_com_nr = 174 -read_com_nr = 175 -write_com_nr = 176 -set_dtr_nr = 177 -reset_dtr_nr = 178 - -init_printer_nr = 179 -check_printer_nr = 180 -write_printer_nr = 181 - -set_cursor_position_nr = 182 -get_cursor_position_nr = 183 -write_char_nr = 184 -write_asciiz_nr = 185 -write_size_string_nr = 186 - -set_video_mode_nr = 187 -set_vga_mode_nr = 188 -set_forecolor_nr = 189 -set_backcolor_nr = 190 -get_string_metrics_nr = 193 -set_font_nr = 194 -get_video_mode_nr = 195 -draw_string_nr = 197 - -xms_handler_nr = 198 -ems_handler_nr = 199 - -test_nr = 200 - -resize_flat_linear_nr = 201 - -set_drawcolor_nr = 202 -set_lgop_nr = 203 -set_hollow_style_nr = 204 -set_filled_style_nr = 205 -get_pixel_nr = 206 -set_pixel_nr = 207 -draw_line_nr = 208 -draw_rect_nr = 209 -draw_ellipse_nr = 210 -create_bitmap_nr = 211 -close_bitmap_nr = 212 -blit_nr = 213 -open_font_nr = 215 -close_font_nr = 216 -create_string_bitmap_nr = 217 -get_bitmap_info_nr = 218 -draw_mask_nr = 219 - -create_sprite_nr = 220 -close_sprite_nr = 221 -show_sprite_nr = 222 -hide_sprite_nr = 223 -move_sprite_nr = 224 - -dup_bitmap_handle_nr = 225 -set_clip_rect_nr = 226 -clear_clip_rect_nr = 227 - -set_rts_nr = 228 -reset_rts_nr = 229 -get_com_receive_space_nr = 230 -get_com_send_space_nr = 231 - -get_char_attrib_nr = 232 - -create_wait_nr = 233 -close_wait_nr = 234 -is_wait_idle_nr = 235 -wait_no_timeout_nr = 236 -wait_timeout_nr = 237 -stop_wait_nr = 238 -add_wait_for_keyboard_nr = 239 - -peek_key_event_nr = 240 -read_key_event_nr = 241 - -add_wait_for_mouse_nr = 242 -remove_wait_nr = 243 - -add_wait_for_adc_nr = 244 -open_adc_nr = 245 -close_adc_nr = 246 -define_adc_time_nr = 247 -read_adc_nr = 248 - -free_v86_nr = 249 - -read_serial_lines_nr = 250 -toggle_serial_line_nr = 251 - -read_serial_val_nr = 252 -write_serial_val_nr = 253 - -create_file_drive_nr = 254 -open_file_drive_nr = 255 - -dos_ext_exec_nr = 256 - -open_sys_env_nr = 257 -open_proc_env_nr = 258 -close_env_nr = 259 -add_env_var_nr = 260 -delete_env_var_nr = 261 -find_env_var_nr = 262 -get_env_data_nr = 263 -set_env_data_nr = 264 - -open_sys_ini_nr = 265 -close_ini_nr = 266 -goto_ini_section_nr = 267 -remove_ini_section_nr = 268 -read_ini_nr = 269 -write_ini_nr = 270 -delete_ini_nr = 271 - -app_debug_nr = 272 -get_version_nr = 273 - -enable_status_led_nr = 274 -disable_status_led_nr = 275 - -start_watchdog_nr = 276 -kick_watchdog_nr = 277 - -erase_disc_sectors_nr = 278 - -cpu_reset_nr = 279 - -enable_cts_nr = 280 -disable_cts_nr = 281 - -wait_for_send_completed_com_nr = 282 - -add_wait_for_tcp_connection_nr = 283 - -get_remote_tcp_connection_ip_nr = 284 -get_remote_tcp_connection_port_nr = 285 -get_local_tcp_connection_port_nr = 286 - -enable_auto_rts_nr = 287 -disable_auto_rts_nr = 288 - -put_keyboard_code_nr = 289 - -poll_tcp_connection_nr = 290 - -create_signal_nr = 291 -free_signal_nr = 292 -add_wait_for_signal_nr = 293 -set_signal_nr = 294 -reset_signal_nr = 295 -is_signalled_nr = 296 - -get_drive_disc_param_nr = 297 - -get_ide_disc_nr = 298 -get_floppy_disc_nr = 299 -demand_load_drive_nr = 300 -set_disc_info_nr = 301 - -get_thread_state_nr = 302 -suspend_thread_nr = 303 -resume_thread_nr = 304 - -update_time_nr = 305 - -allocate_static_drive_nr = 306 -allocate_fixed_drive_nr = 307 -allocate_dynamic_drive_nr = 308 - -get_focus_nr = 309 - -add_wait_for_tcp_listen_nr = 310 -create_tcp_listen_nr = 311 -get_tcp_listen_nr = 312 -close_tcp_listen_nr = 313 - -usergate_entries = 340 diff --git a/newlib/libc/sys/rdos/wait.c b/newlib/libc/sys/rdos/wait.c deleted file mode 100644 index a7bc8aab5..000000000 --- a/newlib/libc/sys/rdos/wait.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int wait(int *status)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/write.c b/newlib/libc/sys/rdos/write.c deleted file mode 100644 index d02faec29..000000000 --- a/newlib/libc/sys/rdos/write.c +++ /dev/null @@ -1,35 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# write.c
-# write function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include "rdos.h"
-
-int write(int file, char *ptr, int len)
-{
- return RdosWriteFile(file, ptr, len);
-}
diff --git a/newlib/libc/sys/rtems/aclocal.m4 b/newlib/libc/sys/rtems/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/rtems/aclocal.m4 +++ b/newlib/libc/sys/rtems/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/rtems/configure b/newlib/libc/sys/rtems/configure index b2d1fbd00..03c1ce55b 100755 --- a/newlib/libc/sys/rtems/configure +++ b/newlib/libc/sys/rtems/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sh/aclocal.m4 b/newlib/libc/sys/sh/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/sh/aclocal.m4 +++ b/newlib/libc/sys/sh/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sh/configure b/newlib/libc/sys/sh/configure index 091e11fe7..9fe5b55ef 100755 --- a/newlib/libc/sys/sh/configure +++ b/newlib/libc/sys/sh/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sparc64/aclocal.m4 b/newlib/libc/sys/sparc64/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/sparc64/aclocal.m4 +++ b/newlib/libc/sys/sparc64/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sparc64/configure b/newlib/libc/sys/sparc64/configure index ebf1e5b5f..3e1dff9e1 100755 --- a/newlib/libc/sys/sparc64/configure +++ b/newlib/libc/sys/sparc64/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sun4/aclocal.m4 b/newlib/libc/sys/sun4/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/sun4/aclocal.m4 +++ b/newlib/libc/sys/sun4/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sun4/configure b/newlib/libc/sys/sun4/configure index eede7cf12..5a7dafc19 100755 --- a/newlib/libc/sys/sun4/configure +++ b/newlib/libc/sys/sun4/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sysmec/aclocal.m4 b/newlib/libc/sys/sysmec/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/sysmec/aclocal.m4 +++ b/newlib/libc/sys/sysmec/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sysmec/configure b/newlib/libc/sys/sysmec/configure index 1efee2bcc..279b68cf7 100755 --- a/newlib/libc/sys/sysmec/configure +++ b/newlib/libc/sys/sysmec/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sysnec810/aclocal.m4 b/newlib/libc/sys/sysnec810/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/sysnec810/aclocal.m4 +++ b/newlib/libc/sys/sysnec810/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sysnec810/configure b/newlib/libc/sys/sysnec810/configure index 6c6f10aeb..beeb761d7 100755 --- a/newlib/libc/sys/sysnec810/configure +++ b/newlib/libc/sys/sysnec810/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sysnecv850/aclocal.m4 b/newlib/libc/sys/sysnecv850/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/sysnecv850/aclocal.m4 +++ b/newlib/libc/sys/sysnecv850/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sysnecv850/configure b/newlib/libc/sys/sysnecv850/configure index 1efee2bcc..279b68cf7 100755 --- a/newlib/libc/sys/sysnecv850/configure +++ b/newlib/libc/sys/sysnecv850/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sysvi386/aclocal.m4 b/newlib/libc/sys/sysvi386/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/sysvi386/aclocal.m4 +++ b/newlib/libc/sys/sysvi386/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sysvi386/configure b/newlib/libc/sys/sysvi386/configure index 0ae9cc4d1..022faf827 100755 --- a/newlib/libc/sys/sysvi386/configure +++ b/newlib/libc/sys/sysvi386/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sysvnecv70/aclocal.m4 b/newlib/libc/sys/sysvnecv70/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/sysvnecv70/aclocal.m4 +++ b/newlib/libc/sys/sysvnecv70/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sysvnecv70/configure b/newlib/libc/sys/sysvnecv70/configure index 88386a9e3..e78bc8c70 100755 --- a/newlib/libc/sys/sysvnecv70/configure +++ b/newlib/libc/sys/sysvnecv70/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/tic80/aclocal.m4 b/newlib/libc/sys/tic80/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/tic80/aclocal.m4 +++ b/newlib/libc/sys/tic80/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/tic80/configure b/newlib/libc/sys/tic80/configure index c97c3f425..891a2ac18 100755 --- a/newlib/libc/sys/tic80/configure +++ b/newlib/libc/sys/tic80/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/w65/aclocal.m4 b/newlib/libc/sys/w65/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/w65/aclocal.m4 +++ b/newlib/libc/sys/w65/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/w65/configure b/newlib/libc/sys/w65/configure index 9050c416e..e7472d379 100755 --- a/newlib/libc/sys/w65/configure +++ b/newlib/libc/sys/w65/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/z8ksim/aclocal.m4 b/newlib/libc/sys/z8ksim/aclocal.m4 index 55d5e67ce..42dedc068 100644 --- a/newlib/libc/sys/z8ksim/aclocal.m4 +++ b/newlib/libc/sys/z8ksim/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/z8ksim/configure b/newlib/libc/sys/z8ksim/configure index 4330a5fb5..16a5d4f20 100755 --- a/newlib/libc/sys/z8ksim/configure +++ b/newlib/libc/sys/z8ksim/configure @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libm/aclocal.m4 b/newlib/libm/aclocal.m4 index 34da4a63f..04b8c816c 100644 --- a/newlib/libm/aclocal.m4 +++ b/newlib/libm/aclocal.m4 @@ -178,9 +178,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libm/common/Makefile.am b/newlib/libm/common/Makefile.am index d6d7e510d..ba7f31030 100644 --- a/newlib/libm/common/Makefile.am +++ b/newlib/libm/common/Makefile.am @@ -6,8 +6,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) src = s_finite.c s_copysign.c s_modf.c s_scalbn.c \ s_cbrt.c s_expm1.c s_ilogb.c s_infconst.c \ - s_infinity.c s_isinf.c s_isinfd.c s_isnan.c s_isnand.c \ - s_log1p.c s_nan.c s_nextafter.c \ + s_infinity.c s_log1p.c s_nan.c s_nextafter.c \ s_rint.c s_logb.c s_matherr.c s_lib_ver.c \ s_fdim.c s_fma.c s_fmax.c s_fmin.c s_fpclassify.c s_lrint.c \ s_lround.c s_nearbyint.c s_remquo.c s_round.c s_scalbln.c \ @@ -15,8 +14,7 @@ src = s_finite.c s_copysign.c s_modf.c s_scalbn.c \ fsrc = sf_finite.c sf_copysign.c sf_modf.c sf_scalbn.c \ sf_cbrt.c sf_expm1.c sf_ilogb.c \ - sf_infinity.c sf_isinf.c sf_isinff.c sf_isnan.c sf_isnanf.c \ - sf_log1p.c sf_nan.c sf_nextafter.c \ + sf_infinity.c sf_log1p.c sf_nan.c sf_nextafter.c \ sf_rint.c sf_logb.c \ sf_fdim.c sf_fma.c sf_fmax.c sf_fmin.c sf_lrint.c \ sf_lround.c sf_nearbyint.c sf_remquo.c sf_round.c \ @@ -37,7 +35,7 @@ endif # USE_LIBTOOL include $(srcdir)/../../Makefile.shared chobj = scbrt.def scopysign.def sexpm1.def silogb.def \ - sinfinity.def sisnan.def slog1p.def smatherr.def smodf.def \ + sinfinity.def slog1p.def smatherr.def smodf.def \ snan.def snextafter.def sscalbn.def SUFFIXES = .def @@ -93,10 +91,6 @@ sinfinity.def: s_infinity.c $(CHEW) < $(srcdir)/s_infinity.c >$@ 2>/dev/null touch stmp-def -sisnan.def: s_isnan.c - $(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null - touch stmp-def - slog1p.def: s_log1p.c $(CHEW) < $(srcdir)/s_log1p.c >$@ 2>/dev/null touch stmp-def diff --git a/newlib/libm/common/Makefile.in b/newlib/libm/common/Makefile.in index 4e9db8b25..e71136f99 100644 --- a/newlib/libm/common/Makefile.in +++ b/newlib/libm/common/Makefile.in @@ -98,10 +98,10 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -src = s_finite.c s_copysign.c s_modf.c s_scalbn.c s_cbrt.c s_expm1.c s_ilogb.c s_infconst.c s_infinity.c s_isinf.c s_isinfd.c s_isnan.c s_isnand.c s_log1p.c s_nan.c s_nextafter.c s_rint.c s_logb.c s_matherr.c s_lib_ver.c s_fdim.c s_fma.c s_fmax.c s_fmin.c s_fpclassify.c s_lrint.c s_lround.c s_nearbyint.c s_remquo.c s_round.c s_scalbln.c s_signbit.c s_trunc.c +src = s_finite.c s_copysign.c s_modf.c s_scalbn.c s_cbrt.c s_expm1.c s_ilogb.c s_infconst.c s_infinity.c s_log1p.c s_nan.c s_nextafter.c s_rint.c s_logb.c s_matherr.c s_lib_ver.c s_fdim.c s_fma.c s_fmax.c s_fmin.c s_fpclassify.c s_lrint.c s_lround.c s_nearbyint.c s_remquo.c s_round.c s_scalbln.c s_signbit.c s_trunc.c -fsrc = sf_finite.c sf_copysign.c sf_modf.c sf_scalbn.c sf_cbrt.c sf_expm1.c sf_ilogb.c sf_infinity.c sf_isinf.c sf_isinff.c sf_isnan.c sf_isnanf.c sf_log1p.c sf_nan.c sf_nextafter.c sf_rint.c sf_logb.c sf_fdim.c sf_fma.c sf_fmax.c sf_fmin.c sf_lrint.c sf_lround.c sf_nearbyint.c sf_remquo.c sf_round.c sf_scalbln.c sf_trunc.c +fsrc = sf_finite.c sf_copysign.c sf_modf.c sf_scalbn.c sf_cbrt.c sf_expm1.c sf_ilogb.c sf_infinity.c sf_log1p.c sf_nan.c sf_nextafter.c sf_rint.c sf_logb.c sf_fdim.c sf_fma.c sf_fmax.c sf_fmin.c sf_lrint.c sf_lround.c sf_nearbyint.c sf_remquo.c sf_round.c sf_scalbln.c sf_trunc.c libcommon_la_LDFLAGS = -Xcompiler -nostdlib @@ -113,7 +113,7 @@ libcommon_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc) -chobj = scbrt.def scopysign.def sexpm1.def silogb.def sinfinity.def sisnan.def slog1p.def smatherr.def smodf.def snan.def snextafter.def sscalbn.def +chobj = scbrt.def scopysign.def sexpm1.def silogb.def sinfinity.def slog1p.def smatherr.def smodf.def snan.def snextafter.def sscalbn.def SUFFIXES = .def @@ -137,8 +137,6 @@ lib_a_LIBADD = @USE_LIBTOOL_FALSE@s_scalbn.$(OBJEXT) s_cbrt.$(OBJEXT) \ @USE_LIBTOOL_FALSE@s_expm1.$(OBJEXT) s_ilogb.$(OBJEXT) \ @USE_LIBTOOL_FALSE@s_infconst.$(OBJEXT) s_infinity.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@s_isinf.$(OBJEXT) s_isinfd.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@s_isnan.$(OBJEXT) s_isnand.$(OBJEXT) \ @USE_LIBTOOL_FALSE@s_log1p.$(OBJEXT) s_nan.$(OBJEXT) \ @USE_LIBTOOL_FALSE@s_nextafter.$(OBJEXT) s_rint.$(OBJEXT) \ @USE_LIBTOOL_FALSE@s_logb.$(OBJEXT) s_matherr.$(OBJEXT) \ @@ -152,9 +150,7 @@ lib_a_LIBADD = @USE_LIBTOOL_FALSE@sf_copysign.$(OBJEXT) sf_modf.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sf_scalbn.$(OBJEXT) sf_cbrt.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sf_expm1.$(OBJEXT) sf_ilogb.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@sf_infinity.$(OBJEXT) sf_isinf.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@sf_isinff.$(OBJEXT) sf_isnan.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@sf_isnanf.$(OBJEXT) sf_log1p.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@sf_infinity.$(OBJEXT) sf_log1p.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sf_nan.$(OBJEXT) sf_nextafter.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sf_rint.$(OBJEXT) sf_logb.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sf_fdim.$(OBJEXT) sf_fma.$(OBJEXT) sf_fmax.$(OBJEXT) \ @@ -167,16 +163,14 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) libcommon_la_LIBADD = @USE_LIBTOOL_TRUE@libcommon_la_OBJECTS = s_finite.lo s_copysign.lo \ @USE_LIBTOOL_TRUE@s_modf.lo s_scalbn.lo s_cbrt.lo s_expm1.lo s_ilogb.lo \ -@USE_LIBTOOL_TRUE@s_infconst.lo s_infinity.lo s_isinf.lo s_isinfd.lo \ -@USE_LIBTOOL_TRUE@s_isnan.lo s_isnand.lo s_log1p.lo s_nan.lo \ +@USE_LIBTOOL_TRUE@s_infconst.lo s_infinity.lo s_log1p.lo s_nan.lo \ @USE_LIBTOOL_TRUE@s_nextafter.lo s_rint.lo s_logb.lo s_matherr.lo \ @USE_LIBTOOL_TRUE@s_lib_ver.lo s_fdim.lo s_fma.lo s_fmax.lo s_fmin.lo \ @USE_LIBTOOL_TRUE@s_fpclassify.lo s_lrint.lo s_lround.lo s_nearbyint.lo \ @USE_LIBTOOL_TRUE@s_remquo.lo s_round.lo s_scalbln.lo s_signbit.lo \ @USE_LIBTOOL_TRUE@s_trunc.lo sf_finite.lo sf_copysign.lo sf_modf.lo \ @USE_LIBTOOL_TRUE@sf_scalbn.lo sf_cbrt.lo sf_expm1.lo sf_ilogb.lo \ -@USE_LIBTOOL_TRUE@sf_infinity.lo sf_isinf.lo sf_isinff.lo sf_isnan.lo \ -@USE_LIBTOOL_TRUE@sf_isnanf.lo sf_log1p.lo sf_nan.lo sf_nextafter.lo \ +@USE_LIBTOOL_TRUE@sf_infinity.lo sf_log1p.lo sf_nan.lo sf_nextafter.lo \ @USE_LIBTOOL_TRUE@sf_rint.lo sf_logb.lo sf_fdim.lo sf_fma.lo sf_fmax.lo \ @USE_LIBTOOL_TRUE@sf_fmin.lo sf_lrint.lo sf_lround.lo sf_nearbyint.lo \ @USE_LIBTOOL_TRUE@sf_remquo.lo sf_round.lo sf_scalbln.lo sf_trunc.lo @@ -456,10 +450,6 @@ sinfinity.def: s_infinity.c $(CHEW) < $(srcdir)/s_infinity.c >$@ 2>/dev/null touch stmp-def -sisnan.def: s_isnan.c - $(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null - touch stmp-def - slog1p.def: s_log1p.c $(CHEW) < $(srcdir)/s_log1p.c >$@ 2>/dev/null touch stmp-def diff --git a/newlib/libm/common/s_isinf.c b/newlib/libm/common/s_isinf.c deleted file mode 100644 index db8e8f82b..000000000 --- a/newlib/libm/common/s_isinf.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * isinf(x) returns 1 if x is infinity, else 0; - * no branching! - * - * isinf is a <math.h> macro in the C99 standard. It was previously - * implemented as a function by newlib and is declared as such in - * <ieeefp.h>. Newlib supplies it here as a function if the user - * chooses to use <ieeefp.h> or needs to link older code compiled with the - * previous <math.h> declaration. - */ - -#include "fdlibm.h" -#include <ieeefp.h> - -#ifndef _DOUBLE_IS_32BITS - -int -_DEFUN (isinf, (x), - double x) -{ - __int32_t hx,lx; - EXTRACT_WORDS(hx,lx,x); - hx &= 0x7fffffff; - hx |= (__uint32_t)(lx|(-lx))>>31; - hx = 0x7ff00000 - hx; - return 1 - (int)((__uint32_t)(hx|(-hx))>>31); -} - -#endif /* _DOUBLE_IS_32BITS */ diff --git a/newlib/libm/common/s_isnan.c b/newlib/libm/common/s_isnan.c deleted file mode 100644 index b0c40369a..000000000 --- a/newlib/libm/common/s_isnan.c +++ /dev/null @@ -1,135 +0,0 @@ - -/* @(#)s_isnan.c 5.1 93/09/24 */ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ - -/* -FUNCTION - <<isnan>>, <<isnanf>>, <<isinf>>, <<isinff>>, <<finite>>, <<finitef>>---test for exceptional numbers - -INDEX - isnan -INDEX - isinf -INDEX - finite - -INDEX - isnanf -INDEX - isinff -INDEX - finitef - -ANSI_SYNOPSIS - #include <ieeefp.h> - int isnan(double <[arg]>); - int isinf(double <[arg]>); - int finite(double <[arg]>); - int isnanf(float <[arg]>); - int isinff(float <[arg]>); - int finitef(float <[arg]>); - -TRAD_SYNOPSIS - #include <ieeefp.h> - int isnan(<[arg]>) - double <[arg]>; - int isinf(<[arg]>) - double <[arg]>; - int finite(<[arg]>); - double <[arg]>; - int isnanf(<[arg]>); - float <[arg]>; - int isinff(<[arg]>); - float <[arg]>; - int finitef(<[arg]>); - float <[arg]>; - - -DESCRIPTION - These functions provide information on the floating-point - argument supplied. - - There are five major number formats: - o+ - o zero - A number which contains all zero bits. - o subnormal - A number with a zero exponent but a nonzero fraction. - o normal - A number with an exponent and a fraction. - o infinity - A number with an all 1's exponent and a zero fraction. - o NAN - A number with an all 1's exponent and a nonzero fraction. - - o- - - <<isnan>> returns 1 if the argument is a nan. <<isinf>> - returns 1 if the argument is infinity. <<finite>> returns 1 if the - argument is zero, subnormal or normal. - - The <<isnanf>>, <<isinff>> and <<finitef>> functions perform the same - operations as their <<isnan>>, <<isinf>> and <<finite>> - counterparts, but on single-precision floating-point numbers. - - It should be noted that the C99 standard dictates that <<isnan>> - and <<isinf>> are macros that operate on multiple types of - floating-point. The SUSv2 standard declares <<isnan>> as - a function taking double. Newlib has decided to declare - them both as macros in math.h and as functions in ieeefp.h. - -QUICKREF - isnan - pure -QUICKREF - isinf - pure -QUICKREF - finite - pure -QUICKREF - isnan - pure -QUICKREF - isinf - pure -QUICKREF - finite - pure -*/ - -/* - * isnan(x) returns 1 is x is nan, else 0; - * no branching! - * - * The C99 standard dictates that isnan is a macro taking - * multiple floating-point types while the SUSv2 standard - * notes it is a function taking a double argument. Newlib - * has chosen to implement it as a macro in <math.h> and - * declare it as a function in <ieeefp.h>. - */ - -#include "fdlibm.h" -#include <ieeefp.h> - -#ifndef _DOUBLE_IS_32BITS - -#ifdef __STDC__ - int isnan(double x) -#else - int isnan(x) - double x; -#endif -{ - __int32_t hx,lx; - EXTRACT_WORDS(hx,lx,x); - hx &= 0x7fffffff; - hx |= (__uint32_t)(lx|(-lx))>>31; - hx = 0x7ff00000 - hx; - return (int)(((__uint32_t)(hx))>>31); -} - -#endif /* _DOUBLE_IS_32BITS */ diff --git a/newlib/libm/common/sf_isinff.c b/newlib/libm/common/sf_isinff.c deleted file mode 100644 index 9d0e742e5..000000000 --- a/newlib/libm/common/sf_isinff.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * __isinff(x) returns 1 if x is +-infinity, else 0; - * Added by Cygnus Support. - */ - -#include "fdlibm.h" - -int -_DEFUN (__isinff, (x), - float x) -{ - __int32_t ix; - GET_FLOAT_WORD(ix,x); - ix &= 0x7fffffff; - return FLT_UWORD_IS_INFINITE(ix); -} - -#ifdef _DOUBLE_IS_32BITS - -int -_DEFUN (__isinfd, (x), - double x) -{ - return __isinff((float) x); -} - -#endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/newlib/libm/common/sf_isnanf.c b/newlib/libm/common/sf_isnanf.c deleted file mode 100644 index 0b0d9bbaf..000000000 --- a/newlib/libm/common/sf_isnanf.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ - -/* - * __isnanf(x) returns 1 is x is nan, else 0; - */ - -#include "fdlibm.h" - -int -_DEFUN (__isnanf, (x), - float x) -{ - __int32_t ix; - GET_FLOAT_WORD(ix,x); - ix &= 0x7fffffff; - return FLT_UWORD_IS_NAN(ix); -} - -#ifdef _DOUBLE_IS_32BITS - -int -_DEFUN (__isnand, (x), - double x) -{ - return __isnanf((float) x); -} - -#endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/newlib/libm/configure b/newlib/libm/configure index 075165c8d..071b604d9 100755 --- a/newlib/libm/configure +++ b/newlib/libm/configure @@ -1455,11 +1455,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1463: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1460: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1493,7 +1490,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1497: checking for executable suffix" >&5 +echo "configure:1494: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1503,7 +1500,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1679,7 +1676,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1683: checking for $ac_word" >&5 +echo "configure:1680: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1709,7 +1706,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1713: checking for $ac_word" >&5 +echo "configure:1710: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1760,7 +1757,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1764: checking for $ac_word" >&5 +echo "configure:1761: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1792,7 +1789,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1796: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1793: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1803,12 +1800,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1807 "configure" +#line 1804 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1834,12 +1831,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1838: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1835: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1843: checking whether we are using GNU C" >&5 +echo "configure:1840: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1848,7 +1845,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1867,7 +1864,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1871: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1868: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1910,7 +1907,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1914: checking for ld used by GCC" >&5 +echo "configure:1911: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1940,10 +1937,10 @@ echo "configure:1914: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1944: checking for GNU ld" >&5 +echo "configure:1941: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1947: checking for non-GNU ld" >&5 +echo "configure:1944: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1978,7 +1975,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1982: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1979: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1995,7 +1992,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1999: checking for $LD option to reload object files" >&5 +echo "configure:1996: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2007,7 +2004,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:2011: checking for BSD-compatible nm" >&5 +echo "configure:2008: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2045,7 +2042,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2049: checking whether ln -s works" >&5 +echo "configure:2046: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2066,7 +2063,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2070: checking how to recognise dependant libraries" >&5 +echo "configure:2067: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2239,13 +2236,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2243: checking for object suffix" >&5 +echo "configure:2240: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2269,7 +2266,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2273: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2270: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2331,7 +2328,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2335: checking for file" >&5 +echo "configure:2332: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2402,7 +2399,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2406: checking for $ac_word" >&5 +echo "configure:2403: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2434,7 +2431,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2438: checking for $ac_word" >&5 +echo "configure:2435: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2469,7 +2466,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2473: checking for $ac_word" >&5 +echo "configure:2470: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2501,7 +2498,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2505: checking for $ac_word" >&5 +echo "configure:2502: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2568,8 +2565,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2572 "configure"' > conftest.$ac_ext - if { (eval echo configure:2573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2569 "configure"' > conftest.$ac_ext + if { (eval echo configure:2570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2588,7 +2585,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2606,7 +2603,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2610: checking whether the C compiler needs -belf" >&5 +echo "configure:2607: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2619,14 +2616,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2623 "configure" +#line 2620 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2656,7 +2653,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2660: checking for $ac_word" >&5 +echo "configure:2657: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2688,7 +2685,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2692: checking for $ac_word" >&5 +echo "configure:2689: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2723,7 +2720,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2727: checking for $ac_word" >&5 +echo "configure:2724: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2755,7 +2752,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2759: checking for $ac_word" >&5 +echo "configure:2756: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2790,7 +2787,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2794: checking for $ac_word" >&5 +echo "configure:2791: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2822,7 +2819,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2826: checking for $ac_word" >&5 +echo "configure:2823: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2858,12 +2855,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2862: checking if libtool should supply DllMain function" >&5 +echo "configure:2859: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2867 "configure" +#line 2864 "configure" #include "confdefs.h" int main() { @@ -2871,7 +2868,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2892,19 +2889,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2896: checking how to link DLLs" >&5 +echo "configure:2893: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2901 "configure" +#line 2898 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else diff --git a/newlib/libm/machine/aclocal.m4 b/newlib/libm/machine/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libm/machine/aclocal.m4 +++ b/newlib/libm/machine/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libm/machine/configure b/newlib/libm/machine/configure index 09ca607a9..e0c27505a 100755 --- a/newlib/libm/machine/configure +++ b/newlib/libm/machine/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1659: checking for $ac_word" >&5 +echo "configure:1656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1685,7 +1682,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1689: checking for $ac_word" >&5 +echo "configure:1686: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1736,7 +1733,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_word" >&5 +echo "configure:1737: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1886,7 +1883,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1954,7 +1951,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2025: checking whether ln -s works" >&5 +echo "configure:2022: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2219: checking for object suffix" >&5 +echo "configure:2216: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,7 +2304,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2311: checking for file" >&5 +echo "configure:2308: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2378,7 +2375,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_word" >&5 +echo "configure:2379: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2414: checking for $ac_word" >&5 +echo "configure:2411: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +2442,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2449: checking for $ac_word" >&5 +echo "configure:2446: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2481: checking for $ac_word" >&5 +echo "configure:2478: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_word" >&5 +echo "configure:2633: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2696,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_word" >&5 +echo "configure:2700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2735: checking for $ac_word" >&5 +echo "configure:2732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2766,7 +2763,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2770: checking for $ac_word" >&5 +echo "configure:2767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2802: checking for $ac_word" >&5 +echo "configure:2799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2834,12 +2831,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2872: checking how to link DLLs" >&5 +echo "configure:2869: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else diff --git a/newlib/libm/machine/i386/aclocal.m4 b/newlib/libm/machine/i386/aclocal.m4 index 35519acf9..a96ef0e01 100644 --- a/newlib/libm/machine/i386/aclocal.m4 +++ b/newlib/libm/machine/i386/aclocal.m4 @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libm/machine/i386/configure b/newlib/libm/machine/i386/configure index 6a01f4342..b458bba61 100755 --- a/newlib/libm/machine/i386/configure +++ b/newlib/libm/machine/i386/configure @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1659: checking for $ac_word" >&5 +echo "configure:1656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1685,7 +1682,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1689: checking for $ac_word" >&5 +echo "configure:1686: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1736,7 +1733,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_word" >&5 +echo "configure:1737: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1886,7 +1883,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1954,7 +1951,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2025: checking whether ln -s works" >&5 +echo "configure:2022: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2219: checking for object suffix" >&5 +echo "configure:2216: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,7 +2304,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2311: checking for file" >&5 +echo "configure:2308: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2378,7 +2375,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_word" >&5 +echo "configure:2379: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2414: checking for $ac_word" >&5 +echo "configure:2411: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +2442,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2449: checking for $ac_word" >&5 +echo "configure:2446: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2481: checking for $ac_word" >&5 +echo "configure:2478: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_word" >&5 +echo "configure:2633: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 +echo "configure:2665: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2696,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_word" >&5 +echo "configure:2700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2735: checking for $ac_word" >&5 +echo "configure:2732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2766,7 +2763,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2770: checking for $ac_word" >&5 +echo "configure:2767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2802: checking for $ac_word" >&5 +echo "configure:2799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2834,12 +2831,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2872: checking how to link DLLs" >&5 +echo "configure:2869: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am index f5971fac9..4b4db93d8 100644 --- a/newlib/libm/math/Makefile.am +++ b/newlib/libm/math/Makefile.am @@ -22,9 +22,10 @@ src = k_standard.c k_rem_pio2.c \ w_cabs.c w_drem.c \ s_asinh.c s_atan.c s_ceil.c \ s_cos.c s_erf.c s_fabs.c s_floor.c \ - s_frexp.c s_ldexp.c \ + s_frexp.c s_isnan.c s_ldexp.c \ s_signif.c s_sin.c \ s_tan.c s_tanh.c \ + s_isinf.c \ w_exp2.c w_tgamma.c fsrc = kf_rem_pio2.c \ @@ -45,9 +46,10 @@ fsrc = kf_rem_pio2.c \ wf_cabs.c wf_drem.c \ sf_asinh.c sf_atan.c sf_ceil.c \ sf_cos.c sf_erf.c sf_fabs.c sf_floor.c \ - sf_frexp.c sf_ldexp.c \ + sf_frexp.c sf_isnan.c sf_ldexp.c \ sf_signif.c sf_sin.c \ sf_tan.c sf_tanh.c \ + sf_isinf.c \ wf_exp2.c wf_tgamma.c libmath_la_LDFLAGS = -Xcompiler -nostdlib @@ -71,7 +73,8 @@ chobj = wacos.def wacosh.def wasin.def sasinh.def \ wgamma.def whypot.def sldexp.def wlog.def \ wlog10.def \ wpow.def wremainder.def ssin.def wsinh.def \ - wsqrt.def stan.def stanh.def + wsqrt.def stan.def stanh.def \ + sisnan.def SUFFIXES = .def @@ -175,6 +178,9 @@ stan.def: s_tan.c stanh.def: s_tanh.c $(CHEW) < $(srcdir)/s_tanh.c >$@ 2>/dev/null touch stmp-def +sisnan.def: s_isnan.c + $(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null + touch stmp-def # A partial dependency list. diff --git a/newlib/libm/math/Makefile.in b/newlib/libm/math/Makefile.in index f00e189c7..1de8a5398 100644 --- a/newlib/libm/math/Makefile.in +++ b/newlib/libm/math/Makefile.in @@ -98,10 +98,10 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -src = k_standard.c k_rem_pio2.c k_cos.c k_sin.c k_tan.c e_acos.c e_acosh.c e_asin.c e_atan2.c e_atanh.c e_cosh.c e_exp.c e_fmod.c er_gamma.c e_hypot.c e_j0.c e_j1.c e_jn.c er_lgamma.c e_log.c e_log10.c e_pow.c e_rem_pio2.c e_remainder.c e_scalb.c e_sinh.c e_sqrt.c w_acos.c w_acosh.c w_asin.c w_atan2.c w_atanh.c w_cosh.c w_exp.c w_fmod.c w_gamma.c wr_gamma.c w_hypot.c w_j0.c w_j1.c w_jn.c w_lgamma.c wr_lgamma.c w_log.c w_log10.c w_pow.c w_remainder.c w_scalb.c w_sinh.c w_sqrt.c w_sincos.c w_cabs.c w_drem.c s_asinh.c s_atan.c s_ceil.c s_cos.c s_erf.c s_fabs.c s_floor.c s_frexp.c s_ldexp.c s_signif.c s_sin.c s_tan.c s_tanh.c w_exp2.c w_tgamma.c +src = k_standard.c k_rem_pio2.c k_cos.c k_sin.c k_tan.c e_acos.c e_acosh.c e_asin.c e_atan2.c e_atanh.c e_cosh.c e_exp.c e_fmod.c er_gamma.c e_hypot.c e_j0.c e_j1.c e_jn.c er_lgamma.c e_log.c e_log10.c e_pow.c e_rem_pio2.c e_remainder.c e_scalb.c e_sinh.c e_sqrt.c w_acos.c w_acosh.c w_asin.c w_atan2.c w_atanh.c w_cosh.c w_exp.c w_fmod.c w_gamma.c wr_gamma.c w_hypot.c w_j0.c w_j1.c w_jn.c w_lgamma.c wr_lgamma.c w_log.c w_log10.c w_pow.c w_remainder.c w_scalb.c w_sinh.c w_sqrt.c w_sincos.c w_cabs.c w_drem.c s_asinh.c s_atan.c s_ceil.c s_cos.c s_erf.c s_fabs.c s_floor.c s_frexp.c s_isnan.c s_ldexp.c s_signif.c s_sin.c s_tan.c s_tanh.c s_isinf.c w_exp2.c w_tgamma.c -fsrc = kf_rem_pio2.c kf_cos.c kf_sin.c kf_tan.c ef_acos.c ef_acosh.c ef_asin.c ef_atan2.c ef_atanh.c ef_cosh.c ef_exp.c ef_fmod.c erf_gamma.c ef_hypot.c ef_j0.c ef_j1.c ef_jn.c erf_lgamma.c ef_log.c ef_log10.c ef_pow.c ef_rem_pio2.c ef_remainder.c ef_scalb.c ef_sinh.c ef_sqrt.c wf_acos.c wf_acosh.c wf_asin.c wf_atan2.c wf_atanh.c wf_cosh.c wf_exp.c wf_fmod.c wf_gamma.c wrf_gamma.c wf_hypot.c wf_j0.c wf_j1.c wf_jn.c wf_lgamma.c wrf_lgamma.c wf_log.c wf_log10.c wf_pow.c wf_remainder.c wf_scalb.c wf_sinh.c wf_sqrt.c wf_sincos.c wf_cabs.c wf_drem.c sf_asinh.c sf_atan.c sf_ceil.c sf_cos.c sf_erf.c sf_fabs.c sf_floor.c sf_frexp.c sf_ldexp.c sf_signif.c sf_sin.c sf_tan.c sf_tanh.c wf_exp2.c wf_tgamma.c +fsrc = kf_rem_pio2.c kf_cos.c kf_sin.c kf_tan.c ef_acos.c ef_acosh.c ef_asin.c ef_atan2.c ef_atanh.c ef_cosh.c ef_exp.c ef_fmod.c erf_gamma.c ef_hypot.c ef_j0.c ef_j1.c ef_jn.c erf_lgamma.c ef_log.c ef_log10.c ef_pow.c ef_rem_pio2.c ef_remainder.c ef_scalb.c ef_sinh.c ef_sqrt.c wf_acos.c wf_acosh.c wf_asin.c wf_atan2.c wf_atanh.c wf_cosh.c wf_exp.c wf_fmod.c wf_gamma.c wrf_gamma.c wf_hypot.c wf_j0.c wf_j1.c wf_jn.c wf_lgamma.c wrf_lgamma.c wf_log.c wf_log10.c wf_pow.c wf_remainder.c wf_scalb.c wf_sinh.c wf_sqrt.c wf_sincos.c wf_cabs.c wf_drem.c sf_asinh.c sf_atan.c sf_ceil.c sf_cos.c sf_erf.c sf_fabs.c sf_floor.c sf_frexp.c sf_isnan.c sf_ldexp.c sf_signif.c sf_sin.c sf_tan.c sf_tanh.c sf_isinf.c wf_exp2.c wf_tgamma.c libmath_la_LDFLAGS = -Xcompiler -nostdlib @@ -113,7 +113,7 @@ libmath_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc) -chobj = wacos.def wacosh.def wasin.def sasinh.def satan.def watan2.def watanh.def wj0.def wcosh.def serf.def wexp.def sfabs.def sfloor.def wfmod.def sfrexp.def wgamma.def whypot.def sldexp.def wlog.def wlog10.def wpow.def wremainder.def ssin.def wsinh.def wsqrt.def stan.def stanh.def +chobj = wacos.def wacosh.def wasin.def sasinh.def satan.def watan2.def watanh.def wj0.def wcosh.def serf.def wexp.def sfabs.def sfloor.def wfmod.def sfrexp.def wgamma.def whypot.def sldexp.def wlog.def wlog10.def wpow.def wremainder.def ssin.def wsinh.def wsqrt.def stan.def stanh.def sisnan.def SUFFIXES = .def @@ -154,9 +154,10 @@ lib_a_LIBADD = @USE_LIBTOOL_FALSE@w_cabs.$(OBJEXT) w_drem.$(OBJEXT) s_asinh.$(OBJEXT) \ @USE_LIBTOOL_FALSE@s_atan.$(OBJEXT) s_ceil.$(OBJEXT) s_cos.$(OBJEXT) \ @USE_LIBTOOL_FALSE@s_erf.$(OBJEXT) s_fabs.$(OBJEXT) s_floor.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@s_frexp.$(OBJEXT) s_ldexp.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@s_signif.$(OBJEXT) s_sin.$(OBJEXT) s_tan.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@s_tanh.$(OBJEXT) w_exp2.$(OBJEXT) w_tgamma.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@s_frexp.$(OBJEXT) s_isnan.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@s_ldexp.$(OBJEXT) s_signif.$(OBJEXT) s_sin.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@s_tan.$(OBJEXT) s_tanh.$(OBJEXT) s_isinf.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@w_exp2.$(OBJEXT) w_tgamma.$(OBJEXT) \ @USE_LIBTOOL_FALSE@kf_rem_pio2.$(OBJEXT) kf_cos.$(OBJEXT) \ @USE_LIBTOOL_FALSE@kf_sin.$(OBJEXT) kf_tan.$(OBJEXT) ef_acos.$(OBJEXT) \ @USE_LIBTOOL_FALSE@ef_acosh.$(OBJEXT) ef_asin.$(OBJEXT) \ @@ -184,9 +185,11 @@ lib_a_LIBADD = @USE_LIBTOOL_FALSE@sf_atan.$(OBJEXT) sf_ceil.$(OBJEXT) sf_cos.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sf_erf.$(OBJEXT) sf_fabs.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sf_floor.$(OBJEXT) sf_frexp.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@sf_ldexp.$(OBJEXT) sf_signif.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@sf_sin.$(OBJEXT) sf_tan.$(OBJEXT) sf_tanh.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@wf_exp2.$(OBJEXT) wf_tgamma.$(OBJEXT) +@USE_LIBTOOL_FALSE@sf_isnan.$(OBJEXT) sf_ldexp.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@sf_signif.$(OBJEXT) sf_sin.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@sf_tan.$(OBJEXT) sf_tanh.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@sf_isinf.$(OBJEXT) wf_exp2.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@wf_tgamma.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) libmath_la_LIBADD = @@ -203,24 +206,25 @@ libmath_la_LIBADD = @USE_LIBTOOL_TRUE@w_remainder.lo w_scalb.lo w_sinh.lo w_sqrt.lo \ @USE_LIBTOOL_TRUE@w_sincos.lo w_cabs.lo w_drem.lo s_asinh.lo s_atan.lo \ @USE_LIBTOOL_TRUE@s_ceil.lo s_cos.lo s_erf.lo s_fabs.lo s_floor.lo \ -@USE_LIBTOOL_TRUE@s_frexp.lo s_ldexp.lo s_signif.lo s_sin.lo s_tan.lo \ -@USE_LIBTOOL_TRUE@s_tanh.lo w_exp2.lo w_tgamma.lo kf_rem_pio2.lo \ -@USE_LIBTOOL_TRUE@kf_cos.lo kf_sin.lo kf_tan.lo ef_acos.lo ef_acosh.lo \ -@USE_LIBTOOL_TRUE@ef_asin.lo ef_atan2.lo ef_atanh.lo ef_cosh.lo \ -@USE_LIBTOOL_TRUE@ef_exp.lo ef_fmod.lo erf_gamma.lo ef_hypot.lo \ -@USE_LIBTOOL_TRUE@ef_j0.lo ef_j1.lo ef_jn.lo erf_lgamma.lo ef_log.lo \ -@USE_LIBTOOL_TRUE@ef_log10.lo ef_pow.lo ef_rem_pio2.lo ef_remainder.lo \ -@USE_LIBTOOL_TRUE@ef_scalb.lo ef_sinh.lo ef_sqrt.lo wf_acos.lo \ -@USE_LIBTOOL_TRUE@wf_acosh.lo wf_asin.lo wf_atan2.lo wf_atanh.lo \ -@USE_LIBTOOL_TRUE@wf_cosh.lo wf_exp.lo wf_fmod.lo wf_gamma.lo \ -@USE_LIBTOOL_TRUE@wrf_gamma.lo wf_hypot.lo wf_j0.lo wf_j1.lo wf_jn.lo \ -@USE_LIBTOOL_TRUE@wf_lgamma.lo wrf_lgamma.lo wf_log.lo wf_log10.lo \ -@USE_LIBTOOL_TRUE@wf_pow.lo wf_remainder.lo wf_scalb.lo wf_sinh.lo \ -@USE_LIBTOOL_TRUE@wf_sqrt.lo wf_sincos.lo wf_cabs.lo wf_drem.lo \ -@USE_LIBTOOL_TRUE@sf_asinh.lo sf_atan.lo sf_ceil.lo sf_cos.lo sf_erf.lo \ -@USE_LIBTOOL_TRUE@sf_fabs.lo sf_floor.lo sf_frexp.lo sf_ldexp.lo \ -@USE_LIBTOOL_TRUE@sf_signif.lo sf_sin.lo sf_tan.lo sf_tanh.lo \ -@USE_LIBTOOL_TRUE@wf_exp2.lo wf_tgamma.lo +@USE_LIBTOOL_TRUE@s_frexp.lo s_isnan.lo s_ldexp.lo s_signif.lo s_sin.lo \ +@USE_LIBTOOL_TRUE@s_tan.lo s_tanh.lo s_isinf.lo w_exp2.lo w_tgamma.lo \ +@USE_LIBTOOL_TRUE@kf_rem_pio2.lo kf_cos.lo kf_sin.lo kf_tan.lo \ +@USE_LIBTOOL_TRUE@ef_acos.lo ef_acosh.lo ef_asin.lo ef_atan2.lo \ +@USE_LIBTOOL_TRUE@ef_atanh.lo ef_cosh.lo ef_exp.lo ef_fmod.lo \ +@USE_LIBTOOL_TRUE@erf_gamma.lo ef_hypot.lo ef_j0.lo ef_j1.lo ef_jn.lo \ +@USE_LIBTOOL_TRUE@erf_lgamma.lo ef_log.lo ef_log10.lo ef_pow.lo \ +@USE_LIBTOOL_TRUE@ef_rem_pio2.lo ef_remainder.lo ef_scalb.lo ef_sinh.lo \ +@USE_LIBTOOL_TRUE@ef_sqrt.lo wf_acos.lo wf_acosh.lo wf_asin.lo \ +@USE_LIBTOOL_TRUE@wf_atan2.lo wf_atanh.lo wf_cosh.lo wf_exp.lo \ +@USE_LIBTOOL_TRUE@wf_fmod.lo wf_gamma.lo wrf_gamma.lo wf_hypot.lo \ +@USE_LIBTOOL_TRUE@wf_j0.lo wf_j1.lo wf_jn.lo wf_lgamma.lo wrf_lgamma.lo \ +@USE_LIBTOOL_TRUE@wf_log.lo wf_log10.lo wf_pow.lo wf_remainder.lo \ +@USE_LIBTOOL_TRUE@wf_scalb.lo wf_sinh.lo wf_sqrt.lo wf_sincos.lo \ +@USE_LIBTOOL_TRUE@wf_cabs.lo wf_drem.lo sf_asinh.lo sf_atan.lo \ +@USE_LIBTOOL_TRUE@sf_ceil.lo sf_cos.lo sf_erf.lo sf_fabs.lo sf_floor.lo \ +@USE_LIBTOOL_TRUE@sf_frexp.lo sf_isnan.lo sf_ldexp.lo sf_signif.lo \ +@USE_LIBTOOL_TRUE@sf_sin.lo sf_tan.lo sf_tanh.lo sf_isinf.lo wf_exp2.lo \ +@USE_LIBTOOL_TRUE@wf_tgamma.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -546,6 +550,9 @@ stan.def: s_tan.c stanh.def: s_tanh.c $(CHEW) < $(srcdir)/s_tanh.c >$@ 2>/dev/null touch stmp-def +sisnan.def: s_isnan.c + $(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null + touch stmp-def # A partial dependency list. diff --git a/newlib/libm/math/math.tex b/newlib/libm/math/math.tex index 7bc56ce9a..0c84e618a 100644 --- a/newlib/libm/math/math.tex +++ b/newlib/libm/math/math.tex @@ -181,7 +181,7 @@ The library is set to X/Open mode by default. @include common/sinfinity.def @page -@include common/sisnan.def +@include math/sisnan.def @page @include math/sldexp.def diff --git a/newlib/libm/common/s_isinfd.c b/newlib/libm/math/s_isinf.c index 5a2b04d4e..87f099566 100644 --- a/newlib/libm/common/s_isinfd.c +++ b/newlib/libm/math/s_isinf.c @@ -1,5 +1,5 @@ /* - * __isinfd(x) returns 1 if x is infinity, else 0; + * isinf(x) returns 1 if x is infinity, else 0; * no branching! * Added by Cygnus Support. */ @@ -8,9 +8,12 @@ #ifndef _DOUBLE_IS_32BITS -int -_DEFUN (__isinfd, (x), - double x) +#ifdef __STDC__ + int isinf(double x) +#else + int isinf(x) + double x; +#endif { __int32_t hx,lx; EXTRACT_WORDS(hx,lx,x); diff --git a/newlib/libm/common/s_isnand.c b/newlib/libm/math/s_isnan.c index 75538d907..596bd2d2a 100644 --- a/newlib/libm/common/s_isnand.c +++ b/newlib/libm/math/s_isnan.c @@ -1,3 +1,5 @@ + +/* @(#)s_isnan.c 5.1 93/09/24 */ /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -74,11 +76,6 @@ DESCRIPTION <<isnan>> returns 1 if the argument is a nan. <<isinf>> returns 1 if the argument is infinity. <<finite>> returns 1 if the argument is zero, subnormal or normal. - - Note that by the C99 standard, <<isnan>> and <<isinf>> are macros - taking any type of floating-point and are declared in - <<math.h>>. Newlib has chosen to declare these as macros in - <<math.h>> and as functions in <<ieeefp.h>>. The <<isnanf>>, <<isinff>> and <<finitef>> functions perform the same operations as their <<isnan>>, <<isinf>> and <<finite>> @@ -99,7 +96,7 @@ QUICKREF */ /* - * __isnand(x) returns 1 is x is nan, else 0; + * isnan(x) returns 1 is x is nan, else 0; * no branching! */ @@ -107,9 +104,12 @@ QUICKREF #ifndef _DOUBLE_IS_32BITS -int -_DEFUN (__isnand, (x), - double x) +#ifdef __STDC__ + int isnan(double x) +#else + int isnan(x) + double x; +#endif { __int32_t hx,lx; EXTRACT_WORDS(hx,lx,x); diff --git a/newlib/libm/common/sf_isinf.c b/newlib/libm/math/sf_isinf.c index 74ba4edf7..43a8abdf2 100644 --- a/newlib/libm/common/sf_isinf.c +++ b/newlib/libm/math/sf_isinf.c @@ -1,15 +1,16 @@ /* * isinff(x) returns 1 if x is +-infinity, else 0; - * - * isinff is an extension declared in <ieeefp.h> and - * <math.h>. + * Added by Cygnus Support. */ #include "fdlibm.h" -int -_DEFUN (isinff, (x), - float x) +#ifdef __STDC__ + int isinff(float x) +#else + int isinff(x) + float x; +#endif { __int32_t ix; GET_FLOAT_WORD(ix,x); @@ -19,11 +20,12 @@ _DEFUN (isinff, (x), #ifdef _DOUBLE_IS_32BITS -#undef isinf - -int -_DEFUN (isinf, (x), - double x) +#ifdef __STDC__ + int isinf(double x) +#else + int isinf(x) + double x; +#endif { return isinff((float) x); } diff --git a/newlib/libm/common/sf_isnan.c b/newlib/libm/math/sf_isnan.c index befc3b2b2..0b4be3e9c 100644 --- a/newlib/libm/common/sf_isnan.c +++ b/newlib/libm/math/sf_isnan.c @@ -1,4 +1,5 @@ -/* sf_c_isnan.c -- float version of s_c_isnan.c. +/* sf_isnan.c -- float version of s_isnan.c. + * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com. */ /* @@ -14,15 +15,16 @@ /* * isnanf(x) returns 1 is x is nan, else 0; - * - * isnanf is an extension declared in <ieeefp.h> and <math.h>. */ #include "fdlibm.h" -int -_DEFUN (isnanf, (x), - float x) +#ifdef __STDC__ + int isnanf(float x) +#else + int isnanf(x) + float x; +#endif { __int32_t ix; GET_FLOAT_WORD(ix,x); @@ -32,11 +34,12 @@ _DEFUN (isnanf, (x), #ifdef _DOUBLE_IS_32BITS -#undef isnan - -int -_DEFUN (isnan, (x), - double x) +#ifdef __STDC__ + int isnan(double x) +#else + int isnan(x) + double x; +#endif { return isnanf((float) x); } diff --git a/newlib/libm/mathfp/Makefile.am b/newlib/libm/mathfp/Makefile.am index e529022a6..82adbea4f 100644 --- a/newlib/libm/mathfp/Makefile.am +++ b/newlib/libm/mathfp/Makefile.am @@ -16,7 +16,7 @@ src = s_acos.c s_frexp.c s_mathcnst.c \ s_sincos.c \ s_atangent.c s_logarithm.c \ s_sineh.c \ - s_ceil.c \ + s_ceil.c s_isnan.c s_isinf.c \ e_acosh.c e_atanh.c e_remainder.c \ er_gamma.c er_lgamma.c \ s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c \ @@ -36,6 +36,7 @@ fsrc = sf_ceil.c \ sf_sincos.c \ sf_atangent.c sf_logarithm.c sf_sineh.c \ sf_log.c sf_sineh.c \ + sf_isnan.c sf_isinf.c \ ef_acosh.c ef_atanh.c ef_remainder.c \ erf_gamma.c erf_lgamma.c \ sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c \ @@ -75,6 +76,7 @@ chobj = eacosh.def \ sfloor.def \ sfmod.def \ sfrexp.def \ + sisnan.def \ sldexp.def \ slog10.def \ slogarithm.def \ @@ -158,6 +160,9 @@ sfmod.def: s_fmod.c sfrexp.def: s_frexp.c $(CHEW) < $(srcdir)/s_frexp.c >$@ 2>/dev/null touch stmp-def +sisnan.def: s_isnan.c + $(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null + touch stmp-def sldexp.def: s_ldexp.c $(CHEW) < $(srcdir)/s_ldexp.c >$@ 2>/dev/null touch stmp-def diff --git a/newlib/libm/mathfp/Makefile.in b/newlib/libm/mathfp/Makefile.in index b11e8130f..e0eaaa43e 100644 --- a/newlib/libm/mathfp/Makefile.in +++ b/newlib/libm/mathfp/Makefile.in @@ -98,10 +98,10 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -src = s_acos.c s_frexp.c s_mathcnst.c s_cos.c s_sinh.c s_asin.c s_asine.c s_cosh.c s_ispos.c s_numtest.c s_sqrt.c s_exp.c s_ldexp.c s_pow.c s_tan.c s_atan.c s_atan2.c s_fabs.c s_log.c s_tanh.c s_log10.c s_sin.c s_floor.c s_sine.c s_sincos.c s_atangent.c s_logarithm.c s_sineh.c s_ceil.c e_acosh.c e_atanh.c e_remainder.c er_gamma.c er_lgamma.c s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c w_cabs.c w_drem.c s_asinh.c s_fmod.c e_scalb.c s_signif.c s_exp2.c s_tgamma.c +src = s_acos.c s_frexp.c s_mathcnst.c s_cos.c s_sinh.c s_asin.c s_asine.c s_cosh.c s_ispos.c s_numtest.c s_sqrt.c s_exp.c s_ldexp.c s_pow.c s_tan.c s_atan.c s_atan2.c s_fabs.c s_log.c s_tanh.c s_log10.c s_sin.c s_floor.c s_sine.c s_sincos.c s_atangent.c s_logarithm.c s_sineh.c s_ceil.c s_isnan.c s_isinf.c e_acosh.c e_atanh.c e_remainder.c er_gamma.c er_lgamma.c s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c w_cabs.c w_drem.c s_asinh.c s_fmod.c e_scalb.c s_signif.c s_exp2.c s_tgamma.c -fsrc = sf_ceil.c sf_acos.c sf_frexp.c sf_cos.c sf_sinh.c sf_asine.c sf_cosh.c sf_ispos.c sf_numtest.c sf_sqrt.c sf_asin.c sf_exp.c sf_ldexp.c sf_pow.c sf_tan.c sf_atan2.c sf_fabs.c sf_tanh.c sf_atan.c sf_log10.c sf_sin.c sf_floor.c sf_sine.c sf_sincos.c sf_atangent.c sf_logarithm.c sf_sineh.c sf_log.c sf_sineh.c ef_acosh.c ef_atanh.c ef_remainder.c erf_gamma.c erf_lgamma.c sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c wf_cabs.c wf_drem.c sf_asinh.c sf_fmod.c ef_scalb.c sf_signif.c sf_exp2.c sf_tgamma.c +fsrc = sf_ceil.c sf_acos.c sf_frexp.c sf_cos.c sf_sinh.c sf_asine.c sf_cosh.c sf_ispos.c sf_numtest.c sf_sqrt.c sf_asin.c sf_exp.c sf_ldexp.c sf_pow.c sf_tan.c sf_atan2.c sf_fabs.c sf_tanh.c sf_atan.c sf_log10.c sf_sin.c sf_floor.c sf_sine.c sf_sincos.c sf_atangent.c sf_logarithm.c sf_sineh.c sf_log.c sf_sineh.c sf_isnan.c sf_isinf.c ef_acosh.c ef_atanh.c ef_remainder.c erf_gamma.c erf_lgamma.c sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c wf_cabs.c wf_drem.c sf_asinh.c sf_fmod.c ef_scalb.c sf_signif.c sf_exp2.c sf_tgamma.c libmathfp_la_LDFLAGS = -Xcompiler -nostdlib @@ -113,7 +113,7 @@ libmathfp_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc) -chobj = eacosh.def eatanh.def ehypot.def eremainder.def erlgamma.def sacos.def sasine.def sasinh.def satan.def satan2.def satangent.def scosh.def serf.def sexp.def sfabs.def sfloor.def sfmod.def sfrexp.def sldexp.def slog10.def slogarithm.def spow.def ssine.def ssineh.def ssqrt.def stan.def stanh.def wjn.def +chobj = eacosh.def eatanh.def ehypot.def eremainder.def erlgamma.def sacos.def sasine.def sasinh.def satan.def satan2.def satangent.def scosh.def serf.def sexp.def sfabs.def sfloor.def sfmod.def sfrexp.def sisnan.def sldexp.def slog10.def slogarithm.def spow.def ssine.def ssineh.def ssqrt.def stan.def stanh.def wjn.def SUFFIXES = .def @@ -143,7 +143,8 @@ lib_a_LIBADD = @USE_LIBTOOL_FALSE@s_sin.$(OBJEXT) s_floor.$(OBJEXT) s_sine.$(OBJEXT) \ @USE_LIBTOOL_FALSE@s_sincos.$(OBJEXT) s_atangent.$(OBJEXT) \ @USE_LIBTOOL_FALSE@s_logarithm.$(OBJEXT) s_sineh.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@s_ceil.$(OBJEXT) e_acosh.$(OBJEXT) e_atanh.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@s_ceil.$(OBJEXT) s_isnan.$(OBJEXT) s_isinf.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@e_acosh.$(OBJEXT) e_atanh.$(OBJEXT) \ @USE_LIBTOOL_FALSE@e_remainder.$(OBJEXT) er_gamma.$(OBJEXT) \ @USE_LIBTOOL_FALSE@er_lgamma.$(OBJEXT) s_erf.$(OBJEXT) e_j0.$(OBJEXT) \ @USE_LIBTOOL_FALSE@e_j1.$(OBJEXT) w_jn.$(OBJEXT) e_hypot.$(OBJEXT) \ @@ -164,6 +165,7 @@ lib_a_LIBADD = @USE_LIBTOOL_FALSE@sf_sincos.$(OBJEXT) sf_atangent.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sf_logarithm.$(OBJEXT) sf_sineh.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sf_log.$(OBJEXT) sf_sineh.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@sf_isnan.$(OBJEXT) sf_isinf.$(OBJEXT) \ @USE_LIBTOOL_FALSE@ef_acosh.$(OBJEXT) ef_atanh.$(OBJEXT) \ @USE_LIBTOOL_FALSE@ef_remainder.$(OBJEXT) erf_gamma.$(OBJEXT) \ @USE_LIBTOOL_FALSE@erf_lgamma.$(OBJEXT) sf_erf.$(OBJEXT) \ @@ -182,18 +184,19 @@ libmathfp_la_LIBADD = @USE_LIBTOOL_TRUE@s_ldexp.lo s_pow.lo s_tan.lo s_atan.lo s_atan2.lo \ @USE_LIBTOOL_TRUE@s_fabs.lo s_log.lo s_tanh.lo s_log10.lo s_sin.lo \ @USE_LIBTOOL_TRUE@s_floor.lo s_sine.lo s_sincos.lo s_atangent.lo \ -@USE_LIBTOOL_TRUE@s_logarithm.lo s_sineh.lo s_ceil.lo e_acosh.lo \ -@USE_LIBTOOL_TRUE@e_atanh.lo e_remainder.lo er_gamma.lo er_lgamma.lo \ -@USE_LIBTOOL_TRUE@s_erf.lo e_j0.lo e_j1.lo w_jn.lo e_hypot.lo w_cabs.lo \ -@USE_LIBTOOL_TRUE@w_drem.lo s_asinh.lo s_fmod.lo e_scalb.lo s_signif.lo \ -@USE_LIBTOOL_TRUE@s_exp2.lo s_tgamma.lo sf_ceil.lo sf_acos.lo \ -@USE_LIBTOOL_TRUE@sf_frexp.lo sf_cos.lo sf_sinh.lo sf_asine.lo \ -@USE_LIBTOOL_TRUE@sf_cosh.lo sf_ispos.lo sf_numtest.lo sf_sqrt.lo \ -@USE_LIBTOOL_TRUE@sf_asin.lo sf_exp.lo sf_ldexp.lo sf_pow.lo sf_tan.lo \ -@USE_LIBTOOL_TRUE@sf_atan2.lo sf_fabs.lo sf_tanh.lo sf_atan.lo \ -@USE_LIBTOOL_TRUE@sf_log10.lo sf_sin.lo sf_floor.lo sf_sine.lo \ -@USE_LIBTOOL_TRUE@sf_sincos.lo sf_atangent.lo sf_logarithm.lo \ -@USE_LIBTOOL_TRUE@sf_sineh.lo sf_log.lo sf_sineh.lo ef_acosh.lo \ +@USE_LIBTOOL_TRUE@s_logarithm.lo s_sineh.lo s_ceil.lo s_isnan.lo \ +@USE_LIBTOOL_TRUE@s_isinf.lo e_acosh.lo e_atanh.lo e_remainder.lo \ +@USE_LIBTOOL_TRUE@er_gamma.lo er_lgamma.lo s_erf.lo e_j0.lo e_j1.lo \ +@USE_LIBTOOL_TRUE@w_jn.lo e_hypot.lo w_cabs.lo w_drem.lo s_asinh.lo \ +@USE_LIBTOOL_TRUE@s_fmod.lo e_scalb.lo s_signif.lo s_exp2.lo \ +@USE_LIBTOOL_TRUE@s_tgamma.lo sf_ceil.lo sf_acos.lo sf_frexp.lo \ +@USE_LIBTOOL_TRUE@sf_cos.lo sf_sinh.lo sf_asine.lo sf_cosh.lo \ +@USE_LIBTOOL_TRUE@sf_ispos.lo sf_numtest.lo sf_sqrt.lo sf_asin.lo \ +@USE_LIBTOOL_TRUE@sf_exp.lo sf_ldexp.lo sf_pow.lo sf_tan.lo sf_atan2.lo \ +@USE_LIBTOOL_TRUE@sf_fabs.lo sf_tanh.lo sf_atan.lo sf_log10.lo \ +@USE_LIBTOOL_TRUE@sf_sin.lo sf_floor.lo sf_sine.lo sf_sincos.lo \ +@USE_LIBTOOL_TRUE@sf_atangent.lo sf_logarithm.lo sf_sineh.lo sf_log.lo \ +@USE_LIBTOOL_TRUE@sf_sineh.lo sf_isnan.lo sf_isinf.lo ef_acosh.lo \ @USE_LIBTOOL_TRUE@ef_atanh.lo ef_remainder.lo erf_gamma.lo \ @USE_LIBTOOL_TRUE@erf_lgamma.lo sf_erf.lo ef_j0.lo ef_j1.lo wf_jn.lo \ @USE_LIBTOOL_TRUE@ef_hypot.lo wf_cabs.lo wf_drem.lo sf_asinh.lo \ @@ -494,6 +497,9 @@ sfmod.def: s_fmod.c sfrexp.def: s_frexp.c $(CHEW) < $(srcdir)/s_frexp.c >$@ 2>/dev/null touch stmp-def +sisnan.def: s_isnan.c + $(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null + touch stmp-def sldexp.def: s_ldexp.c $(CHEW) < $(srcdir)/s_ldexp.c >$@ 2>/dev/null touch stmp-def diff --git a/newlib/libm/mathfp/mathfp.tex b/newlib/libm/mathfp/mathfp.tex index 0b9f08557..87905dcb1 100644 --- a/newlib/libm/mathfp/mathfp.tex +++ b/newlib/libm/mathfp/mathfp.tex @@ -181,7 +181,7 @@ The library is set to X/Open mode by default. @include common/sinfinity.def @page -@include common/sisnan.def +@include mathfp/sisnan.def @page @include mathfp/sldexp.def diff --git a/newlib/libm/mathfp/s_atangent.c b/newlib/libm/mathfp/s_atangent.c index 0a7c4d2f8..981e1c822 100644 --- a/newlib/libm/mathfp/s_atangent.c +++ b/newlib/libm/mathfp/s_atangent.c @@ -197,9 +197,9 @@ _DEFUN (atangent, (double, double, double, int), if (arctan2) { - if (u < 0.0) + if (u < 0.0 || branch == 2) res = __PI - res; - if (v < 0.0) + if (v < 0.0 || branch == 1) res = -res; } else if (x < 0.0) diff --git a/newlib/libm/mathfp/s_frexp.c b/newlib/libm/mathfp/s_frexp.c index 54fa336c8..08611e9a7 100644 --- a/newlib/libm/mathfp/s_frexp.c +++ b/newlib/libm/mathfp/s_frexp.c @@ -82,17 +82,6 @@ double frexp (double d, int *exp) double f; __uint32_t hd, ld, hf, lf; - /* Check for special values. */ - switch (numtest (d)) - { - case NAN: - case INF: - errno = EDOM; - case 0: - *exp = 0; - return (d); - } - EXTRACT_WORDS (hd, ld, d); /* Get the exponent. */ @@ -105,6 +94,16 @@ double frexp (double d, int *exp) INSERT_WORDS (f, hf, lf); + /* Check for special values. */ + switch (numtest (f)) + { + case NAN: + case INF: + errno = EDOM; + *exp = 0; + return (f); + } + return (f); } diff --git a/newlib/libm/mathfp/s_isinf.c b/newlib/libm/mathfp/s_isinf.c new file mode 100644 index 000000000..fe9f54799 --- /dev/null +++ b/newlib/libm/mathfp/s_isinf.c @@ -0,0 +1,37 @@ + +/* @(#)z_isinf.c 1.0 98/08/13 */ +/****************************************************************** + * isinf + * + * Input: + * x - pointer to a floating point value + * + * Output: + * An integer that indicates if the number is infinite. + * + * Description: + * This routine returns an integer that indicates if the number + * passed in is infinite (1) or is finite (0). + * + *****************************************************************/ + +#include "fdlibm.h" +#include "zmath.h" + +#ifndef _DOUBLE_IS_32BITS + +int isinf (double x) +{ + __uint32_t lx, hx; + int exp; + + EXTRACT_WORDS (hx, lx, x); + exp = (hx & 0x7ff00000) >> 20; + + if ((exp == 0x7ff) && ((hx & 0xf0000 || lx) == 0)) + return (1); + else + return (0); +} + +#endif /* _DOUBLE_IS_32BITS */ diff --git a/newlib/libm/mathfp/s_isnan.c b/newlib/libm/mathfp/s_isnan.c new file mode 100644 index 000000000..70ac704c3 --- /dev/null +++ b/newlib/libm/mathfp/s_isnan.c @@ -0,0 +1,124 @@ + +/* @(#)z_isnan.c 1.0 98/08/13 */ + +/* +FUNCTION + <<isnan>>, <<isnanf>>, <<isinf>>, <<isinff>>, <<finite>>, <<finitef>>---test +for exceptional numbers + +INDEX + isnan +INDEX + isinf +INDEX + finite + +INDEX + isnanf +INDEX + isinff +INDEX + finitef + +ANSI_SYNOPSIS + #include <ieeefp.h> + int isnan(double <[arg]>); + int isinf(double <[arg]>); + int finite(double <[arg]>); + int isnanf(float <[arg]>); + int isinff(float <[arg]>); + int finitef(float <[arg]>); + +TRAD_SYNOPSIS + #include <ieeefp.h> + int isnan(<[arg]>) + double <[arg]>; + int isinf(<[arg]>) + double <[arg]>; + int finite(<[arg]>); + double <[arg]>; + int isnanf(<[arg]>); + float <[arg]>; + int isinff(<[arg]>); + float <[arg]>; + int finitef(<[arg]>); + float <[arg]>; + + +DESCRIPTION + These functions provide information on the floating-point + argument supplied. + + There are five major number formats: + o+ + o zero + A number which contains all zero bits. + o subnormal + A number with a zero exponent but a nonzero fraction. + o normal + A number with an exponent and a fraction. + o infinity + A number with an all 1's exponent and a zero fraction. + o NAN + A number with an all 1's exponent and a nonzero fraction. + + o- + + <<isnan>> returns 1 if the argument is a nan. <<isinf>> + returns 1 if the argument is infinity. <<finite>> returns 1 if the + argument is zero, subnormal or normal. + + The <<isnanf>>, <<isinff>> and <<finitef>> functions perform the same + operations as their <<isnan>>, <<isinf>> and <<finite>> + counterparts, but on single-precision floating-point numbers. + +QUICKREF + isnan - pure +QUICKREF + isinf - pure +QUICKREF + finite - pure +QUICKREF + isnan - pure +QUICKREF + isinf - pure +QUICKREF + finite - pure +*/ + + +/****************************************************************** + * isnan + * + * Input: + * x - pointer to a floating-point value + * + * Output: + * An integer that indicates if the number is NaN. + * + * Description: + * This routine returns an integer that indicates if the number + * passed in is NaN (1) or is finite (0). + * + *****************************************************************/ + +#include "fdlibm.h" +#include "zmath.h" + +#ifndef _DOUBLE_IS_32BITS + +int isnan (double x) +{ + __uint32_t lx, hx; + int exp; + + EXTRACT_WORDS (hx, lx, x); + exp = (hx & 0x7ff00000) >> 20; + + if ((exp == 0x7ff) && (hx & 0xf0000 || lx)) + return (1); + else + return (0); +} + +#endif /* _DOUBLE_IS_32BITS */ diff --git a/newlib/libm/mathfp/sf_atangent.c b/newlib/libm/mathfp/sf_atangent.c index 7a8f0cebe..55a90063c 100644 --- a/newlib/libm/mathfp/sf_atangent.c +++ b/newlib/libm/mathfp/sf_atangent.c @@ -126,9 +126,9 @@ _DEFUN (atangentf, (float, float, float, int), if (arctan2) { - if (u < 0.0) + if (u < 0.0 || branch == 2) res = __PI - res; - if (v < 0.0) + if (v < 0.0 || branch == 1) res = -res; } else if (x < 0.0) diff --git a/newlib/libm/mathfp/sf_frexp.c b/newlib/libm/mathfp/sf_frexp.c index 7f25195c8..c2751f65c 100644 --- a/newlib/libm/mathfp/sf_frexp.c +++ b/newlib/libm/mathfp/sf_frexp.c @@ -24,17 +24,6 @@ float frexpf (float d, int *exp) float f; __int32_t wf, wd; - /* Check for special values. */ - switch (numtestf (d)) - { - case NAN: - case INF: - errno = EDOM; - case 0: - *exp = 0; - return (d); - } - GET_FLOAT_WORD (wd, d); /* Get the exponent. */ @@ -46,6 +35,16 @@ float frexpf (float d, int *exp) SET_FLOAT_WORD (f, wf); + /* Check for special values. */ + switch (numtestf (f)) + { + case NAN: + case INF: + errno = EDOM; + *exp = 0; + return (f); + } + return (f); } diff --git a/newlib/libm/mathfp/sf_isinf.c b/newlib/libm/mathfp/sf_isinf.c new file mode 100644 index 000000000..84ab3f71c --- /dev/null +++ b/newlib/libm/mathfp/sf_isinf.c @@ -0,0 +1,48 @@ + +/* @(#)z_isinff.c 1.0 98/08/13 */ +/****************************************************************** + * isinff + * + * Input: + * x - pointer to a floating point value + * + * Output: + * An integer that indicates if the number is infinite. + * + * Description: + * This routine returns an integer that indicates if the number + * passed in is infinite (1) or is finite (0). + * + *****************************************************************/ + +#include "fdlibm.h" +#include "zmath.h" + +int +_DEFUN (isinff, (float), + float x) +{ + __uint32_t wx; + int exp; + + GET_FLOAT_WORD (wx, x); + exp = (wx & 0x7f800000) >> 23; + + if ((exp == 0x7f8) && !(wx & 0xf0000)) + return (1); + else + return (0); +} + +#ifdef _DOUBLE_IS_32BITS + +int +_DEFUN (isinf, (double), + double x) +{ + return isinff ((float) x); +} + +#endif /* defined(_DOUBLE_IS_32BITS) */ + + diff --git a/newlib/libm/mathfp/sf_isnan.c b/newlib/libm/mathfp/sf_isnan.c new file mode 100644 index 000000000..ac557a6b8 --- /dev/null +++ b/newlib/libm/mathfp/sf_isnan.c @@ -0,0 +1,48 @@ + +/* @(#)z_isnanf.c 1.0 98/08/13 */ +/****************************************************************** + * isnanf + * + * Input: + * x - pointer to a floating point value + * + * Output: + * An integer that indicates if the number is NaN. + * + * Description: + * This routine returns an integer that indicates if the number + * passed in is NaN (1) or is finite (0). + * + *****************************************************************/ + +#include "fdlibm.h" +#include "zmath.h" + +int +_DEFUN (isnanf, (float), + float x) +{ + __int32_t wx; + int exp; + + GET_FLOAT_WORD (wx, x); + exp = (wx & 0x7f800000) >> 23; + + if ((exp == 0x7f8) && (wx & 0x7fffff)) + return (1); + else + return (0); +} + + +#ifdef _DOUBLE_IS_32BITS + +int +_DEFUN (isnan, (double), + double x) +{ + return isnanf((float) x); +} + +#endif /* defined(_DOUBLE_IS_32BITS) */ + diff --git a/newlib/newlib.hin b/newlib/newlib.hin index 207192897..b08160cdb 100644 --- a/newlib/newlib.hin +++ b/newlib/newlib.hin @@ -1,4 +1,3 @@ -/* newlib.hin. Generated automatically from configure.in by autoheader. */ #ifndef __NEWLIB_H__ #define __NEWLIB_H__ 1 @@ -30,16 +29,6 @@ /* Enable ICONV external CCS files loading capabilities */ #undef _ICONV_ENABLE_EXTERNAL_CCS -/* Define if the linker supports .preinit_array/.init_array/.fini_array - * sections. */ -#undef HAVE_INITFINI_ARRAY - -/* True if atexit() may dynamically allocate space for cleanup - functions. */ -#undef _ATEXIT_DYNAMIC_ALLOC - -/* Define if the compiler supports aliasing an array to an address. */ -#undef _HAVE_ARRAY_ALIASING /* * Iconv encodings enabled ("to" direction) */ @@ -148,5 +137,12 @@ #undef _ICONV_FROM_ENCODING_WIN_1257 #undef _ICONV_FROM_ENCODING_WIN_1258 +/* Define if the linker supports .preinit_array/.init_array/.fini_array + * sections. */ +#undef HAVE_INITFINI_ARRAY + +/* Define if the compiler supports aliasing an array to an address. */ +#undef _HAVE_ARRAY_ALIASING + #endif /* !__NEWLIB_H__ */ diff --git a/newlib/stamp-h.in b/newlib/stamp-h.in index 9788f7023..e69de29bb 100644 --- a/newlib/stamp-h.in +++ b/newlib/stamp-h.in @@ -1 +0,0 @@ -timestamp |