powerpc: Disable RELOCATABLE for COMPILE_TEST with PPC64
powerpc:allmodconfig has been failing for some time with the following error. arch/powerpc/kernel/exceptions-64s.S: Assembler messages: arch/powerpc/kernel/exceptions-64s.S:1312: Error: attempt to move .org backwards make[1]: *** [arch/powerpc/kernel/head_64.o] Error 1 A number of attempts to fix the problem by moving around code have been unsuccessful and resulted in failed builds for some configurations and the discovery of toolchain bugs. Fix the problem by disabling RELOCATABLE for COMPILE_TEST builds instead. While this is less than perfect, it avoids substantial code changes which would otherwise be necessary just to make COMPILE_TEST builds happy and might have undesired side effects. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
b50a6c584b
commit
fb43e8477e
|
@ -414,7 +414,7 @@ config KEXEC
|
||||||
config CRASH_DUMP
|
config CRASH_DUMP
|
||||||
bool "Build a kdump crash kernel"
|
bool "Build a kdump crash kernel"
|
||||||
depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
|
depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
|
||||||
select RELOCATABLE if PPC64 || 44x || FSL_BOOKE
|
select RELOCATABLE if (PPC64 && !COMPILE_TEST) || 44x || FSL_BOOKE
|
||||||
help
|
help
|
||||||
Build a kernel suitable for use as a kdump capture kernel.
|
Build a kernel suitable for use as a kdump capture kernel.
|
||||||
The same kernel binary can be used as production kernel and dump
|
The same kernel binary can be used as production kernel and dump
|
||||||
|
@ -1017,6 +1017,7 @@ endmenu
|
||||||
if PPC64
|
if PPC64
|
||||||
config RELOCATABLE
|
config RELOCATABLE
|
||||||
bool "Build a relocatable kernel"
|
bool "Build a relocatable kernel"
|
||||||
|
depends on !COMPILE_TEST
|
||||||
select NONSTATIC_KERNEL
|
select NONSTATIC_KERNEL
|
||||||
help
|
help
|
||||||
This builds a kernel image that is capable of running anywhere
|
This builds a kernel image that is capable of running anywhere
|
||||||
|
|
Loading…
Reference in New Issue