Messages in this thread Patch in this message | | | Date | Thu, 11 Nov 2004 16:39:27 -0800 | From | Andrew Morton <> | Subject | Re: [PATCH 2.6.10-rc1 1/2] [m32r] Update for m32r-g00ff |
| |
Hirokazu Takata <takata@linux-m32r.org> wrote: > > - Position-independent zImage support; > this aims at removing constraints of zImage(vmlinuz)'s location.
This generates a reject against Linus's current tree, in arch/m32r/boot/compressed/Makefile
Please always generate diffs against current bitkeeper, or against the latest diff from ftp://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots. 2.6.10-rc1 is too old: we're currently showing a ten megabyte diff against 2.6.10-rc1.
I resolved the reject as below. It might be wrong.
--- 25/arch/m32r/boot/compressed/Makefile~m32r-update-for-m32r-g00ff 2004-11-11 16:35:23.789252008 -0800 +++ 25-akpm/arch/m32r/boot/compressed/Makefile 2004-11-11 16:35:23.800250336 -0800 @@ -5,10 +5,10 @@ # targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o \ - m32r-sio.o piggy.o vmlinux.lds + piggy.o vmlinux.lds EXTRA_AFLAGS := -traditional -OBJECTS = $(obj)/head.o $(obj)/misc.o $(obj)/m32r_sio.o +OBJECTS = $(obj)/head.o $(obj)/misc.o # # IMAGE_OFFSET is the load offset of the compression loader @@ -28,6 +28,8 @@ $(obj)/vmlinux.bin: vmlinux FORCE $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE $(call if_changed,gzip) +CFLAGS_misc.o += -fpic + LDFLAGS_piggy.o := -r --format binary --oformat elf32-m32r-linux -T OBJCOPYFLAGS += -R .empty_zero_page - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |