Changeset bd1deed in mainline for kernel/Makefile

Timestamp:

2007-02-11T20:04:08Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c993e45

Parents:

ce8aed1

Message:

experimental support for Objective C
(disabled by default)

File:

• kernel/Makefile (modified) (6 diffs)

kernel/Makefile

@@ -129 +129 @@
         OBJCOPY = objcopy
         OBJDUMP = objdump
+        LIBDIR = /usr/lib
 else
-        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
-        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
-        LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
-        OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
-        OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
+        CC = $(TOOLCHAIN_DIR)/bin/$(TARGET)-gcc
+        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
 endif
 
@@ -240 +242 @@
 endif
 
+## Experimental features
+#
+
+ifeq ($(CONFIG_EXPERIMENTAL),y)
+        GENERIC_SOURCES += generic/src/lib/objc.c
+        EXTRA_OBJECTS = $(LIBDIR)/libobjc.a
+        EXTRA_FLAGS += -x objective-c
+endif
+
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
@@ -280 +291 @@
 generic/src/debug/real_map.bin: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
         $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) --prefix-sections=symtab Makefile generic/src/debug/empty_map.o
-        $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/empty_map.o -o $@ -Map kernel.map.pre
+        $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/empty_map.o  -o $@ -Map kernel.map.pre
         $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
         tools/genmap.py kernel.map.pre kernel.objdump generic/src/debug/real_map.bin 
@@ -286 +297 @@
         # on architectures, that have bss after symtab
         $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) --prefix-sections=symtab generic/src/debug/real_map.bin generic/src/debug/sizeok_map.o
-        $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/sizeok_map.o -o $@ -Map kernel.map.pre
+        $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/sizeok_map.o -o $@ -Map kernel.map.pre
         $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
         tools/genmap.py kernel.map.pre kernel.objdump generic/src/debug/real_map.bin 
@@ -294 +305 @@
 
 kernel.raw: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o
-        $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o -o $@ -Map kernel.map
+        $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/real_map.o -o $@ -Map kernel.map
 
 kernel.bin: kernel.raw
@@ -309 +320 @@
 
 %.o: %.c
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) -c $< -o $@