Changeset a0a273e in mainline for tools/autotool.py

Timestamp:

2017-10-03T18:12:17Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a41cda7

Parents:

0f28387

Message:

Unify compiler handling a bit.

Most compiler flags have been changed from GCC-specific to "common",
since code might build but not work properly without them.
Clang still rejects some of the flags, but at least we can see
the incompatibilities now.

Explicit —target flag was removed from clang, in favor of using clang
through a target-specific symlink. This allows clang to automatically
find correct assembler and linker, if it needs to.

Additionally, assembly language files are now compiled using $(CC)
whether or not they need the preprocessor. This allows clang to build
.s files using its integrated assembler.

File:

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

tools/autotool.py

@@ -210 +210 @@
         target = None
         gnu_target = None
-        clang_target = None
         helenos_target = None
         cc_args = []
@@ -220 +219 @@
                 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 +228 @@
                         cc_args.append("-mabi=32")
                         gnu_target = "mipsel-linux-gnu"
-                        clang_target = "mipsel-unknown-none"
                         helenos_target = "mipsel-helenos"
         
@@ -237 +233 @@
                 target = config['PLATFORM']
                 gnu_target = "amd64-linux-gnu"
-                clang_target = "x86_64-unknown-none"
                 helenos_target = "amd64-helenos"
         
@@ -243 +238 @@
                 target = config['PLATFORM']
                 gnu_target = "arm-linux-gnueabi"
-                clang_target = "arm-unknown-none-eabi"
                 helenos_target = "arm-helenos-gnueabi"
         
@@ -249 +243 @@
                 target = config['PLATFORM']
                 gnu_target = "i686-pc-linux-gnu"
-                clang_target = "i686-unknown-none"
                 helenos_target = "i686-pc-helenos"
         
@@ -264 +257 @@
                         target = config['PLATFORM']
                         gnu_target = "mipsel-linux-gnu"
-                        clang_target = "mipsel-unknown-none"
                         helenos_target = "mipsel-helenos"
                 
@@ -270 +262 @@
                         target = "mips32eb"
                         gnu_target = "mips-linux-gnu"
-                        clang_target = "mips-unknown-none"
                         helenos_target = "mips-helenos"
         
@@ -280 +271 @@
                         target = config['PLATFORM']
                         gnu_target = "mips64el-linux-gnu"
-                        clang_target = "mips64el-unknown-none"
                         helenos_target = "mips64el-helenos"
         
@@ -286 +276 @@
                 target = config['PLATFORM']
                 gnu_target = "ppc-linux-gnu"
-                clang_target = "ppc-unknown-none"
                 helenos_target = "ppc-helenos"
         
@@ -292 +281 @@
                 target = config['PLATFORM']
                 gnu_target = "riscv64-unknown-linux-gnu"
-                clang_target = "riscv-unknown-none"
                 helenos_target = "riscv64-helenos"
         
@@ -298 +286 @@
                 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 +338 @@
         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 +424 @@
         outf.close()
         
-        args = [common['CC']]
-        args.extend(common['CC_ARGS'])
+        args = common['CC_AUTOGEN'].split(' ')
         args.extend(["-S", "-o", PROBE_OUTPUT, PROBE_SOURCE])
         
@@ -547 +543 @@
         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 +847 @@
                 
                 # 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 +861 @@
                         
                         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 +878 @@
                         
                         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 +887 @@
                         check_common(common, "GCC")
                         common['CC'] = common['GCC']
+                        common['CC_AUTOGEN'] = common['CC']
                 
                 if (config['COMPILER'] == "icc"):
@@ -900 +895 @@
                         
                         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 +907 @@
                         prefix = "%s-" % gnu_target
                         
-                        check_app(["clang", "--version"], "clang compiler", "preferably version 1.0 or newer")
+                        check_clang(path, prefix, common, "")
                         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_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()