TOPLEVEL PATCH: accept more x86 variants

TOPLEVEL PATCH: accept more x86 variants

[Kelley Cook]

[-- Attachment #1: Type: text/plain, Size: 522 bytes --]

Almost no OSes (except freebsd) allow i786 as a machine
variant in the toplevel configure file.

This patch allows them to accept the reasonable i[3-9]86
which is already used in some portions of the tree.

Bootstrapped GCC with --host=i786-pc-cygwin.  No
regressions.

After the corresponding obvious changes to binutils
directories which is being submitted seperately.  I also
configured, make and make -k check binutils on both
i686-pc-cygwin & i786-pc-cygwin with no regressions.

Kelley Cook <no CVSwrite privledges>

[-- Attachment #2: toplevel_x86.diff --]
[-- Type: application/octet-stream, Size: 8123 bytes --]

2003-05-14  Kelley Cook  <kelleycook@wideopenwest.com>

        * configure.in: Accept i[3-9]86 for machine type.
	* config/acinclude.m4: Likewise.
	* etc/configure.texi: Likewise.
	* configure: Regenerate.

diff -up binutils-030514.orig/configure.in binutils-030514/configure.in
--- binutils-030514.orig/configure.in	2003-05-14 01:40:34.000000000 -0400
+++ binutils-030514/configure.in	2003-05-14 12:42:29.000000000 -0400
@@ -278,17 +278,17 @@ case "${host}" in
   hppa*64*-*-*)
     noconfigdirs="$noconfigdirs byacc"
     ;;
-  i[[3456]]86-*-vsta)
+  i[[3-9]]86-*-vsta)
     noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl tix gnuserv gettext"
     ;;
-  i[[3456]]86-*-go32* | i[[3456]]86-*-msdosdjgpp*)
+  i[[3-9]]86-*-go32* | i[[3-9]]86-*-msdosdjgpp*)
     noconfigdirs="tcl tk expect dejagnu send-pr uudecode guile itcl tix gnuserv libffi"
     ;;
-  i[[3456]]86-*-mingw32*)
+  i[[3-9]]86-*-mingw32*)
     # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl tix gnuserv"
     noconfigdirs="expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool"
     ;;
-  i[[3456]]86-*-beos*)
+  i[[3-9]]86-*-beos*)
     noconfigdirs="$noconfigdirs tk itcl tix libgui gdb"
     ;;
   *-*-cygwin*)
@@ -495,13 +495,13 @@ case "${target}" in
     # No gdb or ld support yet.
     noconfigdirs="$noconfigdirs tix readline mmalloc libgui itcl gdb ld"
     ;;
-  i[[3456]]86-*-coff | i[[3456]]86-*-elf)
+  i[[3-9]]86-*-coff | i[[3-9]]86-*-elf)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  i[[34567]]86-*-freebsd*)
+  i[[3-9]]86-*-freebsd*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
-  i[[3456]]86-*-linux*)
+  i[[3-9]]86-*-linux*)
     # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's
     # not build java stuff by default.
     case "${target}" in
@@ -520,13 +520,13 @@ case "${target}" in
     # if the --with-newlib option has been given, because otherwise
     # 'target-newlib' will appear in skipdirs.
     ;;
-  i[[3456]]86-*-mingw32*)
+  i[[3-9]]86-*-mingw32*)
     target_configdirs="$target_configdirs target-mingw"
     noconfigdirs="$noconfigdirs expect target-libgloss ${libgcj}"
 
     # Can't build gdb for mingw32 if not native.
     case "${host}" in
-      i[[3456]]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
+      i[[3-9]]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
       *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix gnuserv"
          ;;
     esac
@@ -544,24 +544,24 @@ case "${target}" in
          ;;
     esac
     ;;    
-  i[[3456]]86-*-pe)
+  i[[3-9]]86-*-pe)
     noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
     ;;
-  i[[3456]]86-*-sco3.2v5*)
+  i[[3-9]]86-*-sco3.2v5*)
     # The linker does not yet know about weak symbols in COFF,
     # and is not configured to handle mixed ELF and COFF.
     noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
     ;;
-  i[[3456]]86-*-sco*)
+  i[[3-9]]86-*-sco*)
     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
     ;;
-  i[[3456]]86-*-solaris2*)
+  i[[3-9]]86-*-solaris2*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
-  i[[3456]]86-*-sysv4*)
+  i[[3-9]]86-*-sysv4*)
     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
     ;;
