[lmi-commits] [lmi] master 288ce278 2/3: Remove support for 32-bit builds

[Greg Chicares]

branch: master
commit 288ce278660902172511c21898dabe54f7601d83
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Remove support for 32-bit builds
    
    These files should also be modified, by a qualified expert:
      .github/workflows/ci.yml
      INSTALL
      gui_test.ps1
    These files are obsolete
      install_mingw.make
      install_mingw32.make
      msw_cygwin.make
    and should therefore be expunged, but 'yml' or 'ps1' code uses
    two or three of them.
---
 GNUmakefile          |  2 --
 gwc/speed_test.sh    |  2 +-
 gwc/toms_vs_brent.sh |  6 +++++-
 gwc/unit_test.sh     |  2 +-
 install_msw.sh       | 11 ++++-------
 nychthemeral_test.sh |  7 +++----
 set_toolchain.sh     | 10 +++++-----
 7 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 06905f47..517b1a20 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -401,7 +401,6 @@ clobber: source_clean
 
 .PHONY: raze
 raze: source_clean
-       -$(RM) --force --recursive $(prefix)/gcc_i686-w64-mingw32/build
        -$(RM) --force --recursive $(prefix)/gcc_x86_64-w64-mingw32/build
        -$(RM) --force --recursive $(prefix)/gcc_x86_64-pc-linux-gnu/build
 
@@ -411,7 +410,6 @@ eviscerate: source_clean
        -$(RM) --force --recursive $(prefix)/local
        -$(RM) --force --recursive $(prefix)/third_party
        -$(RM) --force --recursive $(prefix)/zzz
-       -$(RM) --force --recursive $(prefix)/gcc_i686-w64-mingw32
        -$(RM) --force --recursive $(prefix)/gcc_x86_64-w64-mingw32
        -$(RM) --force --recursive $(prefix)/gcc_x86_64-pc-linux-gnu
 
diff --git a/gwc/speed_test.sh b/gwc/speed_test.sh
index 76646488..50cc828f 100755
--- a/gwc/speed_test.sh
+++ b/gwc/speed_test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-  triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32 i686-w64-mingw32"
+  triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32"
 export LMI_COMPILER=gcc
 export LMI_TRIPLET
 for LMI_TRIPLET in ${triplets} ;
diff --git a/gwc/toms_vs_brent.sh b/gwc/toms_vs_brent.sh
index d23a07d3..77f55231 100755
--- a/gwc/toms_vs_brent.sh
+++ b/gwc/toms_vs_brent.sh
@@ -6,9 +6,13 @@
 # then extract the results of the tests in the TOMS 748 paper and
 # save them to distinct files.
 
+printf 'i686-w64-mingw32 no longer supported; do' > /dev/tty
+printf '  "git switch --detach 72547df8069cfb"'   > /dev/tty
+printf 'if you require i686+x87 timings.'         > /dev/tty
+
 # 'triplets' really is used, but in a zsh-specific way
 # shellcheck disable=SC2034
-  triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32 i686-w64-mingw32"
+  triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32"
 export LMI_COMPILER=gcc
 export LMI_TRIPLET
 # shellcheck disable=SC2043
diff --git a/gwc/unit_test.sh b/gwc/unit_test.sh
index 60db840e..17095564 100755
--- a/gwc/unit_test.sh
+++ b/gwc/unit_test.sh
@@ -2,7 +2,7 @@
 
 # 'triplets' really is used, but in a zsh-specific way
 # shellcheck disable=SC2034
-  triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32 i686-w64-mingw32"
+  triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32"
 export LMI_COMPILER=gcc
 export LMI_TRIPLET
 # shellcheck disable=SC2043
diff --git a/install_msw.sh b/install_msw.sh
index e9c21b50..bdc03250 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -162,7 +162,7 @@ then
     # Install and upgrade all packages if any is missing.
     packages_list='autoconf automake bsdtar curl dos2unix doxygen
       gdb git libgtk-3-dev libtool make patch pkg-config rsync unzip wget
-      zip zsh g++-mingw-w64-i686'
+      zip zsh'
 
     # Disable shellcheck warning about the need to double quote $packages_list:
     # it can't be done here and we really want word splitting to happen here.
@@ -270,15 +270,14 @@ make "$coefficiency" --output-sync=recurse -f 
install_miscellanea.make
 # This for-loop can iterate over as many toolchains as desired.
 # Make sure the current production architecture is built last, so that
 # it's the one installed to /opt/lmi/bin/ when this script ends.
-triplets="x86_64-w64-mingw32 i686-w64-mingw32"
+triplets="x86_64-w64-mingw32"
 if [ "Cygwin" != "$platform" ] && [ "WSL" != "$platform" ]
 then
-    triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32 i686-w64-mingw32"
+    triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32"
 fi
 export LMI_COMPILER=gcc
 export LMI_TRIPLET
 # shellcheck disable=SC2043
-#for LMI_TRIPLET in i686-w64-mingw32 ;
 for LMI_TRIPLET in ${triplets} ;
 do
     # Set a minimal path for makefiles and scripts that are
