Re: [crosstool-ng] Patch application failure while compiling arm-unknown-linux-uclibcgnueabi

[Thomas Petazzoni <thomas dot petazzoni at free-electrons dot com>]

Le Fri, 27 Mar 2009 12:25:09 +0100,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> a Ãcrit :

> [DEBUG]    Applying patch
> '/home/thomas/local/crosstool-ng/patches/gcc/4.3.2/220-noteGNUstack-01.patch' [DEBUG]
> ==> Executing: 'patch -g0 -F1 -p1 -f' [ALL  ]    The next patch would
> create the file boehm-gc/ia64_save_regs_in_stack.S, [ALL  ]    which
> already exists!  Applying it anyway. [ALL  ]    patching file
> boehm-gc/ia64_save_regs_in_stack.S [ALL  ]    Patch attempted to
> create file boehm-gc/ia64_save_regs_in_stack.S, which already exists.
> [ALL  ]    Hunk #1 FAILED at 1. [ALL  ]    1 out of 1 hunk FAILED --
> saving rejects to file boehm-gc/ia64_save_regs_in_stack.S.rej

It seems that in gcc 4.3.2, the file ia64_save_regs_in_stack.s was
already renamed to ia64_save_regs_in_stack.S, so that portion of the
patch is not needed anymore. I'm currently trying the following patch
(untested at the moment).

Index: patches/gcc/4.3.2/220-noteGNUstack-01.patch
===================================================================
--- patches/gcc/4.3.2/220-noteGNUstack-01.patch	(revision 1445)
+++ patches/gcc/4.3.2/220-noteGNUstack-01.patch	(working copy)
@@ -15,45 +15,6 @@
 	* src/ia64/unix.S: Likewise.
 	* src/arm/sysv.S: Likewise.
 
-	* ia64_save_regs_in_stack.s: Moved to...
-	* ia64_save_regs_in_stack.S: ... this.  Add .note.GNU-stack
-	on Linux.
-
-diff -durN gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.S gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.S
---- gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.S	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.S	2008-06-10 14:58:21.000000000 +0200
-@@ -0,0 +1,15 @@
-+        .text
-+        .align 16
-+        .global GC_save_regs_in_stack
-+        .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+        .bodyfoo.mpg
-+        flushrs
-+        ;;
-+        mov r8=ar.bsp
-+        br.ret.sptk.few rp
-+        .endp GC_save_regs_in_stack
-+
-+#ifdef __linux__
-+	.section .note.GNU-stack,"",@progbits
-+#endif
-diff -durN gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.s gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.s
---- gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.s	2001-10-15 06:57:59.000000000 +0200
-+++ gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.s	1970-01-01 02:00:00.000000000 +0200
-@@ -1,12 +0,0 @@
--        .text
--        .align 16
--        .global GC_save_regs_in_stack
--        .proc GC_save_regs_in_stack
--GC_save_regs_in_stack:
--        .body
--        flushrs
--        ;;
--        mov r8=ar.bsp
--        br.ret.sptk.few rp
--        .endp GC_save_regs_in_stack
--
 diff -durN gcc-4.3.1.orig/libffi/src/alpha/osf.S gcc-4.3.1/libffi/src/alpha/osf.S
 --- gcc-4.3.1.orig/libffi/src/alpha/osf.S	2007-04-06 18:24:16.000000000 +0200
 +++ gcc-4.3.1/libffi/src/alpha/osf.S	2008-06-10 14:58:21.000000000 +0200


-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

--
For unsubscribe information see http://sourceware.org/lists.html#faq