diff --git a/COMPILE b/COMPILE
index a60eb46c..77270465 100644
--- a/COMPILE
+++ b/COMPILE
@@ -3,17 +3,17 @@ currently three bootstrap static binaries provided, for x86_64, x86, and armv6j_
 0) (* NOT NECESSARY ANYMORE *)
    copy statically compiled voc compiler for your platform as vocstatic.
    for instance, if your platform is armv6j_hardfp (like raspberry pi)
-   # cp vocstatic.linux.gnuc.armv6j_hardfp vocstatic
+   # cp vocstatic.linux.gcc.armv6j_hardfp vocstatic
    and if your platform is x86 (32bit) gnu/linux then
-   # cp vocstatic.linux.gnuc.x86 vocstatic
+   # cp vocstatic.linux.gcc.x86 vocstatic
    and if it's x86_64 then do nothing or
-   # cp vocstatic.linux.gnuc.x86_64 vocstatic
+   # cp vocstatic.linux.gcc.x86_64 vocstatic
 
 1) make with corresponding makefile
    if it's rasp pi or other armhf platform then do
-   # make -f makefile.gnuc.armv6j_hardfp
+   # make -f makefile.gcc.armv6j_hardfp
    if it's x86 then
-   # make -f makefile.gnuc.x86
+   # make -f makefile.gcc.x86
    and if it's x86_64, then default makefile is for this platform
    # make
 
diff --git a/hints b/hints
index 8d4d235d..4db3bb27 100644
--- a/hints
+++ b/hints
@@ -2,7 +2,7 @@
 0) generate voc.par file for the target platform(if it's not exist in src/par).
    you can do it by compiling vocparam, and running it as "./vocparam > voc.par"
 1) generate voc, ocat, showdef source for target platform by running
-   make -f makefile.gnuc.<arch> port0
+   make -f makefile.gcc.<arch> port0
    (or copy corresponding voc.par to the source directory yourself, remove stage2 from port0 section of the makefile, and run make port0)
 2) transfer source to a target platform and write
    make port1
@@ -13,7 +13,7 @@
 that's how I've done x86 port.
 voc was originally run on x86_64.
 
-notes** in practice everything is not always simple, because you may need to edit Unix.Mod, Args.Mod and SYSTEM.h, and put them to src/lib/system/gnuc/<yourtarget>, and create new makefile for your target.
+notes** in practice everything is not always simple, because you may need to edit Unix.Mod, Args.Mod and SYSTEM.h, and put them to src/lib/system/gcc/<yourtarget>, and create new makefile for your target.
 
 
 ==how to add a new option==
diff --git a/makefile b/makefile
index e0113f87..4f9daf55 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
 TOS = linux
 TARCH = x86_64
 #TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
-CCOMP = gnuc
+CCOMP = gcc
 RELEASE = 1.0
 
 
@@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
 PREFIXLN = $(PRF)/voc
 
 CCOPT = -fPIC $(INCLUDEPATH) -g
-
-CC = cc $(CCOPT) -c 
-CL = cc $(CCOPT) 
-LD = cc -shared -lX11 -o $(LIBRARY).so
+SHRLIBEXT = so
+CC = $(CCOMP) $(CCOPT) -c
+CL = $(CCOMP) $(CCOPT)
+LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
@@ -272,7 +272,7 @@ clean:
 	rm *.sym
 	rm *.o
 	rm *.a
-	rm *.so
+	rm *.$(SHRLIBEXT)
 
 install:
 	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@@ -287,7 +287,7 @@ install:
 	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).$(SHRLIBEXT) $(PREFIX)/lib
 	cp $(LIBRARY).a $(PREFIX)/lib
 	cp *.c $(PREFIX)/lib/voc/obj/
 	cp *.h $(PREFIX)/lib/voc/obj/
diff --git a/makefile.darwin.clang.x86_64 b/makefile.darwin.clang.x86_64
index 9649f0e0..99a51914 100644
--- a/makefile.darwin.clang.x86_64
+++ b/makefile.darwin.clang.x86_64
@@ -27,10 +27,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
 PREFIXLN = $(PRF)/voc
 
 CCOPT = -fPIC $(INCLUDEPATH) -g
-
-CC = cc $(CCOPT) -c 
-CL = cc $(CCOPT) 
-LD = libtool -dynamic -lSystem -compatibility_version $(RELEASE) -current_version $(RELEASE) -install_name $(PREFIX)/lib/$(LIBRARY).dylib -o $(LIBRARY).dylib
+SHRLIBEXT = dylib
+CC = $(CCOMP) $(CCOPT) -c
+CL = $(CCOMP) $(CCOPT)
+LD = libtool -dynamic -lSystem -compatibility_version $(RELEASE) -current_version $(RELEASE) -install_name $(PREFIX)/lib/$(LIBRARY).$(SHRLIBEXT) -o $(LIBRARY).$(SHRLIBEXT)
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
@@ -274,7 +274,7 @@ clean:
 	rm *.sym
 	rm *.o
 	rm *.a
