From 6ac79a93bbca84f4fc0baefc6496c6cc23b13bc1 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Mon, 27 Jun 2016 20:33:34 -0700 Subject: Remove cparser and libfirm for now They require perl and python to generate various sources, and currently use wildcards to enumerate sources. While it can compile many of the simple C packages in oasis, it is not sufficient in general, and it still requires the gcc driver to link with the various start files. --- .gitmodules | 6 ----- devel/cparser/.rev | 1 - devel/cparser/gen.rc | 29 ----------------------- devel/cparser/src | 1 - devel/gen.rc | 2 -- devel/libfirm/.gitignore | 5 ---- devel/libfirm/.rev | 1 - devel/libfirm/gen.rc | 61 ------------------------------------------------ devel/libfirm/src | 1 - 9 files changed, 107 deletions(-) delete mode 100644 devel/cparser/.rev delete mode 100644 devel/cparser/gen.rc delete mode 160000 devel/cparser/src delete mode 100644 devel/libfirm/.gitignore delete mode 100644 devel/libfirm/.rev delete mode 100644 devel/libfirm/gen.rc delete mode 160000 devel/libfirm/src diff --git a/.gitmodules b/.gitmodules index 09a9fbf8..ecd93aba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -91,12 +91,6 @@ path = desktop/wayland/src url = https://anongit.freedesktop.org/git/wayland/wayland.git ignore = all -[submodule "devel/cparser/src"] - path = devel/cparser/src - url = http://pp.ipd.kit.edu/git/cparser.git -[submodule "devel/libfirm/src"] - path = devel/libfirm/src - url = http://pp.ipd.kit.edu/git/libfirm.git [submodule "devel/make/src"] path = devel/make/src url = git://git.sv.gnu.org/make.git diff --git a/devel/cparser/.rev b/devel/cparser/.rev deleted file mode 100644 index d00491fd..00000000 --- a/devel/cparser/.rev +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/devel/cparser/gen.rc b/devel/cparser/gen.rc deleted file mode 100644 index 22fbdeb6..00000000 --- a/devel/cparser/gen.rc +++ /dev/null @@ -1,29 +0,0 @@ -cflags\ - -I devel/libfirm/src/include\ - -I '$builddir'/devel/libfirm/include\ - -I '$srcdir'/src\ - -I '$outdir' - -rule revision_hdr 'echo ''#define cparser_REVISION ""'' >$out.tmp && mv $out.tmp $out' -build '$outdir'/revision.h revision_hdr - -exe cparser -d '$outdir/revision.h phony/devel/libfirm/headers' src/^(\ - main.c\ - adt/^(panic.c pset_new.c strutil.c)\ - ast/^(\ - ast.c attribute.c constfold.c entity.c printer.c string_hash.c\ - string_rep.c symbol_table.c type.c type_hash.c types.c walk.c\ - )\ - driver/^(\ - actions.c c_driver.c diagnostic.c driver.c help.c\ - machine_triple.c options.c predefs.c target.c tempfile.c\ - timing.c warning.c\ - )\ - firm/^(ast2firm.c firm_opt.c jittest.c jump_target.c mangle.c)\ - parser/^(builtins.c format_check.c input.c parser.c preprocessor.c token.c)\ - wrappergen/^(write_compoundsizes.c write_fluffy.c write_jna.c)\ -) '$builddir'/devel/libfirm/libfirm.a -file bin/cparser '$outdir'/cparser 755 -file share/man/man1/cparser.1 '$srcdir'/cparser.1 644 - -fetch git diff --git a/devel/cparser/src b/devel/cparser/src deleted file mode 160000 index d2a926c5..00000000 --- a/devel/cparser/src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d2a926c5f3b2c475650cb6d66eeed45ab7e31bd9 diff --git a/devel/gen.rc b/devel/gen.rc index 9dbc6d1c..9073fecd 100644 --- a/devel/gen.rc +++ b/devel/gen.rc @@ -1,5 +1,3 @@ -subgen cparser -subgen libfirm subgen make subgen mc subgen qbe diff --git a/devel/libfirm/.gitignore b/devel/libfirm/.gitignore deleted file mode 100644 index afd86171..00000000 --- a/devel/libfirm/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/TEMPLATE.ninja -/amd64.ninja -/arm.ninja -/ia32.ninja -/sparc.ninja diff --git a/devel/libfirm/.rev b/devel/libfirm/.rev deleted file mode 100644 index d00491fd..00000000 --- a/devel/libfirm/.rev +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/devel/libfirm/gen.rc b/devel/libfirm/gen.rc deleted file mode 100644 index 99b12d62..00000000 --- a/devel/libfirm/gen.rc +++ /dev/null @@ -1,61 +0,0 @@ -cflags\ - -I '$outdir' \ - -I '$outdir'/include\ - -I '$srcdir'/include/libfirm/adt\ - -I '$srcdir'/include/libfirm\ - -I '$srcdir'/ir/adt\ - -I '$srcdir'/ir/ana\ - -I '$srcdir'/ir/be/ia32\ - -I '$srcdir'/ir/be\ - -I '$srcdir'/ir/common\ - -I '$srcdir'/ir/ident\ - -I '$srcdir'/ir/ir\ - -I '$srcdir'/ir/kaps\ - -I '$srcdir'/ir/libcore\ - -I '$srcdir'/ir/lower\ - -I '$srcdir'/ir/lpp\ - -I '$srcdir'/ir/opt\ - -I '$srcdir'/ir/stat\ - -I '$srcdir'/ir/tr\ - -I '$srcdir'/ir/tv - -backends=(amd64 arm ia32 sparc TEMPLATE) - -rule irspec '$python $srcdir/scripts/gen_ir.py $srcdir/scripts/ir_spec.py $in >$out.tmp && mv $out.tmp $out' -rule new_nodes '$perl $srcdir/ir/be/scripts/generate_new_opcodes.pl $in $outdir' -rule regalloc_if '$perl $srcdir/ir/be/scripts/generate_regalloc_if.pl $in $outdir' -rule emitter '$perl $srcdir/ir/be/scripts/generate_emitter.pl $in $outdir' - -genhdrs=(gen_irnode.h gen_proj_names.h) -gensrcs=(gen_irnode.c gen_irio.c) -for(gensrc in $genhdrs $gensrcs) { - build '$outdir'/$gensrc irspec '$srcdir'/scripts/templates/$gensrc -} - -build '$outdir'/include/nodes.h irspec '$srcdir'/scripts/templates/nodes.h -phony headers include/nodes.h - -srcs=(ir/*/*.c '$outdir'/$gensrcs) -objs=$srcs.o -for(src in $srcs) cc $src '||' 'phony/$dir/internal_headers' - -for(backend in $backends) { - types=(emitter regalloc_if new_nodes) - srcs=(ir/be/$backend/*.c '$outdir'/gen_$backend^_$types.c) - objs=($objs $srcs.o) - genhdrs=($genhdrs gen_$backend^_$types.h) - { - cflags -I '$srcdir'/ir/be/$backend - for(type in $types) { - outs=('$outdir'/gen_$backend^_$type.^(c h))\ - build $"outs $type '$srcdir'/ir/be/$backend/$backend^_spec.pl - } - for(src in $srcs) cc $src '||' 'phony/$dir/internal_headers' - } >../$backend.ninja - subninja '$dir'/$backend.ninja -} -phony internal_headers $genhdrs 'phony/$dir/headers' - -ar libfirm.a $objs - -fetch git diff --git a/devel/libfirm/src b/devel/libfirm/src deleted file mode 160000 index 1dfae908..00000000 --- a/devel/libfirm/src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1dfae908f3acf65d0a396ea12333af6c2bca81e4 -- cgit v1.2.3