Changes in tools/autotool.py [c7a67c4:bfdb7c63] in mainline

File:

• tools/autotool.py (modified) (10 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."
@@ -208 +209 @@
 
 def get_target(config):
+        platform = None
+        gnu_target = None
+        helenos_target = None
         target = None
-        gnu_target = None
-        clang_target = None
-        helenos_target = None
         cc_args = []
         
         if (config['PLATFORM'] == "abs32le"):
                 check_config(config, "CROSS_TARGET")
-                target = config['CROSS_TARGET']
+                platform = config['CROSS_TARGET']
                 
                 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 +230 @@
                         cc_args.append("-mabi=32")
                         gnu_target = "mipsel-linux-gnu"
-                        clang_target = "mipsel-unknown-none"
                         helenos_target = "mipsel-helenos"
         
         if (config['PLATFORM'] == "amd64"):
-                target = config['PLATFORM']
-                gnu_target = "amd64-linux-gnu"
-                clang_target = "x86_64-unknown-none"
+                platform = config['PLATFORM']
+                gnu_target = "amd64-unknown-elf"
                 helenos_target = "amd64-helenos"
         
         if (config['PLATFORM'] == "arm32"):
-                target = config['PLATFORM']
+                platform = config['PLATFORM']
                 gnu_target = "arm-linux-gnueabi"
-                clang_target = "arm-unknown-none-eabi"
                 helenos_target = "arm-helenos-gnueabi"
         
         if (config['PLATFORM'] == "ia32"):
-                target = config['PLATFORM']
+                platform = config['PLATFORM']
                 gnu_target = "i686-pc-linux-gnu"
-                clang_target = "i686-unknown-none"
                 helenos_target = "i686-pc-helenos"
         
         if (config['PLATFORM'] == "ia64"):
-                target = config['PLATFORM']
+                platform = config['PLATFORM']
                 gnu_target = "ia64-pc-linux-gnu"
                 helenos_target = "ia64-pc-helenos"
@@ -262 +257 @@
                 
                 if ((config['MACHINE'] == "msim") or (config['MACHINE'] == "lmalta")):
-                        target = config['PLATFORM']
+                        platform = config['PLATFORM']
                         gnu_target = "mipsel-linux-gnu"
-                        clang_target = "mipsel-unknown-none"
                         helenos_target = "mipsel-helenos"
                 
                 if ((config['MACHINE'] == "bmalta")):
-                        target = "mips32eb"
+                        platform = "mips32eb"
                         gnu_target = "mips-linux-gnu"
-                        clang_target = "mips-unknown-none"
                         helenos_target = "mips-helenos"
         
@@ -278 +271 @@
                 
                 if (config['MACHINE'] == "msim"):
-                        target = config['PLATFORM']
+                        platform = config['PLATFORM']
                         gnu_target = "mips64el-linux-gnu"
-                        clang_target = "mips64el-unknown-none"
                         helenos_target = "mips64el-helenos"
         
         if (config['PLATFORM'] == "ppc32"):
-                target = config['PLATFORM']
+                platform = config['PLATFORM']
                 gnu_target = "ppc-linux-gnu"
-                clang_target = "ppc-unknown-none"
                 helenos_target = "ppc-helenos"
         
         if (config['PLATFORM'] == "riscv64"):
-                target = config['PLATFORM']
+                platform = config['PLATFORM']
                 gnu_target = "riscv64-unknown-linux-gnu"
-                clang_target = "riscv-unknown-none"
                 helenos_target = "riscv64-helenos"
         
         if (config['PLATFORM'] == "sparc64"):
-                target = config['PLATFORM']
+                platform = 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)
+        if (config['COMPILER'] == "gcc_helenos"):
+                target = helenos_target
+        else:
+                target = gnu_target
+        
+        return (platform, cc_args, target)
 
 def check_app(args, name, details):
@@ -351 +345 @@
         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 +431 @@
         outf.close()
         
-        args = [common['CC']]
-        args.extend(common['CC_ARGS'])
+        args = common['CC_AUTOGEN'].split(' ')
         args.extend(["-S", "-o", PROBE_OUTPUT, PROBE_SOURCE])
         
@@ -547 +550 @@
         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])
         
