diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-01-30 06:28:37 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-31 13:29:48 +0000 |
| commit | f4f9f2f4d97e43c579ec1cd97af3766c3f7c7c83 (patch) | |
| tree | 350a5c1efd20f3e29a0b83c23cd9df0d686519ec /meta/conf/machine | |
| parent | 691f7e4fa2897168abc4ddd59b1dd0eed045c8d4 (diff) | |
| download | openembedded-core-contrib-f4f9f2f4d97e43c579ec1cd97af3766c3f7c7c83.tar.gz | |
gcc, qemuppc: Explicitly disable forcing SPE flags
G4 does not have SPE, so we make that explicit in the tune files and
since we emulate G4 when building Qemu, we ensure it for qemuppc as
well.
GCC config for powerpc-linux is made to include SPE by default which is
equivalent if the tripet was powerpc-linux*spe, this forces gcc to
configure assembler to enable -mspe by default, when we do that then the
kernel fails to compile with binutils 2.26, since newer assembler is
smart to detect the tlbia instructions are not compatible with SPE and
hence the kernel build breaks rightly. We configure the kernel for G4 as
well where it enables tlbia instrucitons rightly so because it thinks
its being configured for power4. So we keep the options but do not force
-mspe down to assembler as default.
(From OE-Core rev: 7a51776a830167e43cbd185505f62f328704e271)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
| -rw-r--r-- | meta/conf/machine/include/tune-ppc7400.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuppc.conf | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/conf/machine/include/tune-ppc7400.inc b/meta/conf/machine/include/tune-ppc7400.inc index 8bfda56c25..425e8bd215 100644 --- a/meta/conf/machine/include/tune-ppc7400.inc +++ b/meta/conf/machine/include/tune-ppc7400.inc @@ -3,7 +3,7 @@ DEFAULTTUNE ?= "ppc7400" require conf/machine/include/powerpc/arch-powerpc.inc TUNEVALID[ppc7400] = "Enable ppc7400 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppc7400', ' -mcpu=7400', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ppc7400', ' -mcpu=7400 -mno-spe', '', d)}" AVAILTUNES += "ppc7400" TUNE_FEATURES_tune-ppc7400 = "m32 fpu-hard ppc7400 altivec" diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index 85cbbf798d..bf0038ddba 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf @@ -5,6 +5,8 @@ require conf/machine/include/qemu.inc require conf/machine/include/tune-ppc7400.inc +TARGET_CC_KERNEL_ARCH = "-mno-spe" + KERNEL_IMAGETYPE = "vmlinux" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" |