From a07a3bd48aa96fca79c2cc1ce44da29386bb1f85 Mon Sep 17 00:00:00 2001
From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
Date: Tue, 3 May 2022 22:51:21 +0200
Subject: [PATCH] simple.make: Resurrect.

* simple.make (M2_PLANET_FLAGS): Add --bootstrap-mode.
(M2_SOURCES): Use lib/mes/mini-write.c instead of lib/mes/write.c
---
 simple.make | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/simple.make b/simple.make
index 2efb27bb..4bb59752 100644
--- a/simple.make
+++ b/simple.make
@@ -33,7 +33,7 @@ M2_PLANET_FUBAR = i386
 
 #M2_PLANET_ARCH = amd64
 #M2_PLANET_FUBAR = amd64
-M2_PLANET_FLAGS = --debug --architecture $(M2_PLANET_ARCH)
+M2_PLANET_FLAGS = --bootstrap-mode --debug --architecture $(M2_PLANET_ARCH)
 
 CFLAGS:=					\
   $(CFLAGS)					\
@@ -80,8 +80,9 @@ M2_SOURCES =					\
  lib/m2/exit.c					\
  lib/mes/write.c				\
  lib/linux/x86-mes-m2/syscall.c			\
+ lib/stub/__raise.c				\
  lib/linux/brk.c				\
- lib/stdlib/malloc.c				\
+ lib/m2/malloc.c				\
  lib/string/memset.c				\
 						\
  lib/m2/read.c					\
@@ -216,12 +217,12 @@ m2/mes-m2.hex2: m2/mes-m2.blood-elf.M1
 	    -o $@
 
 bin/mes-m2: m2/mes-m2.hex2
-	hex2					\
-	    --architecture $(M2_PLANET_ARCH)	\
-	    --little-endian			\
-	    --base-address 0x1000000		\
-	    -f lib/x86-mes/elf32-header.hex2	\
-	    -f m2/mes-m2.hex2			\
+	hex2						\
+	    --architecture $(M2_PLANET_ARCH)		\
+	    --little-endian				\
+	    --base-address 0x1000000			\
+	    -f lib/linux/x86-mes/elf32-header.hex2	\
+	    -f m2/mes-m2.hex2				\
 	    -o $@
 	cp -f $@ bin/mes