Index: tools/autotool.py
===================================================================
--- tools/autotool.py	(revision bbe5e34956da986df4d32357c697e539e8cfec0d)
+++ tools/autotool.py	(revision 09ab0a9afc9379f1604c0fd75cac2d9287ba022c)
@@ -179,5 +179,4 @@
 	platform = None
 	target = None
-	cc_args = []
 
 	if (config['PLATFORM'] == "abs32le"):
@@ -192,5 +191,4 @@
 
 		if (config['CROSS_TARGET'] == "mips32"):
-			cc_args.append("-mabi=32")
 			target = "mipsel-helenos"
 
@@ -213,5 +211,4 @@
 	if (config['PLATFORM'] == "mips32"):
 		check_config(config, "MACHINE")
-		cc_args.append("-mabi=32")
 
 		if ((config['MACHINE'] == "msim") or (config['MACHINE'] == "lmalta")):
@@ -225,5 +222,4 @@
 	if (config['PLATFORM'] == "mips64"):
 		check_config(config, "MACHINE")
-		cc_args.append("-mabi=64")
 
 		if (config['MACHINE'] == "msim"):
@@ -243,5 +239,5 @@
 		target = "sparc64-helenos"
 
-	return (platform, cc_args, target)
+	return (platform, target)
 
 def check_app(args, name, details):
@@ -359,5 +355,5 @@
 	return int(value, base)
 
-def probe_compiler(common, typesizes):
+def probe_compiler(cc, common, typesizes):
 	"Generate, compile and parse probing source"
 
@@ -377,5 +373,5 @@
 	outf.close()
 
-	args = common['CC_AUTOGEN'].split(' ')
+	args = cc.split(' ')
 	args.extend(["-S", "-o", PROBE_OUTPUT, PROBE_SOURCE])
 
@@ -564,5 +560,5 @@
 		check_app(["tar", "--version"], "tar utility", "usually part of tar")
 
-		platform, cc_args, target = get_target(config)
+		platform, target = get_target(config)
 
 		if (platform is None) or (target is None):
@@ -577,4 +573,6 @@
 		common['TARGET'] = target
 		prefix = "%s-" % target
+
+		cc_autogen = None
 
 		# Compiler
@@ -584,6 +582,6 @@
 
 			check_common(common, "GCC")
-			common['CC'] = " ".join([common['GCC']] + cc_args)
-			common['CC_AUTOGEN'] = common['CC']
+			common['CC'] = common['GCC']
+			cc_autogen = common['CC']
 
 			check_common(common, "GXX")
@@ -595,6 +593,6 @@
 
 			check_common(common, "CLANG")
-			common['CC'] = " ".join([common['CLANG']] + cc_args)
-			common['CC_AUTOGEN'] = common['CC'] + " -no-integrated-as"
+			common['CC'] = common['CLANG']
+			cc_autogen = common['CC'] + " -no-integrated-as"
 
 			if (config['INTEGRATED_AS'] == "yes"):
@@ -610,5 +608,5 @@
 				common['GENISOIMAGE'] += ' -as genisoimage'
 
-		probe = probe_compiler(common,
+		probe = probe_compiler(cc_autogen, common,
 			[
 				{'type': 'long long int', 'tag': 'LONG_LONG', 'sname': 'LLONG' },