From 5ae143b2702a2ebdd2c8ea49b6935a3e4bc34c53 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii
Date: Fri, 12 Nov 2004 16:10:03 +0000
Subject: Don't require djecho.exe for the v1.x build.

---
 config.bat | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config.bat')

diff --git a/config.bat b/config.bat
index c3e36975dec..c7be653b873 100644
--- a/config.bat
+++ b/config.bat
@@ -121,7 +121,9 @@ Goto End
 set djgpp_ver=1
 If ErrorLevel 20 set djgpp_ver=2
 rm -f junk.c junk junk.exe
-rem DJECHO is used by the top-level Makefile
+rem The v1.x build does not need djecho
+if "%DJGPP_VER%" == "1" Goto djechoOk
+rem DJECHO is used by the top-level Makefile in the v2.x build
 Echo Checking whether 'djecho' is available...
 redir -o Nul -eo djecho -o junk.$$$ foo
 If Exist junk.$$$ Goto djechoOk
-- 
cgit v1.2.1


From a30fb04fbc84ffc78dbba967f4e0478cdf69236a Mon Sep 17 00:00:00 2001
From: Eli Zaretskii
Date: Fri, 12 Nov 2004 18:18:43 +0000
Subject: Add a test for DECL_ALIGN support, and add a trivial definition to
 src/config.h if 8-byte alignment is not supported.

---
 config.bat | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'config.bat')

diff --git a/config.bat b/config.bat
index c7be653b873..64775244391 100644
--- a/config.bat
+++ b/config.bat
@@ -158,6 +158,22 @@ goto src42
 :src41
 sed -f ../msdos/sed2v2.inp <config.tmp >config.h2
 :src42
+Rem See if DECL_ALIGN can be supported with this GCC
+rm -f junk.c junk.o junk junk.exe
+echo struct { int i; char *p; } __attribute__((__aligned__(8))) foo;  >junk.c
+rem Two percent signs because it is a special character for COMMAND.COM
+echo int main(void) { return (unsigned long)&foo %% 8; }             >>junk.c
+gcc -o junk junk.c
+if not exist junk.exe coff2exe junk
+junk
+If Not ErrorLevel 1 Goto alignOk
+Echo WARNING: Your GCC does not support 8-byte aligned variables.
+Echo WARNING: Therefore Emacs cannot support buffers larger than 128MB.
+rem The following line disables DECL_ALIGN which in turn disables USE_LSB_TAG
+rem For details see lisp.h where it defines USE_LSB_TAG
+echo #define DECL_ALIGN(type, var) type var >>config.h2
+:alignOk
+rm -f junk.c junk junk.exe
 update config.h2 config.h >nul
 rm -f config.tmp config.h2
 
-- 
cgit v1.2.1