>From 4ba07b7db7567c8d3ebcbfdea547c6403e87ce6d Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Sun, 17 Nov 2019 23:56:47 +0100
Subject: [PATCH 1/4] havelib: Remove redundant code.

* m4/lib-prefix.m4 (AC_LIB_PREPARE_MULTILIB): Remove Solaris specific
test for 64-bit host. Use gl_HOST_CPU_C_ABI_32BIT result instead.
---
 ChangeLog        |  6 ++++++
 m4/lib-prefix.m4 | 20 ++------------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 053fce4..549152c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2019-11-17  Bruno Haible  <address@hidden>
 
+	havelib: Remove redundant code.
+	* m4/lib-prefix.m4 (AC_LIB_PREPARE_MULTILIB): Remove Solaris specific
+	test for 64-bit host. Use gl_HOST_CPU_C_ABI_32BIT result instead.
+
+2019-11-17  Bruno Haible  <address@hidden>
+
 	havelib: Fix a bug in dependency processing.
 	* m4/lib-link.m4 (AC_LIB_LINKFLAGS_BODY): During dependency processing
 	of .la files, don't overwrite the value of additional_libdir for the
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 8adb17b..dbe4e85 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,4 +1,4 @@
-# lib-prefix.m4 serial 14
+# lib-prefix.m4 serial 15
 dnl Copyright (C) 2001-2005, 2008-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -169,22 +169,6 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT])
 
-  case "$host_os" in
-    solaris*)
-      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
-        [AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#ifdef _LP64
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [gl_cv_solaris_64bit=yes],
-           [gl_cv_solaris_64bit=no])
-        ]);;
-  esac
-
   dnl Allow the user to override the result by setting acl_cv_libdirstems.
   AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
     [acl_cv_libdirstems],
@@ -197,7 +181,7 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
          dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
          dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
          dnl symlink is missing, so we set acl_libdirstem2 too.
-         if test $gl_cv_solaris_64bit = yes; then
+         if test $HOST_CPU_C_ABI_32BIT = no; then
            acl_libdirstem=lib/64
            case "$host_cpu" in
              sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-- 
2.7.4