Index: uspace/lib/c/Makefile
===================================================================
--- uspace/lib/c/Makefile	(revision 91b604993517a2bdc14cfe1ede6902150ab29533)
+++ uspace/lib/c/Makefile	(revision a0a273e83bf1cedff09f94c8181d7f89a6c637a6)
@@ -194,5 +194,5 @@
 %.h: %.ag
 	$(AUTOGEN) probe $< >$<.probe.c
-	$(CC) $(DEFS) $(CFLAGS) -S -o $<.probe.s $<.probe.c
+	$(CC_AUTOGEN) $(DEFS) $(CFLAGS) -S -o $<.probe.s $<.probe.c
 	$(AUTOGEN) generate $< <$<.probe.s >$@   
 
Index: uspace/lib/c/arch/amd64/Makefile.common
===================================================================
--- uspace/lib/c/arch/amd64/Makefile.common	(revision 91b604993517a2bdc14cfe1ede6902150ab29533)
+++ uspace/lib/c/arch/amd64/Makefile.common	(revision a0a273e83bf1cedff09f94c8181d7f89a6c637a6)
@@ -27,6 +27,5 @@
 #
 
-GCC_CFLAGS += -mno-tls-direct-seg-refs -fno-omit-frame-pointer
-CLANG_CFLAGS += -fno-omit-frame-pointer
+COMMON_CFLAGS += -mno-tls-direct-seg-refs -fno-omit-frame-pointer
 LFLAGS += --gc-sections
 
Index: uspace/lib/c/arch/arm32/Makefile.common
===================================================================
--- uspace/lib/c/arch/arm32/Makefile.common	(revision 91b604993517a2bdc14cfe1ede6902150ab29533)
+++ uspace/lib/c/arch/arm32/Makefile.common	(revision a0a273e83bf1cedff09f94c8181d7f89a6c637a6)
@@ -28,5 +28,5 @@
 #
 
-GCC_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -mapcs-frame \
+COMMON_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -mapcs-frame \
 	-march=$(subst _,-,$(PROCESSOR_ARCH))
 
@@ -34,5 +34,5 @@
 
 ifeq ($(CONFIG_FPU),y)
-	GCC_CFLAGS += -mfloat-abi=hard
+	COMMON_CFLAGS += -mfloat-abi=hard
 else
 	BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
Index: uspace/lib/c/arch/ia32/Makefile.common
===================================================================
--- uspace/lib/c/arch/ia32/Makefile.common	(revision 91b604993517a2bdc14cfe1ede6902150ab29533)
+++ uspace/lib/c/arch/ia32/Makefile.common	(revision a0a273e83bf1cedff09f94c8181d7f89a6c637a6)
@@ -28,11 +28,10 @@
 
 ifeq ($(PROCESSOR),i486)
-	GCC_CFLAGS += -march=i486 
+	COMMON_CFLAGS += -march=i486
 else
-	GCC_CFLAGS += -march=pentium
+	COMMON_CFLAGS += -march=pentium
 endif
 
-GCC_CFLAGS += -mno-tls-direct-seg-refs -fno-omit-frame-pointer
-CLANG_CFLAGS += -fno-omit-frame-pointer
+COMMON_CFLAGS += -mno-tls-direct-seg-refs -fno-omit-frame-pointer
 LFLAGS += --gc-sections
 
Index: uspace/lib/c/arch/mips32/Makefile.common
===================================================================
--- uspace/lib/c/arch/mips32/Makefile.common	(revision 91b604993517a2bdc14cfe1ede6902150ab29533)
+++ uspace/lib/c/arch/mips32/Makefile.common	(revision a0a273e83bf1cedff09f94c8181d7f89a6c637a6)
@@ -27,5 +27,5 @@
 #
 
-GCC_CFLAGS += -msoft-float -mabi=32
+COMMON_CFLAGS += -msoft-float -mabi=32
 BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
 AS_PROLOG = .module softfloat;.abicalls;
@@ -38,9 +38,9 @@
 
 ifeq ($(MACHINE),msim)
-	GCC_CFLAGS += -march=r4000 
+	COMMON_CFLAGS += -march=r4000
 endif
 
 ifeq ($(MACHINE),lmalta)
-	GCC_CFLAGS += -march=4kc
+	COMMON_CFLAGS += -march=4kc
 endif
 
Index: uspace/lib/c/arch/mips32eb/Makefile.common
===================================================================
--- uspace/lib/c/arch/mips32eb/Makefile.common	(revision 91b604993517a2bdc14cfe1ede6902150ab29533)
+++ uspace/lib/c/arch/mips32eb/Makefile.common	(revision a0a273e83bf1cedff09f94c8181d7f89a6c637a6)
@@ -27,5 +27,5 @@
 #
 
-GCC_CFLAGS += -msoft-float -mabi=32
+COMMON_CFLAGS += -msoft-float -mabi=32
 BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
 AS_PROLOG = .module softfloat;.abicalls;
@@ -38,5 +38,5 @@
 
 ifeq ($(MACHINE),bmalta)
-	GCC_CFLAGS += -march=4kc
+	COMMON_CFLAGS += -march=4kc
 endif
 
Index: uspace/lib/c/arch/ppc32/Makefile.common
===================================================================
--- uspace/lib/c/arch/ppc32/Makefile.common	(revision 91b604993517a2bdc14cfe1ede6902150ab29533)
+++ uspace/lib/c/arch/ppc32/Makefile.common	(revision a0a273e83bf1cedff09f94c8181d7f89a6c637a6)
@@ -33,5 +33,5 @@
 endif
 
-GCC_CFLAGS += -mcpu=powerpc -m$(FLOATS)-float -m32
+COMMON_CFLAGS += -mcpu=powerpc -m$(FLOATS)-float -m32
 BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
 AFLAGS += -a32
Index: uspace/lib/c/arch/sparc64/Makefile.common
===================================================================
--- uspace/lib/c/arch/sparc64/Makefile.common	(revision 91b604993517a2bdc14cfe1ede6902150ab29533)
+++ uspace/lib/c/arch/sparc64/Makefile.common	(revision a0a273e83bf1cedff09f94c8181d7f89a6c637a6)
@@ -28,10 +28,10 @@
 
 ifeq ($(PROCESSOR),sun4v)
-GCC_CFLAGS += -mcpu=niagara -mno-vis
+COMMON_CFLAGS += -mcpu=niagara -mno-vis
 else
-GCC_CFLAGS += -mcpu=ultrasparc
+COMMON_CFLAGS += -mcpu=ultrasparc
 endif
 
-GCC_CFLAGS += -m64 -mcmodel=medlow
+COMMON_CFLAGS += -m64 -mcmodel=medlow
 
 LFLAGS += -no-check-sections --gc-sections
