Changeset 177e4ea in mainline for kernel/Makefile.build

Timestamp:

2010-03-18T23:34:00Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3c80f2b

Parents:

3ad309d

Message:

move from a simple sanity check tool to a more feature-rich configuration autotool (generates Makefile.common)
check for the presence of cross-compiler toolchain
correct prefixing of GNU binutils on Solaris
remove redundant toolchain definitions from makefiles

File:

• kernel/Makefile.build (modified) (7 diffs)

kernel/Makefile.build

@@ -33 +33 @@
 include Makefile.common
 include ../version
+include ../Makefile.common
 include ../Makefile.config
 include ../config.defs
@@ -42 +43 @@
 INCLUDES = generic/include
 OPTIMIZATION = 3
-
-ifndef CROSS_PREFIX
-        CROSS_PREFIX = /usr/local
-endif
 
 ## Common compiler flags
@@ -89 +86 @@
 # Makefile.inc.
 #
+
 ATSIGN ?= @
 
 ## Cross-platform assembly to start a symtab.data section
 #
+
 SYMTAB_SECTION = ".section symtab.data, \"a\", $(ATSIGN)progbits;"
 
-## Simple detection for the type of the host system
-#
-HOST = $(shell uname)
-
-## On Solaris, some utilities have slightly different names
-#
-ifeq ($(HOST),SunOS)
-        BINUTILS_PREFIX = "g"
-else
-        BINUTILS_PREFIX = ""
-endif
-
-## Toolchain configuration
+## Compilation options
 #
 
 ifeq ($(COMPILER),gcc_native)
-        CC = gcc
-        GCC = gcc
-        AS = $(BINUTILS_PREFIX)as
-        LD = $(BINUTILS_PREFIX)ld
-        OBJCOPY = $(BINUTILS_PREFIX)objcopy
-        OBJDUMP = $(BINUTILS_PREFIX)objdump
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
@@ -122 +103 @@
 
 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
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
@@ -133 +108 @@
 
 ifeq ($(COMPILER),icc)
-        CC = icc
-        GCC = gcc
-        AS = as
-        LD = ld
-        OBJCOPY = objcopy
-        OBJDUMP = objdump
         CFLAGS = $(ICC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
@@ -144 +113 @@
 
 ifeq ($(COMPILER),suncc)
-        CC = suncc
-        GCC = gcc
-        AS = $(BINUTILS_PREFIX)as
-        LD = $(BINUTILS_PREFIX)ld
-        OBJCOPY = $(BINUTILS_PREFIX)objcopy
-        OBJDUMP = $(BINUTILS_PREFIX)objdump
         CFLAGS = $(SUNCC_CFLAGS)
         DEFS += $(CONFIG_DEFS)
@@ -156 +119 @@
 
 ifeq ($(COMPILER),clang)
-        CC = clang
-        GCC = gcc
-        AS = $(BINUTILS_PREFIX)as
-        LD = $(BINUTILS_PREFIX)ld
-        OBJCOPY = $(BINUTILS_PREFIX)objcopy
-        OBJDUMP = $(BINUTILS_PREFIX)objdump
         CFLAGS = $(CLANG_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)