Changeset 4a8635b in mainline

Timestamp:

2007-06-05T21:32:40Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

566f5e5c

Parents:

52d30c4

Message:

Some non-C files (e.g. .S and linker scripts) must be still "compiled" with gcc and GCC_CFLAGS.

File:

• kernel/Makefile (modified) (6 diffs)

kernel/Makefile

@@ -130 +130 @@
 ifeq ($(COMPILER),gcc_native)
         CC = gcc
-        AS_CC = gcc
+        GCC = gcc
         AS = as
         LD = ld
@@ -141 +141 @@
 ifeq ($(COMPILER),icc_native)
         CC = icc
-        AS_CC = gcc
+        GCC = gcc
         AS = as
         LD = ld
@@ -152 +152 @@
 ifeq ($(COMPILER),suncc_native)
         CC = suncc
-        AS_CC = gcc
+        GCC = gcc
         AS = as
         LD = ld
@@ -163 +163 @@
 ifeq ($(COMPILER),gcc_cross)
         CC = $(TOOLCHAIN_DIR)/bin/$(TARGET)-gcc
-        AS_CC = $(CC)
+        GCC = $(CC)
         AS = $(TOOLCHAIN_DIR)/bin/$(TARGET)-as
         LD = $(TOOLCHAIN_DIR)/bin/$(TARGET)-ld
@@ -322 +322 @@
 
 arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
-        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
+        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
 
 generic/src/debug/real_map.bin: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
@@ -349 +349 @@
 
 %.o: %.S
-        $(AS_CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
+        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
 
 %.o: %.s