# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1558865274 -7200
# Node ID 642355b9b9fdd159669da212b3fea5dda21973e2
# Parent  a1ba148cfa9a20df5db1ba20da573bf3c21fb583
linld: more ram for zImage (again)

diff -r a1ba148cfa9a -r 642355b9b9fd linld/receipt
--- a/linld/receipt	Sun May 26 10:44:33 2019 +0100
+++ b/linld/receipt	Sun May 26 12:07:54 2019 +0200
@@ -39,6 +39,8 @@
 EOT
 	SDL_VIDEODRIVER=dummy dosbox MAKE.BAT -exit -c "mount D $src" \
 		2>&1 | grep -v 'ALSA lib'
+	grep '^Fatal[ :]' */LNK.LOG */CPP.LOG && return 1
+	grep '*Fatal*' */*.LST && return 1
 	grep '^Error[ :]' */LNK.LOG */CPP.LOG && return 1
 	grep '*Error*' */*.LST && return 1
 	grep '^Warning[ :]' */LNK.LOG */CPP.LOG
@@ -47,7 +49,8 @@
 	cp TAZBOOT/TAZBOOT.COM tazboot.com
 	objdump -D -b binary -mi386 -Maddr16,data16 --adjust-vma=0x100 \
 		linld.com > linld.lst
-	[ $(stat -c %s linld.com) -gt 4096 ] && linld=linld.com || linld=
+	linld=linld.com
+	[ $(stat -c %s $linld) -le 4096 ] && ls -l $linld && linld=
 	for f in $linld tazboot.com ; do
 		cp $f tmp.com
 		for i in $(seq 1 9); do
diff -r a1ba148cfa9a -r 642355b9b9fd linld/stuff/src/LOAD.CPP
--- a/linld/stuff/src/LOAD.CPP	Sun May 26 10:44:33 2019 +0100
+++ b/linld/stuff/src/LOAD.CPP	Sun May 26 12:07:54 2019 +0200
@@ -152,7 +152,7 @@
         if(* (int *) &first1k->pad10[0x3F-0x24] == 0x3AE8) {
             _csip+=0xFFE00042;
         }
-        else
+        //else
 #endif
         kernelparams->setup_sects=4;
     }
@@ -185,7 +185,8 @@
             // Hook on int15 to work around fn 88 DOS breakage
             hook_int15_88();
         }
-        version_string = (char *) first1k+kernelparams->kernel_version+0x200;
+        if (kernelparams->kernel_version)
+            version_string = (char *) first1k+kernelparams->kernel_version+0x200;
         kernelparams->type_of_loader = 0xff; // kernel do not know us (yet :-)
         if(kernelparams->version >= 0x201) {
             // * offset limit of the setup heap
@@ -242,7 +243,7 @@
 // Read initrd if needed
 void load_initrd() {
     struct image_himem *m = &initrd;
-    if (!initrd_name && !m->fd) return;
+    if (((int)initrd_name | m->fd) == 0) return; // !initrd_name && !m->fd
 #if defined(__BORLANDC__) && defined(NO386)
 #pragma option -3
     asm{