Changeset f4660690 in mainline

Timestamp:

2010-06-23T18:57:24Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d969a9a

Parents:

bc58e2b

Message:

Pass boot stage _link.ld through C preprocessor.

Files:

• boot/Makefile (modified) (2 diffs)
• boot/Makefile.build (modified) (1 diff)
• tools/pack.py (modified) (1 diff)

boot/Makefile

@@ -39 +39 @@
 build_comps: $(COMPONENTS) $(LINK).in
         $(PACK) $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) arch/$(KARCH) $(COMPONENTS)
+        $(MAKE) -f $(BUILD) $(LINK) PRECHECK=$(PRECHECK)
 
 $(INITRD).img: $(INITRD).fs
@@ -72 +73 @@
 
 clean_dist:
-        rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) *.co
+        rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
         rm -f $(USPACE_PATH)/dist/srv/*
         rm -f $(USPACE_PATH)/dist/app/*

boot/Makefile.build

@@ -106 +106 @@
         $(LD) -N $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(COMPONENT_OBJECTS) $(OBJECTS)
 
+$(LINK): $(LINK).comp
+        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).comp | grep -v "^\#" > $(LINK)
+
 %.o: %.S $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

tools/pack.py

@@ -191 +191 @@
         link_in.close()
         
-        link_out = file(os.path.join(arch_path, LINK), "w")
+        link_out = file(os.path.join(arch_path, "%s.comp" % LINK), "w")
         link_out.write(template.replace("[[COMPONENTS]]", "\n".join(link_ctx)))
         link_out.close()