From: Steve Chamberlain Date: Thu, 1 Feb 1996 18:39:00 +0000 (+0000) Subject: * config/powerpc/(cygwin32.mh, cygwin32.mt, tm-cygwin32.h, X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d78f53277a7eb4bd064e4eddbc578132140e750;p=binutils-gdb.git * config/powerpc/(cygwin32.mh, cygwin32.mt, tm-cygwin32.h, xm-cygwin32.h): New. * config/i386/(*win32*): Becomes *cygwin32*. * configure.in (i[3456]86-*-win32*): Becomes i[3456]86-*-cygwin32. (powerpcle-*-cygwin32): New. * configure: Regenerate. * win32-nat.c (child_create_inferior): Call CreateProcess with the right program arg. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 66f18e47df7..96b65602909 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +Thu Feb 1 10:29:31 1996 Steve Chamberlain + + * config/powerpc/(cygwin32.mh, cygwin32.mt, tm-cygwin32.h, + xm-cygwin32.h): New. + * config/i386/(*win32*): Becomes *cygwin32*. + * configure.in (i[3456]86-*-win32*): Becomes i[3456]86-*-cygwin32. + (powerpcle-*-cygwin32): New. + * configure: Regenerate. + * win32-nat.c (child_create_inferior): Call CreateProcess + with the right program arg. + Thu Feb 1 11:01:10 1996 Jeffrey A Law (law@cygnus.com) * config/pa/tm-hppa.h (SOFT_FLOAT): Provide a default definition. diff --git a/gdb/config/i386/.Sanitize b/gdb/config/i386/.Sanitize index 4d7b4e76f44..df1ddf073d3 100644 --- a/gdb/config/i386/.Sanitize +++ b/gdb/config/i386/.Sanitize @@ -96,9 +96,9 @@ tm-ptx.h tm-ptx4.h tm-sun386.h tm-symmetry.h -tm-win32.h -win32.mh -win32.mt +tm-cygwin32.h +cygwin32.mh +cygwin32.mt xm-go32.h xm-i386aix.h xm-i386bsd.h @@ -116,7 +116,7 @@ xm-ptx.h xm-ptx4.h xm-sun386.h xm-symmetry.h -xm-win32.h +xm-cygwin32.h Things-to-lose: diff --git a/gdb/config/i386/cygwin32.mh b/gdb/config/i386/cygwin32.mh new file mode 100644 index 00000000000..25f15cfcd03 --- /dev/null +++ b/gdb/config/i386/cygwin32.mh @@ -0,0 +1,6 @@ +MH_CFLAGS= +XM_FILE=xm-cygwin32.h +TERMCAP= +NATDEPFILES=win32-nat.o +XM_CLIBS=-lkernel32 + diff --git a/gdb/config/i386/cygwin32.mt b/gdb/config/i386/cygwin32.mt new file mode 100644 index 00000000000..22b45473ad6 --- /dev/null +++ b/gdb/config/i386/cygwin32.mt @@ -0,0 +1,6 @@ +# Target: Intel 386 run win32 +TDEPFILES= i386-tdep.o i387-tdep.o +TM_FILE= tm-cygwin32.h + + + diff --git a/gdb/config/i386/tm-cygwin32.h b/gdb/config/i386/tm-cygwin32.h new file mode 100644 index 00000000000..f7464ba66cb --- /dev/null +++ b/gdb/config/i386/tm-cygwin32.h @@ -0,0 +1,125 @@ +/* Macro definitions for i386 running under the win32 API Unix. + Copyright 1995, 1996 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 of the License, 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 02111-1307, USA. */ + + +#include "i386/tm-i386v.h" + +#undef MAX_REGISTER_RAW_SIZE +#undef MAX_REGISTER_VIRTUAL_SIZE +#undef NUM_REGS +#undef REGISTER_BYTE +#undef REGISTER_BYTES +#undef REGISTER_CONVERTIBLE +#undef REGISTER_CONVERT_TO_RAW +#undef REGISTER_CONVERT_TO_VIRTUAL +#undef REGISTER_NAMES +#undef REGISTER_RAW_SIZE +#undef REGISTER_VIRTUAL_SIZE +#undef REGISTER_VIRTUAL_TYPE + +/* Number of machine registers */ + +#define NUM_REGS 24 + +/* Initializer for an array of names of registers. + There should be NUM_REGS strings in this initializer. */ + +/* the order of the first 8 registers must match the compiler's + * numbering scheme (which is the same as the 386 scheme) + * also, this table must match regmap in i386-pinsn.c. + */ + +#define REGISTER_NAMES { "eax", "ecx", "edx", "ebx", \ + "esp", "ebp", "esi", "edi", \ + "eip", "ps", "cs", "ss", \ + "ds", "es", "fs", "gs", \ + "st", "st(1)","st(2)","st(3)",\ + "st(4)","st(5)","st(6)","st(7)",} + +#define FP0_REGNUM 16 + +/* Total amount of space needed to store our copies of the machine's + register state, the array `registers'. */ + +#define REGISTER_BYTES (16 * 4 + 8 * 10) + +/* Index within `registers' of the first byte of the space for + register N. */ + +#define REGISTER_BYTE(N) (((N) < 16) ? (N) * 4 : (((N) - 16) * 10) + (16 * 4)) + +/* Number of bytes of storage in the actual machine representation + for register N. */ + +#define REGISTER_RAW_SIZE(N) (((N) < 16) ? 4 : 10) + +/* Number of bytes of storage in the program's representation + for register N. */ + +#define REGISTER_VIRTUAL_SIZE(N) (((N) < 16) ? 4 : 10) + +/* Largest value REGISTER_RAW_SIZE can have. */ + +#define MAX_REGISTER_RAW_SIZE 10 + +/* Largest value REGISTER_VIRTUAL_SIZE can have. */ + +#define MAX_REGISTER_VIRTUAL_SIZE 10 + +/* Nonzero if register N requires conversion + from raw format to virtual format. */ + +#define REGISTER_CONVERTIBLE(N) \ + ((N < FP0_REGNUM) ? 0 : 1) + +/* Convert data from raw format for register REGNUM in buffer FROM + to virtual format with type TYPE in buffer TO. */ +extern void +i387_to_double PARAMS ((char *, char *)); + + +#define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,TYPE,FROM,TO) \ +{ \ + double val; \ + i387_to_double ((FROM), (char *)&val); \ + store_floating ((TO), TYPE_LENGTH (TYPE), val); \ +} + +extern void +double_to_i387 PARAMS ((char *, char *)); + +#define REGISTER_CONVERT_TO_RAW(TYPE,REGNUM,FROM,TO) \ +{ \ + double val = extract_floating ((FROM), TYPE_LENGTH (TYPE)); \ + double_to_i387((char *)&val, (TO)); \ +} + +/* Return the GDB type object for the "standard" data type + of data in register N. */ + +#define REGISTER_VIRTUAL_TYPE(N) \ + ((N < FP0_REGNUM) ? builtin_type_int : \ + builtin_type_double) + +#define NAMES_HAVE_UNDERSCORE + + +#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) skip_trampoline_code (pc, name) +#define SKIP_TRAMPOLINE_CODE(pc) skip_trampoline_code (pc, 0) +extern CORE_ADDR skip_trampoline_code PARAMS ((CORE_ADDR pc, char *name)); diff --git a/gdb/config/i386/tm-win32.h b/gdb/config/i386/tm-win32.h deleted file mode 100644 index f7464ba66cb..00000000000 --- a/gdb/config/i386/tm-win32.h +++ /dev/null @@ -1,125 +0,0 @@ -/* Macro definitions for i386 running under the win32 API Unix. - Copyright 1995, 1996 Free Software Foundation, Inc. - - This file is part of GDB. - - 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 of the License, 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 02111-1307, USA. */ - - -#include "i386/tm-i386v.h" - -#undef MAX_REGISTER_RAW_SIZE -#undef MAX_REGISTER_VIRTUAL_SIZE -#undef NUM_REGS -#undef REGISTER_BYTE -#undef REGISTER_BYTES -#undef REGISTER_CONVERTIBLE -#undef REGISTER_CONVERT_TO_RAW -#undef REGISTER_CONVERT_TO_VIRTUAL -#undef REGISTER_NAMES -#undef REGISTER_RAW_SIZE -#undef REGISTER_VIRTUAL_SIZE -#undef REGISTER_VIRTUAL_TYPE - -/* Number of machine registers */ - -#define NUM_REGS 24 - -/* Initializer for an array of names of registers. - There should be NUM_REGS strings in this initializer. */ - -/* the order of the first 8 registers must match the compiler's - * numbering scheme (which is the same as the 386 scheme) - * also, this table must match regmap in i386-pinsn.c. - */ - -#define REGISTER_NAMES { "eax", "ecx", "edx", "ebx", \ - "esp", "ebp", "esi", "edi", \ - "eip", "ps", "cs", "ss", \ - "ds", "es", "fs", "gs", \ - "st", "st(1)","st(2)","st(3)",\ - "st(4)","st(5)","st(6)","st(7)",} - -#define FP0_REGNUM 16 - -/* Total amount of space needed to store our copies of the machine's - register state, the array `registers'. */ - -#define REGISTER_BYTES (16 * 4 + 8 * 10) - -/* Index within `registers' of the first byte of the space for - register N. */ - -#define REGISTER_BYTE(N) (((N) < 16) ? (N) * 4 : (((N) - 16) * 10) + (16 * 4)) - -/* Number of bytes of storage in the actual machine representation - for register N. */ - -#define REGISTER_RAW_SIZE(N) (((N) < 16) ? 4 : 10) - -/* Number of bytes of storage in the program's representation - for register N. */ - -#define REGISTER_VIRTUAL_SIZE(N) (((N) < 16) ? 4 : 10) - -/* Largest value REGISTER_RAW_SIZE can have. */ - -#define MAX_REGISTER_RAW_SIZE 10 - -/* Largest value REGISTER_VIRTUAL_SIZE can have. */ - -#define MAX_REGISTER_VIRTUAL_SIZE 10 - -/* Nonzero if register N requires conversion - from raw format to virtual format. */ - -#define REGISTER_CONVERTIBLE(N) \ - ((N < FP0_REGNUM) ? 0 : 1) - -/* Convert data from raw format for register REGNUM in buffer FROM - to virtual format with type TYPE in buffer TO. */ -extern void -i387_to_double PARAMS ((char *, char *)); - - -#define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,TYPE,FROM,TO) \ -{ \ - double val; \ - i387_to_double ((FROM), (char *)&val); \ - store_floating ((TO), TYPE_LENGTH (TYPE), val); \ -} - -extern void -double_to_i387 PARAMS ((char *, char *)); - -#define REGISTER_CONVERT_TO_RAW(TYPE,REGNUM,FROM,TO) \ -{ \ - double val = extract_floating ((FROM), TYPE_LENGTH (TYPE)); \ - double_to_i387((char *)&val, (TO)); \ -} - -/* Return the GDB type object for the "standard" data type - of data in register N. */ - -#define REGISTER_VIRTUAL_TYPE(N) \ - ((N < FP0_REGNUM) ? builtin_type_int : \ - builtin_type_double) - -#define NAMES_HAVE_UNDERSCORE - - -#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) skip_trampoline_code (pc, name) -#define SKIP_TRAMPOLINE_CODE(pc) skip_trampoline_code (pc, 0) -extern CORE_ADDR skip_trampoline_code PARAMS ((CORE_ADDR pc, char *name)); diff --git a/gdb/config/i386/win32.mh b/gdb/config/i386/win32.mh deleted file mode 100644 index 7b5f4e8fdf1..00000000000 --- a/gdb/config/i386/win32.mh +++ /dev/null @@ -1,6 +0,0 @@ -MH_CFLAGS= -XM_FILE=xm-win32.h -TERMCAP= -NATDEPFILES=win32-nat.o -XM_CLIBS=-lkernel32 - diff --git a/gdb/config/i386/win32.mt b/gdb/config/i386/win32.mt deleted file mode 100644 index be484c46d0c..00000000000 --- a/gdb/config/i386/win32.mt +++ /dev/null @@ -1,6 +0,0 @@ -# Target: Intel 386 run win32 -TDEPFILES= i386-tdep.o i387-tdep.o -TM_FILE= tm-win32.h - - - diff --git a/gdb/config/i386/xm-cygwin32.h b/gdb/config/i386/xm-cygwin32.h new file mode 100644 index 00000000000..becbebe08ba --- /dev/null +++ b/gdb/config/i386/xm-cygwin32.h @@ -0,0 +1,41 @@ +/* Definitions for hosting on WIN32, for GDB. + Copyright 1995, 1996 Free Software Foundation, Inc. + +This file is part of GDB. + +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 of the License, 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 02111-1307, USA. */ + +#define HOST_BYTE_ORDER LITTLE_ENDIAN + +#include "fopen-bin.h" + +#define GDBINIT_FILENAME "gdb.ini" + + +#define SLASH_P(X) ((X)=='\\' || (X) == '/') +#define ROOTED_P(X) ((SLASH_P((X)[0]))|| ((X)[1] ==':')) +#define SLASH_CHAR '/' +#define SLASH_STRING "/" + + +/* If we longjmp out of the signal handler we never get another one. + So disable immediate_quit inside request_quit */ +#define REQUEST_QUIT + + + + + + diff --git a/gdb/config/i386/xm-win32.h b/gdb/config/i386/xm-win32.h deleted file mode 100644 index becbebe08ba..00000000000 --- a/gdb/config/i386/xm-win32.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Definitions for hosting on WIN32, for GDB. - Copyright 1995, 1996 Free Software Foundation, Inc. - -This file is part of GDB. - -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 of the License, 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 02111-1307, USA. */ - -#define HOST_BYTE_ORDER LITTLE_ENDIAN - -#include "fopen-bin.h" - -#define GDBINIT_FILENAME "gdb.ini" - - -#define SLASH_P(X) ((X)=='\\' || (X) == '/') -#define ROOTED_P(X) ((SLASH_P((X)[0]))|| ((X)[1] ==':')) -#define SLASH_CHAR '/' -#define SLASH_STRING "/" - - -/* If we longjmp out of the signal handler we never get another one. - So disable immediate_quit inside request_quit */ -#define REQUEST_QUIT - - - - - - diff --git a/gdb/config/powerpc/.Sanitize b/gdb/config/powerpc/.Sanitize index 49bf7aa2cb2..48bfd7a7c39 100644 --- a/gdb/config/powerpc/.Sanitize +++ b/gdb/config/powerpc/.Sanitize @@ -27,6 +27,8 @@ aix.mh aix.mt aix4.mh aix4.mt +cygwin32.mh +cygwin32.mt gdbserve.mt macos.mh macos.mt @@ -37,6 +39,7 @@ ppc-nw.mt ppc-sim.mt ppcle-eabi.mt ppcle-sim.mt +tm-cygwin32.h tm-macos.h tm-ppc-aix.h tm-ppc-aix4.h @@ -45,6 +48,7 @@ tm-ppc-nw.h tm-ppc-sim.h tm-ppcle-eabi.h tm-ppcle-sim.h +xm-cygwin32.h xm-aix.h xm-mpw.h diff --git a/gdb/config/powerpc/cygwin32.mh b/gdb/config/powerpc/cygwin32.mh new file mode 100644 index 00000000000..25f15cfcd03 --- /dev/null +++ b/gdb/config/powerpc/cygwin32.mh @@ -0,0 +1,6 @@ +MH_CFLAGS= +XM_FILE=xm-cygwin32.h +TERMCAP= +NATDEPFILES=win32-nat.o +XM_CLIBS=-lkernel32 + diff --git a/gdb/config/powerpc/cygwin32.mt b/gdb/config/powerpc/cygwin32.mt new file mode 100644 index 00000000000..30783c9ce32 --- /dev/null +++ b/gdb/config/powerpc/cygwin32.mt @@ -0,0 +1,6 @@ +# Target: Powerpc running cygnus's unix api over win32 +TDEPFILES= rs6000-tdep.o +TM_FILE= tm-cygwin32.h + + + diff --git a/gdb/config/powerpc/tm-cygwin32.h b/gdb/config/powerpc/tm-cygwin32.h new file mode 100644 index 00000000000..27ae24aefcd --- /dev/null +++ b/gdb/config/powerpc/tm-cygwin32.h @@ -0,0 +1,21 @@ +/* Macro definitions PowerPC running under the Cygwin API. + Copyright 1996 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 of the License, 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 02111-1307, USA. */ + +#include "powerpc/tm-ppcle-eabi.h" + diff --git a/gdb/config/powerpc/xm-cygwin32.h b/gdb/config/powerpc/xm-cygwin32.h new file mode 100644 index 00000000000..becbebe08ba --- /dev/null +++ b/gdb/config/powerpc/xm-cygwin32.h @@ -0,0 +1,41 @@ +/* Definitions for hosting on WIN32, for GDB. + Copyright 1995, 1996 Free Software Foundation, Inc. + +This file is part of GDB. + +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 of the License, 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 02111-1307, USA. */ + +#define HOST_BYTE_ORDER LITTLE_ENDIAN + +#include "fopen-bin.h" + +#define GDBINIT_FILENAME "gdb.ini" + + +#define SLASH_P(X) ((X)=='\\' || (X) == '/') +#define ROOTED_P(X) ((SLASH_P((X)[0]))|| ((X)[1] ==':')) +#define SLASH_CHAR '/' +#define SLASH_STRING "/" + + +/* If we longjmp out of the signal handler we never get another one. + So disable immediate_quit inside request_quit */ +#define REQUEST_QUIT + + + + + + diff --git a/gdb/configure b/gdb/configure index 6e7b7f3aae3..7e34c3f4ae7 100755 --- a/gdb/configure +++ b/gdb/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.7 +# Generated automatically using autoconf version 2.4 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -51,22 +51,9 @@ 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= ac_prev= for ac_option @@ -88,14 +75,9 @@ do 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) + -build | --build | --buil | --bui | --bu | --b) ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) + -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) build="$ac_optarg" ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ @@ -105,12 +87,6 @@ do | --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. @@ -161,29 +137,12 @@ Configuration: Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + --exec-prefix=PREFIX install architecture-dependent files in PREFIX [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 + --program-transform-name=PROGRAM run sed PROGRAM on installed program names Host type: --build=BUILD configure for building on BUILD [BUILD=HOST] --host=HOST configure for HOST [guessed] @@ -195,10 +154,8 @@ Features and packages: --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 +--enable and --with options recognized:$ac_help EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi exit 0 ;; -host | --host | --hos | --ho) @@ -206,44 +163,6 @@ EOF -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 ;; @@ -256,15 +175,6 @@ EOF | --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=*) @@ -305,23 +215,6 @@ EOF | -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=*) @@ -332,13 +225,6 @@ EOF -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=*) @@ -348,7 +234,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.7" + echo "configure generated by autoconf version 2.4" exit 0 ;; -with-* | --with-*) @@ -394,7 +280,7 @@ EOF -*) { 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 @@ -513,12 +399,9 @@ fi ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='echo $CPP $CPPFLAGS 1>&5; -$CPP $CPPFLAGS' -ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5; -${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='echo ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5; -${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. @@ -578,7 +461,6 @@ 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 @@ -596,8 +478,7 @@ fi rm -f conftest* fi - -echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 + echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 if test $ac_cv_prog_gcc_g = yes; then CFLAGS="-g -O" else @@ -624,7 +505,7 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error @@ -638,7 +519,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error @@ -665,7 +546,7 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@ -810,17 +691,10 @@ else esac done IFS="$ac_save_ifs" - + # As a last resort, use the slow shell script. + test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh" 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 + INSTALL="$ac_cv_path_install" fi echo "$ac_t""$INSTALL" 1>&6 @@ -918,7 +792,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # # The rules are: # 1. You are not allowed to specify --host, --target, and nonopt at the -# same time. +# 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. @@ -1000,10 +874,8 @@ test "$host_alias" != "$target_alias" && 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 + # Double any \ or $. + echo 's,\\,\\\\,g; s,\$,$$,g' > conftestsed program_transform_name="`echo $program_transform_name|sed -f conftestsed`" rm -f conftestsed fi @@ -1026,7 +898,7 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <&6 cross_compiling=$ac_cv_c_cross +echo "$ac_t""$ac_cv_c_cross" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1070,7 +941,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1088,7 +959,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1106,10 +977,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. if test "$cross_compiling" = yes; then - : + ac_cv_header_stdc=no else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1130,7 +1001,6 @@ fi rm -fr conftest* fi fi - echo "$ac_t""$ac_cv_header_stdc" 1>&6 if test $ac_cv_header_stdc = yes; then cat >> confdefs.h <<\EOF @@ -1147,7 +1017,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -1165,7 +1035,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` cat >> confdefs.h <&6 else cat > conftest.$ac_ext < #include @@ -1221,7 +1091,6 @@ fi rm -f conftest* fi - echo "$ac_t""$ac_cv_header_stat_broken" 1>&6 if test $ac_cv_header_stat_broken = yes; then cat >> confdefs.h <<\EOF @@ -1236,7 +1105,7 @@ if eval "test \"`echo '$''{'gdb_have_gregset_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return 0; } @@ -1268,7 +1137,7 @@ if eval "test \"`echo '$''{'gdb_have_fpregset_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return 0; } @@ -1295,57 +1164,6 @@ EOF fi -for ac_func in valloc getpagesize -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); - -int main() { return 0; } -int t() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if eval $ac_link; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* - -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi -done - echo $ac_n "checking for working mmap""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1354,7 +1172,7 @@ else ac_cv_func_mmap=no else cat > conftest.$ac_ext < conftest.$ac_ext < #include +#ifdef BSD +# ifndef BSD4_1 +# define HAVE_GETPAGESIZE +# endif +#endif + #ifndef HAVE_GETPAGESIZE # include # ifdef EXEC_PAGESIZE @@ -1382,7 +1206,7 @@ cat > conftest.$ac_ext <&6 if test $ac_cv_func_mmap = yes; then cat >> confdefs.h <<\EOF @@ -1447,8 +1270,8 @@ ENABLE_CLIBS= ENABLE_OBS= # Check whether --enable-netrom or --disable-netrom was given. -if test "${enable_netrom+set}" = set; then - enableval="$enable_netrom" +enableval="$enable_netrom" +if test -n "$enableval"; then case "${enableval}" in yes) enable_netrom=yes ;; no) enable_netrom=no ;; @@ -1465,8 +1288,8 @@ fi ENABLE_GM= # Check whether --enable-gm or --disable-gm was given. -if test "${enable_gm+set}" = set; then - enableval="$enable_gm" +enableval="$enable_gm" +if test -n "$enableval"; then case "${enableval}" in yes) ENABLE_OBS="${ENABLE_OBS} gmagic.o" ENABLE_CFLAGS=-DGENERAL_MAGIC @@ -1480,8 +1303,8 @@ fi # end-sanitize-gm # Check whether --enable-sim-powerpc or --disable-sim-powerpc was given. -if test "${enable_sim_powerpc+set}" = set; then - enableval="$enable_sim_powerpc" +enableval="$enable_sim_powerpc" +if test -n "$enableval"; then case "${enableval}" in yes) powerpc_sim=yes ;; no) powerpc_sim=no ;; @@ -1496,8 +1319,8 @@ fi ENABLE_GDBTK= # Check whether --enable-gdbtk or --disable-gdbtk was given. -if test "${enable_gdbtk+set}" = set; then - enableval="$enable_gdbtk" +enableval="$enable_gdbtk" +if test -n "$enableval"; then case "${enableval}" in yes) case "$host" in @@ -1534,8 +1357,8 @@ if test "${enable_gdbtk}" = "yes"; then echo $ac_n "checking for X""... $ac_c" 1>&6 # Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" +withval="$with_x" +if test -n "$withval"; then : fi @@ -1561,7 +1384,7 @@ EOF if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then no_x= # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + eval `make acfindx 2>/dev/null | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && @@ -1588,7 +1411,7 @@ test -z "$x_direct_test_library" && x_direct_test_library=Xt test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h cat > conftest.$ac_ext < EOF @@ -1651,7 +1474,7 @@ rm -f conftest* ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext </dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then - X_LIBS="$X_LIBS -R $x_libraries" + X_LIBS="$X_LIBS -R$x_libraries" fi fi @@ -1763,14 +1586,13 @@ else # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for -lICE""... $ac_c" 1>&6 -ac_lib_var=`echo ICE | tr '.-/+' '___p'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_ICE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&6 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" else @@ -1807,14 +1629,13 @@ fi # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for -ldnet""... $ac_c" 1>&6 -ac_lib_var=`echo dnet | tr '.-/+' '___p'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_dnet'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&6 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" else @@ -1842,14 +1663,13 @@ fi if test $ac_cv_lib_dnet = no; then echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&6 -ac_lib_var=`echo dnet_stub | tr '.-/+' '___p'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_dnet_stub'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&6 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" else @@ -1882,14 +1702,13 @@ fi # Not sure which flavor of 386 UNIX this is, but it seems harmless to # check for it. echo $ac_n "checking for -lnsl""... $ac_c" 1>&6 -ac_lib_var=`echo nsl | tr '.-/+' '___p'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_nsl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&6 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" else @@ -1921,14 +1740,13 @@ fi # But -lsocket is broken on IRIX, according to simon@lia.di.epfl.ch. if test "`(uname) 2>/dev/null`" != IRIX; then echo $ac_n "checking for -lsocket""... $ac_c" 1>&6 -ac_lib_var=`echo socket | tr '.-/+' '___p'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&6 X_EXTRA_LIBS="$X_EXTRA_LIBS -lsocket" else @@ -1971,8 +1789,8 @@ fi no_tcl=true echo $ac_n "checking for Tcl private headers""... $ac_c" 1>&6 # Check whether --with-tclinclude or --without-tclinclude was given. -if test "${with_tclinclude+set}" = set; then - withval="$with_tclinclude" +withval="$with_tclinclude" +if test -n "$withval"; then with_tclinclude=${withval} fi @@ -2033,7 +1851,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -2090,7 +1908,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < @@ -2141,8 +1959,8 @@ if test x"${no_tcl}" = x ; then # we reset no_tcl incase something fails here no_tcl=true # Check whether --with-tcllib or --without-tcllib was given. -if test "${with_tcllib+set}" = set; then - withval="$with_tcllib" +withval="$with_tcllib" +if test -n "$withval"; then with_tcllib=${withval} fi @@ -2250,7 +2068,7 @@ else ac_cv_c_tclib="-l$installedtcllibroot" else cat > conftest.$ac_ext <&6 # Check whether --with-tkinclude or --without-tkinclude was given. -if test "${with_tkinclude+set}" = set; then - withval="$with_tkinclude" +withval="$with_tkinclude" +if test -n "$withval"; then with_tkinclude=${withval} fi @@ -2366,7 +2184,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -2430,7 +2248,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < @@ -2492,8 +2310,8 @@ if test x"${no_tk}" = x ; then fi # Check whether --with-tklib or --without-tklib was given. -if test "${with_tklib+set}" = set; then - withval="$with_tklib" +withval="$with_tklib" +if test -n "$withval"; then with_tklib=${withval} fi @@ -2611,7 +2429,7 @@ else ac_cv_c_tklib="-l$installedtklibroot" else cat > conftest.$ac_ext <&6 -ac_lib_var=`echo dl | tr '.-/+' '___p'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_dl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&6 - ac_tr_lib=HAVE_LIB`echo dl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_lib=HAVE_LIB`echo dl | tr '[a-z]' '[A-Z]'` cat >> confdefs.h <&6 echo $ac_n "checking for -ldld""... $ac_c" 1>&6 -ac_lib_var=`echo dld | tr '.-/+' '___p'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_dld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&6 - ac_tr_lib=HAVE_LIB`echo dld | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_lib=HAVE_LIB`echo dld | tr 'a-z' 'A-Z'` cat >> confdefs.h <> $CONFIG_STATUS < conftest.subs <<\\CEOF +# 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%@CFLAGS@%$CFLAGS%g @@ -3368,18 +3182,6 @@ 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%@CC@%$CC%g s%@CPP@%$CPP%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g diff --git a/gdb/configure.in b/gdb/configure.in index d3285bb18ce..502c62cee77 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -289,7 +289,7 @@ i[3456]86-*-unixware) gdb_host=i386v4 ;; i[3456]86-*-sysv*) gdb_host=i386v ;; i[3456]86-*-isc*) gdb_host=i386v32 ;; i[3456]86-*-os9k) gdb_host=i386os9k ;; -i[3456]86-*-win32*) gdb_host=win32 ;; +i[3456]86-*-cygwin32) gdb_host=cygwin32 ;; m680[01]0-sun-sunos3*) gdb_host=sun2os3 ;; m680[01]0-sun-sunos4*) gdb_host=sun2os4 ;; m68030-sony-*) gdb_host=news1000 ;; @@ -338,7 +338,7 @@ ns32k-umax-*) gdb_host=umax ;; ns32k-utek-sysv*) gdb_host=merlin ;; powerpc-*-aix*) gdb_host=aix ;; - +powerpcle-*-cygwin32) gdb_host=cygwin32 ;; pn-*-*) gdb_host=pn ;; pyramid-*-*) gdb_host=pyramid ;; @@ -456,8 +456,7 @@ i[3456]86-*-mach*) gdb_target=i386mach ;; i[3456]86-*-netware*) gdb_target=i386nw configdirs="${configdirs} nlm" ;; i[3456]86-*-osf1mk*) gdb_target=i386mk ;; -i[3456]86-*-win32) gdb_target=win32 ;; - +i[3456]86-*-cygwin32) gdb_target=cygwin32 ;; i960-*-bout*) gdb_target=vxworks960 ;; i960-*-coff*) gdb_target=nindy960 ;; i960-*-elf*) gdb_target=nindy960 ;; @@ -544,6 +543,7 @@ powerpc-*-netware*) gdb_target=ppc-nw powerpc-*-aix4*) gdb_target=aix4 ;; powerpc-*-aix*) gdb_target=aix ;; +powerpcle-*-cygwin32) gdb_target=cygwin32 ;; powerpc-*-eabi*) if test x"$powerpc_sim" = x"yes"; then gdb_target=ppc-sim else diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index e295a663c9e..eee2474f673 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -475,9 +475,10 @@ child_create_inferior (exec_file, allargs, env) if (new_console) flags |= CREATE_NEW_CONSOLE; - args = alloca (strlen (exec_file) + strlen (allargs) + 2); + args = alloca (strlen (real_path) + strlen (allargs) + 2); + + strcpy (args, real_path); - strcpy (args, exec_file); strcat (args, " "); strcat (args, allargs); @@ -489,18 +490,15 @@ child_create_inferior (exec_file, allargs, env) winenv = alloca(envlen + 1); /* allocate new buffer */ /* copy env strings into new buffer */ - for (temp = winenv, i = 0; env[i] && *env[i]; i++) + for (temp = winenv, i = 0; env[i] && *env[i]; i++) { strcpy(temp, env[i]); temp += strlen(temp) + 1; } *temp = 0; /* final nil string to terminate new env */ - strcat (real_path, " "); - strcat (real_path, args); - ret = CreateProcess (0, - real_path, + args, /* command line */ NULL, /* Security */ NULL, /* thread */ TRUE, /* inherit handles */