-  i[[3456]]86-*-beos*)
+  i[[3-9]]86-*-beos*)
     noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
     ;;
   m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
@@ -650,9 +650,9 @@ case "${target}" in
     ;;
   sh-*-*)
     case "${host}" in
-      i[[3456]]86-*-vsta) ;; # don't add gprof back in
-      i[[3456]]86-*-go32*) ;; # don't add gprof back in
-      i[[3456]]86-*-msdosdjgpp*) ;; # don't add gprof back in
+      i[[3-9]]86-*-vsta) ;; # don't add gprof back in
+      i[[3-9]]86-*-go32*) ;; # don't add gprof back in
+      i[[3-9]]86-*-msdosdjgpp*) ;; # don't add gprof back in
       *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
     esac
     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
@@ -1047,19 +1047,19 @@ case "${host}" in
   i370-ibm-opened*)
     tentative_cc="c89"
     ;;
-  i[[3456]]86-*-sysv5*)
+  i[[3-9]]86-*-sysv5*)
     host_makefile_frag="config/mh-sysv5"
     ;;
-  i[[3456]]86-*-dgux*)
+  i[[3-9]]86-*-dgux*)
     tentative_cc="gcc -Wall -ansi -D__using_DGUX"
     host_makefile_frag="config/mh-dgux386"
     ;;
-  i[[3456]]86-ncr-sysv4.3*)
+  i[[3-9]]86-ncr-sysv4.3*)
     # The MetaWare compiler will generate a copyright message unless you
     # turn it off by adding the -Hnocopyr flag.
     tentative_cc="cc -Hnocopyr"
     ;;
-  i[[3456]]86-ncr-sysv4*)
+  i[[3-9]]86-ncr-sysv4*)
     # for an NCR 3000 (i486/SVR4) system.
     # The NCR 3000 ships with a MetaWare compiler installed as /bin/cc.
     # This compiler not only emits obnoxious copyright messages every time
@@ -1068,21 +1068,21 @@ case "${host}" in
     tentative_cc="/usr/ccs/ATT/cc"
     host_makefile_frag="config/mh-ncr3000"
     ;;
-  i[[3456]]86-*-sco3.2v5*)
+  i[[3-9]]86-*-sco3.2v5*)
     ;;
-  i[[3456]]86-*-sco*)
+  i[[3-9]]86-*-sco*)
     # The native C compiler botches some simple uses of const.  Unfortunately,
     # it doesn't defined anything like "__sco__" for us to test for in ansidecl.h.
     tentative_cc="cc -Dconst="
     host_makefile_frag="config/mh-sco"
     ;;
-  i[[3456]]86-*-udk*)
+  i[[3-9]]86-*-udk*)
     host_makefile_frag="config/mh-sysv5"
     ;;
-  i[[3456]]86-*-solaris2*)
+  i[[3-9]]86-*-solaris2*)
     host_makefile_frag="config/mh-sysv4"
     ;;
-  i[[3456]]86-*-msdosdjgpp*)
+  i[[3-9]]86-*-msdosdjgpp*)
     host_makefile_frag="config/mh-djgpp"
     ;;
   *-cygwin*)
@@ -1132,7 +1132,7 @@ extra_nmflags_for_target=
 extra_ranlibflags_for_target=
 target_makefile_frag=/dev/null
 case "${target}" in
-  i[[3456]]86-*-netware*)
+  i[[3-9]]86-*-netware*)
     target_makefile_frag="config/mt-netware"
     ;;
   powerpc-*-netware*)
@@ -1854,7 +1854,7 @@ case " $target_configdirs " in
    fi
 
    case "${target}-${is_cross_compiler}" in
-   i[[3456]]86-*-linux*-no)
+   i[[3-9]]86-*-linux*-no)
       # Here host == target, so we don't need to build gcc,
       # so we don't want to discard standard headers.
       FLAGS_FOR_TARGET=`echo " $FLAGS_FOR_TARGET " | sed -e 's/ -nostdinc / /'`
diff -up binutils-030514.orig/config/acinclude.m4 binutils-030514/config/acinclude.m4
--- binutils-030514.orig/config/acinclude.m4	2002-05-22 05:21:32.000000000 -0400
+++ binutils-030514/config/acinclude.m4	2003-05-14 12:42:29.000000000 -0400
@@ -788,7 +788,7 @@ dnl Yes, this is ugly, and only used for
 dnl is just to keep configure from stopping here.
 case "${host}" in
 changequote(,)
