Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset f4660690 in mainline


Ignore:
Timestamp:
2010-06-23T18:57:24Z (11 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
d969a9a
Parents:
bc58e2b
Message:

Pass boot stage _link.ld through C preprocessor.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile

    rbc58e2b rf4660690  
    3939build_comps: $(COMPONENTS) $(LINK).in
    4040        $(PACK) $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) arch/$(KARCH) $(COMPONENTS)
     41        $(MAKE) -f $(BUILD) $(LINK) PRECHECK=$(PRECHECK)
    4142
    4243$(INITRD).img: $(INITRD).fs
     
    7273
    7374clean_dist:
    74         rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) *.co
     75        rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
    7576        rm -f $(USPACE_PATH)/dist/srv/*
    7677        rm -f $(USPACE_PATH)/dist/app/*
  • boot/Makefile.build

    rbc58e2b rf4660690  
    106106        $(LD) -N $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(COMPONENT_OBJECTS) $(OBJECTS)
    107107
     108$(LINK): $(LINK).comp
     109        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).comp | grep -v "^\#" > $(LINK)
     110
    108111%.o: %.S $(DEPEND)
    109112        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
  • tools/pack.py

    rbc58e2b rf4660690  
    191191        link_in.close()
    192192       
    193         link_out = file(os.path.join(arch_path, LINK), "w")
     193        link_out = file(os.path.join(arch_path, "%s.comp" % LINK), "w")
    194194        link_out.write(template.replace("[[COMPONENTS]]", "\n".join(link_ctx)))
    195195        link_out.close()
Note: See TracChangeset for help on using the changeset viewer.