-	rm *.dylib
+	rm *.$(SHRLIBEXT)
 
 install:
 	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@@ -289,7 +289,7 @@ install:
 	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).dylib $(PREFIX)/lib
+	cp $(LIBRARY).$(SHRLIBEXT) $(PREFIX)/lib
 	cp $(LIBRARY).a $(PREFIX)/lib
 	cp *.c $(PREFIX)/lib/voc/obj/
 	cp *.h $(PREFIX)/lib/voc/obj/
diff --git a/makefile.linux.clang.powerpc b/makefile.linux.clang.powerpc
index 5c09626a..f88e9fbe 100644
--- a/makefile.linux.clang.powerpc
+++ b/makefile.linux.clang.powerpc
@@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
 PREFIXLN = $(PRF)/voc
 
 CCOPT = -fPIC $(INCLUDEPATH) -g
-
-CC = clang $(CCOPT) -c 
-CL = clang $(CCOPT) 
-LD = clang -shared -lX11 -o $(LIBRARY).so
+SHRLIBEXT = so
+CC = $(CCOMP) $(CCOPT) -c
+CL = $(CCOMP) $(CCOPT)
+LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
@@ -272,7 +272,7 @@ clean:
 	rm *.sym
 	rm *.o
 	rm *.a
-	rm *.so
+	rm *.$(SHRLIBEXT)
 
 install:
 	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@@ -287,7 +287,7 @@ install:
 	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).$(SHRLIBEXT) $(PREFIX)/lib
 	cp $(LIBRARY).a $(PREFIX)/lib
 	cp *.c $(PREFIX)/lib/voc/obj/
 	cp *.h $(PREFIX)/lib/voc/obj/
diff --git a/makefile.linux.clang.x86_64 b/makefile.linux.clang.x86_64
index 00ea58d9..9ba508eb 100644
--- a/makefile.linux.clang.x86_64
+++ b/makefile.linux.clang.x86_64
@@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
 PREFIXLN = $(PRF)/voc
 
 CCOPT = -fPIC $(INCLUDEPATH) -g
-
-CC = clang $(CCOPT) -c 
-CL = clang $(CCOPT) 
-LD = clang -shared -lX11 -o $(LIBRARY).so
+SHRLIBEXT = so
+CC = $(CCOMP) $(CCOPT) -c
+CL = $(CCOMP) $(CCOPT)
+LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
@@ -272,7 +272,7 @@ clean:
 	rm *.sym
 	rm *.o
 	rm *.a
-	rm *.so
+	rm *.$(SHRLIBEXT)
 
 install:
 	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@@ -287,7 +287,7 @@ install:
 	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).$(SHRLIBEXT) $(PREFIX)/lib
 	cp $(LIBRARY).a $(PREFIX)/lib
 	cp *.c $(PREFIX)/lib/voc/obj/
 	cp *.h $(PREFIX)/lib/voc/obj/
diff --git a/makefile.linux.gnuc.armv6j b/makefile.linux.gcc.armv6j
similarity index 98%
rename from makefile.linux.gnuc.armv6j
rename to makefile.linux.gcc.armv6j
index 7bebbde2..71e789b6 100644
--- a/makefile.linux.gnuc.armv6j
+++ b/makefile.linux.gcc.armv6j
@@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
 TOS = linux
 TARCH = armv6j
 #TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
-CCOMP = gnuc
+CCOMP = gcc
 RELEASE = 1.0
 
 
@@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
 PREFIXLN = $(PRF)/voc
 
 CCOPT = -fPIC $(INCLUDEPATH) -g
-
-CC = cc $(CCOPT) -c 
-CL = cc $(CCOPT) 
-LD = cc -shared -lX11 -o $(LIBRARY).so
+SHRLIBEXT = so
+CC = $(CCOMP) $(CCOPT) -c
+CL = $(CCOMP) $(CCOPT)
+LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
@@ -272,7 +272,7 @@ clean:
 	rm *.sym
 	rm *.o
 	rm *.a
-	rm *.so
+	rm *.$(SHRLIBEXT)
 
 install:
 	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@@ -287,7 +287,7 @@ install:
 	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).$(SHRLIBEXT) $(PREFIX)/lib
 	cp $(LIBRARY).a $(PREFIX)/lib
 	cp *.c $(PREFIX)/lib/voc/obj/
 	cp *.h $(PREFIX)/lib/voc/obj/
diff --git a/makefile.linux.gnuc.armv6j_hardfp b/makefile.linux.gcc.armv6j_hardfp
similarity index 98%
rename from makefile.linux.gnuc.armv6j_hardfp
rename to makefile.linux.gcc.armv6j_hardfp
index f53966b6..a97b071c 100644
--- a/makefile.linux.gnuc.armv6j_hardfp
+++ b/makefile.linux.gcc.armv6j_hardfp
@@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
 TOS = linux
 TARCH = armv6j_hardfp
 #TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
-CCOMP = gnuc
+CCOMP = gcc
 RELEASE = 1.0
 
 
@@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
 PREFIXLN = $(PRF)/voc
 
 CCOPT = -fPIC $(INCLUDEPATH) -g