-   i[3456]86-*-*) ac_cv_c_little_endian=yes ;;
+   i[3-9]86-*-*) ac_cv_c_little_endian=yes ;;
    sparc*-*-*)    ac_cv_c_little_endian=no ;;
 changequote([,])
   *)    AC_MSG_WARN(Can't cross compile this test) ;;
diff -up binutils-030514.orig/etc/configure.texi binutils-030514/etc/configure.texi
--- binutils-030514.orig/etc/configure.texi	1999-05-03 03:29:06.000000000 -0400
+++ binutils-030514/etc/configure.texi	2003-05-14 12:42:29.000000000 -0400
@@ -1451,7 +1451,7 @@ canonical configuration name (which will
 
 @smallexample
 case "$@{host@}" in
-i[3456]86-*-linux-gnu*) do something ;;
+i[3-9]86-*-linux-gnu*) do something ;;
 sparc*-sun-solaris2.[56789]*) do something ;;
 sparc*-sun-solaris*) do something ;;
 mips*-*-elf*) do something ;;
@@ -1465,7 +1465,7 @@ field, in order to match the version num
 In most cases you must be careful to match a range of processor types.
 For most processor families, a trailing @samp{*} suffices, as in
 @samp{mips*} above.  For the i386 family, something along the lines of
-@samp{i[3456]86} suffices at present.  For the m68k family, you will
+@samp{i[3-9]86} suffices at present.  For the m68k family, you will
 need something like @samp{m68*}.  Of course, if you do not need to match
 on the processor, it is simpler to just replace the entire field by a
 @samp{*}, as in @samp{*-*-irix*}.

Re: TOPLEVEL PATCH: accept more x86 variants

[DJ Delorie]

> ---=_webmail-1.dnv.wideopenwest.com3ec295fd
> Content-Type: application/octet-stream; name="toplevel_x86.diff"
> Content-Transfer-Encoding: base64
> Content-Disposition: attachment; filename="toplevel_x86.diff"

Note that, in general, it's preferable to explicitly list each
character, in case locales or encodings rearrange the order of
characters (like EBCDIC does).  While it doesn't matter in this case,
it's probably better to avoid ranges so that people don't get the idea
that they're OK for all cases.

Your patch is acceptable as-is, but if you could take the time to
expand the ranges, that would be a little better for long-term
portability.

Re: TOPLEVEL PATCH: accept more x86 variants

[Kelley Cook]

DJ Delorie wrote:
 > Note that, in general, it's preferable to explicitly list each
 > character, in case locales or encodings rearrange the order of
 > characters (like EBCDIC does).  While it doesn't matter in this case,
 > it's probably better to avoid ranges so that people don't get the idea
 > that they're OK for all cases.
 >
 > Your patch is acceptable as-is, but if you could take the time to
 > expand the ranges, that would be a little better for long-term
 > portability.

Although it seems ludicrous that somebody would design a character
set where 0-9 were not consecutive, I also wouldn't have thought
that somebody would have made one where "I" isn't next to "J",
so ...

2003-05-15  Kelley Cook  <kelleycook@wideopenwest.com>

	* configure.in: Accept i[3456789]86 for machine type.
	* config/acinclude.m4: Likewise.
	* etc/configure.texi: Likewise.
	* configure: Regenerate.

diff -up binutils-030514.orig/configure.in binutils-030514/./configure.in
--- binutils-030514.orig/configure.in	2003-05-14 01:40:34.000000000 -0400
+++ binutils-030514/configure.in	2003-05-15 09:25:41.000000000 -0400
@@ -278,17 +278,17 @@ case "${host}" in
    hppa*64*-*-*)
      noconfigdirs="$noconfigdirs byacc"
      ;;
-  i[[3456]]86-*-vsta)
+  i[[3456789]]86-*-vsta)
      noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl tix gnuserv gettext"
      ;;
-  i[[3456]]86-*-go32* | i[[3456]]86-*-msdosdjgpp*)
+  i[[3456789]]86-*-go32* | i[[3456789]]86-*-msdosdjgpp*)
      noconfigdirs="tcl tk expect dejagnu send-pr uudecode guile itcl tix gnuserv libffi"
      ;;
-  i[[3456]]86-*-mingw32*)
+  i[[3456789]]86-*-mingw32*)
      # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl tix gnuserv"
      noconfigdirs="expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool"
      ;;
-  i[[3456]]86-*-beos*)
+  i[[3456789]]86-*-beos*)
      noconfigdirs="$noconfigdirs tk itcl tix libgui gdb"
      ;;
    *-*-cygwin*)
