about summary refs log tree commit diff
path: root/src/ci/docker/dist-powerpc-linux
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2017-04-05 00:41:08 -0700
committerJosh Stone <jistone@redhat.com>2017-04-05 00:41:08 -0700
commit608e8fe16c3859b61f3a43ee233cbf0119ecd35f (patch)
treee00aaeb9d9ff11b7313abf5c7140946a54b74ef3 /src/ci/docker/dist-powerpc-linux
parent2564711e803f62e04bebf10408cc1c11297c0caf (diff)
downloadrust-608e8fe16c3859b61f3a43ee233cbf0119ecd35f.tar.gz
rust-608e8fe16c3859b61f3a43ee233cbf0119ecd35f.zip
dist-powerpc-linux: use a pure 32-bit CPU profile
With `-mcpu=power4`, code might use instructions like `fcfid`, excluding
older CPUs like the PowerPC G4, which apparently some users would like
to use.  The generic `-mcpu=powerpc` should stick to pure 32-bit PowerPC
instructions.

Fixes rust-lang/cargo#3852.
Diffstat (limited to 'src/ci/docker/dist-powerpc-linux')
-rw-r--r--src/ci/docker/dist-powerpc-linux/powerpc-linux-gnu.config8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ci/docker/dist-powerpc-linux/powerpc-linux-gnu.config b/src/ci/docker/dist-powerpc-linux/powerpc-linux-gnu.config
index 26e2de863a0..984a0a0304e 100644
--- a/src/ci/docker/dist-powerpc-linux/powerpc-linux-gnu.config
+++ b/src/ci/docker/dist-powerpc-linux/powerpc-linux-gnu.config
@@ -101,8 +101,8 @@ CT_ARCH_SUPPORTS_WITH_FLOAT=y
 CT_ARCH_DEFAULT_BE=y
 CT_ARCH_DEFAULT_32=y
 CT_ARCH_ABI=""
-CT_ARCH_CPU="power4"
-CT_ARCH_TUNE="power6"
+CT_ARCH_CPU="powerpc"
+CT_ARCH_TUNE=""
 CT_ARCH_BE=y
 # CT_ARCH_LE is not set
 CT_ARCH_32=y
@@ -391,8 +391,8 @@ CT_CC_GCC_HAS_LIBSANITIZER=y
 CT_CC_GCC_VERSION="4.9.3"
 # CT_CC_LANG_FORTRAN is not set
 CT_CC_GCC_ENABLE_CXX_FLAGS=""
-CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--with-cpu-32=power4 --with-cpu=default32"
-CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-cpu-32=power4 --with-cpu=default32"
+CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_GCC_EXTRA_CONFIG_ARRAY=""
 CT_CC_GCC_EXTRA_ENV_ARRAY=""
 CT_CC_GCC_STATIC_LIBSTDCXX=y
 # CT_CC_GCC_SYSTEM_ZLIB is not set