diff --git a/makefile b/makefile
index 443710ed..7ca60168 100644
--- a/makefile
+++ b/makefile
@@ -7,15 +7,15 @@ CCOMP = gnuc
 RELEASE = 1.0
 
 
-INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH)
+INCLUDEPATH = -Isrc/lib/system/$(TOS)/$(CCOMP)/$(TARCH)
 
-SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
+SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system/$(TOS)/$(CCOMP):src/lib/system/$(TOS)/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(TOS)/$(CCOMP):src/lib/ooc:src/lib/ooc/$(TOS)/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(TOS)/$(CCOMP):src/voc/$(TOS)/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
 
 VOC = voc
+VERSION = $(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC = $(SETPATH) ./voc
 VOCPARAM = $(shell ./vocparam > voc.par)
-VERSION = GNU_Linux_$(TARCH)
 LIBNAME = VishapOberon
 LIBRARY = lib$(LIBNAME)
 
diff --git a/makefile.darwin.clang.x86_64 b/makefile.darwin.clang.x86_64
new file mode 100644
index 00000000..f9822650
--- /dev/null
+++ b/makefile.darwin.clang.x86_64
@@ -0,0 +1,300 @@
+#SHELL := /bin/bash
+BUILDID=$(shell date +%Y/%m/%d)
+TOS = darwin
+TARCH = x86_64
+#TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
+CCOMP = clang
+RELEASE = 1.0
+
+
+INCLUDEPATH = -Isrc/lib/system/$(TOS)/$(CCOMP)/$(TARCH)
+
+SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system/$(TOS)/$(CCOMP):src/lib/system/$(TOS)/$(CCOMP)/$(TARCH):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(TOS)/$(CCOMP):src/lib/ooc:src/lib/ooc/$(TOS)/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(TOS)/$(CCOMP):src/voc/$(TOS)/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
+
+VOC = voc
+VERSION = $(TOS).$(CCOMP).$(TARCH)
+VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
+VOCSTATIC = $(SETPATH) ./voc
+VOCPARAM = $(shell ./vocparam > voc.par)
+LIBNAME = VishapOberon
+LIBRARY = lib$(LIBNAME)
+
+ifndef PREFIX
+PREFIX = /opt/voc-$(RELEASE)
+endif
+
+ifndef PREFIXLN
+PREFIXLN = /opt/voc
+endif
+
+CCOPT = -fPIC $(INCLUDEPATH) -g
+
+CC = cc $(CCOPT) -c 
+CL = cc $(CCOPT) 
+LD = cc -shared -o $(LIBRARY).so
+# s is necessary to create index inside a archive
+ARCHIVE = ar rcs $(LIBRARY).a
+
+#%.c: %.Mod
+#%.o: %.c
+#	$(CC) $(input)
+
+all: stage2 stage3 stage4 stage5 stage6 stage7
+
+# when porting to new platform:
+# * put corresponding .par file into current directory. it can be generated on the target platform by compiling vocparam (stage0) and running (stage1)
+# * run make port0 - this will generate C source files for the target architecture
+# * move the source tree to the target machine, and compile (or compile here via crosscompiler) (port1)
+port0: stage2 stage3 stage4
+
+# now compile C source files for voc, showdef and ocat on target machine (or by using crosscompiler)
+port1: stage5
+# after you have "voc" compiled for target architecture. replace vocstatic with it and run make on target platform to get everything compiled
+
+# this builds binary which generates voc.par
+stage0: src/tools/vocparam/vocparam.c
+	$(CL) -I src/lib -o vocparam src/tools/vocparam/vocparam.c
+
+# this creates voc.par for a host architecture.
+# comment this out if you need to build a compiler for a different architecture.
+stage1: 
+	#rm voc.par
+	#$(shell "./vocparam > voc.par")
+	#./vocparam > voc.par
+	$(VOCPARAM)
+
+# this copies necessary voc.par to the current directory.
+# skip this if you are building compiler for the host architecture.
+stage2:
+	cp src/par/voc.par.$(CCOMP).$(TARCH) voc.par
+#	cp src/par/voc.par.gnu.x86_64 voc.par
+#	cp src/par/voc.par.gnu.x86 voc.par
+#	cp src/par/voc.par.gnu.armv6 voc.par
+#	cp src/par/voc.par.gnu.armv7 voc.par
+
+# this prepares modules necessary to build the compiler itself
+stage3:
+
+	$(VOCSTATIC0) -siapxPS SYSTEM.Mod 
+	$(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod 
+	$(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod
+	$(VOCSTATIC0) -sxPS Files.Mod 
+	$(VOCSTATIC0) -sxPS OakFiles.Mod 
+	$(VOCSTATIC0) -sPS Reals.Mod CmdlnTexts.Mod errors.Mod
+
+# build the compiler
+stage4:
+	$(VOCSTATIC0) -sPS extTools.Mod
+	$(VOCSTATIC0) -sPS OPM.cmdln.Mod 
+	$(VOCSTATIC0) -sxPS OPS.Mod 
+	$(VOCSTATIC0) -sPS OPT.Mod OPC.Mod OPV.Mod OPB.Mod OPP.Mod
+	$(VOCSTATIC0) -smPS voc.Mod
+	$(VOCSTATIC0) -smPS BrowserCmd.Mod
+	$(VOCSTATIC0) -smPS OCatCmd.Mod
+
+#this is to build the compiler from C sources.
+#this is a way to create a bootstrap binary.
+stage5:
+	$(CC) SYSTEM.c Args.c Console.c Modules.c Unix.c \
+	oocOakStrings.c architecture.c version.c Kernel.c Files.c OakFiles.c Reals.c CmdlnTexts.c \
+	version.c extTools.c \
+	OPM.c OPS.c OPT.c OPC.c OPV.c OPB.c OPP.c errors.c
+
+	$(CL) -static  voc.c -o voc \
+	SYSTEM.o Args.o Console.o Modules.o Unix.o \
+	oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o \
+	extTools.o \
+	OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o errors.o
+	$(CL) BrowserCmd.c -o showdef \
+	SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o \
+	OPM.o OPS.o OPT.o OPV.o OPC.o errors.o
+
+	$(CL) OCatCmd.c -o ocat \
+	SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o
+	
+# build all library files
+stage6:
+
+	#ooc libs
+	$(VOCSTATIC) -sP	oocAscii.Mod
+	$(VOCSTATIC) -sP	oocStrings.Mod
+	$(VOCSTATIC) -sP	oocStrings2.Mod
+	$(VOCSTATIC) -sP	oocCharClass.Mod
+	$(VOCSTATIC) -sP	oocConvTypes.Mod
+	$(VOCSTATIC) -sP	oocIntConv.Mod
+	$(VOCSTATIC) -sP	oocIntStr.Mod
+	$(VOCSTATIC) -sP	oocSysClock.Mod
+	$(VOCSTATIC) -sP	oocTime.Mod
+#	$(VOCSTATIC) -s	oocLongStrings.Mod
+#	$(CC)		oocLongStrings.c
+#	$(VOCSTATIC) -s	oocMsg.Mod
+#	$(CC)		oocMsg.c
+
+
+	#ooc2 libs
+	$(VOCSTATIC) -sP ooc2Strings.Mod
+	$(VOCSTATIC) -sP ooc2Ascii.Mod
+	$(VOCSTATIC) -sP ooc2CharClass.Mod
+	$(VOCSTATIC) -sP ooc2ConvTypes.Mod
+	$(VOCSTATIC) -sP ooc2IntConv.Mod
+	$(VOCSTATIC) -sP ooc2IntStr.Mod
+	$(VOCSTATIC) -sP ooc2Real0.Mod
+	#ooc libs
+	$(VOCSTATIC) -sP oocLowReal.Mod oocLowLReal.Mod
+	$(VOCSTATIC) -sP oocRealMath.Mod oocOakMath.Mod
+	$(VOCSTATIC) -sP oocLRealMath.Mod
+	$(VOCSTATIC) -sP oocLongInts.Mod
+	$(VOCSTATIC) -sP oocComplexMath.Mod oocLComplexMath.Mod
+	$(VOCSTATIC) -sP oocLRealConv.Mod oocLRealStr.Mod
+	$(VOCSTATIC) -sP oocRealConv.Mod oocRealStr.Mod
+	$(VOCSTATIC) -sP oocMsg.Mod oocChannel.Mod
+	$(VOCSTATIC) -sP oocStrings2.Mod oocRts.Mod oocFilenames.Mod
+	$(VOCSTATIC) -sP oocTextRider.Mod oocBinaryRider.Mod oocJulianDay.Mod
+	$(VOCSTATIC) -sP oocFilenames.Mod
+	$(VOCSTATIC) -sP oocwrapperlibc.Mod
+	$(VOCSTATIC) -sP oocC.Mod
+	$(VOCSTATIC) -sP oocX11.Mod
+	$(VOCSTATIC) -sP oocXutil.Mod
+	$(VOCSTATIC) -sP oocXYplane.Mod
+
+	#Ulm's Oberon system libs
+	$(VOCSTATIC) -sP ulmSys.Mod
+	$(VOCSTATIC) -sP ulmSYSTEM.Mod
+	$(VOCSTATIC) -sP ulmASCII.Mod
+	$(VOCSTATIC) -sP ulmSets.Mod
+	$(VOCSTATIC) -sP ulmObjects.Mod
+	$(VOCSTATIC) -sP ulmDisciplines.Mod
+	$(VOCSTATIC) -sP ulmPriorities.Mod
+	$(VOCSTATIC) -sP ulmServices.Mod
+	$(VOCSTATIC) -sP ulmEvents.Mod
+	$(VOCSTATIC) -sP ulmResources.Mod
+	$(VOCSTATIC) -sP ulmForwarders.Mod
+	$(VOCSTATIC) -sP ulmRelatedEvents.Mod
+	$(VOCSTATIC) -sP ulmIO.Mod
+	$(VOCSTATIC) -sP ulmProcess.Mod
+	$(VOCSTATIC) -sP ulmTypes.Mod
+	$(VOCSTATIC) -sP ulmStreams.Mod
+	$(VOCSTATIC) -sP ulmAssertions.Mod
+	$(VOCSTATIC) -sP ulmIndirectDisciplines.Mod
+	$(VOCSTATIC) -sP ulmStreamDisciplines.Mod
+	$(VOCSTATIC) -sP ulmIEEE.Mod
+	$(VOCSTATIC) -sP ulmMC68881.Mod
+	$(VOCSTATIC) -sP ulmReals.Mod
+	$(VOCSTATIC) -sP ulmPrint.Mod
+	$(VOCSTATIC) -sP ulmWrite.Mod
+	$(VOCSTATIC) -sP ulmTexts.Mod
+	$(VOCSTATIC) -sP ulmStrings.Mod
+	$(VOCSTATIC) -sP ulmConstStrings.Mod
+	$(VOCSTATIC) -sP ulmPlotters.Mod
+	$(VOCSTATIC) -sP ulmSysTypes.Mod
+	$(VOCSTATIC) -sP ulmSysConversions.Mod
+	$(VOCSTATIC) -sP ulmErrors.Mod
+	$(VOCSTATIC) -sP ulmSysErrors.Mod
+	$(VOCSTATIC) -sP ulmSysIO.Mod
+	$(VOCSTATIC) -sP ulmLoader.Mod
+	$(VOCSTATIC) -sP ulmNetIO.Mod
+	$(VOCSTATIC) -sP ulmPersistentObjects.Mod
+	$(VOCSTATIC) -sP ulmPersistentDisciplines.Mod
+	$(VOCSTATIC) -sP ulmOperations.Mod
+	$(VOCSTATIC) -sP ulmScales.Mod
+	$(VOCSTATIC) -sP ulmTimes.Mod
+	$(VOCSTATIC) -sP ulmClocks.Mod
+	$(VOCSTATIC) -sP ulmTimers.Mod
+	$(VOCSTATIC) -sP ulmConditions.Mod
+	$(VOCSTATIC) -sP ulmStreamConditions.Mod
+	$(VOCSTATIC) -sP ulmTimeConditions.Mod
+	$(VOCSTATIC) -sP ulmSysConversions.Mod
+	$(VOCSTATIC) -sP ulmSysStat.Mod
+	$(VOCSTATIC) -sP ulmCiphers.Mod
+	$(VOCSTATIC) -sP ulmCipherOps.Mod
+	$(VOCSTATIC) -sP ulmBlockCiphers.Mod
+	$(VOCSTATIC) -sP ulmAsymmetricCiphers.Mod
+	$(VOCSTATIC) -sP ulmConclusions.Mod
+	$(VOCSTATIC) -sP ulmRandomGenerators.Mod
+	$(VOCSTATIC) -sP ulmTCrypt.Mod
+
+	#more v4 libs
+	$(VOCSTATIC) -sP	Printer.Mod
+	$(VOCSTATIC) -sP	Strings.Mod
+	$(VOCSTATIC) -sP	Sets.Mod
+	$(VOCSTATIC) -sP	Sets0.Mod
+	$(VOCSTATIC) -sP	compatIn.Mod
+
+	#pow32 libs
+	$(VOCSTATIC) -sP powStrings.Mod
+
+	#misc libs
+	$(VOCSTATIC) -sP MultiArrays.Mod
+	$(VOCSTATIC) -sP MultiArrayRiders.Mod
+	$(VOCSTATIC) -sP MersenneTwister.Mod
+	$(VOCSTATIC) -sP Listen.Mod
+	
+	#s3 libs
+	$(VOCSTATIC) -sP ethBTrees.Mod
+	$(VOCSTATIC) -sP ethMD5.Mod
+	$(VOCSTATIC) -sP ethSets.Mod
+	$(VOCSTATIC) -sP ethZlib.Mod
+	$(VOCSTATIC) -sP ethZlibBuffers.Mod
+	$(VOCSTATIC) -sP ethZlibInflate.Mod
+	$(VOCSTATIC) -sP ethZlibDeflate.Mod
+	$(VOCSTATIC) -sP ethZlibReaders.Mod
+	$(VOCSTATIC) -sP ethZlibWriters.Mod
+	$(VOCSTATIC) -sP ethZip.Mod
+	$(VOCSTATIC) -sP ethRandomNumbers.Mod
+	$(VOCSTATIC) -sP ethGZReaders.Mod
+	$(VOCSTATIC) -sP ethGZWriters.Mod
+
+
+# build remaining tools
+#	$(VOCSTATIC0) -sPS compatIn.Mod
+#	$(VOCSTATIC0) -smPS vmake.Mod
+#	$(CC) compatIn.c
+#	$(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o oocIntStr.o oocConvTypes.o oocIntConv.o version.o architecture.o
+
+
+
+stage7:
+	#objects := $(wildcard *.o)
+	#$(LD) objects
+	$(ARCHIVE) *.o 
+	#$(ARCHIVE) objects
+	$(LD) *.o
+	echo "$(PREFIX)/lib" > 05vishap.conf
+
+clean:
+#	rm_objects := rm $(wildcard *.o)
+#	objects
+	rm *.o
+	rm *.so
+	rm *.h
+	rm *.c
+	rm *.a
+	rm *.sym
+
+install:
+	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
+	cp voc $(PREFIX)/bin/
+	cp showdef $(PREFIX)/bin/
+	cp ocat $(PREFIX)/bin/
+	#cp vmake $(PREFIX)/bin/
+	cp -a src $(PREFIX)/
+
+	test -d $(PREFIX)/lib/voc | mkdir -p $(PREFIX)/lib/voc
+	test -d $(PREFIX)/lib/voc/ | mkdir -p $(PREFIX)/lib/voc
+	test -d $(PREFIX)/lib/voc/obj | mkdir -p $(PREFIX)/lib/voc/obj
+	test -d $(PREFIX)/lib/voc/sym | mkdir -p $(PREFIX)/lib/voc/sym
+
+	cp $(LIBRARY).so $(PREFIX)/lib
+	cp $(LIBRARY).a $(PREFIX)/lib
+	cp *.c $(PREFIX)/lib/voc/obj/
+	cp *.h $(PREFIX)/lib/voc/obj/
+	cp *.sym $(PREFIX)/lib/voc/sym/
+
+	cp 05vishap.conf /etc/ld.so.conf.d/
+	ldconfig
+	ln -s $(PREFIX) $(PREFIXLN)
+
+#        cp *.o $(PREFIX)/lib/voc/$(RELEASE)/obj/
+uninstall:
+	rm -rf $(PREFIX)
+	rm -rf $(PREFIXLN)
diff --git a/makefile.gnuc.armv6j b/makefile.linux.gnuc.armv6j
similarity index 94%
rename from makefile.gnuc.armv6j
rename to makefile.linux.gnuc.armv6j
index 6954f531..b942e479 100644
--- a/makefile.gnuc.armv6j
+++ b/makefile.linux.gnuc.armv6j
@@ -7,15 +7,15 @@ CCOMP = gnuc
 RELEASE = 1.0
 
 
-INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH)
+INCLUDEPATH = -Isrc/lib/system/$(TOS)/$(CCOMP)/$(TARCH)
 
-SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
+SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system/$(TOS)/$(CCOMP):src/lib/system/$(TOS)/$(CCOMP)/$(TARCH):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(TOS)/$(CCOMP):src/lib/ooc:src/lib/ooc/$(TOS)/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(TOS)/$(CCOMP):src/voc/$(TOS)/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
 
 VOC = voc
+VERSION = $(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC = $(SETPATH) ./voc
 VOCPARAM = $(shell ./vocparam > voc.par)
-VERSION = GNU_Linux_$(TARCH)
 LIBNAME = VishapOberon
 LIBRARY = lib$(LIBNAME)
 
diff --git a/makefile.gnuc.armv6j_hardfp b/makefile.linux.gnuc.armv6j_hardfp
similarity index 94%
rename from makefile.gnuc.armv6j_hardfp
rename to makefile.linux.gnuc.armv6j_hardfp
index b79b7062..a467c79d 100644
--- a/makefile.gnuc.armv6j_hardfp
+++ b/makefile.linux.gnuc.armv6j_hardfp
@@ -7,15 +7,15 @@ CCOMP = gnuc
 RELEASE = 1.0
 
 
-INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH)
+INCLUDEPATH = -Isrc/lib/system/$(TOS)/$(CCOMP)/$(TARCH)
 
-SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
+SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system/$(TOS)/$(CCOMP):src/lib/system/$(TOS)/$(CCOMP)/$(TARCH):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(TOS)/$(CCOMP):src/lib/ooc:src/lib/ooc/$(TOS)/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(TOS)/$(CCOMP):src/voc/$(TOS)/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
 
 VOC = voc
+VERSION = $(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC = $(SETPATH) ./voc
 VOCPARAM = $(shell ./vocparam > voc.par)
-VERSION = GNU_Linux_$(TARCH)
 LIBNAME = VishapOberon
 LIBRARY = lib$(LIBNAME)
 
diff --git a/makefile.gnuc.armv7a_hardfp b/makefile.linux.gnuc.armv7a_hardfp
similarity index 94%
rename from makefile.gnuc.armv7a_hardfp
rename to makefile.linux.gnuc.armv7a_hardfp
index 8d6c6277..e9b49138 100644
--- a/makefile.gnuc.armv7a_hardfp
+++ b/makefile.linux.gnuc.armv7a_hardfp
@@ -7,15 +7,15 @@ CCOMP = gnuc
 RELEASE = 1.0
 
 
-INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH)
+INCLUDEPATH = -Isrc/lib/system/$(TOS)/$(CCOMP)/$(TARCH)
 
-SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
+SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system/$(TOS)/$(CCOMP):src/lib/system/$(TOS)/$(CCOMP)/$(TARCH):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(TOS)/$(CCOMP):src/lib/ooc:src/lib/ooc/$(TOS)/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(TOS)/$(CCOMP):src/voc/$(TOS)/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
 
 VOC = voc
+VERSION = $(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC = $(SETPATH) ./voc
 VOCPARAM = $(shell ./vocparam > voc.par)
-VERSION = GNU_Linux_$(TARCH)
 LIBNAME = VishapOberon
 LIBRARY = lib$(LIBNAME)
 
diff --git a/makefile.gnuc.powerpc b/makefile.linux.gnuc.powerpc
similarity index 94%
rename from makefile.gnuc.powerpc
rename to makefile.linux.gnuc.powerpc
index 1396a93a..a1f8e270 100644
--- a/makefile.gnuc.powerpc
+++ b/makefile.linux.gnuc.powerpc
@@ -7,15 +7,15 @@ CCOMP = gnuc
 RELEASE = 1.0
 
 
-INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH)
+INCLUDEPATH = -Isrc/lib/system/$(TOS)/$(CCOMP)/$(TARCH)
 
-SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
+SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system/$(TOS)/$(CCOMP):src/lib/system/$(TOS)/$(CCOMP)/$(TARCH):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(TOS)/$(CCOMP):src/lib/ooc:src/lib/ooc/$(TOS)/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(TOS)/$(CCOMP):src/voc/$(TOS)/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
 
 VOC = voc
+VERSION = $(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC = $(SETPATH) ./voc
 VOCPARAM = $(shell ./vocparam > voc.par)
-VERSION = GNU_Linux_$(TARCH)
 LIBNAME = VishapOberon
 LIBRARY = lib$(LIBNAME)
 
diff --git a/makefile.gnuc.x86 b/makefile.linux.gnuc.x86
similarity index 94%
rename from makefile.gnuc.x86
rename to makefile.linux.gnuc.x86
index 00ac1b7e..4efe3f2e 100644
--- a/makefile.gnuc.x86
+++ b/makefile.linux.gnuc.x86
@@ -7,15 +7,15 @@ CCOMP = gnuc
 RELEASE = 1.0
 
 
-INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH)
+INCLUDEPATH = -Isrc/lib/system/$(TOS)/$(CCOMP)/$(TARCH)
 
-SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
+SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system/$(TOS)/$(CCOMP):src/lib/system/$(TOS)/$(CCOMP)/$(TARCH):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(TOS)/$(CCOMP):src/lib/ooc:src/lib/ooc/$(TOS)/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(TOS)/$(CCOMP):src/voc/$(TOS)/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
 
 VOC = voc
+VERSION = $(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC = $(SETPATH) ./voc
 VOCPARAM = $(shell ./vocparam > voc.par)
-VERSION = GNU_Linux_$(TARCH)
 LIBNAME = VishapOberon
 LIBRARY = lib$(LIBNAME)
 
diff --git a/makefile.gnuc.x86_64 b/makefile.linux.gnuc.x86_64
similarity index 94%
rename from makefile.gnuc.x86_64
rename to makefile.linux.gnuc.x86_64
index 443710ed..171b5342 100644
--- a/makefile.gnuc.x86_64
+++ b/makefile.linux.gnuc.x86_64
@@ -7,15 +7,15 @@ CCOMP = gnuc
 RELEASE = 1.0
 
 
-INCLUDEPATH = -Isrc/lib/system/$(CCOMP)/$(TARCH)
+INCLUDEPATH = -Isrc/lib/system/$(TOS)/$(CCOMP)/$(TARCH)
 
-SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system:src/lib/system/$(CCOMP):src/lib/system/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(CCOMP):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(CCOMP):src/lib/ooc:src/lib/ooc/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(CCOMP):src/voc/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
+SETPATH = CFLAGS=$(INCLUDEPATH)  PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system/$(TOS)/$(CCOMP):src/lib/system/$(TOS)/$(CCOMP)/$(TARCH):src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(TOS)/$(CCOMP):src/lib/ooc:src/lib/ooc/$(TOS)/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(TOS)/$(CCOMP):src/voc/$(TOS)/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test
 
 VOC = voc
+VERSION = $(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC0 = $(SETPATH) ./vocstatic.$(TOS).$(CCOMP).$(TARCH)
 VOCSTATIC = $(SETPATH) ./voc
 VOCPARAM = $(shell ./vocparam > voc.par)
-VERSION = GNU_Linux_$(TARCH)
 LIBNAME = VishapOberon
 LIBRARY = lib$(LIBNAME)
 
diff --git a/ocat b/ocat
index 802d3c22..c5e15fe4 100755
Binary files a/ocat and b/ocat differ
diff --git a/showdef b/showdef
index 425e4c63..8baf9d05 100755
Binary files a/showdef and b/showdef differ
diff --git a/src/lib/ooc/gnuc/x86_64/oocC.Mod b/src/lib/ooc/darwin/clang/x86_64/oocC.Mod
similarity index 100%
rename from src/lib/ooc/gnuc/x86_64/oocC.Mod
rename to src/lib/ooc/darwin/clang/x86_64/oocC.Mod
diff --git a/src/lib/ooc/gnuc/armv6j/oocC.Mod b/src/lib/ooc/linux/gnuc/armv6j/oocC.Mod
similarity index 100%
rename from src/lib/ooc/gnuc/armv6j/oocC.Mod
rename to src/lib/ooc/linux/gnuc/armv6j/oocC.Mod
diff --git a/src/lib/ooc/gnuc/armv6j_hardfp/oocC.Mod b/src/lib/ooc/linux/gnuc/armv6j_hardfp/oocC.Mod
similarity index 100%
rename from src/lib/ooc/gnuc/armv6j_hardfp/oocC.Mod
rename to src/lib/ooc/linux/gnuc/armv6j_hardfp/oocC.Mod
diff --git a/src/lib/ooc/gnuc/powerpc/oocC.Mod b/src/lib/ooc/linux/gnuc/powerpc/oocC.Mod
similarity index 100%
rename from src/lib/ooc/gnuc/powerpc/oocC.Mod
rename to src/lib/ooc/linux/gnuc/powerpc/oocC.Mod
diff --git a/src/lib/ooc/gnuc/x86/oocC.Mod b/src/lib/ooc/linux/gnuc/x86/oocC.Mod
similarity index 100%
rename from src/lib/ooc/gnuc/x86/oocC.Mod
rename to src/lib/ooc/linux/gnuc/x86/oocC.Mod
diff --git a/src/lib/ooc/linux/gnuc/x86_64/oocC.Mod b/src/lib/ooc/linux/gnuc/x86_64/oocC.Mod
new file mode 100644
index 00000000..14638e75
--- /dev/null
+++ b/src/lib/ooc/linux/gnuc/x86_64/oocC.Mod
@@ -0,0 +1,71 @@
+(* 	$Id: C.Mod,v 1.9 1999/10/03 11:46:01 ooc-devel Exp $	 *)
+MODULE oocC;
+(*  Basic data types for interfacing to C code.
+    Copyright (C) 1997-1998  Michael van Acken
+
+    This module is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public License
+    as published by the Free Software Foundation; either version 2 of
+    the License, or (at your option) any later version.
+
+    This module is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with OOC. If not, write to the Free Software Foundation,
+    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*)
+ 
+IMPORT
+  SYSTEM;
+  
+(*
+These types are intended to be equivalent to their C counterparts.
+They may vary depending on your system, but as long as you stick to a 32 Bit
+Unix they should be fairly safe.
+*)  
+
+TYPE
+  char* = CHAR;
+  signedchar* = SHORTINT;                (* signed char *)
+  shortint* = RECORD a,b : SYSTEM.BYTE END; (* 2 bytes on x64_64 *)  (* short int *)
+  int* = INTEGER;
+  set* = INTEGER;(*SET;*) (* unsigned int, used as set *)
+  longint* = LONGINT;                    (* long int *)
+  longset* = SET; (*SYSTEM.SET64; *) (* unsigned long, used as set *)
+  address* = LONGINT; (*SYSTEM.ADDRESS;*)
+  float* = REAL;
+  double* = LONGREAL;
+
+  enum1* = int;
+  enum2* = int;
+  enum4* = int;
+  
+  (* if your C compiler uses short enumerations, you'll have to replace the
+     declarations above with
+  enum1* = SHORTINT;
+  enum2* = INTEGER;
+  enum4* = LONGINT;
+  *)
+  
+  FILE* = address;  (* this is acually a replacement for `FILE*', i.e., for a pointer type *)
+  sizet* = longint;
+  uidt* = int;
+  gidt* = int;
+
+
+TYPE  (* some commonly used C array types *)
+  charPtr1d* = POINTER TO ARRAY OF char;
+  charPtr2d* = POINTER TO ARRAY OF charPtr1d;
+  intPtr1d* = POINTER TO ARRAY OF int;
+
+TYPE  (* C string type, assignment compatible with character arrays and
+         string constants *)
+  string* = POINTER (*[CSTRING]*) TO ARRAY OF char;
+  
+TYPE
+  Proc* = PROCEDURE;
+  
+END oocC.
diff --git a/src/lib/ooc2/gnuc/oocwrapperlibc.Mod b/src/lib/ooc2/darwin/clang/oocwrapperlibc.Mod
similarity index 100%
rename from src/lib/ooc2/gnuc/oocwrapperlibc.Mod
rename to src/lib/ooc2/darwin/clang/oocwrapperlibc.Mod
diff --git a/src/lib/ooc2/linux/gnuc/oocwrapperlibc.Mod b/src/lib/ooc2/linux/gnuc/oocwrapperlibc.Mod
new file mode 100644
index 00000000..0d0cf9b6
--- /dev/null
+++ b/src/lib/ooc2/linux/gnuc/oocwrapperlibc.Mod
@@ -0,0 +1,34 @@
+MODULE oocwrapperlibc;
+IMPORT SYSTEM;
+PROCEDURE -includeStdio()
+   "#include <stdio.h>";
+
+PROCEDURE -sys(str: ARRAY OF CHAR): INTEGER
+   "system(str)";
+
+PROCEDURE system*(cmd : ARRAY OF CHAR);
+VAR r : INTEGER;
+BEGIN
+r := sys(cmd);
+END system;
+(*
+PROCEDURE strtod* (string: C.address;
+                   VAR tailptr: C.charPtr1d): C.double;
+PROCEDURE strtof* (string: C.address;
+                   VAR tailptr: C.charPtr1d): C.float;
+PROCEDURE sscanf* (s: C.address; template: ARRAY OF CHAR; ...) : C.int;
+*)
+
+PROCEDURE -sprntf(s, t0, t1, t2: ARRAY OF CHAR): INTEGER
+   "sprintf(s, t0, t1, t2)";
+
+PROCEDURE sprintf* (VAR s: ARRAY OF CHAR; template0: ARRAY OF CHAR; template1: ARRAY OF CHAR; template2: ARRAY OF CHAR);
+VAR r : INTEGER;
+BEGIN
+   r := sprntf (s, template0, template1, template2);
+END sprintf;
+
+BEGIN
+
+
+END oocwrapperlibc.
diff --git a/src/lib/system/gnuc/x86_64/Args.Mod b/src/lib/system/darwin/clang/x86_64/Args.Mod
similarity index 100%
rename from src/lib/system/gnuc/x86_64/Args.Mod
rename to src/lib/system/darwin/clang/x86_64/Args.Mod
diff --git a/src/lib/system/gnuc/x86_64/SYSTEM.c0 b/src/lib/system/darwin/clang/x86_64/SYSTEM.c0
similarity index 100%
rename from src/lib/system/gnuc/x86_64/SYSTEM.c0
rename to src/lib/system/darwin/clang/x86_64/SYSTEM.c0
diff --git a/src/lib/system/darwin/clang/x86_64/SYSTEM.h b/src/lib/system/darwin/clang/x86_64/SYSTEM.h
new file mode 100644
index 00000000..9fadaf48
--- /dev/null
+++ b/src/lib/system/darwin/clang/x86_64/SYSTEM.h
@@ -0,0 +1,234 @@
+#ifndef SYSTEM__h
+#define SYSTEM__h
+
+/*
+
+voc (jet backend) runtime system interface and macros library
+copyright (c) Josef Templ, 1995, 1996
+
+clang for Darwin version
+uses double # as concatenation operator
+
+*/
+
+#include <alloca.h>
+#include <string.h>
+
+extern void *memcpy(void *dest, const void *src, long n);
+extern void *malloc(long size);
+extern void exit(int status);
+
+#define export
+#define import extern
+
+/* constants */
+#define __MAXEXT	16
+#define NIL	0L
+#define POINTER__typ	(long*)1L	/* not NIL and not a valid type */
+
+/* basic types */
+//typedef char BOOLEAN;
+#define BOOLEAN char
+//typedef unsigned char CHAR;
+#define CHAR unsigned char
+//exactly two bytes
+#define LONGCHAR unsigned short int
+//typedef signed char SHORTINT;
+#define SHORTINT signed char
+//for x86 GNU/Linux
+//typedef short int INTEGER;
+//for x86_64 GNU/Linux
+//typedef int INTEGER;
+#define INTEGER int
+//typedef long LONGINT;
+#define LONGINT long
+//typedef float REAL;
+#define REAL float
+//typedef double LONGREAL;
+#define LONGREAL double
+//typedef unsigned long SET;
+#define SET unsigned long
+typedef void *SYSTEM_PTR;
+//#define *SYSTEM_PTR void
+//typedef unsigned char SYSTEM_BYTE;
+#define SYSTEM_BYTE unsigned char
+
+/* runtime system routines */
+extern long SYSTEM_DIV();
+extern long SYSTEM_MOD();
+extern long SYSTEM_ENTIER();
+extern long SYSTEM_ASH();
+extern long SYSTEM_ABS();
+extern long SYSTEM_XCHK();
+extern long SYSTEM_RCHK();
+extern double SYSTEM_ABSD();
+extern SYSTEM_PTR SYSTEM_NEWREC();
+extern SYSTEM_PTR SYSTEM_NEWBLK();
+#ifdef __STDC__
+extern SYSTEM_PTR SYSTEM_NEWARR(long*, long, int, int, int, ...);
+#else
+extern SYSTEM_PTR SYSTEM_NEWARR();
+#endif
+extern SYSTEM_PTR SYSTEM_REGMOD();
+extern void SYSTEM_INCREF();
+extern void SYSTEM_REGCMD();
+extern void SYSTEM_REGTYP();
+extern void SYSTEM_REGFIN();
+extern void SYSTEM_FINALL();
+extern void SYSTEM_INIT();
+extern void SYSTEM_FINI();
+extern void SYSTEM_HALT();
+extern void SYSTEM_INHERIT();
+extern void SYSTEM_ENUMP();
+extern void SYSTEM_ENUMR();
+
+/* module registry */
+#define __DEFMOD	static void *m; if(m!=0)return m
+#define __REGMOD(name, enum)	if(m==0)m=SYSTEM_REGMOD((CHAR*)name,enum); else return m
+#define __ENDMOD	return m
+#define __INIT(argc, argv)	static void *m; SYSTEM_INIT(argc, (long)&argv);
+#define __REGMAIN(name, enum)	m=SYSTEM_REGMOD(name,enum)
+#define __FINI	SYSTEM_FINI(); return 0
+#define __IMPORT(name)	SYSTEM_INCREF(name##__init())
+#define __REGCMD(name, cmd)	SYSTEM_REGCMD(m, name, cmd)
+
+/* SYSTEM ops */
+#define __SYSNEW(p, len)	p=SYSTEM_NEWBLK((long)(len))
+#define __VAL(t, x)	(*(t*)&(x))
+#define __GET(a, x, t)	x= *(t*)(a)
+#define __PUT(a, x, t)	*(t*)(a)=x
+#define __LSHL(x, n, t)	((t)((unsigned t)(x)<<(n)))
+#define __LSHR(x, n, t)	((t)((unsigned t)(x)>>(n)))
+#define __LSH(x, n, t)	((n)>=0? __LSHL(x, n, t): __LSHR(x, -(n), t))
+#define __ROTL(x, n, t)	((t)((unsigned t)(x)<<(n)|(unsigned t)(x)>>(8*sizeof(t)-(n))))
+#define __ROTR(x, n, t)	((t)((unsigned t)(x)>>(n)|(unsigned t)(x)<<(8*sizeof(t)-(n))))
+#define __LSHR(x, n, t)	((t)((unsigned t)(x)>>(n)))
+#define __LSH(x, n, t)	((n)>=0? __LSHL(x, n, t): __LSHR(x, -(n), t))
+#define __ROTL(x, n, t)	((t)((unsigned t)(x)<<(n)|(unsigned t)(x)>>(8*sizeof(t)-(n))))
+#define __ROTR(x, n, t)	((t)((unsigned t)(x)>>(n)|(unsigned t)(x)<<(8*sizeof(t)-(n))))
+#define __ROT(x, n, t)	((n)>=0? __ROTL(x, n, t): __ROTR(x, -(n), t))
+#define __BIT(x, n)	(*(unsigned long*)(x)>>(n)&1)
+#define __MOVE(s, d, n)	memcpy((char*)(d),(char*)(s),n)
+
+/* std procs and operator mappings */
+#define __SHORT(x, y)	((int)((unsigned long)(x)+(y)<(y)+(y)?(x):(__HALT(-8),0)))
+#define __SHORTF(x, y)	((int)(__RF((x)+(y),(y)+(y))-(y)))
+#define __CHR(x)	((CHAR)__R(x, 256))
+#define __CHRF(x)	((CHAR)__RF(x, 256))
+#define __DIV(x, y)	((x)>=0?(x)/(y):-(((y)-1-(x))/(y)))
+#define __DIVF(x, y)	SYSTEM_DIV((long)(x),(long)(y))
+#define __MOD(x, y)	((x)>=0?(x)%(y):__MODF(x,y))
+#define __MODF(x, y)	SYSTEM_MOD((long)(x),(long)(y))
+#define __NEW(p, t)	p=SYSTEM_NEWREC((long)t##__typ)
+#define __NEWARR	SYSTEM_NEWARR
+#define __HALT(x)	SYSTEM_HALT(x)
+#define __ASSERT(cond, x)	if (!(cond)) {SYSTEM_assert = x; SYSTEM_HALT(-1);}
+#define __ENTIER(x)	SYSTEM_ENTIER(x)
+#define __ABS(x)	(((x)<0)?-(x):(x))
+#define __ABSF(x)	SYSTEM_ABS((long)(x))
+#define __ABSFD(x)	SYSTEM_ABSD((double)(x))
+#define __CAP(ch)	((CHAR)((ch)&0x5f))
+#define __ODD(x)	((x)&1)
+#define __IN(x, s)	(((s)>>(x))&1)
+#define __SETOF(x)	((SET)1<<(x))
+#define __SETRNG(l, h)	((~(SET)0<<(l))&~(SET)0>>(8*sizeof(SET)-1-(h)))
+#define __MASK(x, m)	((x)&~(m))
+#define __COPY(s, d, n)	{char*_a=(void*)s,*_b=(void*)d;long _i=0,_t=n-1;while(_i<_t&&((_b[_i]=_a[_i])!=0)){_i++;};_b[_i]=0;}
+static int __STRCMP(x, y)
+	CHAR *x, *y;
+{long i = 0; CHAR ch1, ch2;
+	do {ch1 = x[i]; ch2 = y[i]; i++;
+		if (!ch1) return -(int)ch2;
+	} while (ch1==ch2);
+	return (int)ch1 - (int)ch2;
+}
+#define __ASH(x, n)	((n)>=0?__ASHL(x,n):__ASHR(x,-(n)))
+#define __ASHL(x, n)	((long)(x)<<(n))
+#define __ASHR(x, n)	((long)(x)>>(n))
+#define __ASHF(x, n)	SYSTEM_ASH((long)(x), (long)(n))
+#define __DUP(x, l, t)	x=(void*)memcpy(alloca(l*sizeof(t)),x,l*sizeof(t))
+#define __DUPARR(v, t)	v=(void*)memcpy(v##__copy,v,sizeof(t))
+#define __DEL(x)	/* DUP with alloca frees storage automatically */
+#define __IS(tag, typ, level)	(*(tag-(__BASEOFF-level))==(long)typ##__typ)
+#define __TYPEOF(p)	(*(((long**)(p))-1))
+#define __ISP(p, typ, level)	__IS(__TYPEOF(p),typ,level)
+
+/* runtime checks */
+#define __X(i, ub)	(((unsigned)(long)(i)<(unsigned long)(ub))?i:(__HALT(-2),0))
+#define __XF(i, ub)	 SYSTEM_XCHK((long)(i), (long)(ub))
+#define __RETCHK	__retchk: __HALT(-3)
+#define __CASECHK	__HALT(-4)
+#define __GUARDP(p, typ, level)	((typ*)(__ISP(p,typ,level)?p:(__HALT(-5),p)))
+#define __GUARDR(r, typ, level)	(*((typ*)(__IS(r##__typ,typ,level)?r:(__HALT(-5),r))))
+#define __GUARDA(p, typ, level)	((struct typ*)(__IS(__TYPEOF(p),typ,level)?p:(__HALT(-5),p)))
+#define __GUARDEQR(p, dyntyp, typ)	if(dyntyp!=typ##__typ) __HALT(-6);*(p)
+#define __GUARDEQP(p, typ)	if(__TYPEOF(p)!=typ##__typ)__HALT(-6);*(p)
+#define __WITHCHK	__HALT(-7)
+#define __R(i, ub)	(((unsigned)(long)(i)<(unsigned long)(ub))?i:(__HALT(-8),0))
+#define __RF(i, ub)	SYSTEM_RCHK((long)(i),(long)(ub))
+
+/* record type descriptors */
+#define __TDESC(t, m, n) \
+	static struct t##__desc {\
+		long tproc[m]; \
+		long tag, next, level, module; \
+		char name[24]; \
+		long *base[__MAXEXT]; \
+		char *rsrvd; \
+		long blksz, ptr[n+1]; \
+	} t##__desc
+
+#define __BASEOFF	(__MAXEXT+1)
+#define __TPROC0OFF	(__BASEOFF+24/sizeof(long)+5)
+#define __EOM	1
+#define __TDFLDS(name, size)	{__EOM}, 1, 0, 0, 0, name, {0}, 0, size
+#define __ENUMP(adr, n, P)	SYSTEM_ENUMP(adr, (long)(n), P)
+#define __ENUMR(adr, typ, size, n, P)	SYSTEM_ENUMR(adr, typ, (long)(size), (long)(n), P)
+
+#define __INITYP(t, t0, level) \
+	t##__typ= &t##__desc.blksz; \
+	memcpy(t##__desc.base, t0##__typ - __BASEOFF, level*sizeof(long)); \
+	t##__desc.base[level]=t##__typ; \
+	t##__desc.module=(long)m; \
+	if(t##__desc.blksz!=sizeof(struct t)) __HALT(-15); \
+	t##__desc.blksz=(t##__desc.blksz+5*sizeof(long)-1)/(4*sizeof(long))*(4*sizeof(long)); \
+	SYSTEM_REGTYP(m, (long)&t##__desc.next); \
+	SYSTEM_INHERIT(t##__typ, t0##__typ)
+
+/* Oberon-2 type bound procedures support */
+#define __INITBP(t, proc, num)	*(t##__typ-(__TPROC0OFF+num))=(long)proc
+#define __SEND(typ, num, funtyp, parlist)	((funtyp)(*(typ-(__TPROC0OFF+num))))parlist
+
+/* runtime system variables */
+extern LONGINT SYSTEM_argc;
+extern LONGINT SYSTEM_argv;
+extern void (*SYSTEM_Halt)();
+extern LONGINT SYSTEM_halt;
+extern LONGINT SYSTEM_assert;
+extern SYSTEM_PTR SYSTEM_modules;
+extern LONGINT SYSTEM_heapsize;
+extern LONGINT SYSTEM_allocated;
+extern LONGINT SYSTEM_lock;
+extern SHORTINT SYSTEM_gclock;
+extern BOOLEAN SYSTEM_interrupted;
+
+/* ANSI prototypes; not used so far
+static int __STRCMP(CHAR *x, CHAR *y);
+void SYSTEM_INIT(int argc, long argvadr);
+void SYSTEM_FINI(void);
+long SYSTEM_XCHK(long i, long ub);
+long SYSTEM_RCHK(long i, long ub);
+long SYSTEM_ASH(long i, long n);
+long SYSTEM_ABS(long i);
+double SYSTEM_ABSD(double i);
+void SYSTEM_INHERIT(long *t, long *t0);
+void SYSTEM_ENUMP(long *adr, long n, void (*P)(void*));
+void SYSTEM_ENUMR(char *adr, long *typ, long size, long n, void (*P)(void*));
+long SYSTEM_DIV(unsigned long x, unsigned long y);
+long SYSTEM_MOD(unsigned long x, unsigned long y);
+long SYSTEM_ENTIER(double x);
+void SYSTEM_HALT(int n);
+*/
+
+#endif
+
diff --git a/src/lib/system/gnuc/x86_64/Unix.Mod b/src/lib/system/darwin/clang/x86_64/Unix.Mod
similarity index 100%
rename from src/lib/system/gnuc/x86_64/Unix.Mod
rename to src/lib/system/darwin/clang/x86_64/Unix.Mod
diff --git a/src/lib/system/gnuc/Console.Mod b/src/lib/system/linux/gnuc/Console.Mod
similarity index 100%
rename from src/lib/system/gnuc/Console.Mod
rename to src/lib/system/linux/gnuc/Console.Mod
diff --git a/src/lib/system/gnuc/SYSTEM.Mod b/src/lib/system/linux/gnuc/SYSTEM.Mod
similarity index 100%
rename from src/lib/system/gnuc/SYSTEM.Mod
rename to src/lib/system/linux/gnuc/SYSTEM.Mod
diff --git a/src/lib/system/gnuc/armv6j/Args.Mod b/src/lib/system/linux/gnuc/armv6j/Args.Mod
similarity index 100%
rename from src/lib/system/gnuc/armv6j/Args.Mod
rename to src/lib/system/linux/gnuc/armv6j/Args.Mod
diff --git a/src/lib/system/gnuc/armv6j/SYSTEM.c0 b/src/lib/system/linux/gnuc/armv6j/SYSTEM.c0
similarity index 100%
rename from src/lib/system/gnuc/armv6j/SYSTEM.c0
rename to src/lib/system/linux/gnuc/armv6j/SYSTEM.c0
diff --git a/src/lib/system/gnuc/armv6j/SYSTEM.h b/src/lib/system/linux/gnuc/armv6j/SYSTEM.h
similarity index 100%
rename from src/lib/system/gnuc/armv6j/SYSTEM.h
rename to src/lib/system/linux/gnuc/armv6j/SYSTEM.h
diff --git a/src/lib/system/gnuc/armv6j/Unix.Mod b/src/lib/system/linux/gnuc/armv6j/Unix.Mod
similarity index 100%
rename from src/lib/system/gnuc/armv6j/Unix.Mod
rename to src/lib/system/linux/gnuc/armv6j/Unix.Mod
diff --git a/src/lib/system/gnuc/armv6j_hardfp/Args.Mod b/src/lib/system/linux/gnuc/armv6j_hardfp/Args.Mod
similarity index 100%
rename from src/lib/system/gnuc/armv6j_hardfp/Args.Mod
rename to src/lib/system/linux/gnuc/armv6j_hardfp/Args.Mod
diff --git a/src/lib/system/gnuc/armv6j_hardfp/SYSTEM.c0 b/src/lib/system/linux/gnuc/armv6j_hardfp/SYSTEM.c0
similarity index 100%
rename from src/lib/system/gnuc/armv6j_hardfp/SYSTEM.c0
rename to src/lib/system/linux/gnuc/armv6j_hardfp/SYSTEM.c0
diff --git a/src/lib/system/gnuc/armv6j_hardfp/SYSTEM.h b/src/lib/system/linux/gnuc/armv6j_hardfp/SYSTEM.h
similarity index 100%
rename from src/lib/system/gnuc/armv6j_hardfp/SYSTEM.h
rename to src/lib/system/linux/gnuc/armv6j_hardfp/SYSTEM.h
diff --git a/src/lib/system/gnuc/armv6j_hardfp/Unix.Mod b/src/lib/system/linux/gnuc/armv6j_hardfp/Unix.Mod
similarity index 100%
rename from src/lib/system/gnuc/armv6j_hardfp/Unix.Mod
rename to src/lib/system/linux/gnuc/armv6j_hardfp/Unix.Mod
diff --git a/src/lib/system/gnuc/armv7a_hardfp/Args.Mod b/src/lib/system/linux/gnuc/armv7a_hardfp/Args.Mod
similarity index 100%
rename from src/lib/system/gnuc/armv7a_hardfp/Args.Mod
rename to src/lib/system/linux/gnuc/armv7a_hardfp/Args.Mod
diff --git a/src/lib/system/gnuc/armv7a_hardfp/SYSTEM.c0 b/src/lib/system/linux/gnuc/armv7a_hardfp/SYSTEM.c0
similarity index 100%
rename from src/lib/system/gnuc/armv7a_hardfp/SYSTEM.c0
rename to src/lib/system/linux/gnuc/armv7a_hardfp/SYSTEM.c0
diff --git a/src/lib/system/gnuc/armv7a_hardfp/SYSTEM.h b/src/lib/system/linux/gnuc/armv7a_hardfp/SYSTEM.h
similarity index 100%
rename from src/lib/system/gnuc/armv7a_hardfp/SYSTEM.h
rename to src/lib/system/linux/gnuc/armv7a_hardfp/SYSTEM.h
diff --git a/src/lib/system/gnuc/armv7a_hardfp/Unix.Mod b/src/lib/system/linux/gnuc/armv7a_hardfp/Unix.Mod
similarity index 100%
rename from src/lib/system/gnuc/armv7a_hardfp/Unix.Mod
rename to src/lib/system/linux/gnuc/armv7a_hardfp/Unix.Mod
diff --git a/src/lib/system/gnuc/powerpc/Args.Mod b/src/lib/system/linux/gnuc/powerpc/Args.Mod
similarity index 100%
rename from src/lib/system/gnuc/powerpc/Args.Mod
rename to src/lib/system/linux/gnuc/powerpc/Args.Mod
diff --git a/src/lib/system/gnuc/powerpc/SYSTEM.c0 b/src/lib/system/linux/gnuc/powerpc/SYSTEM.c0
similarity index 100%
rename from src/lib/system/gnuc/powerpc/SYSTEM.c0
rename to src/lib/system/linux/gnuc/powerpc/SYSTEM.c0
diff --git a/src/lib/system/gnuc/powerpc/SYSTEM.h b/src/lib/system/linux/gnuc/powerpc/SYSTEM.h
similarity index 100%
rename from src/lib/system/gnuc/powerpc/SYSTEM.h
rename to src/lib/system/linux/gnuc/powerpc/SYSTEM.h
diff --git a/src/lib/system/gnuc/powerpc/Unix.Mod b/src/lib/system/linux/gnuc/powerpc/Unix.Mod
similarity index 100%
rename from src/lib/system/gnuc/powerpc/Unix.Mod
rename to src/lib/system/linux/gnuc/powerpc/Unix.Mod
diff --git a/src/lib/system/gnuc/x86/Args.Mod b/src/lib/system/linux/gnuc/x86/Args.Mod
similarity index 100%
rename from src/lib/system/gnuc/x86/Args.Mod
rename to src/lib/system/linux/gnuc/x86/Args.Mod
diff --git a/src/lib/system/gnuc/x86/SYSTEM.c0 b/src/lib/system/linux/gnuc/x86/SYSTEM.c0
similarity index 100%
rename from src/lib/system/gnuc/x86/SYSTEM.c0
rename to src/lib/system/linux/gnuc/x86/SYSTEM.c0
diff --git a/src/lib/system/gnuc/x86/SYSTEM.h b/src/lib/system/linux/gnuc/x86/SYSTEM.h
similarity index 100%
rename from src/lib/system/gnuc/x86/SYSTEM.h
rename to src/lib/system/linux/gnuc/x86/SYSTEM.h
diff --git a/src/lib/system/gnuc/x86/Unix.Mod b/src/lib/system/linux/gnuc/x86/Unix.Mod
similarity index 100%
rename from src/lib/system/gnuc/x86/Unix.Mod
rename to src/lib/system/linux/gnuc/x86/Unix.Mod
diff --git a/src/lib/system/linux/gnuc/x86_64/Args.Mod b/src/lib/system/linux/gnuc/x86_64/Args.Mod
new file mode 100644
index 00000000..c6b7b56e
--- /dev/null
+++ b/src/lib/system/linux/gnuc/x86_64/Args.Mod
@@ -0,0 +1,65 @@
+MODULE Args;  (* jt, 8.12.94 *)
+
+  (* command line argument handling for voc (jet backend) *)
+
+
+  IMPORT SYSTEM;
+  
+  TYPE
+    ArgPtr = POINTER TO ARRAY 1024 OF CHAR;
+    ArgVec = POINTER TO ARRAY 1024 OF ArgPtr;
+
+  VAR argc-, argv-: LONGINT;
+  (*PROCEDURE -includestdlib() "#include <stdlib.h>";*)
+  PROCEDURE -externgetenv() "extern char *getenv(const char *name);"; (* took this from stdlib.h*)
+  PROCEDURE -Argc(): INTEGER "SYSTEM_argc";
+  PROCEDURE -Argv(): LONGINT "(long)SYSTEM_argv";
+  PROCEDURE -getenv(var: ARRAY OF CHAR): ArgPtr
+    "(Args_ArgPtr)getenv(var)";
+
+  PROCEDURE Get*(n: INTEGER; VAR val: ARRAY OF CHAR);
+    VAR av: ArgVec;
+  BEGIN
+    IF n < argc THEN av := SYSTEM.VAL(ArgVec, argv); COPY(av[n]^, val) END
+  END Get;
+
+  PROCEDURE GetInt*(n: INTEGER; VAR val: LONGINT);
+    VAR s: ARRAY 64 OF CHAR; k, d, i: LONGINT;
+  BEGIN
+    s := ""; Get(n, s); i := 0;
+    IF s[0] = "-" THEN i := 1 END ;
+    k := 0; d := ORD(s[i]) - ORD("0");
+    WHILE (d >= 0 ) & (d <= 9) DO k := k*10 + d; INC(i); d := ORD(s[i]) - ORD("0") END ;
+    IF s[0] = "-" THEN d := -d; DEC(i) END ;
+    IF i > 0 THEN val := k END
+  END GetInt;
+
+  PROCEDURE Pos*(s: ARRAY OF CHAR): INTEGER;
+    VAR i: INTEGER; arg: ARRAY 256 OF CHAR;
+  BEGIN
+    i := 0; Get(i, arg);
+    WHILE (i < argc) & (s # arg) DO INC(i); Get(i, arg) END ;
+    RETURN i
+  END Pos;
+
+  PROCEDURE GetEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR);
+    VAR p: ArgPtr;
+  BEGIN
+    p := getenv(var);
+    IF p # NIL THEN COPY(p^, val) END
+  END GetEnv;
+
+  PROCEDURE getEnv*(var: ARRAY OF CHAR; VAR val: ARRAY OF CHAR): BOOLEAN;
+    VAR p: ArgPtr;
+  BEGIN
+    p := getenv(var);
+    IF p # NIL THEN
+       COPY(p^, val);
+       RETURN TRUE
+    ELSE
+       RETURN FALSE
+    END
+  END getEnv;
+
+BEGIN argc := Argc(); argv := Argv()
+END Args.
diff --git a/src/lib/system/linux/gnuc/x86_64/SYSTEM.c0 b/src/lib/system/linux/gnuc/x86_64/SYSTEM.c0
new file mode 100644
index 00000000..bb8ee442
--- /dev/null
+++ b/src/lib/system/linux/gnuc/x86_64/SYSTEM.c0
@@ -0,0 +1,205 @@
+/* 
+*	The body prefix file of the voc(jet backend) runtime system, Version 1.0
+*
+*	Copyright (c) Software Templ, 1994, 1995
+*
+*	Module SYSTEM is subject to change any time without prior notification.
+*	Software Templ disclaims all warranties with regard to module SYSTEM,
+*	in particular shall Software Templ not be liable for any damage resulting
+*	from inappropriate use or modification of module SYSTEM.
+*
+*	Version 1.1  jt, 24.11.95  fixes for correct pointer arithmetic on Cray computers
+*	jt 31.1.2007  ANSI prototypes for malloc and exit in order to avoid cc warnings
+*
+*/
+
+#include "SYSTEM.h"
+#ifdef __STDC__
+#include "stdarg.h"
+#else
+#include "varargs.h"
+#endif
+
+extern void *malloc(long size);
+extern void exit(int status);
+
+void (*SYSTEM_Halt)();
+LONGINT SYSTEM_halt;	/* x in HALT(x) */
+LONGINT SYSTEM_assert;	/* x in ASSERT(cond, x) */
+LONGINT SYSTEM_argc;
+LONGINT SYSTEM_argv;
+LONGINT SYSTEM_lock;
+BOOLEAN SYSTEM_interrupted;
+static LONGINT SYSTEM_mainfrm;	/* adr of main proc stack frame, used for stack collection */
+
+#define Lock	SYSTEM_lock++
+#define Unlock	SYSTEM_lock--; if (SYSTEM_interrupted && (SYSTEM_lock == 0)) __HALT(-9)
+
+
+static void SYSTEM_InitHeap();
+void *SYSTEM__init();
+
+void SYSTEM_INIT(argc, argvadr)
+	int argc; long argvadr;
+{
+	SYSTEM_mainfrm = argvadr;
+	SYSTEM_argc = argc;
+	SYSTEM_argv = *(long*)argvadr;
+	SYSTEM_InitHeap();
+	SYSTEM_halt = -128;
+	SYSTEM__init();
+}
+
+void SYSTEM_FINI()
+{
+	SYSTEM_FINALL();
+}
+
+long SYSTEM_XCHK(i, ub) long i, ub; {return __X(i, ub);}
+long SYSTEM_RCHK(i, ub) long i, ub; {return __R(i, ub);}
+long SYSTEM_ASH(i, n) long i, n; {return __ASH(i, n);}
+long SYSTEM_ABS(i) long i; {return __ABS(i);}
+double SYSTEM_ABSD(i) double i; {return __ABS(i);}
+
+void SYSTEM_INHERIT(t, t0)
+	long *t, *t0;
+{
+	t -= __TPROC0OFF;
+	t0 -= __TPROC0OFF;
+	while (*t0 != __EOM) {*t = *t0; t--; t0--;}
+}
+
+void SYSTEM_ENUMP(adr, n, P)
+	long *adr;
+	long n;
+	void (*P)();
+{
+	while (n > 0) {P(*adr); adr++; n--;}
+}
+
+void SYSTEM_ENUMR(adr, typ, size, n, P)
+	char *adr;
+	long *typ, size, n;
+	void (*P)();
+{
+	long *t, off;
+	typ++;
+	while (n > 0) {
+		t = typ;
+		off = *t;
+		while (off >= 0) {P(*(long*)(adr+off)); t++; off = *t;}
+		adr += size; n--;
+	}
+}
+
+long SYSTEM_DIV(x, y)
+	unsigned long x, y;
+{  if ((long) x >= 0) return (x / y);
+	else return -((y - 1 - x) / y);
+}
+
+long SYSTEM_MOD(x, y)
+	unsigned long x, y;
+{ unsigned long m;
+	if ((long) x >= 0) return (x % y);
+	else { m = (-x) % y;
+		if (m != 0) return (y - m); else return 0;
+	}
+}
+
+long SYSTEM_ENTIER(x)
+	double x;
+{
+	long y;
+	if (x >= 0)
+		return (long)x;
+	else {
+		y = (long)x;
+		if (y <= x) return y; else return y - 1;
+	}
+}
+
+void SYSTEM_HALT(n)
+	int n;
+{
+	SYSTEM_halt = n;
+	if (SYSTEM_Halt!=0) SYSTEM_Halt(n);
+	exit(n);
+}
+
+#ifdef __STDC__
+SYSTEM_PTR SYSTEM_NEWARR(long *typ, long elemsz, int elemalgn, int nofdim, int nofdyn, ...)
+#else
+SYSTEM_PTR SYSTEM_NEWARR(typ, elemsz, elemalgn, nofdim, nofdyn, va_alist)
+	long *typ, elemsz;
+	int elemalgn, nofdim, nofdyn;
+	va_dcl
+#endif
+{
+	long nofelems, size, dataoff, n, nptr, *x, *p, nofptrs, i, *ptab, off;
+	va_list ap;
+#ifdef __STDC__
+	va_start(ap, nofdyn);
+#else
+	va_start(ap);
+#endif
+	nofelems = 1;
+	while (nofdim > 0) {
+		nofelems = nofelems * va_arg(ap, long); nofdim--;
+		if (nofelems <= 0) __HALT(-20);
+	}
+	va_end(ap);
+	dataoff = nofdyn * sizeof(long);
+	if (elemalgn > sizeof(long)) {
+		n = dataoff % elemalgn;
+		if (n != 0) dataoff += elemalgn - n;
+	}
+	size = dataoff + nofelems * elemsz;
+	Lock;
+	if (typ == NIL) {
+		/* element typ does not contain pointers */
+		x = SYSTEM_NEWBLK(size);
+	}
+	else if (typ == POINTER__typ) {
+		/* element type is a pointer */
+		x = SYSTEM_NEWBLK(size + nofelems * sizeof(long));
+		p = (long*)x[-1];
+		p[-nofelems] = *p;	/* build new type desc in situ: 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
+		p -= nofelems - 1; n = 1;	/* n =1 for skipping the size field */
+		while (n <= nofelems) {*p = n*sizeof(long); p++; n++;}
+		*p = - (nofelems + 1) * sizeof(long);	/* sentinel */
+		x[-1] -= nofelems * sizeof(long);
+	}
+	else {
+		/* element type is a record that contains pointers */
+		ptab = typ + 1; nofptrs = 0;
+		while (ptab[nofptrs] >= 0) {nofptrs++;}	/* number of pointers per element */
+		nptr = nofelems * nofptrs;	/* total number of pointers */
+		x = SYSTEM_NEWBLK(size + nptr * sizeof(long));
+		p = (long*)x[- 1];
+		p[-nptr] = *p;	/* build new type desc in situ; 1. copy block size; 2. setup ptr tab; 3. set sentinel; 4. patch tag */
+		p -= nptr - 1; n = 0; off = dataoff;
+		while (n < nofelems) {i = 0;
+			while (i < nofptrs) {*p = off + ptab[i]; p++; i++;}
+			off += elemsz; n++;
+		}
+		*p = - (nptr + 1) * sizeof(long);	/* sentinel */
+		x[-1] -= nptr * sizeof(long);
+	}
+	if (nofdyn != 0) {
+		/* setup len vector for index checks */
+#ifdef __STDC__
+		va_start(ap, nofdyn);
+#else
+		va_start(ap);
+#endif
+		p = x;
+		while (nofdyn > 0) {*p = va_arg(ap, long); p++, nofdyn--;}
+		va_end(ap);
+	}
+	Unlock;
+	return x;
+}
+
+/* ----------- end of SYSTEM.co ------------- */
+
diff --git a/src/lib/system/gnuc/x86_64/SYSTEM.h b/src/lib/system/linux/gnuc/x86_64/SYSTEM.h
similarity index 100%
rename from src/lib/system/gnuc/x86_64/SYSTEM.h
rename to src/lib/system/linux/gnuc/x86_64/SYSTEM.h
diff --git a/src/lib/system/linux/gnuc/x86_64/Unix.Mod b/src/lib/system/linux/gnuc/x86_64/Unix.Mod
new file mode 100644
index 00000000..7dfde70d
--- /dev/null
+++ b/src/lib/system/linux/gnuc/x86_64/Unix.Mod
@@ -0,0 +1,501 @@
+MODULE Unix;  (* Josef Templ, 5.3.90  Linux system calls *)
+(* ported to gnu x86_64 and added system function, noch *)
+(* Module Unix provides a system call interface to Linux.
+  Naming conventions:
+    Procedure and Type-names always start with a capital letter.
+    error numbers as defined in Unix
+    other constants start with lower case letters *)
+
+IMPORT SYSTEM;
+
+CONST
+
+(* various important constants *)
+
+  stdin* = 0; stdout* =1; stderr* = 2;
+
+  LOCKEX* = 2; LOCKUN* = 8;  (* /usr/include/file.h *)
+  AFINET* = 2; (* /usr/include/sys/socket.h *)
+  PFINET* = AFINET; (* /usr/include/linux/socket.h *)
+  SOCKSTREAM* = 1; (* /usr/include/linux/socket.h *)
+  FIONREAD* =  541BH; (* in /usr/include/asm/termios.h *)
+  SETFL* = 4; (* set file descriptor flags; in asm/fcntl.h *)
+  TCP* = 0;
+
+(* flag sets, cf. /usr/include/asm/fcntl.h *)
+  rdonly* = {}; wronly* = {0}; rdwr* = {1}; creat* = {6}; excl* = {7}; trunc* = {9}; append* = {10}; ndelay = {11};
+
+(* error numbers *)
+
+  EPERM* = 1;  (* Not owner *)
+  ENOENT* = 2;  (* No such file or directory *)
+  ESRCH* = 3;  (* No such process *)
+  EINTR* = 4;  (* Interrupted system call *)
+  EIO* = 5;  (* I/O error *)
+  ENXIO* = 6;  (* No such device or address *)
+  E2BIG* = 7;  (* Arg list too long *)
+  ENOEXEC* = 8;  (* Exec format error *)
+  EBADF* = 9;  (* Bad file number *)
+  ECHILD* = 10;  (* No children *)
+  EAGAIN* = 11;  (* No more processes *)
+  ENOMEM* = 12;  (* Not enough core *)
+  EACCES* = 13;  (* Permission denied *)
+  EFAULT* = 14;  (* Bad address *)
+  ENOTBLK* = 15;  (* Block device required *)
+  EBUSY* = 16;  (* Mount device busy *)
+  EEXIST* = 17;  (* File exists *)
+  EXDEV* = 18;  (* Cross-device link *)
+  ENODEV* = 19;  (* No such device *)
+  ENOTDIR* = 20;  (* Not a directory*)
+  EISDIR* = 21;  (* Is a directory *)
+  EINVAL* = 22;  (* Invalid argument *)
+  ENFILE* = 23;  (* File table overflow *)
+  EMFILE* = 24;  (* Too many open files *)
+  ENOTTY* = 25;  (* Not a typewriter *)
+  ETXTBSY* = 26;  (* Text file busy *)
+  EFBIG* = 27;  (* File too large *)
+  ENOSPC* = 28;  (* No space left on device *)
+  ESPIPE* = 29;  (* Illegal seek *)
+  EROFS* = 30;  (* Read-only file system *)
+  EMLINK* = 31;  (* Too many links *)
+  EPIPE* = 32;  (* Broken pipe *)
+  EDOM* = 33;  (* Argument too large *)
+  ERANGE* = 34;  (* Result too large *)
+  EDEADLK* = 35;  (* Resource deadlock would occur *)
+  ENAMETOOLONG* = 36;  (* File name too long *)
+  ENOLCK* = 37;  (* No record locks available *)
+  ENOSYS* = 38;  (* Function not implemented *)
+  ENOTEMPTY* = 39;  (* Directory not empty *)
+  ELOOP* = 40;  (* Too many symbolic links encountered *)
+  EWOULDBLOCK* = EAGAIN;  (* Operation would block *)
+  ENOMSG* = 42;  (* No message of desired type *)
+  EIDRM* = 43;  (* Identifier removed *)
+  ECHRNG* = 44;  (* Channel number out of range *)
+  EL2NSYNC* = 45;  (* Level 2 not synchronized *)
+  EL3HLT* = 46;  (* Level 3 halted *)
+  EL3RST* = 47;  (* Level 3 reset *)
+  ELNRNG* = 48;  (* Link number out of range *)
+  EUNATCH* = 49;  (* Protocol driver not attached *)
+  ENOCSI* = 50;  (* No CSI structure available *)
+  EL2HLT* = 51;  (* Level 2 halted *)
+  EBADE* = 52;  (* Invalid exchange *)
+  EBADR* = 53;  (* Invalid request descriptor *)
+  EXFULL* = 54;  (* Exchange full *)
+  ENOANO* = 55;  (* No anode *)
+  EBADRQC* = 56;  (* Invalid request code *)
+  EBADSLT* = 57;  (* Invalid slot *)
+  EDEADLOCK* = 58;  (* File locking deadlock error *)
+  EBFONT* = 59;  (* Bad font file format *)
+  ENOSTR* = 60;  (* Device not a stream *)
+  ENODATA* = 61;  (* No data available *)
+  ETIME* = 62;  (* Timer expired *)
+  ENOSR* = 63;  (* Out of streams resources *)
+  ENONET* = 64;  (* Machine is not on the network *)
+  ENOPKG* = 65;  (* Package not installed *)
+  EREMOTE* = 66;  (* Object is remote *)
+  ENOLINK* = 67;  (* Link has been severed *)
+  EADV* = 68;  (* Advertise error *)
+  ESRMNT* = 69;  (* Srmount error *)
+  ECOMM* = 70;  (* Communication error on send *)
+  EPROTO* = 71;  (* Protocol error *)
+  EMULTIHOP* = 72;  (* Multihop attempted *)
+  EDOTDOT* = 73;  (* RFS specific error *)
+  EBADMSG* = 74;  (* Not a data message *)
+  EOVERFLOW* = 75;  (* Value too large for defined data type *)
+  ENOTUNIQ* = 76;  (* Name not unique on network *)
+  EBADFD* = 77;  (* File descriptor in bad state *)
+  EREMCHG* = 78;  (* Remote address changed *)
+  ELIBACC* = 79;  (* Can not access a needed shared library *)
+  ELIBBAD* = 80;  (* Accessing a corrupted shared library *)
+  ELIBSCN* = 81;  (* .lib section in a.out corrupted *)
+  ELIBMAX* = 82;  (* Attempting to link in too many shared libraries *)
+  ELIBEXEC* = 83;  (* Cannot exec a shared library directly *)
+  EILSEQ* = 84;  (* Illegal byte sequence *)
+  ERESTART* = 85;  (* Interrupted system call should be restarted *)
+  ESTRPIPE* = 86;  (* Streams pipe error *)
+  EUSERS* = 87;  (* Too many users *)
+  ENOTSOCK* = 88;  (* Socket operation on non-socket *)
+  EDESTADDRREQ* = 89;  (* Destination address required *)
+  EMSGSIZE* = 90;  (* Message too long *)
+  EPROTOTYPE* = 91;  (* Protocol wrong type for socket *)
+  ENOPROTOOPT* = 92;  (* Protocol not available *)
+  EPROTONOSUPPORT* = 93;  (* Protocol not supported *)
+  ESOCKTNOSUPPORT* = 94;  (* Socket type not supported *)
+  EOPNOTSUPP* = 95;  (* Operation not supported on transport endpoint *)
+  EPFNOSUPPORT* = 96;  (* Protocol family not supported *)
+  EAFNOSUPPORT* = 97;  (* Address family not supported by protocol *)
+  EADDRINUSE* = 98;  (* Address already in use *)
+  EADDRNOTAVAIL* = 99;  (* Cannot assign requested address *)
+  ENETDOWN* = 100;  (* Network is down *)
+  ENETUNREACH* = 101;  (* Network is unreachable *)
+  ENETRESET* = 102;  (* Network dropped connection because of reset *)
+  ECONNABORTED* = 103;  (* Software caused connection abort *)
+  ECONNRESET* = 104;  (* Connection reset by peer *)
+  ENOBUFS* = 105;  (* No buffer space available *)
+  EISCONN* = 106;  (* Transport endpoint is already connected *)
+  ENOTCONN* = 107;  (* Transport endpoint is not connected *)
+  ESHUTDOWN* = 108;  (* Cannot send after transport endpoint shutdown *)
+  ETOOMANYREFS* = 109;  (* Too many references: cannot splice *)
+  ETIMEDOUT* = 110;  (* Connection timed out *)
+  ECONNREFUSED* = 111;  (* Connection refused *)
+  EHOSTDOWN* = 112;  (* Host is down *)
+  EHOSTUNREACH* = 113;  (* No route to host *)
+  EALREADY* = 114;  (* Operation already in progress *)
+  EINPROGRESS* = 115;  (* Operation now in progress *)
+  ESTALE* = 116;  (* Stale NFS file handle *)
+  EUCLEAN* = 117;  (* Structure needs cleaning *)
+  ENOTNAM* = 118;  (* Not a XENIX named type file *)
+  ENAVAIL* = 119;  (* No XENIX semaphores available *)
+  EISNAM* = 120;  (* Is a named type file *)
+  EREMOTEIO* = 121;  (* Remote I/O error *)
+  EDQUOT* = 122;  (* Quota exceeded *)
+
+CONST sigsetarrlength = 1024 / 8 * SIZE(LONGINT);
+
+
+TYPE
+(* bits/sigset.h
+ _SIGSET_NWORDS (1024 / (8 * sizeof (unsigned long int)))
+
+  1024 / 8*8 = 16
+  1024 / 8*4 = 32
+*)
+  sigsett* = RECORD
+      val : ARRAY 16 OF LONGINT (* 32 for 32 bit *)
+      (*val : ARRAY sigsetarrlength OF LONGINT *)
+  END;
+
+  JmpBuf* = RECORD
+    (*bx*, si*, di*, bp*, sp*, pc*: LONGINT;*)
+    (* bits/setjmp.h sets up longer array in GNU libc *)
+    (*
+         # if __WORDSIZE == 64
+         typedef long int __jmp_buf[8];
+         # else
+         typedef int __jmp_buf[6];
+         # endif
+    *)
+    bx*, si*, di*, bp*, sp*, pc*, ki*, ku*: LONGINT;
+    (*  setjmp.h
+/* Calling environment, plus possibly a saved signal mask.  */
+struct __jmp_buf_tag
+  {
+    /* NOTE: The machine-dependent definitions of `__sigsetjmp'
+       assume that a `jmp_buf' begins with a `__jmp_buf' and that
+       `__mask_was_saved' follows it.  Do not move these members
+       or add others before it.  */
+    __jmp_buf __jmpbuf;         /* Calling environment.  */
+    int __mask_was_saved;       /* Saved the signal mask?  */
+    __sigset_t __saved_mask;    /* Saved signal mask.  */
+  };
+
+    *)
+    (*maskWasSaved*, savedMask*: LONGINT;*)
+    maskWasSaved*: INTEGER; 
+    (* 
+   # define _SIGSET_NWORDS (1024 / (8 * sizeof (unsigned long int)))
+typedef struct
+  {
+    unsigned long int __val[_SIGSET_NWORDS];
+  } __sigset_t; 
+    
+    *)
+    savedMask*: sigsett;
+  END ;
+
+  Status* = RECORD (* struct stat *)
+    dev* : LONGINT; (* dev_t 8 *)
+    ino* : LONGINT; (* ino 8 *)
+    nlink* : LONGINT;
+    mode* : INTEGER;
+    uid*, gid*: INTEGER;
+    pad0* : INTEGER;
+    rdev* : LONGINT;
+    size* : LONGINT;
+    blksize* : LONGINT;
+    blocks* : LONGINT;
+    atime* : LONGINT;
+    atimences* : LONGINT;
+    mtime* : LONGINT;
+    mtimensec* : LONGINT;
+    ctime* : LONGINT;
+    ctimensec* : LONGINT; 
+    unused0*, unused1*, unused2*: LONGINT;
+  END ;
+ 
+(* from /usr/include/bits/time.h
+
+struct timeval
+  {
+    __time_t tv_sec;            /* Seconds.  */ //__time_t 8
+    __suseconds_t tv_usec;      /* Microseconds.  */  __suseconds_t 8
+  };
+
+
+*)
+
+  Timeval* = RECORD
+    sec*, usec*: LONGINT
+  END ;
+
+
+(*
+from man gettimeofday
+
+          struct timezone {
+               int tz_minuteswest;     /* minutes west of Greenwich */ int 4
+               int tz_dsttime;         /* type of DST correction */    int 4
+           };
+*)
+
+
+  Timezone* = RECORD
+    (*minuteswest*, dsttime*: LONGINT*)
+    minuteswest*, dsttime*: INTEGER
+  END ;
+
+  Itimerval* = RECORD
+    interval*, value*: Timeval
+  END ;
+
+  FdSet* = ARRAY 8 OF SET;
+
+  SigCtxPtr* = POINTER TO SigContext;
+  SigContext* = RECORD
+  END ;
+
+  SignalHandler* = PROCEDURE (sig, code: LONGINT; scp: SigCtxPtr);
+
+  Dirent* = RECORD
+    ino, off: LONGINT;
+    reclen: INTEGER;
+    name: ARRAY 256 OF CHAR;
+  END ;
+
+  Rusage* = RECORD
+    utime*, stime*: Timeval;
+    maxrss*, ixrss*, idrss*, isrss*,
+    minflt*, majflt*, nswap*, inblock*,
+    oublock*, msgsnd*, msgrcv*, nsignals*,
+    nvcsw*, nivcsw*: LONGINT
+  END ;
+
+  Iovec* = RECORD
+    base*, len*: LONGINT
+  END ;
+
+  SocketPair* = ARRAY 2 OF LONGINT;
+
+  Pollfd* = RECORD
+    fd*: LONGINT;
+    events*, revents*: INTEGER
+  END ;
+
+  Sockaddr* = RECORD
+    family*: INTEGER;
+    port*: INTEGER;
+    internetAddr*: LONGINT;
+    pad*: ARRAY 8 OF CHAR;
+  END ;
+  
+  HostEntry* = POINTER [1] TO Hostent;
+  Hostent* = RECORD
+    name*, aliases*: LONGINT;
+    addrtype*, length*: LONGINT;
+    addrlist*: LONGINT; (*POINTER TO POINTER TO LONGINT, network byte order*)
+  END;
+
+  Name* = ARRAY OF CHAR;
+
+  PROCEDURE -includeStat()
+    "#include <sys/stat.h>";
+
+  PROCEDURE -includeErrno()
+    "#include <errno.h>";
+
+  PROCEDURE -err(): LONGINT
+    "errno";
+
+  PROCEDURE errno*(): LONGINT;
+  BEGIN
+    RETURN err()
+  END errno;
+
+  PROCEDURE -Exit*(n: LONGINT)
+    "exit(n)";
+
+  PROCEDURE -Fork*(): LONGINT
+    "fork()";
+
+  PROCEDURE -Wait*(VAR status: LONGINT): LONGINT
+    "wait(status)";
+
+  PROCEDURE -Select*(width: LONGINT; VAR readfds, writefds, exceptfds: FdSet; VAR timeout: Timeval): LONGINT
+    "select(width, readfds, writefds, exceptfds, timeout)";
+
+  PROCEDURE -Gettimeofday* (VAR tv: Timeval; VAR tz: Timezone) : LONGINT
+    "gettimeofday(tv, tz)";
+
+  PROCEDURE -Read* (fd, buf, nbyte: LONGINT): LONGINT
+    "read(fd, buf, nbyte)";
+
+  PROCEDURE -ReadBlk* (fd: LONGINT; VAR buf: ARRAY OF SYSTEM.BYTE): LONGINT
+    "read(fd, buf, buf__len)";
+
+  PROCEDURE -Write* (fd, buf, nbyte: LONGINT): LONGINT
+    "write(fd, buf, nbyte)";
+
+  PROCEDURE -WriteBlk* (fd: LONGINT; VAR buf: ARRAY OF SYSTEM.BYTE): LONGINT
+    "write(fd, buf, buf__len)";
+
+  PROCEDURE -Dup*(fd: LONGINT): LONGINT
+    "dup(fd)";
+
+  PROCEDURE -Dup2*(fd1, fd2: LONGINT): LONGINT
+    "dup(fd1, fd2)";
+
+  PROCEDURE -Pipe*(fds : LONGINT): LONGINT
+     "pipe(fds)";
+
+  PROCEDURE -Getpid*(): LONGINT
+    "getpid()";
+
+  PROCEDURE -Getuid*(): LONGINT
+    "getuid()";
+
+  PROCEDURE -Geteuid*(): LONGINT
+    "geteuid()";
+
+  PROCEDURE -Getgid*(): LONGINT
+    "getgid()";
+
+  PROCEDURE -Getegid*(): LONGINT
+    "getegid()";
+
+  PROCEDURE -Unlink*(name: Name): LONGINT
+    "unlink(name)";
+
+  PROCEDURE -Open*(name: Name; flag, mode: SET): LONGINT
+    "open(name, flag, mode)";
+
+  PROCEDURE -Close*(fd: LONGINT): LONGINT
+    "close(fd)";
+
+  PROCEDURE -stat(name: Name; VAR statbuf: Status): LONGINT
+    "stat((const char*)name, (struct stat*)statbuf)";
+
+  PROCEDURE Stat*(name: Name; VAR statbuf: Status): LONGINT;
+    VAR res: LONGINT;
+  BEGIN
+    res := stat(name, statbuf);
+    (* make the first 4 bytes as unique as possible (used in module Files for caching!) *) 
+    (* don't understand this
+    INC(statbuf.dev, statbuf.devX);
+    INC(statbuf.rdev, statbuf.rdevX); *)
+    RETURN res;
+  END Stat;
+
+  PROCEDURE -fstat(fd: LONGINT; VAR statbuf: Status): LONGINT   
+    "fstat(fd, (struct stat*)statbuf)";
+
+  PROCEDURE Fstat*(fd: LONGINT; VAR statbuf: Status): LONGINT;
+    VAR res: LONGINT;
+  BEGIN
+    res := fstat(fd, statbuf);
+    (* make the first 4 bytes as unique as possible (used in module Files for caching!) *) 
+    (*INC(statbuf.dev, statbuf.devX); 
+    INC(statbuf.rdev, statbuf.rdevX); *)
+    RETURN res;
+  END Fstat;
+
+  PROCEDURE -Fchmod*(fd, mode: LONGINT): LONGINT
+    "fchmod(fd, mode)";
+
+  PROCEDURE -Chmod*(path: Name; mode: LONGINT): LONGINT
+    "chmod(path, mode)";
+
+  PROCEDURE -Lseek*(fd, offset, origin: LONGINT): LONGINT
+    "lseek(fd, offset, origin)";
+
+  PROCEDURE -Fsync*(fd: LONGINT): LONGINT
+    "fsync(fd)";
+
+  PROCEDURE -Fcntl*(fd, cmd, arg: LONGINT ): LONGINT
+    "fcntl(fd, cmd, arg)";
+
+  PROCEDURE -Flock*(fd, operation: LONGINT): LONGINT
+    "flock(fd, operation)";
+
+  PROCEDURE -Ftruncate*(fd, length: LONGINT): LONGINT
+    "ftruncate(fd, length)";
+
+  PROCEDURE -Readblk*(fd: LONGINT; VAR buf: ARRAY OF SYSTEM.BYTE; len: LONGINT): LONGINT
+    "read(fd, buf, len)";
+
+  PROCEDURE -Rename*(old, new: Name): LONGINT
+    "rename(old, new)";
+
+  PROCEDURE -Chdir*(path: Name): LONGINT
+    "chdir(path)";
+
+  PROCEDURE -Ioctl*(fd, request, arg: LONGINT): LONGINT
+    "ioctl(fd, request, arg)";
+
+  PROCEDURE -Kill*(pid, sig: LONGINT): LONGINT
+    "kill(pid, sig)";
+
+  PROCEDURE -Sigsetmask*(mask: LONGINT): LONGINT
+    "sigsetmask(mask)";
+
+
+  (* TCP/IP networking *)
+
+  PROCEDURE -Gethostbyname*(name: Name): HostEntry
+    "(Unix_HostEntry)gethostbyname(name)";
+
+  PROCEDURE -Gethostname*(VAR name: Name): LONGINT
+    "gethostname(name, name__len)";
+
+  PROCEDURE -Socket*(af, type, protocol: LONGINT): LONGINT
+    "socket(af, type, protocol)";
+
+  PROCEDURE -Connect*(socket: LONGINT; name: Sockaddr; namelen: LONGINT): LONGINT
+    "connect(socket, &(name), namelen)";
+
+  PROCEDURE -Getsockname*(socket: LONGINT; VAR name: Sockaddr; VAR namelen: LONGINT): LONGINT
+    "getsockname(socket, name, namelen)";
+
+  PROCEDURE -Bind*(socket: LONGINT; name: Sockaddr; namelen: LONGINT): LONGINT
+    "bind(socket, &(name), namelen)";
+
+  PROCEDURE -Listen*(socket, backlog: LONGINT): LONGINT
+    "listen(socket, backlog)";
+
+  PROCEDURE -Accept*(socket: LONGINT; VAR addr: Sockaddr; VAR addrlen: LONGINT): LONGINT
+    "accept(socket, addr, addrlen)";
+
+  PROCEDURE -Recv*(socket, bufadr, buflen, flags: LONGINT): LONGINT
+    "recv(socket, bufadr, buflen, flags)";
+
+  PROCEDURE -Send*(socket, bufadr, buflen, flags: LONGINT): LONGINT
+    "send(socket, bufadr, buflen, flags)";
+
+   PROCEDURE -sys(str: ARRAY OF CHAR): INTEGER   (* need this to call external tools like gcc or gas; noch *)
+      "system(str)";
+
+   PROCEDURE system*(cmd : ARRAY OF CHAR);
+   VAR r : INTEGER;
+   BEGIN
+      r := sys(cmd);
+   END system;
+
+   PROCEDURE System*(cmd : ARRAY OF CHAR): INTEGER;
+   VAR r : INTEGER;
+   BEGIN
+      r := sys(cmd);
+      RETURN r
+   END System;
+
+
+
+END Unix.
diff --git a/src/voc/darwin/clang/extTools.Mod b/src/voc/darwin/clang/extTools.Mod
new file mode 100644
index 00000000..0dda5009
--- /dev/null
+++ b/src/voc/darwin/clang/extTools.Mod
@@ -0,0 +1,82 @@
+MODULE extTools;
+   IMPORT Args, Unix, Strings := oocOakStrings, 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
+*)
+
+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/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);
+IF statically THEN Strings.Append(" -static ", cmd) END;
+Strings.Append(" -o ", cmd);
+Strings.Append(m, cmd);
+Strings.Append(" ", cmd);
+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/darwin/clang";
+incPath1 := "lib/voc/obj ";
+ccOpt := " -fPIC -g -I ";
+COPY (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);
+Strings.Append ("-lVishapOberon -L. -L", ccOpt);
+Strings.Append (version.prefix, ccOpt);
+Strings.Append ("/lib ", ccOpt);
+Args.GetEnv("CFLAGS", CFLAGS);
+Strings.Append (CFLAGS, ccOpt);
+Strings.Append (" ", ccOpt);
+ccString := "cc ";
+(*Strings.Append (ccOpt, ccString);*)
+
+END extTools.
diff --git a/src/voc/gnuc/x86_64/architecture.Mod b/src/voc/darwin/clang/x86_64/architecture.Mod
similarity index 100%
rename from src/voc/gnuc/x86_64/architecture.Mod
rename to src/voc/darwin/clang/x86_64/architecture.Mod
diff --git a/src/voc/gnuc/armv6j/architecture.Mod b/src/voc/linux/gnuc/armv6j/architecture.Mod
similarity index 100%
rename from src/voc/gnuc/armv6j/architecture.Mod
rename to src/voc/linux/gnuc/armv6j/architecture.Mod
diff --git a/src/voc/gnuc/armv6j_hardfp/architecture.Mod b/src/voc/linux/gnuc/armv6j_hardfp/architecture.Mod
similarity index 100%
rename from src/voc/gnuc/armv6j_hardfp/architecture.Mod
rename to src/voc/linux/gnuc/armv6j_hardfp/architecture.Mod
diff --git a/src/voc/gnuc/armv7a_hardfp/architecture.Mod b/src/voc/linux/gnuc/armv7a_hardfp/architecture.Mod
similarity index 100%
rename from src/voc/gnuc/armv7a_hardfp/architecture.Mod
rename to src/voc/linux/gnuc/armv7a_hardfp/architecture.Mod
diff --git a/src/voc/gnuc/extTools.Mod b/src/voc/linux/gnuc/extTools.Mod
similarity index 100%
rename from src/voc/gnuc/extTools.Mod
rename to src/voc/linux/gnuc/extTools.Mod
diff --git a/src/voc/gnuc/powerpc/architecture.Mod b/src/voc/linux/gnuc/powerpc/architecture.Mod
similarity index 100%
rename from src/voc/gnuc/powerpc/architecture.Mod
rename to src/voc/linux/gnuc/powerpc/architecture.Mod
diff --git a/src/voc/gnuc/x86/architecture.Mod b/src/voc/linux/gnuc/x86/architecture.Mod
similarity index 100%
rename from src/voc/gnuc/x86/architecture.Mod
rename to src/voc/linux/gnuc/x86/architecture.Mod
diff --git a/src/voc/linux/gnuc/x86_64/architecture.Mod b/src/voc/linux/gnuc/x86_64/architecture.Mod
new file mode 100644
index 00000000..1f95d2fd
--- /dev/null
+++ b/src/voc/linux/gnuc/x86_64/architecture.Mod
@@ -0,0 +1,4 @@
+MODULE architecture;
+CONST arch* = "x86_64";
+
+END architecture.
diff --git a/voc b/voc
index 886580f2..0ecd26e0 100755
Binary files a/voc and b/voc differ
diff --git a/vocparam b/vocparam
index c6b6f164..441298eb 100755
Binary files a/vocparam and b/vocparam differ
diff --git a/vocstatic b/vocstatic
index 6f1a5b84..0ecd26e0 100755
Binary files a/vocstatic and b/vocstatic differ
diff --git a/vocstatic.linux.gnuc.x86_64 b/vocstatic.linux.gnuc.x86_64
index 6f1a5b84..0ecd26e0 100755
Binary files a/vocstatic.linux.gnuc.x86_64 and b/vocstatic.linux.gnuc.x86_64 differ