@@ -495,13 +495,13 @@ case "${target}" in
      # No gdb or ld support yet.
      noconfigdirs="$noconfigdirs tix readline mmalloc libgui itcl gdb ld"
      ;;
-  i[[3456]]86-*-coff | i[[3456]]86-*-elf)
+  i[[3456789]]86-*-coff | i[[3456789]]86-*-elf)
      noconfigdirs="$noconfigdirs ${libgcj}"
      ;;
-  i[[34567]]86-*-freebsd*)
+  i[[3456789]]86-*-freebsd*)
      noconfigdirs="$noconfigdirs target-newlib target-libgloss"
      ;;
-  i[[3456]]86-*-linux*)
+  i[[3456789]]86-*-linux*)
      # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's
      # not build java stuff by default.
      case "${target}" in
@@ -520,13 +520,13 @@ case "${target}" in
      # if the --with-newlib option has been given, because otherwise
      # 'target-newlib' will appear in skipdirs.
      ;;
-  i[[3456]]86-*-mingw32*)
+  i[[3456789]]86-*-mingw32*)
      target_configdirs="$target_configdirs target-mingw"
      noconfigdirs="$noconfigdirs expect target-libgloss ${libgcj}"

      # Can't build gdb for mingw32 if not native.
      case "${host}" in
-      i[[3456]]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
+      i[[3456789]]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
        *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix gnuserv"
           ;;
      esac
@@ -544,24 +544,24 @@ case "${target}" in
           ;;
      esac
      ;;
-  i[[3456]]86-*-pe)
+  i[[3456789]]86-*-pe)
      noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
      ;;
-  i[[3456]]86-*-sco3.2v5*)
+  i[[3456789]]86-*-sco3.2v5*)
      # The linker does not yet know about weak symbols in COFF,
      # and is not configured to handle mixed ELF and COFF.
      noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
      ;;
-  i[[3456]]86-*-sco*)
+  i[[3456789]]86-*-sco*)
      noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
      ;;
-  i[[3456]]86-*-solaris2*)
+  i[[3456789]]86-*-solaris2*)
      noconfigdirs="$noconfigdirs target-libgloss"
      ;;
-  i[[3456]]86-*-sysv4*)
+  i[[3456789]]86-*-sysv4*)
      noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
-  i[[3456]]86-*-beos*)
+  i[[3456789]]86-*-beos*)
      noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
      ;;
    m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
@@ -650,9 +650,9 @@ case "${target}" in
      ;;
    sh-*-*)
      case "${host}" in
-      i[[3456]]86-*-vsta) ;; # don't add gprof back in
-      i[[3456]]86-*-go32*) ;; # don't add gprof back in
-      i[[3456]]86-*-msdosdjgpp*) ;; # don't add gprof back in
+      i[[3456789]]86-*-vsta) ;; # don't add gprof back in
+      i[[3456789]]86-*-go32*) ;; # don't add gprof back in
+      i[[3456789]]86-*-msdosdjgpp*) ;; # don't add gprof back in
        *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
      esac
      noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
@@ -1047,19 +1047,19 @@ case "${host}" in
    i370-ibm-opened*)
      tentative_cc="c89"
      ;;
-  i[[3456]]86-*-sysv5*)
+  i[[3456789]]86-*-sysv5*)
      host_makefile_frag="config/mh-sysv5"
      ;;
-  i[[3456]]86-*-dgux*)
+  i[[3456789]]86-*-dgux*)
      tentative_cc="gcc -Wall -ansi -D__using_DGUX"
      host_makefile_frag="config/mh-dgux386"
      ;;
-  i[[3456]]86-ncr-sysv4.3*)
+  i[[3456789]]86-ncr-sysv4.3*)
      # The MetaWare compiler will generate a copyright message unless you
      # turn it off by adding the -Hnocopyr flag.
      tentative_cc="cc -Hnocopyr"
      ;;
-  i[[3456]]86-ncr-sysv4*)
+  i[[3456789]]86-ncr-sysv4*)
      # for an NCR 3000 (i486/SVR4) system.
      # The NCR 3000 ships with a MetaWare compiler installed as /bin/cc.
      # This compiler not only emits obnoxious copyright messages every time
@@ -1068,21 +1068,21 @@ case "${host}" in
      tentative_cc="/usr/ccs/ATT/cc"
      host_makefile_frag="config/mh-ncr3000"
      ;;
-  i[[3456]]86-*-sco3.2v5*)
+  i[[3456789]]86-*-sco3.2v5*)
      ;;
