Changeset 0c2d9bb in mainline for tools/autotool.py

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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) (13 diffs)

tools/autotool.py

@@ -186 +186 @@
         gnu_target = None
         clang_target = None
+        helenos_target = None
         cc_args = []
         
@@ -195 +196 @@
                         gnu_target = "arm-linux-gnueabi"
                         clang_target = "arm-unknown-linux"
+                        helenos_target = "arm-helenos-gnueabi"
                 
                 if (config['CROSS_TARGET'] == "ia32"):
                         gnu_target = "i686-pc-linux-gnu"
                         clang_target = "i386-unknown-linux"
+                        helenos_target = "i686-pc-helenos"
                 
                 if (config['CROSS_TARGET'] == "mips32"):
                         gnu_target = "mipsel-linux-gnu"
                         clang_target = "mipsel-unknown-linux"
+                        helenos_target = "mipsel-helenos"
                         common['CC_ARGS'].append("-mabi=32")
         
@@ -209 +213 @@
                 gnu_target = "amd64-linux-gnu"
                 clang_target = "x86_64-unknown-linux"
+                helenos_target = "amd64-helenos"
         
         if (config['PLATFORM'] == "arm32"):
@@ -214 +219 @@
                 gnu_target = "arm-linux-gnueabi"
                 clang_target = "arm-unknown-linux"
+                helenos_target = "arm-helenos-gnueabi"
         
         if (config['PLATFORM'] == "ia32"):
@@ -219 +225 @@
                 gnu_target = "i686-pc-linux-gnu"
                 clang_target = "i386-unknown-linux"
+                helenos_target = "i686-pc-helenos"
         
         if (config['PLATFORM'] == "ia64"):
                 target = config['PLATFORM']
                 gnu_target = "ia64-pc-linux-gnu"
+                helenos_target = "ia64-pc-helenos"
         
         if (config['PLATFORM'] == "mips32"):
@@ -232 +240 @@
                         gnu_target = "mipsel-linux-gnu"
                         clang_target = "mipsel-unknown-linux"
+                        helenos_target = "mipsel-helenos"
                 
                 if ((config['MACHINE'] == "bmalta")):
@@ -237 +246 @@
                         gnu_target = "mips-linux-gnu"
                         clang_target = "mips-unknown-linux"
+                        helenos_target = "mips-helenos"
         
         if (config['PLATFORM'] == "mips64"):
@@ -246 +256 @@
                         gnu_target = "mips64el-linux-gnu"
                         clang_target = "mips64el-unknown-linux"
+                        helenos_target = "mips64el-helenos"
         
         if (config['PLATFORM'] == "ppc32"):
@@ -251 +262 @@
                 gnu_target = "ppc-linux-gnu"
                 clang_target = "powerpc-unknown-linux"
+                helenos_target = "ppc-helenos"
+        
+        if (config['PLATFORM'] == "sparc32"):
+                target = config['PLATFORM'];
+                gnu_target = "sparc-leon3-linux-gnu"
+                helenos_target = "sparc-leon3-helenos"
         
         if (config['PLATFORM'] == "sparc64"):
@@ -256 +273 @@
                 gnu_target = "sparc64-linux-gnu"
                 clang_target = "sparc-unknown-linux"
-
-        if (config['PLATFORM'] == "sparc32"):
-                target = config['PLATFORM'];
-                gnu_target = "sparc-leon3-linux-gnu"
-        
-        return (target, cc_args, gnu_target, clang_target)
+                helenos_target = "sparc64-helenos"
+        
+        return (target, cc_args, gnu_target, clang_target, helenos_target)
 
 def check_app(args, name, details):
@@ -701 +715 @@
                 cross_prefix = "/usr/local/cross"
         
+        # HelenOS cross-compiler prefix
+        if ('CROSS_HELENOS_PREFIX' in os.environ):
+                cross_helenos_prefix = os.environ['CROSS_HELENOS_PREFIX']
+        else:
+                cross_helenos_prefix = "/usr/local/cross-helenos"
+        
         # Prefix binutils tools on Solaris
         if (os.uname()[0] == "SunOS"):
@@ -723 +743 @@
                 common['CC_ARGS'] = []
                 if (config['COMPILER'] == "gcc_cross"):
-                        target, cc_args, gnu_target, clang_target = get_target(config)
+                        target, cc_args, gnu_target, clang_target, helenos_target = get_target(config)
                         
                         if (target is None) or (gnu_target is None):
@@ -731 +751 @@
                         path = "%s/%s/bin" % (cross_prefix, target)
                         prefix = "%s-" % gnu_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)
+                
+                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)