>From f181860de413a26827602178f25593c9b14bc1e7 Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Sun, 22 Dec 2019 10:08:36 +0100
Subject: [PATCH 12/15] malloca: Assume that the compiler supports 'long long'.

* lib/malloca.h: Assume HAVE_LONG_LONG_INT to be 1.
* m4/malloca.m4 (gl_MALLOCA): Don't require AC_TYPE_LONG_LONG_INT.
* modules/malloca (Files): Remove longlong.m4.
* modules/relocatable-prog-wrapper (Files): Likewise.
---
 ChangeLog                        | 6 ++++++
 lib/malloca.h                    | 4 ----
 m4/malloca.m4                    | 3 +--
 modules/malloca                  | 1 -
 modules/relocatable-prog-wrapper | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fa580b5..40560e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2019-12-22  Bruno Haible  <address@hidden>
 
+	malloca: Assume that the compiler supports 'long long'.
+	* lib/malloca.h: Assume HAVE_LONG_LONG_INT to be 1.
+	* m4/malloca.m4 (gl_MALLOCA): Don't require AC_TYPE_LONG_LONG_INT.
+	* modules/malloca (Files): Remove longlong.m4.
+	* modules/relocatable-prog-wrapper (Files): Likewise.
+
 	atoll: Assume that the compiler supports 'long long'.
 	* m4/atoll.m4 (gl_FUNC_ATOLL): Don't require AC_TYPE_LONG_LONG_INT.
 	* modules/atoll (Files): Remove longlong.m4.
diff --git a/lib/malloca.h b/lib/malloca.h
index 949db55..f2448f1 100644
--- a/lib/malloca.h
+++ b/lib/malloca.h
@@ -112,14 +112,10 @@ enum
    among all elementary types.  */
   sa_alignment_long = sa_alignof (long),
   sa_alignment_double = sa_alignof (double),
-#if HAVE_LONG_LONG_INT
   sa_alignment_longlong = sa_alignof (long long),
-#endif
   sa_alignment_longdouble = sa_alignof (long double),
   sa_alignment_max = ((sa_alignment_long - 1) | (sa_alignment_double - 1)
-#if HAVE_LONG_LONG_INT
                       | (sa_alignment_longlong - 1)
-#endif
                       | (sa_alignment_longdouble - 1)
                      ) + 1
 };
diff --git a/m4/malloca.m4 b/m4/malloca.m4
index 820f40a..3033c70 100644
--- a/m4/malloca.m4
+++ b/m4/malloca.m4
@@ -1,4 +1,4 @@
-# malloca.m4 serial 1
+# malloca.m4 serial 2
 dnl Copyright (C) 2003-2004, 2006-2007, 2009-2019 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -11,5 +11,4 @@ AC_DEFUN([gl_MALLOCA],
   dnl @ALLOCA@ and @LTALLOCA@.
   dnl gl_FUNC_ALLOCA   dnl Already brought in by the module dependencies.
   AC_REQUIRE([gl_EEMALLOC])
-  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
 ])
diff --git a/modules/malloca b/modules/malloca
index 0ae3fe0..9b7a3db 100644
--- a/modules/malloca
+++ b/modules/malloca
@@ -6,7 +6,6 @@ lib/malloca.h
 lib/malloca.c
 m4/malloca.m4
 m4/eealloc.m4
-m4/longlong.m4
 
 Depends-on:
 alloca-opt
diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index db451ef..d70d63e 100644
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -29,7 +29,6 @@ m4/malloca.m4
 m4/canonicalize.m4
 m4/eealloc.m4
 m4/environ.m4
-m4/longlong.m4
 m4/readlink.m4
 m4/relocatable-lib.m4
 m4/setenv.m4
-- 
2.7.4