-
-CC = cc $(CCOPT) -c 
-CL = cc $(CCOPT) 
-LD = cc -shared -lX11 -o $(LIBRARY).so
+SHRLIBEXT = so
+CC = $(CCOMP) $(CCOPT) -c
+CL = $(CCOMP) $(CCOPT)
+LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
@@ -272,7 +272,7 @@ clean:
 	rm *.sym
 	rm *.o
 	rm *.a
-	rm *.so
+	rm *.$(SHRLIBEXT)
 
 install:
 	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@@ -287,7 +287,7 @@ install:
 	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).$(SHRLIBEXT) $(PREFIX)/lib
 	cp $(LIBRARY).a $(PREFIX)/lib
 	cp *.c $(PREFIX)/lib/voc/obj/
 	cp *.h $(PREFIX)/lib/voc/obj/
diff --git a/makefile.linux.gnuc.armv7a_hardfp b/makefile.linux.gcc.armv7a_hardfp
similarity index 98%
rename from makefile.linux.gnuc.armv7a_hardfp
rename to makefile.linux.gcc.armv7a_hardfp
index fc15b5ed..1ddd970d 100644
--- a/makefile.linux.gnuc.armv7a_hardfp
+++ b/makefile.linux.gcc.armv7a_hardfp
@@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
 TOS = linux
 TARCH = armv7a_hardfp
 #TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
-CCOMP = gnuc
+CCOMP = gcc
 RELEASE = 1.0
 
 
@@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
 PREFIXLN = $(PRF)/voc
 
 CCOPT = -fPIC $(INCLUDEPATH) -g
-
-CC = cc $(CCOPT) -c 
-CL = cc $(CCOPT) 
-LD = cc -shared -lX11 -o $(LIBRARY).so
+SHRLIBEXT = so
+CC = $(CCOMP) $(CCOPT) -c
+CL = $(CCOMP) $(CCOPT)
+LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
@@ -272,7 +272,7 @@ clean:
 	rm *.sym
 	rm *.o
 	rm *.a
-	rm *.so
+	rm *.$(SHRLIBEXT)
 
 install:
 	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@@ -287,7 +287,7 @@ install:
 	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).$(SHRLIBEXT) $(PREFIX)/lib
 	cp $(LIBRARY).a $(PREFIX)/lib
 	cp *.c $(PREFIX)/lib/voc/obj/
 	cp *.h $(PREFIX)/lib/voc/obj/
diff --git a/makefile.linux.gnuc.powerpc b/makefile.linux.gcc.powerpc
similarity index 98%
rename from makefile.linux.gnuc.powerpc
rename to makefile.linux.gcc.powerpc
index 90fdf8de..7912ede2 100644
--- a/makefile.linux.gnuc.powerpc
+++ b/makefile.linux.gcc.powerpc
@@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
 TOS = linux
 TARCH = powerpc
 #TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
-CCOMP = gnuc
+CCOMP = gcc
 RELEASE = 1.0
 
 
@@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
 PREFIXLN = $(PRF)/voc
 
 CCOPT = -fPIC $(INCLUDEPATH) -g
-
-CC = cc $(CCOPT) -c 
-CL = cc $(CCOPT) 
-LD = cc -shared -lX11 -o $(LIBRARY).so
+SHRLIBEXT = so
+CC = $(CCOMP) $(CCOPT) -c
+CL = $(CCOMP) $(CCOPT)
+LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
@@ -272,7 +272,7 @@ clean:
 	rm *.sym
 	rm *.o
 	rm *.a
-	rm *.so
+	rm *.$(SHRLIBEXT)
 
 install:
 	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@@ -287,7 +287,7 @@ install:
 	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).$(SHRLIBEXT) $(PREFIX)/lib
 	cp $(LIBRARY).a $(PREFIX)/lib
 	cp *.c $(PREFIX)/lib/voc/obj/
 	cp *.h $(PREFIX)/lib/voc/obj/
diff --git a/makefile.linux.gnuc.x86 b/makefile.linux.gcc.x86
similarity index 98%
rename from makefile.linux.gnuc.x86
rename to makefile.linux.gcc.x86
index 812cb0ea..ab43576c 100644
--- a/makefile.linux.gnuc.x86
+++ b/makefile.linux.gcc.x86
@@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
 TOS = linux
 TARCH = x86
 #TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
-CCOMP = gnuc
+CCOMP = gcc
 RELEASE = 1.0
 
 
@@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
 PREFIXLN = $(PRF)/voc
 
 CCOPT = -fPIC $(INCLUDEPATH) -g
-
-CC = cc $(CCOPT) -c 
-CL = cc $(CCOPT) 
-LD = cc -shared -lX11 -o $(LIBRARY).so
+SHRLIBEXT = so
+CC = $(CCOMP) $(CCOPT) -c
+CL = $(CCOMP) $(CCOPT)
+LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
@@ -272,7 +272,7 @@ clean:
 	rm *.sym
 	rm *.o
 	rm *.a
-	rm *.so
+	rm *.$(SHRLIBEXT)
 
 install:
 	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@@ -287,7 +287,7 @@ install:
 	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).$(SHRLIBEXT) $(PREFIX)/lib
 	cp $(LIBRARY).a $(PREFIX)/lib
 	cp *.c $(PREFIX)/lib/voc/obj/
 	cp *.h $(PREFIX)/lib/voc/obj/
diff --git a/makefile.linux.gnuc.x86_64 b/makefile.linux.gcc.x86_64
similarity index 98%
rename from makefile.linux.gnuc.x86_64
rename to makefile.linux.gcc.x86_64
index e0113f87..4f9daf55 100644
--- a/makefile.linux.gnuc.x86_64
+++ b/makefile.linux.gcc.x86_64
@@ -3,7 +3,7 @@ BUILDID=$(shell date +%Y/%m/%d)
 TOS = linux
 TARCH = x86_64
 #TARCH = x86 x86_64 armv6j armv6j_hardfp armv7a_hardfp powerpc
-CCOMP = gnuc
+CCOMP = gcc
 RELEASE = 1.0
 
 
@@ -26,10 +26,10 @@ PREFIX = $(PRF)/voc-$(RELEASE)
 PREFIXLN = $(PRF)/voc
 
 CCOPT = -fPIC $(INCLUDEPATH) -g
-
-CC = cc $(CCOPT) -c 
-CL = cc $(CCOPT) 
-LD = cc -shared -lX11 -o $(LIBRARY).so
+SHRLIBEXT = so
+CC = $(CCOMP) $(CCOPT) -c
+CL = $(CCOMP) $(CCOPT)
+LD = $(CCOMP) -shared -lX11 -o $(LIBRARY).$(SHRLIBEXT)
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
@@ -272,7 +272,7 @@ clean:
 	rm *.sym
 	rm *.o
 	rm *.a
-	rm *.so
+	rm *.$(SHRLIBEXT)
 
 install:
 	test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin
@@ -287,7 +287,7 @@ install:
 	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).$(SHRLIBEXT) $(PREFIX)/lib
 	cp $(LIBRARY).a $(PREFIX)/lib
 	cp *.c $(PREFIX)/lib/voc/obj/
 	cp *.h $(PREFIX)/lib/voc/obj/
diff --git a/src/lib/ooc/linux/gnuc/armv6j/oocC.Mod b/src/lib/ooc/linux/gcc/armv6j/oocC.Mod
similarity index 100%
rename from src/lib/ooc/linux/gnuc/armv6j/oocC.Mod
rename to src/lib/ooc/linux/gcc/armv6j/oocC.Mod
diff --git a/src/lib/ooc/linux/gnuc/armv6j_hardfp/oocC.Mod b/src/lib/ooc/linux/gcc/armv6j_hardfp/oocC.Mod
similarity index 100%
rename from src/lib/ooc/linux/gnuc/armv6j_hardfp/oocC.Mod
rename to src/lib/ooc/linux/gcc/armv6j_hardfp/oocC.Mod
diff --git a/src/lib/ooc/linux/gnuc/powerpc/oocC.Mod b/src/lib/ooc/linux/gcc/powerpc/oocC.Mod
similarity index 100%
rename from src/lib/ooc/linux/gnuc/powerpc/oocC.Mod
rename to src/lib/ooc/linux/gcc/powerpc/oocC.Mod
diff --git a/src/lib/ooc/linux/gnuc/x86/oocC.Mod b/src/lib/ooc/linux/gcc/x86/oocC.Mod
similarity index 100%
rename from src/lib/ooc/linux/gnuc/x86/oocC.Mod
rename to src/lib/ooc/linux/gcc/x86/oocC.Mod
diff --git a/src/lib/ooc/linux/gnuc/x86_64/oocC.Mod b/src/lib/ooc/linux/gcc/x86_64/oocC.Mod
similarity index 100%
rename from src/lib/ooc/linux/gnuc/x86_64/oocC.Mod
rename to src/lib/ooc/linux/gcc/x86_64/oocC.Mod
diff --git a/src/lib/ooc2/linux/gnuc/oocwrapperlibc.Mod b/src/lib/ooc2/linux/gcc/oocwrapperlibc.Mod
similarity index 100%
rename from src/lib/ooc2/linux/gnuc/oocwrapperlibc.Mod
rename to src/lib/ooc2/linux/gcc/oocwrapperlibc.Mod
diff --git a/src/lib/system/linux/gnuc/Console.Mod b/src/lib/system/linux/gcc/Console.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/Console.Mod
rename to src/lib/system/linux/gcc/Console.Mod
diff --git a/src/lib/system/linux/gnuc/Files.Mod b/src/lib/system/linux/gcc/Files.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/Files.Mod
rename to src/lib/system/linux/gcc/Files.Mod
diff --git a/src/lib/system/linux/gnuc/Files0.Mod b/src/lib/system/linux/gcc/Files0.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/Files0.Mod
rename to src/lib/system/linux/gcc/Files0.Mod
diff --git a/src/lib/system/linux/gnuc/Kernel.Mod b/src/lib/system/linux/gcc/Kernel.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/Kernel.Mod
rename to src/lib/system/linux/gcc/Kernel.Mod
diff --git a/src/lib/system/linux/gnuc/Kernel0.Mod b/src/lib/system/linux/gcc/Kernel0.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/Kernel0.Mod
rename to src/lib/system/linux/gcc/Kernel0.Mod
diff --git a/src/lib/system/linux/gnuc/SYSTEM.Mod b/src/lib/system/linux/gcc/SYSTEM.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/SYSTEM.Mod
rename to src/lib/system/linux/gcc/SYSTEM.Mod
diff --git a/src/lib/system/linux/gnuc/Texts.Mod b/src/lib/system/linux/gcc/Texts.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/Texts.Mod
rename to src/lib/system/linux/gcc/Texts.Mod
diff --git a/src/lib/system/linux/gnuc/Texts0.Mod b/src/lib/system/linux/gcc/Texts0.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/Texts0.Mod
rename to src/lib/system/linux/gcc/Texts0.Mod
diff --git a/src/lib/system/linux/gnuc/armv6j/Args.Mod b/src/lib/system/linux/gcc/armv6j/Args.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/armv6j/Args.Mod
rename to src/lib/system/linux/gcc/armv6j/Args.Mod
diff --git a/src/lib/system/linux/gnuc/armv6j/SYSTEM.c0 b/src/lib/system/linux/gcc/armv6j/SYSTEM.c0
similarity index 100%
rename from src/lib/system/linux/gnuc/armv6j/SYSTEM.c0
rename to src/lib/system/linux/gcc/armv6j/SYSTEM.c0
diff --git a/src/lib/system/linux/gnuc/armv6j/SYSTEM.h b/src/lib/system/linux/gcc/armv6j/SYSTEM.h
similarity index 100%
rename from src/lib/system/linux/gnuc/armv6j/SYSTEM.h
rename to src/lib/system/linux/gcc/armv6j/SYSTEM.h
diff --git a/src/lib/system/linux/gnuc/armv6j/Unix.Mod b/src/lib/system/linux/gcc/armv6j/Unix.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/armv6j/Unix.Mod
rename to src/lib/system/linux/gcc/armv6j/Unix.Mod
diff --git a/src/lib/system/linux/gnuc/armv6j_hardfp/Args.Mod b/src/lib/system/linux/gcc/armv6j_hardfp/Args.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/armv6j_hardfp/Args.Mod
rename to src/lib/system/linux/gcc/armv6j_hardfp/Args.Mod
diff --git a/src/lib/system/linux/gnuc/armv6j_hardfp/SYSTEM.c0 b/src/lib/system/linux/gcc/armv6j_hardfp/SYSTEM.c0
similarity index 100%
rename from src/lib/system/linux/gnuc/armv6j_hardfp/SYSTEM.c0
rename to src/lib/system/linux/gcc/armv6j_hardfp/SYSTEM.c0
diff --git a/src/lib/system/linux/gnuc/armv6j_hardfp/SYSTEM.h b/src/lib/system/linux/gcc/armv6j_hardfp/SYSTEM.h
similarity index 100%
rename from src/lib/system/linux/gnuc/armv6j_hardfp/SYSTEM.h
rename to src/lib/system/linux/gcc/armv6j_hardfp/SYSTEM.h
diff --git a/src/lib/system/linux/gnuc/armv6j_hardfp/Unix.Mod b/src/lib/system/linux/gcc/armv6j_hardfp/Unix.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/armv6j_hardfp/Unix.Mod
rename to src/lib/system/linux/gcc/armv6j_hardfp/Unix.Mod
diff --git a/src/lib/system/linux/gnuc/armv7a_hardfp/Args.Mod b/src/lib/system/linux/gcc/armv7a_hardfp/Args.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/armv7a_hardfp/Args.Mod
rename to src/lib/system/linux/gcc/armv7a_hardfp/Args.Mod
diff --git a/src/lib/system/linux/gnuc/armv7a_hardfp/SYSTEM.c0 b/src/lib/system/linux/gcc/armv7a_hardfp/SYSTEM.c0
similarity index 100%
rename from src/lib/system/linux/gnuc/armv7a_hardfp/SYSTEM.c0
rename to src/lib/system/linux/gcc/armv7a_hardfp/SYSTEM.c0
diff --git a/src/lib/system/linux/gnuc/armv7a_hardfp/SYSTEM.h b/src/lib/system/linux/gcc/armv7a_hardfp/SYSTEM.h
similarity index 100%
rename from src/lib/system/linux/gnuc/armv7a_hardfp/SYSTEM.h
rename to src/lib/system/linux/gcc/armv7a_hardfp/SYSTEM.h
diff --git a/src/lib/system/linux/gnuc/armv7a_hardfp/Unix.Mod b/src/lib/system/linux/gcc/armv7a_hardfp/Unix.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/armv7a_hardfp/Unix.Mod
rename to src/lib/system/linux/gcc/armv7a_hardfp/Unix.Mod
diff --git a/src/lib/system/linux/gnuc/powerpc/Args.Mod b/src/lib/system/linux/gcc/powerpc/Args.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/powerpc/Args.Mod
rename to src/lib/system/linux/gcc/powerpc/Args.Mod
diff --git a/src/lib/system/linux/gnuc/powerpc/SYSTEM.c0 b/src/lib/system/linux/gcc/powerpc/SYSTEM.c0
similarity index 100%
rename from src/lib/system/linux/gnuc/powerpc/SYSTEM.c0
rename to src/lib/system/linux/gcc/powerpc/SYSTEM.c0
diff --git a/src/lib/system/linux/gnuc/powerpc/SYSTEM.h b/src/lib/system/linux/gcc/powerpc/SYSTEM.h
similarity index 100%
rename from src/lib/system/linux/gnuc/powerpc/SYSTEM.h
rename to src/lib/system/linux/gcc/powerpc/SYSTEM.h
diff --git a/src/lib/system/linux/gnuc/powerpc/Unix.Mod b/src/lib/system/linux/gcc/powerpc/Unix.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/powerpc/Unix.Mod
rename to src/lib/system/linux/gcc/powerpc/Unix.Mod
diff --git a/src/lib/system/linux/gnuc/x86/Args.Mod b/src/lib/system/linux/gcc/x86/Args.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/x86/Args.Mod
rename to src/lib/system/linux/gcc/x86/Args.Mod
diff --git a/src/lib/system/linux/gnuc/x86/SYSTEM.c0 b/src/lib/system/linux/gcc/x86/SYSTEM.c0
similarity index 100%
rename from src/lib/system/linux/gnuc/x86/SYSTEM.c0
rename to src/lib/system/linux/gcc/x86/SYSTEM.c0
diff --git a/src/lib/system/linux/gnuc/x86/SYSTEM.h b/src/lib/system/linux/gcc/x86/SYSTEM.h
similarity index 100%
rename from src/lib/system/linux/gnuc/x86/SYSTEM.h
rename to src/lib/system/linux/gcc/x86/SYSTEM.h
diff --git a/src/lib/system/linux/gnuc/x86/Unix.Mod b/src/lib/system/linux/gcc/x86/Unix.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/x86/Unix.Mod
rename to src/lib/system/linux/gcc/x86/Unix.Mod
diff --git a/src/lib/system/linux/gnuc/x86_64/Args.Mod b/src/lib/system/linux/gcc/x86_64/Args.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/x86_64/Args.Mod
rename to src/lib/system/linux/gcc/x86_64/Args.Mod
diff --git a/src/lib/system/linux/gnuc/x86_64/SYSTEM.c0 b/src/lib/system/linux/gcc/x86_64/SYSTEM.c0
similarity index 100%
rename from src/lib/system/linux/gnuc/x86_64/SYSTEM.c0
rename to src/lib/system/linux/gcc/x86_64/SYSTEM.c0
diff --git a/src/lib/system/linux/gnuc/x86_64/SYSTEM.h b/src/lib/system/linux/gcc/x86_64/SYSTEM.h
similarity index 100%
rename from src/lib/system/linux/gnuc/x86_64/SYSTEM.h
rename to src/lib/system/linux/gcc/x86_64/SYSTEM.h
diff --git a/src/lib/system/linux/gnuc/x86_64/Unix.Mod b/src/lib/system/linux/gcc/x86_64/Unix.Mod
similarity index 100%
rename from src/lib/system/linux/gnuc/x86_64/Unix.Mod
rename to src/lib/system/linux/gcc/x86_64/Unix.Mod
diff --git a/src/par/voc.par.gnuc.armv6j b/src/par/voc.par.gcc.armv6j
similarity index 100%
rename from src/par/voc.par.gnuc.armv6j
rename to src/par/voc.par.gcc.armv6j
diff --git a/src/par/voc.par.gnuc.armv6j_hardfp b/src/par/voc.par.gcc.armv6j_hardfp
similarity index 100%
rename from src/par/voc.par.gnuc.armv6j_hardfp
rename to src/par/voc.par.gcc.armv6j_hardfp
diff --git a/src/par/voc.par.gnuc.armv7a_hardfp b/src/par/voc.par.gcc.armv7a_hardfp
similarity index 100%
rename from src/par/voc.par.gnuc.armv7a_hardfp
rename to src/par/voc.par.gcc.armv7a_hardfp
diff --git a/src/par/voc.par.gnuc.powerpc b/src/par/voc.par.gcc.powerpc
similarity index 100%
rename from src/par/voc.par.gnuc.powerpc
rename to src/par/voc.par.gcc.powerpc
diff --git a/src/par/voc.par.gnuc.x86 b/src/par/voc.par.gcc.x86
similarity index 100%
rename from src/par/voc.par.gnuc.x86
rename to src/par/voc.par.gcc.x86
diff --git a/src/par/voc.par.gnuc.x86_64 b/src/par/voc.par.gcc.x86_64
similarity index 100%
rename from src/par/voc.par.gnuc.x86_64
rename to src/par/voc.par.gcc.x86_64
diff --git a/src/test/x11/0/makefile b/src/test/x11/0/makefile
index 7921db51..69ca6f0b 100644
--- a/src/test/x11/0/makefile
+++ b/src/test/x11/0/makefile
@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) -m test.Mod
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c
diff --git a/src/test/x11/mines/makefile b/src/test/x11/mines/makefile
index 3a794e62..2b486cf2 100644
--- a/src/test/x11/mines/makefile
+++ b/src/test/x11/mines/makefile
@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) -s Linie.Mod Minesweeper.Mod -m
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c
diff --git a/src/test/x11/pacman/makefile b/src/test/x11/pacman/makefile
index 7ae675c3..ae28d8a8 100644
--- a/src/test/x11/pacman/makefile
+++ b/src/test/x11/pacman/makefile
@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) -s Grafik.Mod PacMan.Mod -m
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c
diff --git a/src/test/x11/tetris/makefile b/src/test/x11/tetris/makefile
index 3bc59057..d5a93d6c 100644
--- a/src/test/x11/tetris/makefile
+++ b/src/test/x11/tetris/makefile
@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) -s Linie.Mod Ziffer.Mod Tetris.Mod -m
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c
diff --git a/src/test/x11/tron/makefile b/src/test/x11/tron/makefile
index 51682996..dcc2db7d 100644
--- a/src/test/x11/tron/makefile
+++ b/src/test/x11/tron/makefile
@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) Tron.Mod -m
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c
diff --git a/src/test/x11/vier/makefile b/src/test/x11/vier/makefile
index 4f6ab8a5..c99f0ca2 100644
--- a/src/test/x11/vier/makefile
+++ b/src/test/x11/vier/makefile
@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) -s Ausgabe.Mod Vier.Mod -m
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c
diff --git a/src/voc/darwin/clang/extTools.Mod b/src/voc/darwin/clang/extTools.Mod
index 466af114..c8e8d0bd 100644
--- a/src/voc/darwin/clang/extTools.Mod
+++ b/src/voc/darwin/clang/extTools.Mod
@@ -6,6 +6,7 @@ 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;
 
