summaryrefslogtreecommitdiff
path: root/pkg/scc/patch
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2017-02-09 13:08:08 -0800
committerMichael Forney <mforney@mforney.org>2017-02-09 13:08:08 -0800
commit296ffd4196fbdeb9159d1e599e8c7c3a33007d2a (patch)
tree2040021613dadd6564bf486493c227e533043d99 /pkg/scc/patch
parent9277a796ec1bfd6dc056f5f09d003060d82d2a1e (diff)
scc: Update to latest git
Diffstat (limited to 'pkg/scc/patch')
-rw-r--r--pkg/scc/patch/0001-Allow-generated-sysincludes.h-in-separate-directory.patch81
-rw-r--r--pkg/scc/patch/0002-cc1-Add-missing-icode-declaration.patch24
2 files changed, 105 insertions, 0 deletions
diff --git a/pkg/scc/patch/0001-Allow-generated-sysincludes.h-in-separate-directory.patch b/pkg/scc/patch/0001-Allow-generated-sysincludes.h-in-separate-directory.patch
new file mode 100644
index 00000000..e6545788
--- /dev/null
+++ b/pkg/scc/patch/0001-Allow-generated-sysincludes.h-in-separate-directory.patch
@@ -0,0 +1,81 @@
+From e44ceb42cf228e57264e657ea1fa3767811e68cf Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Thu, 9 Feb 2017 13:01:13 -0800
+Subject: [PATCH] Allow generated sysincludes.h in separate directory
+
+---
+ cc1/Makefile | 2 +-
+ cc1/arch/amd64-sysv/arch.c | 2 +-
+ cc1/arch/i386-sysv/arch.c | 2 +-
+ cc1/arch/qbe/arch.c | 2 +-
+ cc1/arch/z80/arch.c | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/cc1/Makefile b/cc1/Makefile
+index b9f73ce..3ec023b 100644
+--- a/cc1/Makefile
++++ b/cc1/Makefile
+@@ -1,7 +1,7 @@
+ # See LICENSE file for copyright and license details.
+ .POSIX:
+
+-CSTDINC = -I../inc/$(STD)
++CSTDINC = -I../inc -I../inc/$(STD)
+
+ include ../config.mk
+
+diff --git a/cc1/arch/amd64-sysv/arch.c b/cc1/arch/amd64-sysv/arch.c
+index f4492b4..f72d275 100644
+--- a/cc1/arch/amd64-sysv/arch.c
++++ b/cc1/arch/amd64-sysv/arch.c
+@@ -2,7 +2,7 @@
+ static char sccsid[] = "@(#) ./cc1/arch/amd64-sysv/arch.c";
+ #include <stdio.h>
+
+-#include "../../../inc/sysincludes.h"
++#include <sysincludes.h>
+ #include "../../../inc/cc.h"
+ #include "../../cc1.h"
+
+diff --git a/cc1/arch/i386-sysv/arch.c b/cc1/arch/i386-sysv/arch.c
+index f72f889..3672acd 100644
+--- a/cc1/arch/i386-sysv/arch.c
++++ b/cc1/arch/i386-sysv/arch.c
+@@ -2,7 +2,7 @@
+ static char sccsid[] = "@(#) ./cc1/arch/i386-sysv/arch.c";
+ #include <stdio.h>
+
+-#include "../../../inc/sysincludes.h"
++#include <sysincludes.h>
+ #include "../../../inc/cc.h"
+ #include "../../cc1.h"
+
+diff --git a/cc1/arch/qbe/arch.c b/cc1/arch/qbe/arch.c
+index 233a390..e633a40 100644
+--- a/cc1/arch/qbe/arch.c
++++ b/cc1/arch/qbe/arch.c
+@@ -2,7 +2,7 @@
+ static char sccsid[] = "@(#) ./cc1/arch/qbe/arch.c";
+ #include <stdio.h>
+
+-#include "../../../inc/sysincludes.h"
++#include <sysincludes.h>
+ #include "../../../inc/cc.h"
+ #include "../../cc1.h"
+
+diff --git a/cc1/arch/z80/arch.c b/cc1/arch/z80/arch.c
+index 0c603f6..e709bfb 100644
+--- a/cc1/arch/z80/arch.c
++++ b/cc1/arch/z80/arch.c
+@@ -2,7 +2,7 @@
+ static char sccsid[] = "@(#) ./cc1/arch/z80/arch.c";
+ #include <stdio.h>
+
+-#include "../../../inc/sysincludes.h"
++#include <sysincludes.h>
+ #include "../../../inc/cc.h"
+ #include "../../cc1.h"
+
+--
+2.11.1
+
diff --git a/pkg/scc/patch/0002-cc1-Add-missing-icode-declaration.patch b/pkg/scc/patch/0002-cc1-Add-missing-icode-declaration.patch
new file mode 100644
index 00000000..78d250f1
--- /dev/null
+++ b/pkg/scc/patch/0002-cc1-Add-missing-icode-declaration.patch
@@ -0,0 +1,24 @@
+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
+