From 4b36fd69f7b98c7e485e9142d60b69939c2b4908 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Tue, 13 Feb 2018 04:17:08 +0000
Subject: [PATCH] Export SIZEOF_LONG and SIZEOF_KERNEL_LONG_T to tests

* configure.ac (AC_SUBST): Add SIZEOF_LONG and SIZEOF_KERNEL_LONG_T.
* tests/Makefile.am (SIZEOF_LONG, SIZEOF_KERNEL_LONG_T): New variables.
(AM_TEST_LOG_FLAGS): Pass them.
* bootstrap: Substitute them.
---
 bootstrap         | 2 ++
 configure.ac      | 5 +++++
 tests/Makefile.am | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/bootstrap b/bootstrap
index 54d04090..c2372d2c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -10,7 +10,9 @@ for m in m32 mx32; do
 	rm -rf $tests
 	mkdir $tests
 	s='[[:space:]]*'
+	[ "$m" = m32 ] && k="s/^\\(SIZEOF_KERNEL_LONG_T$s=\\).*/\\1 4/;" || k=
 	sed "s/@arch@/@arch_$m@/;
+	     s/^\\(SIZEOF_LONG$s=\\).*/\\1 4/; $k
 	     s/^MPERS_NAME$s=.*/& $m/;
 	     s/^MPERS_CC_FLAGS$s=.*/& @cc_flags_$m@/;
 	     s/^ARCH_MFLAGS$s=.*/& -DMPERS_IS_\$(MPERS_NAME) \$(MPERS_CC_FLAGS)/" \
diff --git a/configure.ac b/configure.ac
index c2d1be7f..3501cf6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -755,11 +755,16 @@ AC_CACHE_CHECK([for BLKGETSIZE64], [ac_cv_have_blkgetsize64],
 	fi)
 
 AC_CHECK_SIZEOF([long])
+SIZEOF_LONG="$ac_cv_sizeof_long"
+AC_SUBST(SIZEOF_LONG)
 AC_CHECK_SIZEOF([long long])
 AC_CHECK_SIZEOF([off_t],,[#include <sys/types.h>])
 AC_CHECK_SIZEOF([kernel_long_t],,[#include "$srcdir/kernel_types.h"])
+SIZEOF_KERNEL_LONG_T="$ac_cv_sizeof_kernel_long_t"
+AC_SUBST(SIZEOF_KERNEL_LONG_T)
 AC_CHECK_SIZEOF([struct i64_i32],,[struct i64_i32 {long long i64; int i32;};])
 
+
 AC_CACHE_CHECK([for SIGRTMIN], [st_cv_SIGRTMIN],
 	       [[st_cv_SIGRTMIN="$(echo SIGRTMIN |
 			$CPP $CPPFLAGS -P -imacros asm/signal.h - |
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3c3d9746..c442a5cb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -29,6 +29,8 @@
 OS = linux
 ARCH = @arch@
 NATIVE_ARCH = @arch_native@
+SIZEOF_KERNEL_LONG_T = @SIZEOF_KERNEL_LONG_T@
+SIZEOF_LONG = @SIZEOF_LONG@
 MPERS_NAME =
 MPERS_CC_FLAGS =
 ARCH_MFLAGS =
@@ -325,6 +327,8 @@ XFAIL_TESTS = $(XFAIL_TESTS_$(MPERS_NAME)) $(XFAIL_TESTS_$(ARCH))
 
 TEST_LOG_COMPILER = env
 AM_TEST_LOG_FLAGS = STRACE_ARCH=$(ARCH) STRACE_NATIVE_ARCH=$(NATIVE_ARCH) \
+			SIZEOF_KERNEL_LONG_T=$(SIZEOF_KERNEL_LONG_T) \
+			SIZEOF_LONG=$(SIZEOF_LONG) \
 			MIPS_ABI=$(MIPS_ABI) $(srcdir)/run.sh
 
 @VALGRIND_CHECK_RULES@
-- 
2.40.0