Index: scalapack/TESTING/EIG/pcgsepreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/pcgsepreq.f	2022-02-16 13:01:18.446865045 +0100
+++ scalapack/TESTING/EIG/pcgsepreq.f	2023-10-29 10:38:49.208125730 +0100
@@ -80,7 +80,12 @@
       REAL               FIVE
       PARAMETER          ( FIVE = 5.0E+0 )
       INTEGER            CPLXSZ, INTGSZ
-      PARAMETER          ( CPLXSZ = 8, INTGSZ = 4 )
+      PARAMETER          ( CPLXSZ = 8 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            REALSZ
       PARAMETER          ( REALSZ = 4 )
       INTEGER            MAXSETSIZE
Index: scalapack/TESTING/EIG/pcsepreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/pcsepreq.f	2022-02-16 13:01:18.450865075 +0100
+++ scalapack/TESTING/EIG/pcsepreq.f	2023-10-29 10:38:24.755859390 +0100
@@ -78,7 +78,12 @@
      $                   CTXT_ = 2, M_ = 3, N_ = 4, MB_ = 5, NB_ = 6,
      $                   RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            CPLXSZ, INTGSZ
-      PARAMETER          ( CPLXSZ = 8, INTGSZ = 4 )
+      PARAMETER          ( CPLXSZ = 8 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            REALSZ
       PARAMETER          ( REALSZ = 4 )
       INTEGER            MAXSETSIZE
Index: scalapack/TESTING/EIG/pcseprreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/pcseprreq.f	2022-02-16 13:01:18.450865075 +0100
+++ scalapack/TESTING/EIG/pcseprreq.f	2023-10-29 10:37:44.263412642 +0100
@@ -72,7 +72,12 @@
       INTEGER            DLEN_
       PARAMETER          ( DLEN_ = 9 )
       INTEGER            REALSZ, INTGSZ
-      PARAMETER          ( REALSZ = 4, INTGSZ = 4 )
+      PARAMETER          ( REALSZ = 4 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            KMPXSZ
       PARAMETER          ( KMPXSZ = 8 )
       INTEGER            MAXSETSIZE
Index: scalapack/TESTING/EIG/pdgsepreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/pdgsepreq.f	2022-02-16 13:01:18.450865075 +0100
+++ scalapack/TESTING/EIG/pdgsepreq.f	2023-10-29 10:37:18.015119007 +0100
@@ -80,7 +80,12 @@
       DOUBLE PRECISION   FIVE
       PARAMETER          ( FIVE = 5.0D+0 )
       INTEGER            DBLESZ, INTGSZ
-      PARAMETER          ( DBLESZ = 8, INTGSZ = 4 )
+      PARAMETER          ( DBLESZ = 8 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            MAXSETSIZE
       PARAMETER          ( MAXSETSIZE = 50 )
 *     ..
Index: scalapack/TESTING/EIG/pdhseqrdriver.f
===================================================================
--- scalapack.orig/TESTING/EIG/pdhseqrdriver.f	2022-02-16 13:01:18.450865075 +0100
+++ scalapack/TESTING/EIG/pdhseqrdriver.f	2023-10-29 10:40:12.725017667 +0100
@@ -41,8 +41,13 @@
       INTEGER           DPALLOC, INTALLC
       INTEGER           DPSIZ, INTSZ, NOUT, IZERO
       PARAMETER         ( DPSIZ = 8, DPALLOC = 8 000 000,
-     $                    INTSZ = 4, INTALLC = 8 000 000,
+     $                    INTALLC = 8 000 000,
      $                    NOUT = 6, IZERO = 0)
+#ifdef TEST_INT64
+      PARAMETER         ( INTSZ = 8 )
+#else
+      PARAMETER         ( INTSZ = 4 )
+#endif
       DOUBLE PRECISION  ZERO, ONE, TWO
       PARAMETER         ( ZERO = 0.0D+00, ONE = 1.0D+00, TWO = 2.0D+00 )
 *
Index: scalapack/TESTING/EIG/pdsepreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/pdsepreq.f	2022-02-16 13:01:18.450865075 +0100
+++ scalapack/TESTING/EIG/pdsepreq.f	2023-10-29 10:36:37.646660785 +0100
@@ -79,7 +79,12 @@
      $                   CTXT_ = 2, M_ = 3, N_ = 4, MB_ = 5, NB_ = 6,
      $                   RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            DBLESZ, INTGSZ
-      PARAMETER          ( DBLESZ = 8, INTGSZ = 4 )
+      PARAMETER          ( DBLESZ = 8 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            MAXSETSIZE
       PARAMETER          ( MAXSETSIZE = 50 )
 *     ..
Index: scalapack/TESTING/EIG/pdseprreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/pdseprreq.f	2022-02-16 13:01:18.450865075 +0100
+++ scalapack/TESTING/EIG/pdseprreq.f	2023-10-29 10:36:12.474370741 +0100
@@ -72,7 +72,12 @@
       INTEGER            DLEN_
       PARAMETER          ( DLEN_ = 9 )
       INTEGER            DBLESZ, INTGSZ
-      PARAMETER          ( DBLESZ = 8, INTGSZ = 4 )
+      PARAMETER          ( DBLESZ = 8 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            MAXSETSIZE
       PARAMETER          ( MAXSETSIZE = 50 )
 *     ..
Index: scalapack/TESTING/EIG/psgsepreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/psgsepreq.f	2022-02-16 13:01:18.454865105 +0100
+++ scalapack/TESTING/EIG/psgsepreq.f	2023-10-29 10:35:50.018109022 +0100
@@ -80,7 +80,12 @@
       REAL               FIVE
       PARAMETER          ( FIVE = 5.0E+0 )
       INTEGER            REALSZ, INTGSZ
-      PARAMETER          ( REALSZ = 4, INTGSZ = 4 )
+      PARAMETER          ( REALSZ = 4 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            MAXSETSIZE
       PARAMETER          ( MAXSETSIZE = 50 )
 *     ..
Index: scalapack/TESTING/EIG/pshseqrdriver.f
===================================================================
--- scalapack.orig/TESTING/EIG/pshseqrdriver.f	2022-02-16 13:01:18.454865105 +0100
+++ scalapack/TESTING/EIG/pshseqrdriver.f	2023-10-29 10:42:08.958219425 +0100
@@ -41,8 +41,13 @@
       INTEGER           DPALLOC, INTALLC
       INTEGER           DPSIZ, INTSZ, NOUT, IZERO
       PARAMETER         ( DPSIZ = 8, DPALLOC = 8 000 000,
-     $                    INTSZ = 4, INTALLC = 8 000 000,
+     $                    INTALLC = 8 000 000,
      $                    NOUT = 6, IZERO = 0)
+#ifdef TEST_INT64
+      PARAMETER         ( INTSZ = 8 )
+#else
+      PARAMETER         ( INTSZ = 4 )
+#endif
       REAL              ZERO, ONE, TWO
       PARAMETER         ( ZERO = 0.0, ONE = 1.0, TWO = 2.0 )
 *
Index: scalapack/TESTING/EIG/pssepreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/pssepreq.f	2022-02-16 13:01:18.454865105 +0100
+++ scalapack/TESTING/EIG/pssepreq.f	2023-10-29 10:35:08.033611764 +0100
@@ -79,7 +79,12 @@
      $                   CTXT_ = 2, M_ = 3, N_ = 4, MB_ = 5, NB_ = 6,
      $                   RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            REALSZ, INTGSZ
-      PARAMETER          ( REALSZ = 4, INTGSZ = 4 )
+      PARAMETER          ( REALSZ = 4 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            MAXSETSIZE
       PARAMETER          ( MAXSETSIZE = 50 )
 *     ..
Index: scalapack/TESTING/EIG/psseprreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/psseprreq.f	2022-02-16 13:01:18.454865105 +0100
+++ scalapack/TESTING/EIG/psseprreq.f	2023-10-29 10:34:37.593244331 +0100
@@ -72,7 +72,12 @@
       INTEGER            DLEN_
       PARAMETER          ( DLEN_ = 9 )
       INTEGER            REALSZ, INTGSZ
-      PARAMETER          ( REALSZ = 4, INTGSZ = 4 )
+      PARAMETER          ( REALSZ = 4 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            MAXSETSIZE
       PARAMETER          ( MAXSETSIZE = 50 )
 *     ..
Index: scalapack/TESTING/EIG/pzgsepreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/pzgsepreq.f	2022-02-16 13:01:18.454865105 +0100
+++ scalapack/TESTING/EIG/pzgsepreq.f	2023-10-29 10:34:10.044906480 +0100
@@ -80,7 +80,12 @@
       DOUBLE PRECISION   FIVE
       PARAMETER          ( FIVE = 5.0D+0 )
       INTEGER            ZPLXSZ, INTGSZ
-      PARAMETER          ( ZPLXSZ = 16, INTGSZ = 4 )
+      PARAMETER          ( ZPLXSZ = 16 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            DBLESZ
       PARAMETER          ( DBLESZ = 8 )
       INTEGER            MAXSETSIZE
Index: scalapack/TESTING/EIG/pzsepreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/pzsepreq.f	2022-02-16 13:01:18.454865105 +0100
+++ scalapack/TESTING/EIG/pzsepreq.f	2023-10-29 10:33:25.308346290 +0100
@@ -78,7 +78,12 @@
      $                   CTXT_ = 2, M_ = 3, N_ = 4, MB_ = 5, NB_ = 6,
      $                   RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            ZPLXSZ, INTGSZ
-      PARAMETER          ( ZPLXSZ = 16, INTGSZ = 4 )
+      PARAMETER          ( ZPLXSZ = 16 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            DBLESZ
       PARAMETER          ( DBLESZ = 8 )
       INTEGER            MAXSETSIZE
Index: scalapack/TESTING/EIG/pzseprreq.f
===================================================================
--- scalapack.orig/TESTING/EIG/pzseprreq.f	2022-02-16 13:01:18.454865105 +0100
+++ scalapack/TESTING/EIG/pzseprreq.f	2023-10-29 10:31:53.043140631 +0100
@@ -72,7 +72,12 @@
       INTEGER            DLEN_
       PARAMETER          ( DLEN_ = 9 )
       INTEGER            DBLESZ, INTGSZ
-      PARAMETER          ( DBLESZ = 8, INTGSZ = 4 )
+      PARAMETER          ( DBLESZ = 8 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
       INTEGER            KMPXSZ
       PARAMETER          ( KMPXSZ = 16 )
       INTEGER            MAXSETSIZE
Index: scalapack/TESTING/LIN/pcinvdriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/pcinvdriver.f	2022-02-16 13:01:18.458865136 +0100
+++ scalapack/TESTING/LIN/pcinvdriver.f	2023-10-29 10:54:48.021421209 +0100
@@ -68,11 +68,16 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            CPLXSZ, INTGSZ, MEMSIZ, NTESTS, REALSZ, TOTMEM
       COMPLEX            PADVAL, ZERO
-      PARAMETER          ( CPLXSZ = 8, INTGSZ = 4, REALSZ = 4,
+      PARAMETER          ( CPLXSZ = 8, REALSZ = 4,
      $                     TOTMEM = 2000000, MEMSIZ = TOTMEM / CPLXSZ,
      $                     NTESTS = 20,
      $                     PADVAL = ( -9923.0E+0, -9923.0E+0 ),
      $                     ZERO = ( 0.0E+0, 0.0E+0 ) )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
 *     ..
 *     .. Local Scalars ..
       CHARACTER          UPLO
Index: scalapack/TESTING/LIN/pcludriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/pcludriver.f	2022-02-16 13:01:18.458865136 +0100
+++ scalapack/TESTING/LIN/pcludriver.f	2023-10-29 10:54:04.265023649 +0100
@@ -75,11 +75,16 @@
       INTEGER            CPLXSZ, INTGSZ, MEMSIZ, NTESTS, REALSZ, TOTMEM
       REAL               ZERO
       COMPLEX            PADVAL
-      PARAMETER          ( CPLXSZ = 8, INTGSZ = 4, REALSZ = 4,
+      PARAMETER          ( CPLXSZ = 8, REALSZ = 4,
      $                     TOTMEM = 4000000,
      $                     MEMSIZ = TOTMEM / CPLXSZ, NTESTS = 20,
      $                     PADVAL = ( -9923.0E+0, -9923.0E+0 ),
      $                     ZERO = 0.0E+0 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
 *     ..
 *     .. Local Scalars ..
       LOGICAL            CHECK, EST
Index: scalapack/TESTING/LIN/pcqrdriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/pcqrdriver.f	2022-02-16 13:01:18.458865136 +0100
+++ scalapack/TESTING/LIN/pcqrdriver.f	2023-10-29 10:53:30.380714900 +0100
@@ -72,10 +72,15 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            CPLXSZ, INTGSZ, MEMSIZ, NTESTS, REALSZ, TOTMEM
       COMPLEX            PADVAL
-      PARAMETER          ( CPLXSZ = 8, INTGSZ = 4, REALSZ = 4,
+      PARAMETER          ( CPLXSZ = 8, REALSZ = 4,
      $                     TOTMEM = 2000000, MEMSIZ = TOTMEM / CPLXSZ,
      $                     NTESTS = 20,
      $                     PADVAL = ( -9923.0E+0, -9923.0E+0 ) )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
 *     ..
 *     .. Local Scalars ..
       CHARACTER*2        FACT
Index: scalapack/TESTING/LIN/pdinvdriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/pdinvdriver.f	2022-02-16 13:01:18.462865166 +0100
+++ scalapack/TESTING/LIN/pdinvdriver.f	2023-10-29 10:52:59.404431917 +0100
@@ -66,9 +66,14 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            DBLESZ, INTGSZ, MEMSIZ, NTESTS, TOTMEM
       DOUBLE PRECISION   PADVAL, ZERO
-      PARAMETER          ( DBLESZ = 8, INTGSZ = 4, TOTMEM = 2000000,
+      PARAMETER          ( DBLESZ = 8, TOTMEM = 2000000,
      $                     MEMSIZ = TOTMEM / DBLESZ, NTESTS = 20,
      $                     PADVAL = -9923.0D+0, ZERO = 0.0D+0 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
 *     ..
 *     .. Local Scalars ..
       CHARACTER          UPLO
Index: scalapack/TESTING/LIN/pdlltdriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/pdlltdriver.f	2022-02-16 13:01:18.462865166 +0100
+++ scalapack/TESTING/LIN/pdlltdriver.f	2023-10-29 10:52:29.376156878 +0100
@@ -72,9 +72,14 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            DBLESZ, INTGSZ, MEMSIZ, NTESTS, TOTMEM
       DOUBLE PRECISION   PADVAL, ZERO
-      PARAMETER          ( DBLESZ = 8, INTGSZ = 4, TOTMEM = 2000000,
+      PARAMETER          ( DBLESZ = 8, TOTMEM = 2000000,
      $                     MEMSIZ = TOTMEM / DBLESZ, NTESTS = 20,
      $                     PADVAL = -9923.0D+0, ZERO = 0.0D+0 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
 *     ..
 *     .. Local Scalars ..
       LOGICAL            CHECK, EST
Index: scalapack/TESTING/LIN/pdludriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/pdludriver.f	2022-02-16 13:01:18.462865166 +0100
+++ scalapack/TESTING/LIN/pdludriver.f	2023-10-29 10:51:57.775866637 +0100
@@ -73,9 +73,14 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            DBLESZ, INTGSZ, MEMSIZ, NTESTS, TOTMEM
       DOUBLE PRECISION   PADVAL, ZERO
-      PARAMETER          ( DBLESZ = 8, INTGSZ = 4, TOTMEM = 4000000,
+      PARAMETER          ( DBLESZ = 8, TOTMEM = 4000000,
      $                     MEMSIZ = TOTMEM / DBLESZ, NTESTS = 20,
      $                     PADVAL = -9923.0D+0, ZERO = 0.0D+0 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
 *     ..
 *     .. Local Scalars ..
       LOGICAL            CHECK, EST
Index: scalapack/TESTING/LIN/pdqrdriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/pdqrdriver.f	2022-02-16 13:01:18.462865166 +0100
+++ scalapack/TESTING/LIN/pdqrdriver.f	2023-10-29 10:51:26.719580555 +0100
@@ -70,9 +70,14 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            DBLESZ, INTGSZ, MEMSIZ, NTESTS, TOTMEM
       DOUBLE PRECISION   PADVAL
-      PARAMETER          ( DBLESZ = 8, INTGSZ = 4, TOTMEM = 2000000,
+      PARAMETER          ( DBLESZ = 8, TOTMEM = 2000000,
      $                     MEMSIZ = TOTMEM / DBLESZ, NTESTS = 20,
      $                     PADVAL = -9923.0D+0 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
 *     ..
 *     .. Local Scalars ..
       CHARACTER*2        FACT
Index: scalapack/TESTING/LIN/psinvdriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/psinvdriver.f	2022-02-16 13:01:18.462865166 +0100
+++ scalapack/TESTING/LIN/psinvdriver.f	2023-10-29 10:50:32.467078628 +0100
@@ -66,7 +66,12 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            INTGSZ, MEMSIZ, NTESTS, REALSZ, TOTMEM
       REAL               PADVAL, ZERO
-      PARAMETER          ( INTGSZ = 4, REALSZ = 4, TOTMEM = 2000000,
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
+      PARAMETER          ( REALSZ = 4, TOTMEM = 2000000,
      $                     MEMSIZ = TOTMEM / REALSZ, NTESTS = 20,
      $                     PADVAL = -9923.0E+0, ZERO = 0.0E+0 )
 *     ..
Index: scalapack/TESTING/LIN/pslltdriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/pslltdriver.f	2022-02-16 13:01:18.462865166 +0100
+++ scalapack/TESTING/LIN/pslltdriver.f	2023-10-29 10:50:01.422790052 +0100
@@ -72,7 +72,12 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            INTGSZ, MEMSIZ, NTESTS, REALSZ, TOTMEM
       REAL               PADVAL, ZERO
-      PARAMETER          ( INTGSZ = 4, REALSZ = 4, TOTMEM = 2000000,
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
+      PARAMETER          ( REALSZ = 4, TOTMEM = 2000000,
      $                     MEMSIZ = TOTMEM / REALSZ, NTESTS = 20,
      $                     PADVAL = -9923.0E+0, ZERO = 0.0E+0 )
 *     ..
Index: scalapack/TESTING/LIN/psludriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/psludriver.f	2022-02-16 13:01:18.462865166 +0100
+++ scalapack/TESTING/LIN/psludriver.f	2023-10-29 10:49:26.790466881 +0100
@@ -73,7 +73,12 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            INTGSZ, MEMSIZ, NTESTS, REALSZ, TOTMEM
       REAL               PADVAL, ZERO
-      PARAMETER          ( INTGSZ = 4, REALSZ = 4, TOTMEM = 2000000,
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
+      PARAMETER          ( REALSZ = 4, TOTMEM = 2000000,
      $                     MEMSIZ = TOTMEM / REALSZ, NTESTS = 20,
      $                     PADVAL = -9923.0E+0, ZERO = 0.0E+0 )
 *     ..
Index: scalapack/TESTING/LIN/psqrdriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/psqrdriver.f	2022-02-16 13:01:18.466865196 +0100
+++ scalapack/TESTING/LIN/psqrdriver.f	2023-10-29 10:47:24.273311585 +0100
@@ -70,7 +70,12 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            INTGSZ, MEMSIZ, NTESTS, REALSZ, TOTMEM
       REAL               PADVAL
-      PARAMETER          ( INTGSZ = 4, REALSZ = 4, TOTMEM = 2000000,
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
+      PARAMETER          ( REALSZ = 4, TOTMEM = 2000000,
      $                     MEMSIZ = TOTMEM / REALSZ, NTESTS = 20,
      $                     PADVAL = -9923.0E+0 )
 *     ..
Index: scalapack/TESTING/LIN/pzinvdriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/pzinvdriver.f	2022-02-16 13:01:18.466865196 +0100
+++ scalapack/TESTING/LIN/pzinvdriver.f	2023-10-29 10:46:47.224958037 +0100
@@ -68,11 +68,16 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            DBLESZ, INTGSZ, MEMSIZ, NTESTS, TOTMEM, ZPLXSZ
       COMPLEX*16         PADVAL, ZERO
-      PARAMETER          ( DBLESZ = 8, INTGSZ = 4, TOTMEM = 2000000,
+      PARAMETER          ( DBLESZ = 8, TOTMEM = 2000000,
      $                     ZPLXSZ = 16, MEMSIZ = TOTMEM / ZPLXSZ,
      $                     NTESTS = 20,
      $                     PADVAL = ( -9923.0D+0, -9923.0D+0 ),
      $                     ZERO = ( 0.0D+0, 0.0D+0 ) )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
 *     ..
 *     .. Local Scalars ..
       CHARACTER          UPLO
Index: scalapack/TESTING/LIN/pzludriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/pzludriver.f	2022-02-16 13:01:18.466865196 +0100
+++ scalapack/TESTING/LIN/pzludriver.f	2023-10-29 10:45:46.200370843 +0100
@@ -75,11 +75,16 @@
       INTEGER            INTGSZ, DBLESZ, MEMSIZ, NTESTS, TOTMEM, ZPLXSZ
       DOUBLE PRECISION   ZERO
       COMPLEX*16         PADVAL
-      PARAMETER          ( INTGSZ = 4, DBLESZ = 8, TOTMEM = 8000000,
+      PARAMETER          ( DBLESZ = 8, TOTMEM = 8000000,
      $                     ZPLXSZ = 16, MEMSIZ = TOTMEM / ZPLXSZ,
      $                     NTESTS = 20,
      $                     PADVAL = ( -9923.0D+0, -9923.0D+0 ),
      $                     ZERO = 0.0D+0 )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
 *     ..
 *     .. Local Scalars ..
       LOGICAL            CHECK, EST
Index: scalapack/TESTING/LIN/pzqrdriver.f
===================================================================
--- scalapack.orig/TESTING/LIN/pzqrdriver.f	2022-02-16 13:01:18.466865196 +0100
+++ scalapack/TESTING/LIN/pzqrdriver.f	2023-10-29 10:45:05.339973935 +0100
@@ -72,10 +72,15 @@
      $                     RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
       INTEGER            DBLESZ, INTGSZ, MEMSIZ, NTESTS, TOTMEM, ZPLXSZ
       COMPLEX*16         PADVAL
-      PARAMETER          ( DBLESZ = 8, INTGSZ = 4, TOTMEM = 2000000,
+      PARAMETER          ( DBLESZ = 8, TOTMEM = 2000000,
      $                     ZPLXSZ = 16, MEMSIZ = TOTMEM / ZPLXSZ,
      $                     NTESTS = 20,
      $                     PADVAL = ( -9923.0D+0, -9923.0D+0 ) )
+#ifdef TEST_INT64
+      PARAMETER          ( INTGSZ = 8 )
+#else
+      PARAMETER          ( INTGSZ = 4 )
+#endif
 *     ..
 *     .. Local Scalars ..
       CHARACTER*2        FACT
