diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-08-29 18:26:01 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-08-30 13:08:53 +1000 |
| commit | 1e4a79e0458beca871c662028610ae3a88e3f1bf (patch) | |
| tree | fe4b4940e5673a658d9bd07feebc3ba596f9d225 | |
| parent | 2739e8cf113ce6e931608986a28bab5a42c0acd9 (diff) | |
| download | blackbird-op-linux-1e4a79e0458beca871c662028610ae3a88e3f1bf.tar.gz blackbird-op-linux-1e4a79e0458beca871c662028610ae3a88e3f1bf.zip | |
[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 <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/ppc64/kernel/head.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S index d98a9986c14f..036959775623 100644 --- a/arch/ppc64/kernel/head.S +++ b/arch/ppc64/kernel/head.S @@ -1276,6 +1276,11 @@ fwnmi_data_area: #ifdef CONFIG_PPC_ISERIES . = 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 |