@@ -33,7 +34,6 @@ 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
 (*
@@ -80,7 +80,8 @@ END LinkMain;
 
 BEGIN
 
-incPath0 := "src/lib/system/darwin/clang";
+incPath0 := "src/lib/system/darwin/";
+Strings.Append (compiler, incPath0);
 incPath1 := "lib/voc/obj ";
 ccOpt := " -fPIC -g ";
 
@@ -98,7 +99,7 @@ Strings.Append(tmp1, ccOpt);
 Args.GetEnv("CFLAGS", CFLAGS);
 Strings.Append (CFLAGS, ccOpt);
 Strings.Append (" ", ccOpt);
-ccString := "cc ";
-(*Strings.Append (ccOpt, ccString);*)
+ccString := compiler;
+Strings.Append (" ", ccString);
 
 END extTools.
diff --git a/src/voc/linux/clang/extTools.Mod b/src/voc/linux/clang/extTools.Mod
index 58c28991..b7173120 100644
--- a/src/voc/linux/clang/extTools.Mod
+++ b/src/voc/linux/clang/extTools.Mod
@@ -6,6 +6,7 @@ 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;
 
@@ -62,7 +63,8 @@ END LinkMain;
 
 BEGIN
 
-incPath0 := "src/lib/system/linux/clang";
+incPath0 := "src/lib/system/linux/";
+Strings.Append (compiler, incPath0);
 incPath1 := "lib/voc/obj ";
 ccOpt := " -fPIC -g ";
 
@@ -80,7 +82,7 @@ Strings.Append(tmp1, ccOpt);
 Args.GetEnv("CFLAGS", CFLAGS);
 Strings.Append (CFLAGS, ccOpt);
 Strings.Append (" ", ccOpt);
-ccString := "clang ";
-(*Strings.Append (ccOpt, ccString);*)
+ccString := compiler;
+Strings.Append (" ", ccString);
 
 END extTools.
diff --git a/src/voc/linux/gnuc/armv6j/architecture.Mod b/src/voc/linux/gcc/armv6j/architecture.Mod
similarity index 100%
rename from src/voc/linux/gnuc/armv6j/architecture.Mod
rename to src/voc/linux/gcc/armv6j/architecture.Mod
diff --git a/src/voc/linux/gnuc/armv6j_hardfp/architecture.Mod b/src/voc/linux/gcc/armv6j_hardfp/architecture.Mod
similarity index 100%
rename from src/voc/linux/gnuc/armv6j_hardfp/architecture.Mod
rename to src/voc/linux/gcc/armv6j_hardfp/architecture.Mod
diff --git a/src/voc/linux/gnuc/armv7a_hardfp/architecture.Mod b/src/voc/linux/gcc/armv7a_hardfp/architecture.Mod
similarity index 100%
rename from src/voc/linux/gnuc/armv7a_hardfp/architecture.Mod
rename to src/voc/linux/gcc/armv7a_hardfp/architecture.Mod
diff --git a/src/voc/linux/gnuc/extTools.Mod b/src/voc/linux/gcc/extTools.Mod
similarity index 90%
rename from src/voc/linux/gnuc/extTools.Mod
rename to src/voc/linux/gcc/extTools.Mod
index 49cd393f..fc5ea490 100644
--- a/src/voc/linux/gnuc/extTools.Mod
+++ b/src/voc/linux/gcc/extTools.Mod
@@ -6,6 +6,7 @@ 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;
 
@@ -62,7 +63,8 @@ END LinkMain;
 
 BEGIN
 
-incPath0 := "src/lib/system/linux/gnuc";
+incPath0 := "src/lib/system/linux/";
+Strings.Append (compiler, incPath0);
 incPath1 := "lib/voc/obj ";
 ccOpt := " -fPIC -g ";
 
@@ -77,15 +79,10 @@ 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);*)
+ccString := compiler;
+Strings.Append (" ", ccString);
 
 END extTools.
