From 98b27dd50557e0bfc7a90c0dfd92ddf12c7c43f1 Mon Sep 17 00:00:00 2001 From: George Koehler Date: Sat, 11 Nov 2017 19:35:48 -0500 Subject: [PATCH] Remove old "assert.h" in mach/proto/ncg *Important:* You must "make clean" after checking out this commit, because the build had copied the old "assert.h" to several places in obj/. If you don't "make clean", then the compiler finds the old "assert.h" before libc , and the build fails because this commit removes badassertion() in subr.c. After "make clean", the compiler finds libc and the build succeeds. --- mach/proto/ncg/assert.h | 12 ------------ mach/proto/ncg/build.lua | 10 +++++++++- mach/proto/ncg/codegen.c | 2 +- mach/proto/ncg/compute.c | 2 +- mach/proto/ncg/equiv.c | 2 +- mach/proto/ncg/fillem.c | 2 +- mach/proto/ncg/gencode.c | 2 +- mach/proto/ncg/move.c | 2 +- mach/proto/ncg/nextem.c | 2 +- mach/proto/ncg/reg.c | 2 +- mach/proto/ncg/regvar.c | 2 +- mach/proto/ncg/salloc.c | 2 +- mach/proto/ncg/state.c | 2 +- mach/proto/ncg/subr.c | 11 ++--------- 14 files changed, 22 insertions(+), 33 deletions(-) delete mode 100644 mach/proto/ncg/assert.h diff --git a/mach/proto/ncg/assert.h b/mach/proto/ncg/assert.h deleted file mode 100644 index 2fda064d1..000000000 --- a/mach/proto/ncg/assert.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands. - * See the copyright notice in the ACK home directory, in the file "Copyright". - */ -/* $Id$ */ - -#undef NDEBUG -#ifndef NDEBUG -#define assert(x) if(!(x)) badassertion("x",__FILE__,__LINE__) -#else -#define assert(x) /* nothing */ -#endif diff --git a/mach/proto/ncg/build.lua b/mach/proto/ncg/build.lua index e2345ca0c..1210382fc 100644 --- a/mach/proto/ncg/build.lua +++ b/mach/proto/ncg/build.lua @@ -11,7 +11,15 @@ definerule("build_ncg", name = e.name.."/headers", srcs = {}, hdrs = { - "mach/proto/ncg/*.h", + "mach/proto/ncg/data.h", + "mach/proto/ncg/equiv.h", + "mach/proto/ncg/glosym.h", + "mach/proto/ncg/label.h", + "mach/proto/ncg/param.h", + "mach/proto/ncg/regvar.h", + "mach/proto/ncg/result.h", + "mach/proto/ncg/state.h", + "mach/proto/ncg/types.h", "mach/"..e.arch.."/ncg/mach.c", "mach/"..e.arch.."/ncg/*.h", } diff --git a/mach/proto/ncg/codegen.c b/mach/proto/ncg/codegen.c index 95a3c012d..c003d8a5d 100644 --- a/mach/proto/ncg/codegen.c +++ b/mach/proto/ncg/codegen.c @@ -2,9 +2,9 @@ static char rcsid[] = "$Id$"; #endif +#include #include #include -#include "assert.h" #include "param.h" #include "tables.h" #include "types.h" diff --git a/mach/proto/ncg/compute.c b/mach/proto/ncg/compute.c index 41e159f04..6adc21941 100644 --- a/mach/proto/ncg/compute.c +++ b/mach/proto/ncg/compute.c @@ -2,10 +2,10 @@ static char rcsid[] = "$Id$"; #endif +#include #include #include #include -#include "assert.h" #include "param.h" #include "tables.h" #include "types.h" diff --git a/mach/proto/ncg/equiv.c b/mach/proto/ncg/equiv.c index ace068882..9a18b08bb 100644 --- a/mach/proto/ncg/equiv.c +++ b/mach/proto/ncg/equiv.c @@ -2,9 +2,9 @@ static char rcsid[] = "$Id$"; #endif +#include #include #include -#include "assert.h" #include "equiv.h" #include "param.h" #include "tables.h" diff --git a/mach/proto/ncg/fillem.c b/mach/proto/ncg/fillem.c index e2ad5028c..f7f5ffcc9 100644 --- a/mach/proto/ncg/fillem.c +++ b/mach/proto/ncg/fillem.c @@ -2,10 +2,10 @@ static char rcsid2[] = "$Id$"; #endif +#include #include #include #include -#include "assert.h" #include #include #include diff --git a/mach/proto/ncg/gencode.c b/mach/proto/ncg/gencode.c index 68676868e..9cc10778f 100644 --- a/mach/proto/ncg/gencode.c +++ b/mach/proto/ncg/gencode.c @@ -2,7 +2,7 @@ static char rcsid[] = "$Id$"; #endif -#include "assert.h" +#include #include #include "param.h" #include "tables.h" diff --git a/mach/proto/ncg/move.c b/mach/proto/ncg/move.c index 17669c956..d6bf6aa5e 100644 --- a/mach/proto/ncg/move.c +++ b/mach/proto/ncg/move.c @@ -2,9 +2,9 @@ static char rcsid[] = "$Id$"; #endif +#include #include #include -#include "assert.h" #include "param.h" #include "tables.h" #include "types.h" diff --git a/mach/proto/ncg/nextem.c b/mach/proto/ncg/nextem.c index 75f0d0fec..0e8446b3f 100644 --- a/mach/proto/ncg/nextem.c +++ b/mach/proto/ncg/nextem.c @@ -2,11 +2,11 @@ static char rcsid[] = "$Id$"; #endif +#include #include #include #include #include -#include "assert.h" #include "param.h" #include "tables.h" #include "types.h" diff --git a/mach/proto/ncg/reg.c b/mach/proto/ncg/reg.c index 0ce218982..fd0f115f0 100644 --- a/mach/proto/ncg/reg.c +++ b/mach/proto/ncg/reg.c @@ -2,9 +2,9 @@ static char rcsid[] = "$Id$"; #endif +#include #include #include -#include "assert.h" #include "param.h" #include "tables.h" #include "types.h" diff --git a/mach/proto/ncg/regvar.c b/mach/proto/ncg/regvar.c index 51909b082..b863bffd5 100644 --- a/mach/proto/ncg/regvar.c +++ b/mach/proto/ncg/regvar.c @@ -1,6 +1,6 @@ +#include #include #include -#include "assert.h" #include "param.h" #include "tables.h" diff --git a/mach/proto/ncg/salloc.c b/mach/proto/ncg/salloc.c index 7ce1287bb..a261a5a09 100644 --- a/mach/proto/ncg/salloc.c +++ b/mach/proto/ncg/salloc.c @@ -2,9 +2,9 @@ static char rcsid[] = "$Id$"; #endif +#include #include #include -#include "assert.h" #include "param.h" #include "tables.h" #include "types.h" diff --git a/mach/proto/ncg/state.c b/mach/proto/ncg/state.c index 4656ba872..b8d53b27f 100644 --- a/mach/proto/ncg/state.c +++ b/mach/proto/ncg/state.c @@ -2,9 +2,9 @@ static char rcsid[] = "$Id$"; #endif +#include #include #include -#include "assert.h" #include "param.h" #include "tables.h" #include "types.h" diff --git a/mach/proto/ncg/subr.c b/mach/proto/ncg/subr.c index fd6b72718..6e57ed18d 100644 --- a/mach/proto/ncg/subr.c +++ b/mach/proto/ncg/subr.c @@ -2,10 +2,10 @@ static char rcsid[] = "$Id$"; #endif +#include #include #include #include -#include "assert.h" #include "param.h" #include "tables.h" #include "types.h" @@ -712,11 +712,4 @@ ruletrace() { i--; } } -#endif - -#ifndef NDEBUG -badassertion(asstr,file,line) char *asstr, *file; { - - fatal("\"%s\", line %d:Assertion \"%s\" failed",file,line,asstr); -} -#endif +#endif /* TABLEDEBUG */