commit eb28f98e61cf995a7c1f9c85faf3431438018e03
parent 856d3c7dbd889b25f3e5be8559f67ab3f65a0384
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Tue, 8 Oct 2024 10:17:50 +0200
build: Remove qbe fork
As mainstream qbe already supports common we don't have to maintain
our copy of qbe anymore and we can use the mainstream version,
which incorporated many new features and architectures.
Diffstat:
4 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "src/cmd/qbe"]
- path = src/cmd/qbe
- url = git://git.simple-cc.org/qbe
diff --git a/src/cmd/Makefile b/src/cmd/Makefile
@@ -18,20 +18,9 @@ TARGET =\
scc-objdump\
scc-objcopy\
scc-addr2line\
- qbe/qbe\
all: $(TARGET) $(DIRS)
-qbe/qbe: qbe
- cp $@ $(LIBEXEC)/scc
-
-qbe/.git:
- git submodule init qbe
- git submodule update qbe
-
-qbe: qbe/.git FORCE
- +cd qbe && $(MAKE) CC=$(CC) CFLAGS='$(PROJ_CFLAGS)'
-
scc-nm: nm.o $(LIBMACH) $(LIBSCC)
$(CC) $(PROJ_LDFLAGS) nm.o -lmach -lscc $(PROJ_LDLIBS) -o $@
cp $@ $(BINDIR)
diff --git a/src/cmd/cc/posix/cc.c b/src/cmd/cc/posix/cc.c
@@ -234,15 +234,15 @@ settool(int tool, char *infile, int nexttool)
goto local_tool;
case CC2:
fmt = cc2fmt(tool);
- goto local_tool;
- case QBE:
- fmt = "%s/libexec/scc/%s";
local_tool:
n = snprintf(t->cmd, sizeof(t->cmd),
fmt, prefix, t->bin, arch, abi);
if (n < 0 || n >= sizeof(t->cmd))
die("scc-cc: target tool path is too long");
break;
+ case QBE:
+ strcpy(t->cmd, "qbe");
+ break;
case LD:
if (!outfile)
outfile = "a.out";
diff --git a/src/cmd/qbe b/src/cmd/qbe
@@ -1 +0,0 @@
-Subproject commit 167b6dca703cf1999b50833640e9468e330820b7