diff --git a/src/voc/linux/gnuc/powerpc/architecture.Mod b/src/voc/linux/gcc/powerpc/architecture.Mod
similarity index 100%
rename from src/voc/linux/gnuc/powerpc/architecture.Mod
rename to src/voc/linux/gcc/powerpc/architecture.Mod
diff --git a/src/voc/linux/gnuc/x86/architecture.Mod b/src/voc/linux/gcc/x86/architecture.Mod
similarity index 100%
rename from src/voc/linux/gnuc/x86/architecture.Mod
rename to src/voc/linux/gcc/x86/architecture.Mod
diff --git a/src/voc/linux/gnuc/x86_64/architecture.Mod b/src/voc/linux/gcc/x86_64/architecture.Mod
similarity index 100%
rename from src/voc/linux/gnuc/x86_64/architecture.Mod
rename to src/voc/linux/gcc/x86_64/architecture.Mod
diff --git a/src/voc07R/makefile b/src/voc07R/makefile
index d9b3c6bd..dffd2946 100644
--- a/src/voc07R/makefile
+++ b/src/voc07R/makefile
@@ -1,5 +1,5 @@
 
-SETPATH = MODULES=".:gnuc:gnuc/x86_64"
+SETPATH = MODULES=".:gcc:gcc/x86_64"
 
 VOC0 = $(SETPATH) /opt/voc/bin/voc
 
