Changeset 69dc065 in mainline

Timestamp:

2009-09-17T22:42:56Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c1618ed

Parents:

82cf692

Message:

initial Clang support

this is more like a proof-of-concept (tested with Clang and LLVM 2.6-pre1)

• it is limited to ia32/amd64, but it will probably fail except compiling ia32 target on ia32 host
• actually only Clang as compiler is used, native binutils are used for standalone assembler files and linking
• kernel compiles fine, boots and even prints some scrambled initial messages to the framebuffer, but panics soon after that (it might be just a tiny glitch in output functions)
• uspace compiles mostly fine, but the linking fails

Files:

• HelenOS.config (modified) (1 diff)
• boot/arch/ia64/loader/Makefile (modified) (1 diff)
• kernel/Makefile (modified) (4 diffs)
• kernel/arch/ia32/Makefile.inc (modified) (2 diffs)
• uspace/lib/libc/Makefile.toolchain (modified) (3 diffs)

HelenOS.config

@@ -219 +219 @@
 
 % Compiler
-@ "gcc_cross" GCC Cross-compiler
-@ "gcc_native" GCC Native
-@ "icc_native" ICC Native
-@ "suncc_native" Sun Studio C Compiler
+@ "gcc_cross" GNU C Compiler (cross-compiler)
+@ "gcc_native" GNU C Compiler (native)
+@ "icc" Intel C Compiler
+@ "suncc" Sun Studio C Compiler
+@ "clang" Clang
 ! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
 
 % Compiler
-@ "gcc_cross" GCC Cross-compiler
-@ "gcc_native" GCC Native
-@ "icc_native" ICC Native
+@ "gcc_cross" GNU C Compiler (cross-compiler)
+@ "gcc_native" GNU C Compiler (native)
+@ "icc" Intel C Compiler
 ! [PLATFORM=ia64] COMPILER (choice)
 
 % Compiler
-@ "gcc_cross" GCC Cross-compiler
-@ "gcc_native" GCC Native
-@ "suncc_native" Sun Studio C Compiler
+@ "gcc_cross" GNU C Compiler (cross-compiler)
+@ "gcc_native" GNU C Compiler (native)
+@ "suncc" Sun Studio C Compiler
 ! [PLATFORM=sparc64] COMPILER (choice)
 
 % Compiler
-@ "gcc_cross" GCC Cross-compiler
-@ "gcc_native" GCC Native
+@ "gcc_cross" GNU C Compiler (cross-compiler)
+@ "gcc_native" GNU C Compiler (native)
 ! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice)
 

boot/arch/ia64/loader/Makefile

@@ -51 +51 @@
 endif
 
-ifeq ($(COMPILER),icc_native)
+ifeq ($(COMPILER),icc)
         CC = icc
         AS = as

kernel/Makefile

@@ -54 +54 @@
 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
         -fno-builtin -Wall -Wmissing-prototypes -Werror \
-        -nostdlib -nostdinc \
-        -wd170
+        -nostdlib -nostdinc -wd170
 
 SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
         -xnolib -xc99=all -features=extensions \
         -erroff=E_ZERO_SIZED_STRUCT_UNION
+
+CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
+        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
+        -finput-charset=UTF-8 -fno-builtin -Wall -Wextra -Wno-unused-parameter \
+        -Wmissing-prototypes -nostdlib -nostdinc -pipe
 
 LFLAGS = -M
@@ -109 +113 @@
 endif
 
-ifeq ($(COMPILER),icc_native)
+ifeq ($(COMPILER),gcc_cross)
+        CC = $(TOOLCHAIN_DIR)/bin/$(TARGET)-gcc
+        GCC = $(CC)
+        AS = $(TOOLCHAIN_DIR)/bin/$(TARGET)-as
+        LD = $(TOOLCHAIN_DIR)/bin/$(TARGET)-ld
+        OBJCOPY = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objcopy
+        OBJDUMP = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objdump
+        LIBDIR = $(TOOLCHAIN_DIR)/lib
+        CFLAGS = $(GCC_CFLAGS)
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+endif
+
+ifeq ($(COMPILER),icc)
         CC = icc
         GCC = gcc
@@ -121 +137 @@
 endif
 
-ifeq ($(COMPILER),suncc_native)
+ifeq ($(COMPILER),suncc)
         CC = suncc
         GCC = gcc
@@ -134 +150 @@
 endif
 
-ifeq ($(COMPILER),gcc_cross)
-        CC = $(TOOLCHAIN_DIR)/bin/$(TARGET)-gcc
-        GCC = $(CC)
-        AS = $(TOOLCHAIN_DIR)/bin/$(TARGET)-as
-        LD = $(TOOLCHAIN_DIR)/bin/$(TARGET)-ld
-        OBJCOPY = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objcopy
-        OBJDUMP = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objdump
-        LIBDIR = $(TOOLCHAIN_DIR)/lib
-        CFLAGS = $(GCC_CFLAGS)
+ifeq ($(COMPILER),clang)
+        CC = clang
+        GCC = gcc
+        AS = $(BINUTILS_PREFIX)as
+        LD = $(BINUTILS_PREFIX)ld
+        OBJCOPY = $(BINUTILS_PREFIX)objcopy
+        OBJDUMP = $(BINUTILS_PREFIX)objdump
+        LIBDIR = /usr/lib
+        CFLAGS = $(CLANG_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif

kernel/arch/ia32/Makefile.inc

@@ -43 +43 @@
 ICC_CFLAGS += $(CMN1)
 SUNCC_CFLAGS += $(CMN1)
+CLANG_CFLAGS += $(CMN1)
 
 ## Accepted CPUs
@@ -71 +72 @@
 GCC_CFLAGS += $(CMN2)
 ICC_CFLAGS += $(CMN2)
+CLANG_CFLAGS += $(CMN2)
 
 ARCH_SOURCES = \

uspace/lib/libc/Makefile.toolchain

@@ -64 +64 @@
 #
 
+ifeq ($(COMPILER),gcc_cross)
+        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
+        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
+        LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
+        AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
+        OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
+        OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+endif
+
 ifeq ($(COMPILER),gcc_native)
         CC = gcc
@@ -74 +84 @@
 endif
 
-ifeq ($(COMPILER),icc_native)
+ifeq ($(COMPILER),icc)
         CC = icc
         AS = as
@@ -84 +94 @@
 endif
 
-ifeq ($(COMPILER),gcc_cross)
-        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
-        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
-        LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
-        AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
-        OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
-        OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
+ifeq ($(COMPILER),clang)
+        CC = clang
+        AS = $(BINUTILS_PREFIX)as
+        LD = $(BINUTILS_PREFIX)ld
+        AR = $(BINUTILS_PREFIX)ar
+        OBJCOPY = $(BINUTILS_PREFIX)objcopy
+        OBJDUMP = $(BINUTILS_PREFIX)objdump
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif