Commit 2881875e authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc32: fix build with CONFIG_MODVERSIONS

From: Paul Mackerras <paulus@samba.org>
      Olaf Hering <olh@suse.de>

This adds __kcrctab to the discard list for the link script for the boot
wrapper, and is needed if you compile with CONFIG_MODVERSIONS.

With this patch applied, we need to update makefile dependencies.  Otherwise
the bootfiles will remain untouched because they do not depend on the changed
linker script.
parent 692e47d5
...@@ -82,6 +82,7 @@ SECTIONS ...@@ -82,6 +82,7 @@ SECTIONS
*(__ksymtab) *(__ksymtab)
*(__ksymtab_strings) *(__ksymtab_strings)
*(__bug_table) *(__bug_table)
*(__kcrctab)
} }
} }
...@@ -104,10 +104,10 @@ quiet_cmd_gen-coff = COFF $@ ...@@ -104,10 +104,10 @@ quiet_cmd_gen-coff = COFF $@
$(HACKCOFF) $@ && \ $(HACKCOFF) $@ && \
ln -sf $(notdir $@) $(images)/zImage$(initrd).pmac ln -sf $(notdir $@) $(images)/zImage$(initrd).pmac
$(images)/vmlinux.coff: $(obj)/coffboot $(images)/vmlinux.coff: $(obj)/coffboot $(boot)/ld.script
$(call cmd,gen-coff) $(call cmd,gen-coff)
$(images)/vmlinux.initrd.coff: $(obj)/coffboot.initrd $(images)/vmlinux.initrd.coff: $(obj)/coffboot.initrd $(boot)/ld.script
$(call cmd,gen-coff) $(call cmd,gen-coff)
quiet_cmd_gen-elf-pmac = ELF $@ quiet_cmd_gen-elf-pmac = ELF $@
...@@ -116,19 +116,19 @@ quiet_cmd_gen-elf-pmac = ELF $@ ...@@ -116,19 +116,19 @@ quiet_cmd_gen-elf-pmac = ELF $@
$(OBJCOPY) $@ $@ --add-section=.note=$(obj)/note \ $(OBJCOPY) $@ $@ --add-section=.note=$(obj)/note \
-R .comment $(del-ramdisk-sec) -R .comment $(del-ramdisk-sec)
$(images)/vmlinux.elf-pmac: $(obj)/image.o $(NEWWORLDOBJS) $(LIBS) $(obj)/note $(images)/vmlinux.elf-pmac: $(obj)/image.o $(NEWWORLDOBJS) $(LIBS) $(obj)/note $(boot)/ld.script
$(call cmd,gen-elf-pmac) $(call cmd,gen-elf-pmac)
$(images)/vmlinux.initrd.elf-pmac: $(obj)/image.initrd.o $(NEWWORLDOBJS) \ $(images)/vmlinux.initrd.elf-pmac: $(obj)/image.initrd.o $(NEWWORLDOBJS) \
$(LIBS) $(obj)/note $(LIBS) $(obj)/note $(boot)/ld.script
$(call cmd,gen-elf-pmac) $(call cmd,gen-elf-pmac)
quiet_cmd_gen-chrp = CHRP $@ quiet_cmd_gen-chrp = CHRP $@
cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $^ && \ cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $^ && \
$(OBJCOPY) $@ $@ -R .comment $(del-ramdisk-sec) $(OBJCOPY) $@ $@ -R .comment $(del-ramdisk-sec)
$(images)/zImage.chrp: $(CHRPOBJS) $(obj)/image.o $(LIBS) $(images)/zImage.chrp: $(CHRPOBJS) $(obj)/image.o $(LIBS) $(boot)/ld.script
$(call cmd,gen-chrp) $(call cmd,gen-chrp)
$(images)/zImage.initrd.chrp: $(CHRPOBJS) $(obj)/image.initrd.o $(LIBS) $(images)/zImage.initrd.chrp: $(CHRPOBJS) $(obj)/image.initrd.o $(LIBS) $(boot)/ld.script
$(call cmd,gen-chrp) $(call cmd,gen-chrp)
quiet_cmd_addnote = ADDNOTE $@ quiet_cmd_addnote = ADDNOTE $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment