From 9cc63cc6c272f7c63713e3486253fd9e15893a2b Mon Sep 17 00:00:00 2001 From: David Brown Date: Thu, 16 Jun 2016 12:06:42 +0100 Subject: [PATCH] Compiler source directory: consolidate duplicate files. --- src/voc/{voc.Mod => Vishap.Mod} | 0 src/voc/darwin/clang/extTools.Mod | 105 ------------------ src/voc/darwin/clang/x86_64/architecture.Mod | 4 - src/voc/{linux/gcc => }/extTools.Mod | 0 src/voc/freebsd/clang/extTools.Mod | 88 --------------- src/voc/freebsd/clang/x86_64/architecture.Mod | 4 - src/voc/linux/clang/armv6j/architecture.Mod | 4 - .../clang/armv6j_hardfp/architecture.Mod | 4 - .../clang/armv7a_hardfp/architecture.Mod | 4 - src/voc/linux/clang/extTools.Mod | 88 --------------- src/voc/linux/clang/powerpc/architecture.Mod | 4 - src/voc/linux/clang/x86/architecture.Mod | 4 - src/voc/linux/clang/x86_64/architecture.Mod | 4 - src/voc/linux/gcc/armv6j/architecture.Mod | 4 - .../linux/gcc/armv6j_hardfp/architecture.Mod | 4 - .../linux/gcc/armv7a_hardfp/architecture.Mod | 4 - src/voc/linux/gcc/powerpc/architecture.Mod | 4 - src/voc/linux/gcc/x86/architecture.Mod | 4 - src/voc/linux/gcc/x86_64/architecture.Mod | 4 - src/voc/openbsd/gcc/extTools.Mod | 88 --------------- src/voc/openbsd/gcc/x86_64/architecture.Mod | 4 - src/voc/prf.Mod | 5 - src/voc/prf.Mod_default | 5 - src/voc/version.Mod | 41 ------- 24 files changed, 480 deletions(-) rename src/voc/{voc.Mod => Vishap.Mod} (100%) delete mode 100644 src/voc/darwin/clang/extTools.Mod delete mode 100644 src/voc/darwin/clang/x86_64/architecture.Mod rename src/voc/{linux/gcc => }/extTools.Mod (100%) delete mode 100644 src/voc/freebsd/clang/extTools.Mod delete mode 100644 src/voc/freebsd/clang/x86_64/architecture.Mod delete mode 100644 src/voc/linux/clang/armv6j/architecture.Mod delete mode 100644 src/voc/linux/clang/armv6j_hardfp/architecture.Mod delete mode 100644 src/voc/linux/clang/armv7a_hardfp/architecture.Mod delete mode 100644 src/voc/linux/clang/extTools.Mod delete mode 100644 src/voc/linux/clang/powerpc/architecture.Mod delete mode 100644 src/voc/linux/clang/x86/architecture.Mod delete mode 100644 src/voc/linux/clang/x86_64/architecture.Mod delete mode 100644 src/voc/linux/gcc/armv6j/architecture.Mod delete mode 100644 src/voc/linux/gcc/armv6j_hardfp/architecture.Mod delete mode 100644 src/voc/linux/gcc/armv7a_hardfp/architecture.Mod delete mode 100644 src/voc/linux/gcc/powerpc/architecture.Mod delete mode 100644 src/voc/linux/gcc/x86/architecture.Mod delete mode 100644 src/voc/linux/gcc/x86_64/architecture.Mod delete mode 100644 src/voc/openbsd/gcc/extTools.Mod delete mode 100644 src/voc/openbsd/gcc/x86_64/architecture.Mod delete mode 100644 src/voc/prf.Mod delete mode 100644 src/voc/prf.Mod_default delete mode 100644 src/voc/version.Mod diff --git a/src/voc/voc.Mod b/src/voc/Vishap.Mod similarity index 100% rename from src/voc/voc.Mod rename to src/voc/Vishap.Mod diff --git a/src/voc/darwin/clang/extTools.Mod b/src/voc/darwin/clang/extTools.Mod deleted file mode 100644 index a26e83a5..00000000 --- a/src/voc/darwin/clang/extTools.Mod +++ /dev/null @@ -1,105 +0,0 @@ -MODULE extTools; - IMPORT Args, Unix, Strings, Console, version; -(* -INCLUDEPATH = -Isrc/lib/system/linux/gnuc/x86_64 -CCOPT = -fPIC $(INCLUDEPATH) -g -CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lVishapOberon -static -g -CC = cc $(CCOPT) -c -*) -CONST compiler="clang"; - -VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 1023 OF CHAR; - -PROCEDURE Assemble*(m : ARRAY OF CHAR); -VAR cmd : ARRAY 1023 OF CHAR; -cc : ARRAY 1023 OF CHAR; -ext : ARRAY 5 OF CHAR; -BEGIN -COPY (ccString, cc); -Strings.Append (" -c ", cc); -COPY(cc, cmd); -Strings.Append (" ", cmd); -Strings.Append (ccOpt, cmd); -ext := ".c"; -Strings.Append (ext, m); -Strings.Append(m, cmd); -(*Console.Ln; Console.String (cmd); Console.Ln;*) -Unix.system(cmd); -END Assemble; - - -PROCEDURE LinkMain*(VAR m : ARRAY OF CHAR; statically : BOOLEAN; additionalopts : ARRAY OF CHAR); -VAR lpath : ARRAY 1023 OF CHAR; -cc : ARRAY 1023 OF CHAR; -ccopt : ARRAY 1023 OF CHAR; -cmd : ARRAY 1023 OF CHAR; -ext : ARRAY 5 OF CHAR; -cmd2 : ARRAY 1023 OF CHAR; -BEGIN -(* -gcc -g -o hello hello.c -I $RPATH/src/lib/system/linux/gnuc/x86_64 -I. -I$RPATH -lOberon -L. -L$RPATH -static -*) -cmd := ""; -cc := ""; -ext := ".c"; -COPY(ccString, cc); -COPY (cc, cmd); -Strings.Append(" ", cmd); -Strings.Append(m, cmd); -Strings.Append(ext, cmd); -Strings.Append(additionalopts, cmd); -Strings.Append(" ", cmd); -(*IF statically THEN Strings.Append(" -static ", cmd) END;*) -IF statically THEN - Strings.Append(version.prefix, cmd); - Strings.Append("/lib/libVishapOberon.a ", cmd); -END; -Strings.Append(" -o ", cmd); -Strings.Append(m, cmd); -Strings.Append(" ", cmd); -IF ~statically THEN -Strings.Append ("-lVishapOberon -L. -L", ccOpt); -Strings.Append (version.prefix, ccOpt); -Strings.Append ("/lib ", ccOpt); -END; -Strings.Append(ccOpt, cmd); - -Console.Ln; Console.String(cmd); Console.Ln; (* may be it's feasible to add debug mode later *) -Unix.system(cmd); - -IF ~statically THEN - cmd2 := ""; - COPY ("install_name_tool -change libVishapOberon.dylib ", cmd2); - Strings.Append(version.prefix, cmd2); - Strings.Append ("/lib/libVishapOberon.dylib ", cmd2); - Strings.Append (m, cmd2); - Console.String(cmd2); Console.Ln; - Unix.system(cmd2); - END -END LinkMain; - -BEGIN - -incPath0 := "src/lib/system/darwin/"; -Strings.Append (compiler, incPath0); -incPath1 := "lib/voc/obj "; -ccOpt := " -fPIC -g "; - -COPY ("-I ", tmp1); -Strings.Append (version.prefix, tmp1); -Strings.Append("/", tmp1); -Strings.Append(incPath0, tmp1); -Strings.Append("/", tmp1); -Strings.Append(version.arch, tmp1); -Strings.Append(" -I ", tmp1); -Strings.Append(version.prefix, tmp1); -Strings.Append("/", tmp1); -Strings.Append(incPath1, tmp1); -Strings.Append(tmp1, ccOpt); -Args.GetEnv("CFLAGS", CFLAGS); -Strings.Append (CFLAGS, ccOpt); -Strings.Append (" ", ccOpt); -ccString := compiler; -Strings.Append (" ", ccString); - -END extTools. diff --git a/src/voc/darwin/clang/x86_64/architecture.Mod b/src/voc/darwin/clang/x86_64/architecture.Mod deleted file mode 100644 index 1f95d2fd..00000000 --- a/src/voc/darwin/clang/x86_64/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "x86_64"; - -END architecture. diff --git a/src/voc/linux/gcc/extTools.Mod b/src/voc/extTools.Mod similarity index 100% rename from src/voc/linux/gcc/extTools.Mod rename to src/voc/extTools.Mod diff --git a/src/voc/freebsd/clang/extTools.Mod b/src/voc/freebsd/clang/extTools.Mod deleted file mode 100644 index 62f7368a..00000000 --- a/src/voc/freebsd/clang/extTools.Mod +++ /dev/null @@ -1,88 +0,0 @@ -MODULE extTools; - IMPORT Args, Unix, Strings, Console, version; -(* -INCLUDEPATH = -Isrc/lib/system/gnuc/x86_64 -CCOPT = -fPIC $(INCLUDEPATH) -g -CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lOberon -static -g -CC = cc $(CCOPT) -c -*) -CONST compiler="clang"; - -VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 1023 OF CHAR; - -PROCEDURE Assemble*(m : ARRAY OF CHAR); -VAR cmd : ARRAY 1023 OF CHAR; -cc : ARRAY 1023 OF CHAR; -ext : ARRAY 5 OF CHAR; -BEGIN -COPY (ccString, cc); -Strings.Append (" -c ", cc); -COPY(cc, cmd); -Strings.Append (" ", cmd); -Strings.Append (ccOpt, cmd); -ext := ".c"; -Strings.Append (ext, m); -Strings.Append(m, cmd); -(*Console.Ln; Console.String (cmd); Console.Ln;*) -Unix.system(cmd); -END Assemble; - - -PROCEDURE LinkMain*(VAR m : ARRAY OF CHAR; statically : BOOLEAN; additionalopts : ARRAY OF CHAR); -VAR lpath : ARRAY 1023 OF CHAR; -cc : ARRAY 1023 OF CHAR; -ccopt : ARRAY 1023 OF CHAR; -cmd : ARRAY 1023 OF CHAR; -ext : ARRAY 5 OF CHAR; -BEGIN -(* -gcc -g -o hello hello.c -I $RPATH/src/lib/system/gnuc/x86_64 -I. -I$RPATH -lOberon -L. -L$RPATH -static -*) -cmd := ""; -cc := ""; -ext := ".c"; -COPY(ccString, cc); -COPY (cc, cmd); -Strings.Append(" ", cmd); -Strings.Append(m, cmd); -Strings.Append(ext, cmd); -Strings.Append(additionalopts, cmd); -IF statically THEN Strings.Append(" -static ", cmd) END; -Strings.Append(" -o ", cmd); -Strings.Append(m, cmd); -Strings.Append(" ", cmd); - -Strings.Append (" -lVishapOberon -L. -L", ccOpt); -Strings.Append (version.prefix, ccOpt); -Strings.Append ("/lib ", ccOpt); - -Strings.Append(ccOpt, cmd); -Console.Ln; Console.String(cmd); Console.Ln; (* may be it's feasible to add debug mode later *) -Unix.system(cmd); -END LinkMain; - -BEGIN - -incPath0 := "src/lib/system/freebsd/"; -Strings.Append (compiler, incPath0); -incPath1 := "lib/voc/obj "; -ccOpt := " -fPIC -g "; - -COPY ("-I ", tmp1); -Strings.Append (version.prefix, tmp1); -Strings.Append("/", tmp1); -Strings.Append(incPath0, tmp1); -Strings.Append("/", tmp1); -Strings.Append(version.arch, tmp1); -Strings.Append(" -I ", tmp1); -Strings.Append(version.prefix, tmp1); -Strings.Append("/", tmp1); -Strings.Append(incPath1, tmp1); -Strings.Append(tmp1, ccOpt); -Args.GetEnv("CFLAGS", CFLAGS); -Strings.Append (CFLAGS, ccOpt); -Strings.Append (" ", ccOpt); -ccString := compiler; -Strings.Append (" ", ccString); - -END extTools. diff --git a/src/voc/freebsd/clang/x86_64/architecture.Mod b/src/voc/freebsd/clang/x86_64/architecture.Mod deleted file mode 100644 index 1f95d2fd..00000000 --- a/src/voc/freebsd/clang/x86_64/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "x86_64"; - -END architecture. diff --git a/src/voc/linux/clang/armv6j/architecture.Mod b/src/voc/linux/clang/armv6j/architecture.Mod deleted file mode 100644 index d8409c34..00000000 --- a/src/voc/linux/clang/armv6j/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "armv6j"; - -END architecture. diff --git a/src/voc/linux/clang/armv6j_hardfp/architecture.Mod b/src/voc/linux/clang/armv6j_hardfp/architecture.Mod deleted file mode 100644 index 761f8c99..00000000 --- a/src/voc/linux/clang/armv6j_hardfp/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "armv6j_hardfp"; - -END architecture. diff --git a/src/voc/linux/clang/armv7a_hardfp/architecture.Mod b/src/voc/linux/clang/armv7a_hardfp/architecture.Mod deleted file mode 100644 index fab9a0e2..00000000 --- a/src/voc/linux/clang/armv7a_hardfp/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "armv7a_hardfp"; - -END architecture. diff --git a/src/voc/linux/clang/extTools.Mod b/src/voc/linux/clang/extTools.Mod deleted file mode 100644 index e18f3361..00000000 --- a/src/voc/linux/clang/extTools.Mod +++ /dev/null @@ -1,88 +0,0 @@ -MODULE extTools; - IMPORT Args, Unix, Strings, Console, version; -(* -INCLUDEPATH = -Isrc/lib/system/gnuc/x86_64 -CCOPT = -fPIC $(INCLUDEPATH) -g -CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lOberon -static -g -CC = cc $(CCOPT) -c -*) -CONST compiler="clang"; - -VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 1023 OF CHAR; - -PROCEDURE Assemble*(m : ARRAY OF CHAR); -VAR cmd : ARRAY 1023 OF CHAR; -cc : ARRAY 1023 OF CHAR; -ext : ARRAY 5 OF CHAR; -BEGIN -COPY (ccString, cc); -Strings.Append (" -c ", cc); -COPY(cc, cmd); -Strings.Append (" ", cmd); -Strings.Append (ccOpt, cmd); -ext := ".c"; -Strings.Append (ext, m); -Strings.Append(m, cmd); -(*Console.Ln; Console.String (cmd); Console.Ln;*) -Unix.system(cmd); -END Assemble; - - -PROCEDURE LinkMain*(VAR m : ARRAY OF CHAR; statically : BOOLEAN; additionalopts : ARRAY OF CHAR); -VAR lpath : ARRAY 1023 OF CHAR; -cc : ARRAY 1023 OF CHAR; -ccopt : ARRAY 1023 OF CHAR; -cmd : ARRAY 1023 OF CHAR; -ext : ARRAY 5 OF CHAR; -BEGIN -(* -gcc -g -o hello hello.c -I $RPATH/src/lib/system/gnuc/x86_64 -I. -I$RPATH -lOberon -L. -L$RPATH -static -*) -cmd := ""; -cc := ""; -ext := ".c"; -COPY(ccString, cc); -COPY (cc, cmd); -Strings.Append(" ", cmd); -Strings.Append(m, cmd); -Strings.Append(ext, cmd); -Strings.Append(additionalopts, cmd); -IF statically THEN Strings.Append(" -static ", cmd) END; -Strings.Append(" -o ", cmd); -Strings.Append(m, cmd); -Strings.Append(" ", cmd); - -Strings.Append (" -lVishapOberon -L. -L", ccOpt); -Strings.Append (version.prefix, ccOpt); -Strings.Append ("/lib ", ccOpt); - -Strings.Append(ccOpt, cmd); -Console.Ln; Console.String(cmd); Console.Ln; (* may be it's feasible to add debug mode later *) -Unix.system(cmd); -END LinkMain; - -BEGIN - -incPath0 := "src/lib/system/linux/"; -Strings.Append (compiler, incPath0); -incPath1 := "lib/voc/obj "; -ccOpt := " -fPIC -g "; - -COPY ("-I ", tmp1); -Strings.Append (version.prefix, tmp1); -Strings.Append("/", tmp1); -Strings.Append(incPath0, tmp1); -Strings.Append("/", tmp1); -Strings.Append(version.arch, tmp1); -Strings.Append(" -I ", tmp1); -Strings.Append(version.prefix, tmp1); -Strings.Append("/", tmp1); -Strings.Append(incPath1, tmp1); -Strings.Append(tmp1, ccOpt); -Args.GetEnv("CFLAGS", CFLAGS); -Strings.Append (CFLAGS, ccOpt); -Strings.Append (" ", ccOpt); -ccString := compiler; -Strings.Append (" ", ccString); - -END extTools. diff --git a/src/voc/linux/clang/powerpc/architecture.Mod b/src/voc/linux/clang/powerpc/architecture.Mod deleted file mode 100644 index 1cd033d5..00000000 --- a/src/voc/linux/clang/powerpc/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "powerpc"; - -END architecture. diff --git a/src/voc/linux/clang/x86/architecture.Mod b/src/voc/linux/clang/x86/architecture.Mod deleted file mode 100644 index 84835238..00000000 --- a/src/voc/linux/clang/x86/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "x86"; - -END architecture. diff --git a/src/voc/linux/clang/x86_64/architecture.Mod b/src/voc/linux/clang/x86_64/architecture.Mod deleted file mode 100644 index 1f95d2fd..00000000 --- a/src/voc/linux/clang/x86_64/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "x86_64"; - -END architecture. diff --git a/src/voc/linux/gcc/armv6j/architecture.Mod b/src/voc/linux/gcc/armv6j/architecture.Mod deleted file mode 100644 index d8409c34..00000000 --- a/src/voc/linux/gcc/armv6j/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "armv6j"; - -END architecture. diff --git a/src/voc/linux/gcc/armv6j_hardfp/architecture.Mod b/src/voc/linux/gcc/armv6j_hardfp/architecture.Mod deleted file mode 100644 index 761f8c99..00000000 --- a/src/voc/linux/gcc/armv6j_hardfp/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "armv6j_hardfp"; - -END architecture. diff --git a/src/voc/linux/gcc/armv7a_hardfp/architecture.Mod b/src/voc/linux/gcc/armv7a_hardfp/architecture.Mod deleted file mode 100644 index fab9a0e2..00000000 --- a/src/voc/linux/gcc/armv7a_hardfp/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "armv7a_hardfp"; - -END architecture. diff --git a/src/voc/linux/gcc/powerpc/architecture.Mod b/src/voc/linux/gcc/powerpc/architecture.Mod deleted file mode 100644 index 1cd033d5..00000000 --- a/src/voc/linux/gcc/powerpc/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "powerpc"; - -END architecture. diff --git a/src/voc/linux/gcc/x86/architecture.Mod b/src/voc/linux/gcc/x86/architecture.Mod deleted file mode 100644 index 84835238..00000000 --- a/src/voc/linux/gcc/x86/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "x86"; - -END architecture. diff --git a/src/voc/linux/gcc/x86_64/architecture.Mod b/src/voc/linux/gcc/x86_64/architecture.Mod deleted file mode 100644 index 1f95d2fd..00000000 --- a/src/voc/linux/gcc/x86_64/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "x86_64"; - -END architecture. diff --git a/src/voc/openbsd/gcc/extTools.Mod b/src/voc/openbsd/gcc/extTools.Mod deleted file mode 100644 index 92110890..00000000 --- a/src/voc/openbsd/gcc/extTools.Mod +++ /dev/null @@ -1,88 +0,0 @@ -MODULE extTools; - IMPORT Args, Unix, Strings, Console, version; -(* -INCLUDEPATH = -Isrc/lib/system/gnuc/x86_64 -CCOPT = -fPIC $(INCLUDEPATH) -g -CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lOberon -static -g -CC = cc $(CCOPT) -c -*) -CONST compiler="gcc"; - -VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 1023 OF CHAR; - -PROCEDURE Assemble*(m : ARRAY OF CHAR); -VAR cmd : ARRAY 1023 OF CHAR; -cc : ARRAY 1023 OF CHAR; -ext : ARRAY 5 OF CHAR; -BEGIN -COPY (ccString, cc); -Strings.Append (" -c ", cc); -COPY(cc, cmd); -Strings.Append (" ", cmd); -Strings.Append (ccOpt, cmd); -ext := ".c"; -Strings.Append (ext, m); -Strings.Append(m, cmd); -(*Console.Ln; Console.String (cmd); Console.Ln;*) -Unix.system(cmd); -END Assemble; - - -PROCEDURE LinkMain*(VAR m : ARRAY OF CHAR; statically : BOOLEAN; additionalopts : ARRAY OF CHAR); -VAR lpath : ARRAY 1023 OF CHAR; -cc : ARRAY 1023 OF CHAR; -ccopt : ARRAY 1023 OF CHAR; -cmd : ARRAY 1023 OF CHAR; -ext : ARRAY 5 OF CHAR; -BEGIN -(* -gcc -g -o hello hello.c -I $RPATH/src/lib/system/gnuc/x86_64 -I. -I$RPATH -lOberon -L. -L$RPATH -static -*) -cmd := ""; -cc := ""; -ext := ".c"; -COPY(ccString, cc); -COPY (cc, cmd); -Strings.Append(" ", cmd); -Strings.Append(m, cmd); -Strings.Append(ext, cmd); -Strings.Append(additionalopts, cmd); -IF statically THEN Strings.Append(" -static ", cmd) END; -Strings.Append(" -o ", cmd); -Strings.Append(m, cmd); -Strings.Append(" ", cmd); - -Strings.Append (" -lVishapOberon -L. -L", ccOpt); -Strings.Append (version.prefix, ccOpt); -Strings.Append ("/lib ", ccOpt); - -Strings.Append(ccOpt, cmd); -Console.Ln; Console.String(cmd); Console.Ln; (* may be it's feasible to add debug mode later *) -Unix.system(cmd); -END LinkMain; - -BEGIN - -incPath0 := "src/lib/system/openbsd/"; -Strings.Append (compiler, incPath0); -incPath1 := "lib/voc/obj "; -ccOpt := " -fPIC -g "; - -COPY ("-I ", tmp1); -Strings.Append (version.prefix, tmp1); -Strings.Append("/", tmp1); -Strings.Append(incPath0, tmp1); -Strings.Append("/", tmp1); -Strings.Append(version.arch, tmp1); -Strings.Append(" -I ", tmp1); -Strings.Append(version.prefix, tmp1); -Strings.Append("/", tmp1); -Strings.Append(incPath1, tmp1); -Strings.Append(tmp1, ccOpt); -Args.GetEnv("CFLAGS", CFLAGS); -Strings.Append (CFLAGS, ccOpt); -Strings.Append (" ", ccOpt); -ccString := compiler; -Strings.Append (" ", ccString); - -END extTools. diff --git a/src/voc/openbsd/gcc/x86_64/architecture.Mod b/src/voc/openbsd/gcc/x86_64/architecture.Mod deleted file mode 100644 index 1f95d2fd..00000000 --- a/src/voc/openbsd/gcc/x86_64/architecture.Mod +++ /dev/null @@ -1,4 +0,0 @@ -MODULE architecture; -CONST arch* = "x86_64"; - -END architecture. diff --git a/src/voc/prf.Mod b/src/voc/prf.Mod deleted file mode 100644 index 2f4d8f24..00000000 --- a/src/voc/prf.Mod +++ /dev/null @@ -1,5 +0,0 @@ -MODULE prf; - -CONST prefix* = "/opt"; - -END prf. diff --git a/src/voc/prf.Mod_default b/src/voc/prf.Mod_default deleted file mode 100644 index 2f4d8f24..00000000 --- a/src/voc/prf.Mod_default +++ /dev/null @@ -1,5 +0,0 @@ -MODULE prf; - -CONST prefix* = "/opt"; - -END prf. diff --git a/src/voc/version.Mod b/src/voc/version.Mod deleted file mode 100644 index 0dc5e636..00000000 --- a/src/voc/version.Mod +++ /dev/null @@ -1,41 +0,0 @@ -MODULE version; - IMPORT Strings, architecture, prf; -CONST -(* targets *) - gnux86* = 0; gnux8664* = 1; gnuarmv6j* = 2; gnuarmv6jhardfp* = 3; gnuarmv7ahardfp* = 4; gnupowerpc* = 5; - -VAR arch-, version-, date-, versionLong-, prefix0-, prefix- : ARRAY 256 OF CHAR; -defaultTarget* : INTEGER; -BEGIN -arch := architecture.arch; -date := " [2016/01/12]"; -version := "1.1"; -versionLong := ""; -COPY(version, versionLong); -Strings.Append (" ", versionLong); -Strings.Append(date, versionLong); - prefix := ""; - (*prefix0 := "/opt";*) - COPY(prf.prefix, prefix0); - COPY (prefix0, prefix); - Strings.Append ("/voc-", prefix); - Strings.Append(version, prefix); (* /opt/voc-x.x *) - (* will be used later in Kernel0.Mod to set OBERON default path *) - - IF arch = "x86_64" THEN - defaultTarget := gnux8664 - ELSIF arch = "x86" THEN - defaultTarget := gnux86 - ELSIF arch = "armv6j" THEN - defaultTarget := gnuarmv6j - ELSIF arch = "armv6j_hardfp" THEN - defaultTarget := gnuarmv6jhardfp - ELSIF arch = "armv7a_hardfp" THEN - defaultTarget := gnuarmv7ahardfp - ELSIF arch = "powerpc" THEN - defaultTarget := gnupowerpc - ELSE - defaultTarget := gnux8664 - END - -END version.