Changes in tools/autotool.py [84eb4edd:9ce911d] 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."
@@ -211 +210 @@
         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"
                 
@@ -229 +231 @@
                         cc_args.append("-mabi=32")
                         gnu_target = "mipsel-linux-gnu"
+                        clang_target = "mipsel-unknown-none"
                         helenos_target = "mipsel-helenos"
         
@@ -234 +237 @@
                 target = config['PLATFORM']
                 gnu_target = "amd64-linux-gnu"
+                clang_target = "x86_64-unknown-none"
                 helenos_target = "amd64-helenos"
         
@@ -239 +243 @@
                 target = config['PLATFORM']
                 gnu_target = "arm-linux-gnueabi"
+                clang_target = "arm-unknown-none-eabi"
                 helenos_target = "arm-helenos-gnueabi"
         
@@ -244 +249 @@
                 target = config['PLATFORM']
                 gnu_target = "i686-pc-linux-gnu"
+                clang_target = "i686-unknown-none"
                 helenos_target = "i686-pc-helenos"
         
@@ -258 +264 @@
                         target = config['PLATFORM']
                         gnu_target = "mipsel-linux-gnu"
+                        clang_target = "mipsel-unknown-none"
                         helenos_target = "mipsel-helenos"
                 
@@ -263 +270 @@
                         target = "mips32eb"
                         gnu_target = "mips-linux-gnu"
+                        clang_target = "mips-unknown-none"
                         helenos_target = "mips-helenos"
         
@@ -272 +280 @@
                         target = config['PLATFORM']
                         gnu_target = "mips64el-linux-gnu"
+                        clang_target = "mips64el-unknown-none"
                         helenos_target = "mips64el-helenos"
         
@@ -277 +286 @@
                 target = config['PLATFORM']
                 gnu_target = "ppc-linux-gnu"
+                clang_target = "ppc-unknown-none"
                 helenos_target = "ppc-helenos"
         
@@ -282 +292 @@
                 target = config['PLATFORM']
                 gnu_target = "riscv64-unknown-linux-gnu"
+                clang_target = "riscv-unknown-none"
                 helenos_target = "riscv64-helenos"
         
@@ -287 +298 @@
                 target = config['PLATFORM']
                 gnu_target = "sparc64-linux-gnu"
+                clang_target = "sparc-unknown-none"
                 helenos_target = "sparc64-helenos"
         
-        return (target, cc_args, gnu_target, helenos_target)
+        return (target, cc_args, gnu_target, clang_target, helenos_target)
 
 def check_app(args, name, details):
@@ -339 +351 @@
         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"
@@ -425 +427 @@
         outf.close()
         
-        args = common['CC_AUTOGEN'].split(' ')
+        args = [common['CC']]
+        args.extend(common['CC_ARGS'])
         args.extend(["-S", "-o", PROBE_OUTPUT, PROBE_SOURCE])
         
@@ -544 +547 @@
         outf.close()
         
-        args = common['CC_AUTOGEN'].split(' ')
+        args = [common['CC']]
+        args.extend(common['CC_ARGS'])
         args.extend(["-S", "-o", PROBE_INT128_OUTPUT, PROBE_INT128_SOURCE])
         
@@ -848 +852 @@
                 
                 # Compiler
+                common['CC_ARGS'] = []
                 if (config['COMPILER'] == "gcc_cross"):
-                        target, cc_args, gnu_target, helenos_target = get_target(config)
+                        target, cc_args, gnu_target, clang_target, helenos_target = get_target(config)
                         
                         if (target is None) or (gnu_target is None):
@@ -862 +867 @@
                         
                         check_common(common, "GCC")
-                        common['CC'] = " ".join([common['GCC']] + cc_args)
-                        common['CC_AUTOGEN'] = common['CC']
+                        common['CC'] = common['GCC']
+                        common['CC_ARGS'].extend(cc_args)
                 
                 if (config['COMPILER'] == "gcc_helenos"):
-                        target, cc_args, gnu_target, helenos_target = get_target(config)
+                        target, cc_args, gnu_target, clang_target, helenos_target = get_target(config)
                         
                         if (target is None) or (helenos_target is None):
@@ -879 +884 @@
                         
                         check_common(common, "GCC")
-                        common['CC'] = " ".join([common['GCC']] + cc_args)
-                        common['CC_AUTOGEN'] = common['CC']
+                        common['CC'] = common['GCC']
+                        common['CC_ARGS'].extend(cc_args)
                 
                 if (config['COMPILER'] == "gcc_native"):
@@ -888 +893 @@
                         check_common(common, "GCC")
                         common['CC'] = common['GCC']
-                        common['CC_AUTOGEN'] = common['CC']
                 
                 if (config['COMPILER'] == "icc"):
@@ -896 +900 @@
                         
                         common['CC'] = "icc"
-                        common['CC_AUTOGEN'] = common['CC']
                 
                 if (config['COMPILER'] == "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.",
+                        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.",
                                              "Please contact the developers of HelenOS."])
                         
@@ -908 +911 @@
                         prefix = "%s-" % gnu_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_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_python()