Index: tools/autogen.py
===================================================================
--- tools/autogen.py	(revision a420203e10bd60efe9f0855ec6ec46a9bf0fac5f)
+++ tools/autogen.py	(revision 6efd162be8f9914f77c8beb570c4d16d4dee19ca)
@@ -66,12 +66,12 @@
 	for i in range(len(struct['members'])):
 		member = struct['members'][i]
-		code = code + ("\temit_constant(%s_OFFSET_%s, offsetof(%s_t, %s));\n" % 
+		code = code + ("\temit_constant(%s_OFFSET_%s, offsetof(%s_t, %s));\n" %
 		    (struct['name'].upper(), member['name'].upper(), struct['name'],
 		    member['name']))
-		code = code + ("\temit_constant(%s_SIZE_%s, sizeof(((%s_t *) 0)->%s));\n" % 
+		code = code + ("\temit_constant(%s_SIZE_%s, sizeof(((%s_t *) 0)->%s));\n" %
 		    (struct['name'].upper(), member['name'].upper(), struct['name'],
 		    member['name']))
 		if 'elements' in member.keys():
-			code = code + ("\temit_constant(%s_%s_ITEM_SIZE, sizeof(%s));\n" % 
+			code = code + ("\temit_constant(%s_%s_ITEM_SIZE, sizeof(%s));\n" %
 			    (struct['name'].upper(), member['name'].upper(), member['type']))
 			
@@ -83,5 +83,5 @@
 
 	code = """
-%s		
+%s
 
 #define str(s) #s
@@ -92,5 +92,7 @@
 %s
 
-int main()
+extern int main(int, char *[]);
+
+int main(int argc, char *argv[])
 {
 %s
@@ -100,5 +102,5 @@
 	""" % (generate_includes(struct), generate_struct(struct),
 	    generate_probes(struct), name.upper(), typename)
-
+	
 	return code
 
@@ -167,3 +169,2 @@
 
 run()
-
Index: tools/autotool.py
===================================================================
--- tools/autotool.py	(revision a420203e10bd60efe9f0855ec6ec46a9bf0fac5f)
+++ tools/autotool.py	(revision 6efd162be8f9914f77c8beb570c4d16d4dee19ca)
@@ -88,4 +88,6 @@
 	AUTOTOOL_DECLARE("floatsize", "", tag, #type, "", "", sizeof(type));
 
+extern int main(int, char *[]);
+
 int main(int argc, char *argv[])
 {
@@ -115,4 +117,6 @@
 	AUTOTOOL_DECLARE("intsize", "signed", tag, #type, "", "", sizeof(signed type));
 
+extern int main(int, char *[]);
+
 int main(int argc, char *argv[])
 {
@@ -216,22 +220,22 @@
 		if (config['CROSS_TARGET'] == "arm32"):
 			gnu_target = "arm-linux-gnueabi"
-			clang_target = "arm-unknown-linux"
+			clang_target = "arm-unknown-none"
 			helenos_target = "arm-helenos-gnueabi"
 		
 		if (config['CROSS_TARGET'] == "ia32"):
 			gnu_target = "i686-pc-linux-gnu"
-			clang_target = "i386-unknown-linux"
+			clang_target = "i686-unknown-none"
 			helenos_target = "i686-pc-helenos"
 		
 		if (config['CROSS_TARGET'] == "mips32"):
+			cc_args.append("-mabi=32")
 			gnu_target = "mipsel-linux-gnu"
-			clang_target = "mipsel-unknown-linux"
+			clang_target = "mipsel-unknown-none"
 			helenos_target = "mipsel-helenos"
-			common['CC_ARGS'].append("-mabi=32")
 	
 	if (config['PLATFORM'] == "amd64"):
 		target = config['PLATFORM']
 		gnu_target = "amd64-linux-gnu"
-		clang_target = "x86_64-unknown-linux"
+		clang_target = "x86_64-unknown-none"
 		helenos_target = "amd64-helenos"
 	
@@ -239,5 +243,5 @@
 		target = config['PLATFORM']
 		gnu_target = "arm-linux-gnueabi"
-		clang_target = "arm-unknown-linux"
+		clang_target = "arm-unknown-none-eabi"
 		helenos_target = "arm-helenos-gnueabi"
 	
@@ -245,5 +249,5 @@
 		target = config['PLATFORM']
 		gnu_target = "i686-pc-linux-gnu"
-		clang_target = "i386-unknown-linux"
+		clang_target = "i686-unknown-none"
 		helenos_target = "i686-pc-helenos"
 	
@@ -260,5 +264,5 @@
 			target = config['PLATFORM']
 			gnu_target = "mipsel-linux-gnu"
-			clang_target = "mipsel-unknown-linux"
+			clang_target = "mipsel-unknown-none"
 			helenos_target = "mipsel-helenos"
 		
@@ -266,5 +270,5 @@
 			target = "mips32eb"
 			gnu_target = "mips-linux-gnu"
-			clang_target = "mips-unknown-linux"
+			clang_target = "mips-unknown-none"
 			helenos_target = "mips-helenos"
 	
@@ -276,5 +280,5 @@
 			target = config['PLATFORM']
 			gnu_target = "mips64el-linux-gnu"
-			clang_target = "mips64el-unknown-linux"
+			clang_target = "mips64el-unknown-none"
 			helenos_target = "mips64el-helenos"
 	
@@ -282,5 +286,5 @@
 		target = config['PLATFORM']
 		gnu_target = "ppc-linux-gnu"
-		clang_target = "powerpc-unknown-linux"
+		clang_target = "ppc-unknown-none"
 		helenos_target = "ppc-helenos"
 	
@@ -293,5 +297,5 @@
 		target = config['PLATFORM']
 		gnu_target = "sparc64-linux-gnu"
-		clang_target = "sparc-unknown-linux"
+		clang_target = "sparc-unknown-none"
 		helenos_target = "sparc64-helenos"
 	
@@ -417,5 +421,5 @@
 	
 	for typedef in floatsizes:
-		outf.write("\nDECLARE_FLOATSIZE(\"%s\", %s);\n" % (typedef['tag'], typedef['type']))
+		outf.write("\tDECLARE_FLOATSIZE(\"%s\", %s);\n" % (typedef['tag'], typedef['type']))
 	
 	outf.write(PROBE_TAIL)
@@ -889,8 +893,9 @@
 		
 		if (config['COMPILER'] == "icc"):
-			common['CC'] = "icc"
 			check_app([common['CC'], "-V"], "Intel C++ Compiler", "support is experimental")
 			check_gcc(None, "", common, PACKAGE_GCC)
 			check_binutils(None, binutils_prefix, common, PACKAGE_BINUTILS)
+			
+			common['CC'] = "icc"
 		
 		if (config['COMPILER'] == "clang"):