summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--include/version.h2
-rw-r--r--mkfile1
-rw-r--r--utils/c2l/c2l.c5
-rw-r--r--utils/mkfile12
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGES b/CHANGES
index 1c9c1159..1b1dfae6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+20070302
+ change /mkfile to build yacc earlier, mainly to make bootstrap of a new host easier (makemk.sh and mk install)
+ change /utils/mkfile not to build k[acl] and q[acl] on Plan 9, since the system ones are the same
20070228
make array bounds checking the default for on-the-fly compilers (emu/port/main.c)
improve wording in security-ssl(2) and ssl(3)
diff --git a/include/version.h b/include/version.h
index eb0148cb..7c30efaf 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20070301)"
+#define VERSION "Fourth Edition (20070302)"
diff --git a/mkfile b/mkfile
index 72b35d4b..e43fc116 100644
--- a/mkfile
+++ b/mkfile
@@ -12,6 +12,7 @@ EMUDIRS=\
libmp\
libsec\
libmath\
+ utils/yacc\
limbo\
libinterp\
libkeyring\
diff --git a/utils/c2l/c2l.c b/utils/c2l/c2l.c
index f870d640..83409dbb 100644
--- a/utils/c2l/c2l.c
+++ b/utils/c2l/c2l.c
@@ -20,7 +20,6 @@ char buf[128], mbuf[128];
static Sym *sysop, *bioop, *libcop;
static int again;
-#define INFINITY 0x7fffffff
#define STAR 0x80
#define RET 0x80
@@ -1053,7 +1052,7 @@ epgen(int b)
{
char **p;
- /* output(INFINITY, 1); */
+ /* output(0x7fffffff, 1); */ /* INFINITY */
if(!dolog())
return;
if(b){
@@ -1402,7 +1401,6 @@ ltype(Type *t)
default:
return t;
}
- return t;
}
static int
@@ -4633,7 +4631,6 @@ hasbrk(Node *n)
default:
return 0;
}
- return 0;
}
static int
diff --git a/utils/mkfile b/utils/mkfile
index cf6bdf0d..cc67410d 100644
--- a/utils/mkfile
+++ b/utils/mkfile
@@ -25,12 +25,6 @@ ALWAYS=\
# 5i\
5coff\
5cv\
- ka\
- kc\
- kl\
- qa\
- qc\
- ql\
sqz\
tc\
acid\
@@ -53,9 +47,15 @@ NOTPLAN9=\
8a\
8c\
8l\
+ qa\
+ qc\
+ ql\
va\
vc\
vl\
+ ka\
+ kc\
+ kl\
mk\
ksize\
kstrip\