Changeset 533e2d7 in mainline for tools/autotool.py

Timestamp:

2013-06-03T07:55:35Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

797d4d19

Parents:

ea15a89a (diff), 6db5d4b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

tools/autotool.py

@@ -182 +182 @@
                              "Please contact the developers of HelenOS."])
 
-def get_target(config, needs_clang = False):
+def get_target(config):
         target = None
         gnu_target = None
@@ -194 +194 @@
                 if (config['CROSS_TARGET'] == "arm32"):
                         gnu_target = "arm-linux-gnueabi"
+                        clang_target = "arm-unknown-linux"
                 
                 if (config['CROSS_TARGET'] == "ia32"):
                         gnu_target = "i686-pc-linux-gnu"
+                        clang_target = "i386-unknown-linux"
                 
                 if (config['CROSS_TARGET'] == "mips32"):
                         gnu_target = "mipsel-linux-gnu"
+                        clang_target = "mipsel-unknown-linux"
                         common['CC_ARGS'].append("-mabi=32")
         
@@ -205 +208 @@
                 target = config['PLATFORM']
                 gnu_target = "amd64-linux-gnu"
-                clang_target = "x86_64-uknown-linux"
+                clang_target = "x86_64-unknown-linux"
         
         if (config['PLATFORM'] == "arm32"):
                 target = config['PLATFORM']
                 gnu_target = "arm-linux-gnueabi"
+                clang_target = "arm-unknown-linux"
         
         if (config['PLATFORM'] == "ia32"):
                 target = config['PLATFORM']
                 gnu_target = "i686-pc-linux-gnu"
-                clang_target = "i386-uknown-linux"
+                clang_target = "i386-unknown-linux"
         
         if (config['PLATFORM'] == "ia64"):
@@ -227 +231 @@
                         target = config['PLATFORM']
                         gnu_target = "mipsel-linux-gnu"
+                        clang_target = "mipsel-unknown-linux"
                 
                 if ((config['MACHINE'] == "bmalta")):
                         target = "mips32eb"
                         gnu_target = "mips-linux-gnu"
+                        clang_target = "mips-unknown-linux"
         
         if (config['PLATFORM'] == "mips64"):
@@ -239 +245 @@
                         target = config['PLATFORM']
                         gnu_target = "mips64el-linux-gnu"
+                        clang_target = "mips64el-unknown-linux"
         
         if (config['PLATFORM'] == "ppc32"):
                 target = config['PLATFORM']
                 gnu_target = "ppc-linux-gnu"
+                clang_target = "powerpc-unknown-linux"
         
         if (config['PLATFORM'] == "sparc64"):
                 target = config['PLATFORM']
                 gnu_target = "sparc64-linux-gnu"
-        
-        if (target is None) or (gnu_target is None) or (clang_target is None and needs_clang):
-                print_error(["Failed to determine target for compiler.",
-                             "Please contact the developers of HelenOS."])
+                clang_target = "sparc-unknown-linux"
         
         return (target, cc_args, gnu_target, clang_target)
@@ -714 +719 @@
                 common['CC_ARGS'] = []
                 if (config['COMPILER'] == "gcc_cross"):
-                        target, cc_args, gnu_target, clang_target_unused = get_target(config)
+                        target, cc_args, gnu_target, clang_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
@@ -739 +749 @@
                 
                 if (config['COMPILER'] == "clang"):
-                        target, cc_args, gnu_target, clang_target = get_target(config, True)
+                        target, cc_args, gnu_target, clang_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."])
+                        
                         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)
-                        check_app([common['CC'], "--version"], "Clang compiler", "preferably version 1.0 or newer")
-                        check_gcc(path, prefix, common, PACKAGE_GCC)
-                        check_binutils(path, prefix, common, PACKAGE_BINUTILS)
+                        common['CLANG_TARGET'] = clang_target
                 
                 # Platform-specific utilities