From c0276416d84a784e4675096ce3516a5e0870d2c8 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Fri, 22 Jun 2018 22:20:02 +0200
Subject: [PATCH] Move some more libc functions into core.

---
 build.lua                                           | 2 +-
 lang/cem/libcc.ansi/build.lua                       | 2 +-
 lang/cem/libcc.ansi/{ => core}/misc/getopt.c        | 0
 lang/cem/libcc.ansi/{ => core}/misc/termcap.c       | 0
 lang/cem/libcc.ansi/{misc => core/stdio}/getw.c     | 0
 lang/cem/libcc.ansi/{misc => core/stdio}/putw.c     | 0
 lang/cem/libcc.ansi/{misc => core/stdlib}/environ.c | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename lang/cem/libcc.ansi/{ => core}/misc/getopt.c (100%)
 rename lang/cem/libcc.ansi/{ => core}/misc/termcap.c (100%)
 rename lang/cem/libcc.ansi/{misc => core/stdio}/getw.c (100%)
 rename lang/cem/libcc.ansi/{misc => core/stdio}/putw.c (100%)
 rename lang/cem/libcc.ansi/{misc => core/stdlib}/environ.c (100%)

diff --git a/build.lua b/build.lua
index a1fe98e80..73844b358 100644
--- a/build.lua
+++ b/build.lua
@@ -16,7 +16,7 @@ vars.plats = {
 	"pc86",
 	"rpi",
 	"pdpv7",
-	"em22",
+--	"em22", temporarily disabled due to ass bugs
 }
 vars.plats_with_tests = {
 	"linux68k",
diff --git a/lang/cem/libcc.ansi/build.lua b/lang/cem/libcc.ansi/build.lua
index b40ec30ec..9ca2279cd 100644
--- a/lang/cem/libcc.ansi/build.lua
+++ b/lang/cem/libcc.ansi/build.lua
@@ -41,9 +41,9 @@ for _, plat in ipairs(vars.plats) do
 			"./core/math/*.c", -- hypot.c
 			"./core/math/*.e",
 			"./core/ctype/*.c",
+			"./core/misc/*.c",
 			"./errno/*.c",
 			"./malloc/*.c",
-			"./misc/environ.c", -- don't build everything here as it's all obsolete
 			"./signal/*.c",
 			"./assert/*.c",
 			"./stdio/*.c",
diff --git a/lang/cem/libcc.ansi/misc/getopt.c b/lang/cem/libcc.ansi/core/misc/getopt.c
similarity index 100%
rename from lang/cem/libcc.ansi/misc/getopt.c
rename to lang/cem/libcc.ansi/core/misc/getopt.c
diff --git a/lang/cem/libcc.ansi/misc/termcap.c b/lang/cem/libcc.ansi/core/misc/termcap.c
similarity index 100%
rename from lang/cem/libcc.ansi/misc/termcap.c
rename to lang/cem/libcc.ansi/core/misc/termcap.c
diff --git a/lang/cem/libcc.ansi/misc/getw.c b/lang/cem/libcc.ansi/core/stdio/getw.c
similarity index 100%
rename from lang/cem/libcc.ansi/misc/getw.c
rename to lang/cem/libcc.ansi/core/stdio/getw.c
diff --git a/lang/cem/libcc.ansi/misc/putw.c b/lang/cem/libcc.ansi/core/stdio/putw.c
similarity index 100%
rename from lang/cem/libcc.ansi/misc/putw.c
rename to lang/cem/libcc.ansi/core/stdio/putw.c
diff --git a/lang/cem/libcc.ansi/misc/environ.c b/lang/cem/libcc.ansi/core/stdlib/environ.c
similarity index 100%
rename from lang/cem/libcc.ansi/misc/environ.c
rename to lang/cem/libcc.ansi/core/stdlib/environ.c