.incbin patch

.incbin patch

[David Mosberger]

Linus,

Would you mind applying the attached small patch (originally by H.J. Lu)?
It's the last thing that keeps your tree from building directly for ia64.

Sam said he would submit the patch to you, but this was over a week
ago.  I tried to contact Sam, but it looks like his mailbox is full
(probably on vacation).

As I recall, the only objection to this patch came from Russell King,
since it would force ARM to upgrade to a reasonably recent version of
binutils, but he (grudingly) agreed to the change.

Thanks,

	--david

===== usr/Makefile 1.6 vs edited =====
--- 1.6/usr/Makefile	Sun Mar  9 13:47:41 2003
+++ edited/usr/Makefile	Tue Jul  8 10:29:19 2003
@@ -5,11 +5,9 @@
 
 clean-files := initramfs_data.cpio.gz
 
-LDFLAGS_initramfs_data.o := $(LDFLAGS_BLOB) -r -T
-
-$(obj)/initramfs_data.o: $(src)/initramfs_data.scr \
-			 $(obj)/initramfs_data.cpio.gz FORCE
-	$(call if_changed,ld)
+$(src)/initramfs_data.S: $(obj)/initramfs_data.cpio.gz
+	echo "	.section .init.ramfs,\"a\"" > $(src)/initramfs_data.S
+	echo ".incbin \"usr/initramfs_data.cpio.gz\"" >> $(src)/initramfs_data.S
 
 # initramfs-y are the programs which will be copied into the CPIO
 # archive. Currently, the filenames are hardcoded in gen_init_cpio,
===== usr/initramfs_data.scr 1.1 vs edited =====
--- 1.1/usr/initramfs_data.scr	Mon Nov  4 14:04:41 2002
+++ edited/usr/initramfs_data.scr	Tue Jul  8 10:29:19 2003
@@ -1,4 +0,0 @@
-SECTIONS
-{
-	.init.ramfs : { *(.data) }
-}

Re: .incbin patch

[Joshua Kwan]

[-- Attachment #1: Type: text/plain, Size: 580 bytes --]

On Wed, Jul 09, 2003 at 03:06:30PM -0700, David Mosberger wrote:
> +	echo "	.section .init.ramfs,\"a\"" > $(src)/initramfs_data.S
> +	echo ".incbin \"usr/initramfs_data.cpio.gz\"" >> $(src)/initramfs_data.S

Maybe you should resend it with the correct '>' signs :)

-Josh
-- 
"Notice that, written there, rather legibly, in the Baroque style common 
to New York subway wall writers, was, uhm... was the old familiar 
suggestion. And rather beautifully illustrated, as well..."

       -- Art Garfunkel on the inspiration for "A Poem On The Underground Wall"

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]