Changeset 8f2eca0 in mainline

Timestamp:

2013-07-25T10:51:36Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

98f7830

Parents:

f03c3da

Message:

Add support for *-helenos-* toolchain

Files:

• HelenOS.config (modified) (5 diffs)
• boot/Makefile.build (modified) (1 diff)
• kernel/Makefile (modified) (1 diff)
• tools/autotool.py (modified) (13 diffs)
• uspace/Makefile.common (modified) (1 diff)

HelenOS.config

@@ -291 +291 @@
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
+@ "gcc_helenos" GNU C Compiler (HelenOS-specific cross-compiler)
 @ "icc" Intel C Compiler
 @ "clang" Clang
@@ -299 +300 @@
 @ "gcc_native" GNU C Compiler (native)
 @ "icc" Intel C Compiler
+@ "gcc_helenos" GNU C Compiler (HelenOS-specific cross-compiler)
 ! [PLATFORM=ia64] COMPILER (choice)
 
@@ -304 +306 @@
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
+@ "gcc_helenos" GNU C Compiler (HelenOS-specific cross-compiler)
 ! [PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] COMPILER (choice)
 
@@ -309 +312 @@
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
+@ "gcc_helenos" GNU C Compiler (HelenOS-specific cross-compiler)
 @ "clang" Clang
 ! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64] COMPILER (choice)
@@ -319 +323 @@
 @ "ia32" Intel IA-32
 @ "mips32" MIPS 32-bit
-! [PLATFORM=abs32le&COMPILER=gcc_cross] CROSS_TARGET (choice)
+! [PLATFORM=abs32le&(COMPILER=gcc_cross|COMPILER=gcc_helenos)] CROSS_TARGET (choice)
 
 

boot/Makefile.build

@@ -75 +75 @@
 endif
 
+ifeq ($(COMPILER),gcc_helenos)
+        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+endif
+
+
 ifeq ($(COMPILER),icc)
         CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)

kernel/Makefile

@@ -167 +167 @@
 
 ifeq ($(COMPILER),gcc_cross)
+        CFLAGS = $(GCC_CFLAGS)
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+        INSTRUMENTATION = -finstrument-functions
+endif
+
+ifeq ($(COMPILER),gcc_helenos)
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)

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'] == "sparc64"):
@@ -256 +268 @@
                 gnu_target = "sparc64-linux-gnu"
                 clang_target = "sparc-unknown-linux"
-        
-        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):
@@ -697 +710 @@
                 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"):
@@ -719 +738 @@
                 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):
@@ -727 +746 @@
                         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)

uspace/Makefile.common

@@ -243 +243 @@
 endif
 
+ifeq ($(COMPILER),gcc_helenos)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+endif
+
 ifeq ($(COMPILER),gcc_native)
         CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)