@@ -849 +851 @@
                 check_app(["make", "--version"], "Make utility", "preferably GNU Make")
                 check_app(["makedepend", "-f", "-"], "Makedepend utility", "usually part of imake or xutils")
+                check_app(["unzip"], "unzip utility", "usually part of zip/unzip utilities")
+                
+                platform, cc_args, target = get_target(config)
+                
+                if (platform is None) or (target is None):
+                        print_error(["Unsupported compiler target.",
+                                     "Please contact the developers of HelenOS."])
+                
+                path = "%s/%s/bin" % (cross_prefix, target)
+                
+                # Compatibility with earlier toolchain paths.
+                if not os.path.exists(path):
+                        if (config['COMPILER'] == "gcc_helenos"):
+                                check_path = "%s/%s/%s" % (cross_helenos_prefix, platform, target)
+                                if not os.path.exists(check_path):
+                                        print_error(["Toolchain for target is not installed, or CROSS_PREFIX is not set correctly."])
+                                path = "%s/%s/bin" % (cross_helenos_prefix, platform)
+                        else:
+                                check_path = "%s/%s/%s" % (cross_prefix, platform, target)
+                                if not os.path.exists(check_path):
+                                        print_error(["Toolchain for target is not installed, or CROSS_PREFIX is not set correctly."])
+                                path = "%s/%s/bin" % (cross_prefix, platform)
+                
+                prefix = "%s-" % target
                 
                 # Compiler
-                common['CC_ARGS'] = []
-                if (config['COMPILER'] == "gcc_cross"):
-                        target, cc_args, gnu_target, clang_target, helenos_target = get_target(config)
-                        
-                        if (target is None) or (gnu_target is None):
-                                print_error(["Unsupported compiler target for GNU GCC.",
-                                             "Please contact the developers of HelenOS."])
-                        
-                        path = "%s/%s/bin" % (cross_prefix, target)
-                        prefix = "%s-" % gnu_target
-                        
+                if (config['COMPILER'] == "gcc_cross" or config['COMPILER'] == "gcc_helenos"):
                         check_gcc(path, prefix, common, PACKAGE_CROSS)
                         check_binutils(path, prefix, common, PACKAGE_CROSS)
                         
                         check_common(common, "GCC")
-                        common['CC'] = common['GCC']
-                        common['CC_ARGS'].extend(cc_args)
-                
-                if (config['COMPILER'] == "gcc_helenos"):
-                        target, cc_args, gnu_target, clang_target, helenos_target = get_target(config)
-                        
-                        if (target is None) or (helenos_target is None):
-                                print_error(["Unsupported compiler target for GNU GCC.",
-                                             "Please contact the developers of HelenOS."])
-                        
-                        path = "%s/%s/bin" % (cross_helenos_prefix, target)
-                        prefix = "%s-" % helenos_target
-                        
-                        check_gcc(path, prefix, common, PACKAGE_CROSS)
-                        check_binutils(path, prefix, common, PACKAGE_CROSS)
-                        
-                        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"):
@@ -892 +891 @@
                         check_common(common, "GCC")
                         common['CC'] = common['GCC']
-                
-                if (config['COMPILER'] == "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_AUTOGEN'] = common['CC']
+                
+                if (config['COMPILER'] == "clang"):
+                        check_binutils(path, prefix, common, PACKAGE_CROSS)
+                        check_clang(path, prefix, common, PACKAGE_CLANG)
                         
-                        common['CC'] = "icc"
-                
-                if (config['COMPILER'] == "clang"):
-                        target, cc_args, gnu_target, clang_target, helenos_target = get_target(config)
+                        check_common(common, "CLANG")
+                        common['CC'] = " ".join([common['CLANG']] + cc_args)
+                        common['CC_AUTOGEN'] = common['CC'] + " -no-integrated-as"
                         
-                        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."])
+                        if (config['INTEGRATED_AS'] == "yes"):
+                                common['CC'] += " -integrated-as"
                         
-                        path = "%s/%s/bin" % (cross_prefix, target)
-                        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
+                        if (config['INTEGRATED_AS'] == "no"):
+                                common['CC'] += " -no-integrated-as"
                 
                 check_python()