Changes in tools/autotool.py [9ce911d:84eb4edd] in mainline

File:

• tools/autotool.py (modified) (22 diffs)

tools/autotool.py

@@ -54 +54 @@
 PACKAGE_GCC = "preferably version 4.7.0 or newer"
 PACKAGE_CROSS = "use tools/toolchain.sh to build the cross-compiler toolchain"
+PACKAGE_CLANG = "reasonably recent version of clang needs to be installed"
 
 COMPILER_FAIL = "The compiler is probably not capable to compile HelenOS."
@@ -210 +211 @@
         target = None
         gnu_target = None
-        clang_target = None
         helenos_target = None
         cc_args = []
@@ -220 +220 @@
                 if (config['CROSS_TARGET'] == "arm32"):
                         gnu_target = "arm-linux-gnueabi"
-                        clang_target = "arm-unknown-none"
                         helenos_target = "arm-helenos-gnueabi"
                 
                 if (config['CROSS_TARGET'] == "ia32"):
                         gnu_target = "i686-pc-linux-gnu"
-                        clang_target = "i686-unknown-none"
                         helenos_target = "i686-pc-helenos"
                 
@@ -231 +229 @@
                         cc_args.append("-mabi=32")
                         gnu_target = "mipsel-linux-gnu"
-                        clang_target = "mipsel-unknown-none"
                         helenos_target = "mipsel-helenos"
         
@@ -237 +234 @@
                 target = config['PLATFORM']
                 gnu_target = "amd64-linux-gnu"
-                clang_target = "x86_64-unknown-none"
                 helenos_target = "amd64-helenos"
         
@@ -243 +239 @@
                 target = config['PLATFORM']
                 gnu_target = "arm-linux-gnueabi"
-                clang_target = "arm-unknown-none-eabi"
                 helenos_target = "arm-helenos-gnueabi"
         
@@ -249 +244 @@
                 target = config['PLATFORM']
                 gnu_target = "i686-pc-linux-gnu"
-                clang_target = "i686-unknown-none"
                 helenos_target = "i686-pc-helenos"
         
@@ -264 +258 @@
                         target = config['PLATFORM']
                         gnu_target = "mipsel-linux-gnu"
-                        clang_target = "mipsel-unknown-none"
                         helenos_target = "mipsel-helenos"
                 
@@ -270 +263 @@
                         target = "mips32eb"
                         gnu_target = "mips-linux-gnu"
-                        clang_target = "mips-unknown-none"
                         helenos_target = "mips-helenos"
         
@@ -280 +272 @@
                         target = config['PLATFORM']
                         gnu_target = "mips64el-linux-gnu"
-                        clang_target = "mips64el-unknown-none"
                         helenos_target = "mips64el-helenos"
         
@@ -286 +277 @@
                 target = config['PLATFORM']
                 gnu_target = "ppc-linux-gnu"
-                clang_target = "ppc-unknown-none"
                 helenos_target = "ppc-helenos"
         
@@ -292 +282 @@
                 target = config['PLATFORM']
                 gnu_target = "riscv64-unknown-linux-gnu"
-                clang_target = "riscv-unknown-none"
                 helenos_target = "riscv64-helenos"
         
@@ -298 +287 @@
                 target = config['PLATFORM']
                 gnu_target = "sparc64-linux-gnu"
-                clang_target = "sparc-unknown-none"
                 helenos_target = "sparc64-helenos"
         
-        return (target, cc_args, gnu_target, clang_target, helenos_target)
+        return (target, cc_args, gnu_target, helenos_target)
 
 def check_app(args, name, details):
@@ -351 +339 @@
         return found
 
+def check_clang(path, prefix, common, details):
+        "Check for clang"
+        
+        common['CLANG'] = "%sclang" % prefix
+        
+        if (not path is None):
+                common['CLANG'] = "%s/%s" % (path, common['CLANG'])
+        
+        check_app([common['CLANG'], "--version"], "clang", details)
+
 def check_gcc(path, prefix, common, details):
         "Check for GCC"
@@ -427 +425 @@
         outf.close()
         
-        args = [common['CC']]
-        args.extend(common['CC_ARGS'])
+        args = common['CC_AUTOGEN'].split(' ')
         args.extend(["-S", "-o", PROBE_OUTPUT, PROBE_SOURCE])
         
@@ -547 +544 @@
         outf.close()
         
-        args = [common['CC']]
-        args.extend(common['CC_ARGS'])
+        args = common['CC_AUTOGEN'].split(' ')
         args.extend(["-S", "-o", PROBE_INT128_OUTPUT, PROBE_INT128_SOURCE])
         
@@ -852 +848 @@
                 
                 # Compiler
-                common['CC_ARGS'] = []
                 if (config['COMPILER'] == "gcc_cross"):
-                        target, cc_args, gnu_target, clang_target, helenos_target = get_target(config)
+                        target, cc_args, gnu_target, helenos_target = get_target(config)
                         
                         if (target is None) or (gnu_target is None):
@@ -867 +862 @@
                         
                         check_common(common, "GCC")
-                        common['CC'] = common['GCC']
-                        common['CC_ARGS'].extend(cc_args)
+                        common['CC'] = " ".join([common['GCC']] + cc_args)
+                        common['CC_AUTOGEN'] = common['CC']
                 
                 if (config['COMPILER'] == "gcc_helenos"):
-                        target, cc_args, gnu_target, clang_target, helenos_target = get_target(config)
+                        target, cc_args, gnu_target, helenos_target = get_target(config)
                         
                         if (target is None) or (helenos_target is None):
@@ -884 +879 @@
                         
                         check_common(common, "GCC")
-                        common['CC'] = common['GCC']
-                        common['CC_ARGS'].extend(cc_args)
+                        common['CC'] = " ".join([common['GCC']] + cc_args)
+                        common['CC_AUTOGEN'] = common['CC']
                 
                 if (config['COMPILER'] == "gcc_native"):
@@ -893 +888 @@
                         check_common(common, "GCC")
                         common['CC'] = common['GCC']
+                        common['CC_AUTOGEN'] = common['CC']
                 
                 if (config['COMPILER'] == "icc"):
@@ -900 +896 @@
                         
                         common['CC'] = "icc"
+                        common['CC_AUTOGEN'] = common['CC']
                 
                 if (config['COMPILER'] == "clang"):
-                        target, cc_args, gnu_target, clang_target, helenos_target = get_target(config)
-                        
-                        if (target is None) or (gnu_target is None) or (clang_target is None):
-                                print_error(["Unsupported compiler target for clang.",
+                        target, cc_args, gnu_target, helenos_target = get_target(config)
+                        
+                        if (target is None) or (gnu_target is None):
+                                print_error(["Unsupported compiler target.",
                                              "Please contact the developers of HelenOS."])
                         
@@ -911 +908 @@
                         prefix = "%s-" % gnu_target
                         
-                        check_app(["clang", "--version"], "clang compiler", "preferably version 1.0 or newer")
-                        check_gcc(path, prefix, common, PACKAGE_GCC)
-                        check_binutils(path, prefix, common, PACKAGE_BINUTILS)
-                        
-                        check_common(common, "GCC")
-                        common['CC'] = "clang"
-                        common['CC_ARGS'].extend(cc_args)
-                        common['CC_ARGS'].append("-target")
-                        common['CC_ARGS'].append(clang_target)
-                        common['CLANG_TARGET'] = clang_target
+                        check_binutils(path, prefix, common, PACKAGE_CROSS)
+                        check_clang(path, prefix, common, PACKAGE_CLANG)
+                        
+                        check_common(common, "CLANG")
+                        common['CC'] = " ".join([common['CLANG']] + cc_args)
+                        common['CC_AUTOGEN'] = common['CC'] + " -no-integrated-as"
+                        
+                        if (config['INTEGRATED_AS'] == "yes"):
+                                common['CC'] += " -integrated-as"
+                        
+                        if (config['INTEGRATED_AS'] == "no"):
+                                common['CC'] += " -no-integrated-as"
                 
                 check_python()