Changeset 26bcc658 in mainline

Timestamp:

2013-03-11T13:54:47Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

dd870b1

Parents:

1570759b

Message:

Run clang with -target in autotool

This ensures that sizes of long/int/short are determined correctly
(based on target architecture, not a host one).

File:

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

tools/autotool.py

@@ -182 +182 @@
                              "Please contact the developers of HelenOS."])
 
-def get_target(config):
+def get_target(config, needs_clang = False):
         target = None
         gnu_target = None
+        clang_target = None
         
         if (config['PLATFORM'] == "abs32le"):
@@ -203 +204 @@
                 target = config['PLATFORM']
                 gnu_target = "amd64-linux-gnu"
+                clang_target = "x86_64-uknown-linux"
         
         if (config['PLATFORM'] == "arm32"):
@@ -211 +213 @@
                 target = config['PLATFORM']
                 gnu_target = "i686-pc-linux-gnu"
+                clang_target = "i386-uknown-linux"
         
         if (config['PLATFORM'] == "ia64"):
@@ -244 +247 @@
                 gnu_target = "sparc64-linux-gnu"
         
-        if (target is None) or (gnu_target is None):
+        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."])
         
-        return (target, gnu_target)
+        return (target, gnu_target, clang_target)
 
 def check_app(args, name, details):
@@ -710 +713 @@
                 common['CC_ARGS'] = []
                 if (config['COMPILER'] == "gcc_cross"):
-                        target, gnu_target = get_target(config)
+                        target, gnu_target, clang_target_unused = get_target(config)
                                 
                         path = "%s/%s/bin" % (cross_prefix, target)
@@ -735 +738 @@
                 
                 if (config['COMPILER'] == "clang"):
-                        target, gnu_target = get_target(config)
+                        target, gnu_target, clang_target = get_target(config, True)
                         path = "%s/%s/bin" % (cross_prefix, target)
                         prefix = "%s-" % gnu_target
                         
                         common['CC'] = "clang"
+                        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)