Changeset 67f5fbd9 in mainline for boot

Timestamp:

2007-05-31T21:14:14Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e8a0b90

Parents:

c31e536

Message:

update for new compiler configuration scheme

Location:

boot

Files:

• arch/mips32/loader/Makefile (modified) (2 diffs)
• arch/ppc32/loader/Makefile (modified) (2 diffs)
• arch/ppc64/loader/Makefile (modified) (2 diffs)
• arch/sparc64/loader/Makefile (modified) (2 diffs)
• boot.config (modified) (1 diff)

boot/arch/mips32/loader/Makefile

@@ -36 +36 @@
 TOOLCHAIN_DIR = /usr/local/mipsel/bin
 
-ifeq ($(COMPILER),native)
+ifeq ($(COMPILER),gcc_native)
         CC = gcc
         AS = as
@@ -42 +42 @@
         OBJCOPY = objcopy
         OBJDUMP = objdump
-else
+endif
+
+ifeq ($(COMPILER),icc_native)
+        CC = icc
+        AS = as
+        LD = ld
+        OBJCOPY = objcopy
+        OBJDUMP = objdump
+endif
+
+ifeq ($(COMPILER),gcc_cross)
         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as

boot/arch/ppc32/loader/Makefile

@@ -36 +36 @@
 TOOLCHAIN_DIR = /usr/local/ppc/bin
 
-ifeq ($(COMPILER),native)
+ifeq ($(COMPILER),gcc_native)
         CC = gcc
         AS = as
@@ -42 +42 @@
         OBJCOPY = objcopy
         OBJDUMP = objdump
-else
+endif
+
+ifeq ($(COMPILER),icc_native)
+        CC = icc
+        AS = as
+        LD = ld
+        OBJCOPY = objcopy
+        OBJDUMP = objdump
+endif
+
+ifeq ($(COMPILER),gcc_cross)
         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as

boot/arch/ppc64/loader/Makefile

@@ -36 +36 @@
 TOOLCHAIN_DIR = /usr/local/ppc64/bin
 
-ifeq ($(COMPILER),native)
+ifeq ($(COMPILER),gcc_native)
         CC = gcc
         AS = as
@@ -42 +42 @@
         OBJCOPY = objcopy
         OBJDUMP = objdump
-else
+endif
+
+ifeq ($(COMPILER),icc_native)
+        CC = icc
+        AS = as
+        LD = ld
+        OBJCOPY = objcopy
+        OBJDUMP = objdump
+endif
+
+ifeq ($(COMPILER),gcc_cross)
         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as

boot/arch/sparc64/loader/Makefile

@@ -36 +36 @@
 TOOLCHAIN_DIR = /usr/local/sparc64/bin
 
-ifeq ($(COMPILER),native)
+ifeq ($(COMPILER),gcc_native)
         CC = gcc
         AS = as
@@ -42 +42 @@
         OBJCOPY = objcopy
         OBJDUMP = objdump
-else
+endif
+
+ifeq ($(COMPILER),icc_native)
+        CC = icc
+        AS = as
+        LD = ld
+        OBJCOPY = objcopy
+        OBJDUMP = objdump
+endif
+
+ifeq ($(COMPILER),gcc_cross)
         CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
         AS = $(TOOLCHAIN_DIR)/$(TARGET)-as

boot/boot.config

@@ -14 +14 @@
 
 # Compiler
-@ "cross" Cross-compiler
-@ "native" Native
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
+@ "icc_native" ICC Native
 ! COMPILER (choice)