tree fe4b4940e5673a658d9bd07feebc3ba596f9d225
parent 2739e8cf113ce6e931608986a28bab5a42c0acd9
author Stephen Rothwell <[EMAIL PROTECTED]> Mon, 29 Aug 2005 18:26:01 +1000
committer Paul Mackerras <[EMAIL PROTECTED]> Tue, 30 Aug 2005 13:08:53 +1000

[PATCH] fix iSeries build for gcc-3.4

gcc 3.4 (at least the build we are using) puts the gcc generated .ident
string into a .note section at the end of the files it compiles (gcc
3.3.3-hammer and gcc 4.0.2 Debian puts it in the .text section).  This
means that the lparmap.s file we produce in the iSeries build may end with
a .note section.  When we include it into head.S, the assembler can no
longer resolve some of the conditional branches since the target label
ends up too far away.  This patch just forces us back to the .text section
after including lparmap.s.

The breakage was caused by my patch "iSeries build with newer assemblers
and compilers" (sha1-id: 2ad56496627630ebc99f06af5f81ca23e17e014e).

Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>

 arch/ppc64/kernel/head.S |    5 +++++
 1 files changed, 5 insertions(+)

diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -1276,6 +1276,11 @@ fwnmi_data_area:
         . = LPARMAP_PHYS
 #include "lparmap.s"
+ * This ".text" is here for old compilers that generate a trailing
+ * .note section when compiling .c files to .s
+ */
+       .text
 #endif /* CONFIG_PPC_ISERIES */
         . = 0x8000
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to