diff --git a/voc.REMOVED.git-id b/voc.REMOVED.git-id
index cf95ff0c..a47e45a0 100644
--- a/voc.REMOVED.git-id
+++ b/voc.REMOVED.git-id
@@ -1 +1 @@
-09450eb346c6cc2c136316f7b2010d955a9b3c5a
\ No newline at end of file
+6e5167bb4612bdd49ff2a901df26c5aa1c5ac1fe
\ No newline at end of file
diff --git a/vocstatic.linux.clang.x86_64.REMOVED.git-id b/vocstatic.linux.clang.x86_64.REMOVED.git-id
index cf95ff0c..a47e45a0 100644
--- a/vocstatic.linux.clang.x86_64.REMOVED.git-id
+++ b/vocstatic.linux.clang.x86_64.REMOVED.git-id
@@ -1 +1 @@
-09450eb346c6cc2c136316f7b2010d955a9b3c5a
\ No newline at end of file
+6e5167bb4612bdd49ff2a901df26c5aa1c5ac1fe
\ No newline at end of file
diff --git a/vocstatic.linux.gnuc.armv6j_hardfp.REMOVED.git-id b/vocstatic.linux.gcc.armv6j_hardfp.REMOVED.git-id
similarity index 100%
rename from vocstatic.linux.gnuc.armv6j_hardfp.REMOVED.git-id
rename to vocstatic.linux.gcc.armv6j_hardfp.REMOVED.git-id
diff --git a/vocstatic.linux.gnuc.powerpc.REMOVED.git-id b/vocstatic.linux.gcc.powerpc.REMOVED.git-id
similarity index 100%
rename from vocstatic.linux.gnuc.powerpc.REMOVED.git-id
rename to vocstatic.linux.gcc.powerpc.REMOVED.git-id
diff --git a/vocstatic.linux.gnuc.x86.REMOVED.git-id b/vocstatic.linux.gcc.x86.REMOVED.git-id
similarity index 100%
rename from vocstatic.linux.gnuc.x86.REMOVED.git-id
rename to vocstatic.linux.gcc.x86.REMOVED.git-id
diff --git a/vocstatic.linux.gcc.x86_64.REMOVED.git-id b/vocstatic.linux.gcc.x86_64.REMOVED.git-id
new file mode 100644
index 00000000..824e7787
--- /dev/null
+++ b/vocstatic.linux.gcc.x86_64.REMOVED.git-id
@@ -0,0 +1 @@
+61b5753acc412437ff8651ca9e966787ec455b07
\ No newline at end of file
diff --git a/vocstatic.linux.gnuc.x86_64.REMOVED.git-id b/vocstatic.linux.gnuc.x86_64.REMOVED.git-id
deleted file mode 100644
index 5d2efab8..00000000
--- a/vocstatic.linux.gnuc.x86_64.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-cdb8a13e4b5934d5f3e3e447f26636575b6b12a8
\ No newline at end of file