Changeset 34d9ab28 in mainline for Makefile

Timestamp:

2005-10-26T00:07:17Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

807d2d4

Parents:

81e1396

Message:

Create genarch directory.
Move ppc32 ofw.[ch] to genarch.
Fix prototype for ofw_call() to return address instead of int (please review).
Fix copyright notice in sparc64/boot/boot.S.

File:

• Makefile (modified) (5 diffs)

Makefile

@@ -1 +1 @@
 include Makefile.config
 include arch/$(ARCH)/Makefile.inc
+include genarch/Makefile.inc
 
 sources=src/cpu/cpu.c \
@@ -51 +52 @@
 endif
 arch_objects:=$(addsuffix .o,$(basename $(arch_sources)))
+genarch_objects:=$(addsuffix .o,$(basename $(genarch_sources)))
 objects:=$(addsuffix .o,$(basename $(sources)))
 
@@ -61 +63 @@
 config:
         find src/ include/ -name arch -type l -exec rm \{\} \;
+        find src/ include/ -name genarch -type l -exec rm \{\} \;       
         ln -s ../arch/$(ARCH)/src/ src/arch
         ln -s ../arch/$(ARCH)/include/ include/arch
+        ln -s ../genarch/src/ src/genarch
+        ln -s ../genarch/include/ include/genarch
 
 depend:
-        $(CC) $(CFLAGS) -M $(arch_sources) $(sources) >Makefile.depend
+        $(CC) $(CFLAGS) -M $(arch_sources) $(genarch_sources) $(sources) >Makefile.depend
 
 build: kernel.bin boot
 
 clean:
-        find src/ arch/$(ARCH)/src/ test/ -name '*.o' -exec rm \{\} \;
+        find src/ arch/$(ARCH)/src/ genarch/src/ test/ -name '*.o' -exec rm \{\} \;
         -rm *.bin kernel.map kernel.map.pre kernel.objdump src/debug/real_map.bin
         $(MAKE) -C arch/$(ARCH)/boot/ clean
@@ -76 +81 @@
 dist-clean:
         find src/ include/ -name arch -type l -exec rm \{\} \;
+        find src/ include/ -name genarch -type l -exec rm \{\} \;       
         -rm Makefile.depend
         -$(MAKE) clean
 
-src/debug/real_map.bin: $(arch_objects) $(objects) $(test_objects) arch/$(ARCH)/_link.ld 
+src/debug/real_map.bin: $(arch_objects) $(genarch_objects) $(objects) $(test_objects) arch/$(ARCH)/_link.ld 
         $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) --prefix-sections=symtab Makefile src/debug/empty_map.o
-        $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(arch_objects) $(objects) $(test_objects) src/debug/empty_map.o -o $@ -Map kernel.map.pre
-        $(OBJDUMP) -t $(arch_objects) $(objects) $(test_objects) > kernel.objdump
+        $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(arch_objects) $(genarch_objects) $(objects) $(test_objects) src/debug/empty_map.o -o $@ -Map kernel.map.pre
+        $(OBJDUMP) -t $(arch_objects) $(genarch_objects) $(objects) $(test_objects) > kernel.objdump
         tools/genmap.py kernel.map.pre kernel.objdump src/debug/real_map.bin 
 
@@ -89 +95 @@
 
 
-kernel.bin: $(arch_objects) $(objects) $(test_objects) arch/$(ARCH)/_link.ld src/debug/real_map.o
-        $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(arch_objects) $(objects) $(test_objects) src/debug/real_map.o -o $@ -Map kernel.map
+kernel.bin: $(arch_objects) $(genarch_objects) $(objects) $(test_objects) arch/$(ARCH)/_link.ld src/debug/real_map.o
+        $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(arch_objects) $(genarch_objects) $(objects) $(test_objects) src/debug/real_map.o -o $@ -Map kernel.map
 
 %.o: %.S