@@ -290,9 +289,7 @@ do
     then
         mingw_dir=/opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/gcc_msw
         [ -d "$mingw_dir" ] && rm --force --recursive "$mingw_dir"
-        if   [ "i686-w64-mingw32"   = "$LMI_TRIPLET" ]; then
-          make "$coefficiency" --output-sync=recurse -f install_mingw32.make
-        elif [ "x86_64-w64-mingw32" = "$LMI_TRIPLET" ]; then
+        if [ "x86_64-w64-mingw32" = "$LMI_TRIPLET" ]; then
           make "$coefficiency" --output-sync=recurse -f install_mingw.make
         else
           printf 'No MinGW compiler for this triplet.\n'
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 3338c343..a60e82e7 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -256,17 +256,16 @@ esac
 # This for-loop can iterate over as many toolchains as desired.
 # Make sure the current production architecture is built last, so that
 # it's the one installed to /opt/lmi/bin/ when this script ends.
-triplets="x86_64-w64-mingw32 i686-w64-mingw32"
+triplets="x86_64-w64-mingw32"
 if [ "Cygwin" != "$platform" ] && [ "WSL" != "$platform" ]
 then
 # 'triplets' really is used, but in a zsh-specific way
 # shellcheck disable=SC2034
-  triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32 i686-w64-mingw32"
+  triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32"
 fi
 export LMI_COMPILER=gcc
 export LMI_TRIPLET
 # shellcheck disable=SC2043
-#for LMI_TRIPLET in i686-w64-mingw32 ;
 # "${=...} expansion--see zsh faq 3.1:
 #  "Why does $var where var="foo bar" not do what I expect?"
 for LMI_TRIPLET in ${=triplets} ;
@@ -321,7 +320,7 @@ printf '\n# cgi and cli tests\n\n'
 make "$coefficiency" --output-sync=recurse cgi_tests cli_tests 2>&1 \
   | tee "$log_dir"/cgi_cli | sed -e "$build_clutter" -e "$cli_cgi_clutter"
 
-if [ "i686-w64-mingw32" = "$LMI_TRIPLET" ]
+if [ "x86_64-w64-mingw32" = "$LMI_TRIPLET" ]
 then
   printf '\n# system test\n\n'
   make "$coefficiency" system_test 2>&1 \
diff --git a/set_toolchain.sh b/set_toolchain.sh
index 65fd1581..12929beb 100755
--- a/set_toolchain.sh
+++ b/set_toolchain.sh
@@ -28,7 +28,6 @@
 # be overridden at the command line, e.g.:
 #
 #   LMI_COMPILER=gcc ; LMI_TRIPLET=x86_64-pc-linux-gnu ; . 
/opt/lmi/src/lmi/set_toolchain.sh
-#   LMI_COMPILER=gcc ; LMI_TRIPLET=i686-w64-mingw32    ; . 
/opt/lmi/src/lmi/set_toolchain.sh
 #   LMI_COMPILER=gcc ; LMI_TRIPLET=x86_64-w64-mingw32  ; . 
/opt/lmi/src/lmi/set_toolchain.sh
 #
 # Implemented as a function that runs and then erases itself, so that
@@ -61,7 +60,7 @@
 #
 # Supported values:
 #   LMI_COMPILER : gcc, clang
-#   LMI_TRIPLET  : x86_64-pc-linux-gnu, i686-w64-mingw32, x86_64-w64-mingw32
+#   LMI_TRIPLET  : x86_64-pc-linux-gnu, x86_64-w64-mingw32
 # (clang not yet tested).
 #
 # Examples:
@@ -69,7 +68,7 @@
 #  LMI_TOOLCHAIN  LMI_COMPILER  ----------LMI_TRIPLET----------
 #                               cpu     -vendor -[kernel-]system
 #
-#      gcc_msw32       gcc      i686    -w64            -mingw32
+#      gcc_msw32       gcc      i686    -w64            -mingw32 [unsupported]
 #      gcc_msw64       gcc      x86_64  -w64            -mingw32
 #    clang_gnu64      clang     x86_64  -pc     -linux  -gnu
 #
@@ -82,6 +81,8 @@
 # (contradicting each other), but actually neither does--the word size
 # is determined by the "i686" field. See:
 #   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622276
+# That remains the motivation for this design even though i686 builds
+# are no longer supported.
 
 foo()
 {
@@ -155,7 +156,7 @@ esac
 export LMI_COMPILER
 export LMI_TRIPLET
        LMI_COMPILER=${LMI_COMPILER:-"gcc"}
-       LMI_TRIPLET=${LMI_TRIPLET:-"i686-w64-mingw32"}
+       LMI_TRIPLET=${LMI_TRIPLET:-"x86_64-w64-mingw32"}
 
 case "$LMI_COMPILER" in
     (gcc) ;;
@@ -167,7 +168,6 @@ esac
 
 case "$LMI_TRIPLET" in
     (x86_64-pc-linux-gnu) ;;
-    (i686-w64-mingw32)    ;;
     (x86_64-w64-mingw32)  ;;
     (*)
         printf '%s\n' "Changed nothing because host triplet '$LMI_TRIPLET' is 
untested."