Changeset 8786aa5 in mainline for kernel

Timestamp:

2010-01-04T15:21:19Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b766352

Parents:

e405228

Message:

remove Stanse-specific constructs from makefiles
add generic support for checkers via generating an universal jobfiles (for kernel, boot loader, libraries and tasks)
add Stanse preprocessor which uses this universal jobfiles to run Stanse

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• Makefile.build (modified) (5 diffs)
• Makefile.common (modified) (1 diff)

kernel/Makefile

@@ -33 +33 @@
 all: ../version ../Makefile.config ../config.h ../config.defs
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build EXTRA_TOOL=$(EXTRA_TOOL)
+        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
         rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld
         find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
-        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o.preproc' -follow -exec rm \{\} \;

kernel/Makefile.build

@@ -375 +375 @@
 %.o: %.S $(DEPEND)
         $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(GCC_CFLAGS) -D__ASM__
+endif
 
 %.o: %.s $(DEPEND)
         $(AS) $(AFLAGS) $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
+endif
 
 #
@@ -385 +391 @@
 test/fpu/%.o: test/fpu/%.c $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) -c $< -o $@
-ifeq ($(EXTRA_TOOL),stanse)
-        ../tools/jobfile.py $(JOB) $< $@ $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc test $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
 endif
 
@@ -394 +400 @@
 %.o: %.c $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) -c $< -o $@
-ifeq ($(EXTRA_TOOL),stanse)
-        ../tools/jobfile.py $(JOB) $< $@ $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)
 endif
 
@@ -405 +411 @@
         $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(EMPTY_MAP) -o $@ -Map $(MAP_PREV)
         $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
-        tools/genmap.py $(MAP_PREV) $(DUMP) $@
+        $(GENMAP) $(MAP_PREV) $(DUMP) $@
         
         # Do it once again, this time to get correct even the symbols
@@ -413 +419 @@
         $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SIZEOK_MAP) -o $@ -Map $(MAP_PREV)
         $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
-        tools/genmap.py $(MAP_PREV) $(DUMP) $@
+        $(GENMAP) $(MAP_PREV) $(DUMP) $@
 
 $(DEPEND): $(ARCH_INCLUDE) $(GENARCH_INCLUDE)

kernel/Makefile.common

@@ -44 +44 @@
 ARCH_INCLUDE = generic/include/arch
 GENARCH_INCLUDE = generic/include/genarch
+
+GENMAP = tools/genmap.py
+JOBFILE = ../tools/jobfile.py