logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 9b4c353cd82b5cf4485de040013e3895b20309e7
parent 753bb3880e9e45df07e965246a6d2d610e0985f0
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 21 Feb 2019 22:50:01 -0800

Remove scc

Diffstat:

M.gitmodules4----
Mpkg/gen.lua1-
Dpkg/scc/.gitignore1-
Dpkg/scc/gen.lua45---------------------------------------------
Dpkg/scc/inc/ldflags.h4----
Dpkg/scc/inc/sysincludes.h4----
Dpkg/scc/inc/syslibs.h4----
Dpkg/scc/patch/0001-Allow-generated-headers-in-separate-directory.patch111-------------------------------------------------------------------------------
Dpkg/scc/patch/0002-Build-with-musl-CRT-files.patch41-----------------------------------------
Dpkg/scc/rev1-
Dpkg/scc/src1-
11 files changed, 0 insertions(+), 217 deletions(-)

diff --git a/.gitmodules b/.gitmodules @@ -205,10 +205,6 @@ [submodule "pkg/sbase/src"] path = pkg/sbase/src url = https://github.com/michaelforney/sbase -[submodule "pkg/scc/src"] - path = pkg/scc/src - url = git://git.2f30.org/scc - ignore = all [submodule "pkg/sdhcp/src"] path = pkg/sdhcp/src url = https://github.com/michaelforney/sdhcp diff --git a/pkg/gen.lua b/pkg/gen.lua @@ -73,7 +73,6 @@ subgen 'python' subgen 'qbe' subgen 'samurai' subgen 'sbase' -subgen 'scc' subgen 'sdhcp' subgen 'sinit' subgen 'skeleton' diff --git a/pkg/scc/.gitignore b/pkg/scc/.gitignore @@ -1 +0,0 @@ -/qbe.ninja diff --git a/pkg/scc/gen.lua b/pkg/scc/gen.lua @@ -1,45 +0,0 @@ -set('arch', 'qbe') -cflags{ - '-std=c99', - [[-D 'SYS="linux"']], - [[-D 'ARCH="$arch"']], - '-D PREFIX=', - '-D NDEBUG', - '-I $dir/inc', - '-I $srcdir/inc/c99', - '-I $outdir/inc', -} - -lib('libcc.a', { - 'lib/debug.c', - 'lib/die.c', - 'lib/newitem.c', - 'lib/xcalloc.c', - 'lib/xmalloc.c', - 'lib/xrealloc.c', - 'lib/xstrdup.c', -}) - -build('awk', '$outdir/inc/error.h', {'$srcdir/cc2/cc2.h', '|', '$srcdir/cc2/generror.awk'}, { - expr='-f $srcdir/cc2/generror.awk', -}) - -cflags{[[-D 'ARCH="$arch"']]} - -exe('cc1-$arch', [[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 builtin.c - arch/$arch/arch.c -) $outdir/libcc.a]]) -file('libexec/scc/cc1-$arch', '755', '$outdir/cc1-$arch') - -exe('cc2-$arch', [[cc2/( - main.c parser.c peep.c symbol.c node.c code.c optm.c - arch/$arch/(code.c cgen.c types.c optm.c) -) $outdir/libcc.a]], {'$outdir/inc/error.h'}) -file('libexec/scc/cc2-$arch', '755', '$outdir/cc2-$arch') - -exe('scc', {'driver/posix/scc.c', 'libcc.a'}) -file('bin/scc', '755', '$outdir/scc') - -fetch 'git' diff --git a/pkg/scc/inc/ldflags.h b/pkg/scc/inc/ldflags.h @@ -1,4 +0,0 @@ -char *ldflags[] = { - "-static", - NULL -}; diff --git a/pkg/scc/inc/sysincludes.h b/pkg/scc/inc/sysincludes.h @@ -1,4 +0,0 @@ -char *sysincludes[] = { - PREFIX "/include/", - NULL -}; diff --git a/pkg/scc/inc/syslibs.h b/pkg/scc/inc/syslibs.h @@ -1,4 +0,0 @@ -char *syslibs[] = { - PREFIX "/lib/", - NULL -}; diff --git a/pkg/scc/patch/0001-Allow-generated-headers-in-separate-directory.patch b/pkg/scc/patch/0001-Allow-generated-headers-in-separate-directory.patch @@ -1,111 +0,0 @@ -From 5ee9b6dbb259fd0ca6024c27e9af1730f01db2d4 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 headers 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 +- - driver/posix/Makefile | 2 ++ - driver/posix/scc.c | 4 ++-- - 7 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/cc1/Makefile b/cc1/Makefile -index bd37547..3881eae 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 ba5d7ea..692a288 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 fd73eba..36d6366 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 01e2410..ab718c7 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 b5e31f3..a686c90 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" - -diff --git a/driver/posix/Makefile b/driver/posix/Makefile -index 782a0a2..458b32b 100644 ---- a/driver/posix/Makefile -+++ b/driver/posix/Makefile -@@ -1,6 +1,8 @@ - # See LICENSE file for copyright and license details. - .POSIX: - -+CSTDINC = -I../../inc -+ - include ../../config.mk - - OBJS = scc.o -diff --git a/driver/posix/scc.c b/driver/posix/scc.c -index dd74e26..26f4f8c 100644 ---- a/driver/posix/scc.c -+++ b/driver/posix/scc.c -@@ -16,8 +16,8 @@ static char sccsid[] = "@(#) ./driver/posix/scc.c"; - - #include "../../inc/arg.h" - #include "../../inc/cc.h" --#include "../../inc/syslibs.h" --#include "../../inc/ldflags.h" -+#include <syslibs.h> -+#include <ldflags.h> - - enum { - CC1, --- -2.14.1 - diff --git a/pkg/scc/patch/0002-Build-with-musl-CRT-files.patch b/pkg/scc/patch/0002-Build-with-musl-CRT-files.patch @@ -1,41 +0,0 @@ -From a67e93d3e3353aeba7eb4b1a94ae98fa54f76b49 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Wed, 16 Aug 2017 22:34:28 -0700 -Subject: [PATCH] Build with musl CRT files - ---- - driver/posix/scc.c | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -diff --git a/driver/posix/scc.c b/driver/posix/scc.c -index 26f4f8c..aa61827 100644 ---- a/driver/posix/scc.c -+++ b/driver/posix/scc.c -@@ -99,7 +99,6 @@ static int - inittool(int tool) - { - struct tool *t = &tools[tool]; -- char *crt; - int n; - - if (t->init) -@@ -126,14 +125,8 @@ inittool(int tool) - addarg(tool, "-L"); - addarg(tool, syslibs[n]); - } -- n = snprintf(NULL, 0, "%s-%s-%s.o", -- PREFIX "/lib/scc/crt", arch, sys); -- if (n < 0) -- die("scc: wrong crt file name"); -- crt = xmalloc(++n); -- n = snprintf(crt, n, "%s-%s-%s.o", -- PREFIX "/lib/scc/crt", arch, sys); -- addarg(tool, crt); -+ addarg(tool, PREFIX "/lib/crt1.o"); -+ addarg(tool, PREFIX "/lib/crtn.o"); - break; - case AS: - addarg(tool, "-o"); --- -2.14.1 - diff --git a/pkg/scc/rev b/pkg/scc/rev @@ -1 +0,0 @@ -7 diff --git a/pkg/scc/src b/pkg/scc/src @@ -1 +0,0 @@ -Subproject commit 830e83ac3127699ad53a85f0e4d868040ca38580