diff options
| author | Michael Forney <mforney@mforney.org> | 2017-02-17 18:59:52 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-02-17 19:13:23 -0800 |
| commit | fa9128534be0cb889a76265eb467cfd1fa05619b (patch) | |
| tree | b587a2526c4bef6a8313695391c2e6147b1ccefd | |
| parent | 08a7e6fb237e563c3bcddfa97bbba1f42a017086 (diff) | |
scc: Update to latest git
| -rw-r--r-- | pkg/scc/gen.rc | 12 | ||||
| -rw-r--r-- | pkg/scc/patch/0002-cc1-Add-missing-icode-declaration.patch | 24 | ||||
| -rw-r--r-- | pkg/scc/rev | 2 | ||||
| m--------- | pkg/scc/src | 0 |
4 files changed, 8 insertions, 30 deletions
diff --git a/pkg/scc/gen.rc b/pkg/scc/gen.rc index e29e7534..51a17ebc 100644 --- a/pkg/scc/gen.rc +++ b/pkg/scc/gen.rc @@ -14,7 +14,10 @@ build '$outdir'/inc/error.h awk '$srcdir'/cc2/cc2.h '|' '$srcdir'/cc2/generror.a build '$outdir'/inc/sysincludes.h copy '$srcdir'/inc/sysincludes.def.h set baseoutdir '$outdir' -hdrs=() +hdrs=(\ + assert.h stddef.h errno.h locale.h string.h stdarg.h stdbool.h stdlib.h\ + signal.h stdio.h ctype.h stdint.h\ +) for(arch in $archs) { { set outdir '$outdir'/$arch @@ -22,7 +25,8 @@ for(arch in $archs) { exe cc1-$arch -d '$baseoutdir'/inc/sysincludes.h cc1/^(\ types.c decl.c lex.c error.c symbol.c main.c expr.c\ - code.c stmt.c cpp.c fold.c init.c arch/$arch/arch.c\ + code.c stmt.c cpp.c fold.c init.c builtin.c\ + arch/$arch/arch.c\ ) '$baseoutdir'/libcc.a file libexec/scc/cc1-$arch '$outdir'/cc1-$arch 755 @@ -33,15 +37,13 @@ for(arch in $archs) { file libexec/scc/cc2-$arch '$outdir'/cc2-$arch 755 } >$arch.ninja ; subninja $arch.ninja - hdrs=($hdrs $arch/^(assert.h ctype.h errno.h signal.h stdint.h stdio.h stdlib.h string.h)) + hdrs=($hdrs bits/$arch/arch/^(stddef.h string.h stdlib.h signal.h stdio.h stdint.h)) } cflags -D 'ARCH=''"'^$archs(1)^'"''' exe scc driver/posix/scc.c libcc.a file bin/scc '$outdir'/scc 755 -if(~ amd64-sysv $archs) - hdrs=($hdrs amd64-sysv/stdarg.h) for(hdr in $hdrs) file include/scc/$hdr '$srcdir'/libc/include/$hdr 644 diff --git a/pkg/scc/patch/0002-cc1-Add-missing-icode-declaration.patch b/pkg/scc/patch/0002-cc1-Add-missing-icode-declaration.patch deleted file mode 100644 index 78d250f1..00000000 --- a/pkg/scc/patch/0002-cc1-Add-missing-icode-declaration.patch +++ /dev/null @@ -1,24 +0,0 @@ -From eca0568e51f6c14648a9ca0e0cba4897d961e644 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Thu, 9 Feb 2017 13:03:30 -0800 -Subject: [PATCH] [cc1] Add missing icode declaration - ---- - cc1/cc1.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cc1/cc1.h b/cc1/cc1.h -index 705e0b9..06484fc 100644 ---- a/cc1/cc1.h -+++ b/cc1/cc1.h -@@ -410,6 +410,7 @@ extern int setloc(char *fname, unsigned line); - #define accept(t) ((yytoken == (t)) ? next() : 0) - - /* code.c */ -+extern void icode(void); - extern void prtree(Node *np); - extern void emit(unsigned, void *); - extern Node *node(unsigned op, Type *tp, Node *left, Node *rigth); --- -2.11.1 - diff --git a/pkg/scc/rev b/pkg/scc/rev index 7ed6ff82..1e8b3149 100644 --- a/pkg/scc/rev +++ b/pkg/scc/rev @@ -1 +1 @@ -5 +6 diff --git a/pkg/scc/src b/pkg/scc/src -Subproject a84618bba7d82a3c2cd9f96bcf1234419917476 +Subproject cd855240d86b9577a78b3bd980aa7b1a85495fc |