From d25dfa82a56c16f8c5eedc412ed8a6a5dfae29db Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 2 Feb 2023 16:59:06 +0000
Subject: [PATCH] ECC-1521: Drop support for 32-bit architectures

---
 CMakeLists.txt             | 10 +++++-----
 eccodes_config.h.in        |  1 -
 tests/grib_second_order.sh |  6 +-----
 tests/grib_sh_ieee64.sh    |  4 ----
 tests/include.ctest.sh.in  |  1 -
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96fde7dc8..50e625c44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,11 @@ ecbuild_debug("ECCODES_BIG_ENDIAN=${ECCODES_BIG_ENDIAN}")
 ecbuild_debug("ECCODES_LITTLE_ENDIAN=${ECCODES_LITTLE_ENDIAN}")
 ecbuild_info("Operating system=${CMAKE_SYSTEM} (${EC_OS_BITS} bits)")
 
+# Only support 64 bit operating systems
+if( NOT EC_OS_BITS EQUAL "64" )
+    ecbuild_critical( "Operating system ${CMAKE_SYSTEM} ${EC_OS_BITS} bits -- ecCodes only supports 64 bit OS's" )
+endif()
+
 ###############################################################################
 # some variables/options of this project
 
@@ -315,11 +320,6 @@ if( IEEE_LE )
     set( IEEE_BE 0 )
 endif()
 
-set( ECCODES_ON_LINUX_32BIT 0 )
-if( EC_OS_NAME MATCHES "linux" AND EC_OS_BITS EQUAL "32" )
-    set( ECCODES_ON_LINUX_32BIT 1 )
-endif()
-
 set( ECCODES_ON_WINDOWS 0 )
 if( EC_OS_NAME MATCHES "windows" )
     # Symbols need to be explicitly exported on Windows so we can link to dlls.
diff --git a/eccodes_config.h.in b/eccodes_config.h.in
index 3341c4682..d80a4554d 100644
--- a/eccodes_config.h.in
+++ b/eccodes_config.h.in
@@ -53,7 +53,6 @@
 #cmakedefine ECCODES_HAVE_REALPATH
 #cmakedefine ECCODES_HAVE_FSYNC
 #cmakedefine ECCODES_HAVE_FDATASYNC
-#cmakedefine ECCODES_ON_LINUX_32BIT
 
 #if defined(EC_HAVE_ASSERT_H) || defined(ECCODES_HAVE_ASSERT_H)
 #define   HAVE_ASSERT_H 1
diff --git a/tests/grib_second_order.sh b/tests/grib_second_order.sh
index c95d50b0b..bc41a47be 100755
--- a/tests/grib_second_order.sh
+++ b/tests/grib_second_order.sh
@@ -153,11 +153,7 @@ grib_check_key_equals $temp3 packingType,accuracy 'grid_second_order 24'
 
 # ECC-1219: packingType conversion from grid_ieee to grid_second_order
 # ---------------------------------------------------------------------
-if [ $ECCODES_ON_LINUX_32BIT -eq 1 ] ; then
-    ALLOWED_ERROR=7e-06
-else
-    ALLOWED_ERROR=3e-06
-fi
+ALLOWED_ERROR=3e-06
 if [ $ECCODES_ON_WINDOWS -eq 0 ]; then
     infile=grid_ieee.grib
     ${tools_dir}/grib_set -r -s packingType=grid_second_order $infile $temp1
diff --git a/tests/grib_sh_ieee64.sh b/tests/grib_sh_ieee64.sh
index 9fcfbb4ee..cad07bad3 100755
--- a/tests/grib_sh_ieee64.sh
+++ b/tests/grib_sh_ieee64.sh
@@ -20,9 +20,5 @@ if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
     echo "$0: This test is currently disabled on Windows"
     exit 0
 fi
-if [ $ECCODES_ON_LINUX_32BIT -eq 1 ]; then
-    echo "$0: This test is currently disabled on Linux 32 bit system"
-    exit 0
-fi
 
 $EXEC $test_dir/grib_sh_ieee64
diff --git a/tests/include.ctest.sh.in b/tests/include.ctest.sh.in
index 8da7bf747..8832e2d0b 100644
--- a/tests/include.ctest.sh.in
+++ b/tests/include.ctest.sh.in
@@ -67,7 +67,6 @@ HAVE_PNG=@HAVE_PNG@
 HAVE_AEC=@HAVE_AEC@
 HAVE_EXTRA_TESTS=@HAVE_EXTRA_TESTS@
 HAVE_MEMFS=@HAVE_MEMFS@
-ECCODES_ON_LINUX_32BIT=@ECCODES_ON_LINUX_32BIT@
 ECCODES_ON_WINDOWS=@ECCODES_ON_WINDOWS@
 
 echo "Current directory: `pwd`"