Changeset 95e370f8 in mainline

Timestamp:

2013-05-30T20:49:46Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

45b4300

Parents:

bf85e56

Message:

determine CLANG_TARGET in autotool

Files:

• kernel/arch/amd64/Makefile.inc (modified) (1 diff)
• kernel/arch/ia32/Makefile.inc (modified) (1 diff)
• tools/autotool.py (modified) (6 diffs)
• uspace/lib/c/arch/amd64/Makefile.common (modified) (1 diff)
• uspace/lib/c/arch/ia32/Makefile.common (modified) (1 diff)

kernel/arch/amd64/Makefile.inc

@@ -30 +30 @@
 BFD_ARCH = i386:x86-64
 BFD = binary
-CLANG_TARGET = x86_64-unknown-linux
 
 FPU_NO_CFLAGS = -mno-sse -mno-sse2

kernel/arch/ia32/Makefile.inc

@@ -30 +30 @@
 BFD_ARCH = i386
 BFD = binary
-CLANG_TARGET = i386-unknown-linux
 
 BITS = 32

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
@@ -205 +205 @@
                 target = config['PLATFORM']
                 gnu_target = "amd64-linux-gnu"
-                clang_target = "x86_64-uknown-linux"
+                clang_target = "x86_64-unknown-linux"
         
         if (config['PLATFORM'] == "arm32"):
@@ -214 +214 @@
                 target = config['PLATFORM']
                 gnu_target = "i686-pc-linux-gnu"
-                clang_target = "i386-uknown-linux"
+                clang_target = "i386-unknown-linux"
         
         if (config['PLATFORM'] == "ia64"):
@@ -247 +247 @@
                 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."])
         
         return (target, cc_args, gnu_target, clang_target)
@@ -714 +710 @@
                 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 +740 @@
                 
                 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

uspace/lib/c/arch/amd64/Makefile.common

@@ -27 +27 @@
 #
 
-CLANG_TARGET = x86_64-unknown-linux
 GCC_CFLAGS += -fno-omit-frame-pointer
 CLANG_CFLAGS += -fno-omit-frame-pointer

uspace/lib/c/arch/ia32/Makefile.common

@@ -27 +27 @@
 #
 
-CLANG_TARGET = i386-unknown-linux
-
 ifeq ($(PROCESSOR),i486)
         GCC_CFLAGS += -march=i486 -fno-omit-frame-pointer