-  i[[3456]]86-*-sco*)
+  i[[3456789]]86-*-sco*)
      # The native C compiler botches some simple uses of const.  Unfortunately,
      # it doesn't defined anything like "__sco__" for us to test for in ansidecl.h.
      tentative_cc="cc -Dconst="
      host_makefile_frag="config/mh-sco"
      ;;
-  i[[3456]]86-*-udk*)
+  i[[3456789]]86-*-udk*)
      host_makefile_frag="config/mh-sysv5"
      ;;
-  i[[3456]]86-*-solaris2*)
+  i[[3456789]]86-*-solaris2*)
      host_makefile_frag="config/mh-sysv4"
      ;;
-  i[[3456]]86-*-msdosdjgpp*)
+  i[[3456789]]86-*-msdosdjgpp*)
      host_makefile_frag="config/mh-djgpp"
      ;;
    *-cygwin*)
@@ -1132,7 +1132,7 @@ extra_nmflags_for_target=
  extra_ranlibflags_for_target=
  target_makefile_frag=/dev/null
  case "${target}" in
-  i[[3456]]86-*-netware*)
+  i[[3456789]]86-*-netware*)
      target_makefile_frag="config/mt-netware"
      ;;
    powerpc-*-netware*)
@@ -1854,7 +1854,7 @@ case " $target_configdirs " in
     fi

     case "${target}-${is_cross_compiler}" in
-   i[[3456]]86-*-linux*-no)
+   i[[3456789]]86-*-linux*-no)
        # Here host == target, so we don't need to build gcc,
        # so we don't want to discard standard headers.
        FLAGS_FOR_TARGET=`echo " $FLAGS_FOR_TARGET " | sed -e 's/ -nostdinc / /'`
diff -up binutils-030514.orig/config/acinclude.m4 binutils-030514/config/acinclude.m4
--- binutils-030514.orig/config/acinclude.m4	2002-05-22 05:21:32.000000000 -0400
+++ binutils-030514/config/acinclude.m4	2003-05-15 09:26:15.000000000 -0400
@@ -788,7 +788,7 @@ dnl Yes, this is ugly, and only used for
  dnl is just to keep configure from stopping here.
  case "${host}" in
  changequote(,)
-   i[3456]86-*-*) ac_cv_c_little_endian=yes ;;
+   i[3456789]86-*-*) ac_cv_c_little_endian=yes ;;
     sparc*-*-*)    ac_cv_c_little_endian=no ;;
  changequote([,])
    *)    AC_MSG_WARN(Can't cross compile this test) ;;
diff -up binutils-030514.orig/etc/configure.texi binutils-030514/etc/configure.texi
--- binutils-030514.orig/etc/configure.texi	1999-05-03 03:29:06.000000000 -0400
+++ binutils-030514/etc/configure.texi	2003-05-15 09:26:55.000000000 -0400
@@ -1451,7 +1451,7 @@ canonical configuration name (which will

  @smallexample
  case "$@{host@}" in
-i[3456]86-*-linux-gnu*) do something ;;
+i[3456789]86-*-linux-gnu*) do something ;;
  sparc*-sun-solaris2.[56789]*) do something ;;
  sparc*-sun-solaris*) do something ;;
  mips*-*-elf*) do something ;;
@@ -1465,7 +1465,7 @@ field, in order to match the version num
  In most cases you must be careful to match a range of processor types.
  For most processor families, a trailing @samp{*} suffices, as in
  @samp{mips*} above.  For the i386 family, something along the lines of
-@samp{i[3456]86} suffices at present.  For the m68k family, you will
+@samp{i[3456789]86} suffices at present.  For the m68k family, you will
  need something like @samp{m68*}.  Of course, if you do not need to match
  on the processor, it is simpler to just replace the entire field by a
  @samp{*}, as in @samp{*-*-irix*}.

Re: TOPLEVEL PATCH: accept more x86 variants

[DJ Delorie]

> Although it seems ludicrous that somebody would design a character
> set where 0-9 were not consecutive, I also wouldn't have thought
> that somebody would have made one where "I" isn't next to "J",
> so ...

Yeah, stuff like that never fails to surprise me.

> 2003-05-15  Kelley Cook  <kelleycook@wideopenwest.com>
> 
> 	* configure.in: Accept i[3456789]86 for machine type.
> 	* config/acinclude.m4: Likewise.
> 	* etc/configure.texi: Likewise.
> 	* configure: Regenerate.

This is fine.  Please apply to both gcc and src repositories if you
can, or email me privately if you can't.