Skip to content

Rollup of 9 pull requests #41138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Apr 7, 2017
Merged

Rollup of 9 pull requests #41138

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
03949f5
issue #40793
GAJaloyan Mar 24, 2017
c80868e
correcting another mistake in an example
GAJaloyan Mar 27, 2017
3fb1a84
Add a common Build::src_is_git flag
cuviper Apr 3, 2017
e9cfc30
Only use cargo-vendor if building from git sources
cuviper Apr 3, 2017
4d32ff4
Loosen src_is_git to just check exists()
cuviper Apr 3, 2017
60381cd
cstore: return an immutable borrow from `visible_parent_map`
arielb1 Apr 4, 2017
b970bc2
Enable appveyor cache, add more paranoia
aidanhs Apr 4, 2017
608e8fe
dist-powerpc-linux: use a pure 32-bit CPU profile
cuviper Apr 5, 2017
9ffb545
Remove some CStr transmutes.
Apr 6, 2017
8a1d2a3
rustdoc: collapse docblock before showing label
euclio Apr 6, 2017
b135c12
travis: Use upstream LLVM repositories for Fuchsia
petrhosek Apr 7, 2017
edc1ac3
ICH: Centrally compute and cache DefPath hashes as part of DefPathTable.
michaelwoerister Apr 3, 2017
bb63872
SVH: Don't hash the HIR twice when once is enough.
michaelwoerister Apr 3, 2017
d860b1c
Rollup merge of #40797 - GAJaloyan:patch-1, r=arielb1
frewsxcv Apr 7, 2017
ef9eee7
Rollup merge of #41047 - cuviper:src_is_git, r=alexcrichton
frewsxcv Apr 7, 2017
88e97f0
Rollup merge of #41056 - michaelwoerister:central-defpath-hashes, r=n…
frewsxcv Apr 7, 2017
996f06f
Rollup merge of #41061 - arielb1:parent-lock, r=eddyb
frewsxcv Apr 7, 2017
a2c0326
Rollup merge of #41075 - aidanhs:aphs-enable-appveyor-cache, r=alexcr…
frewsxcv Apr 7, 2017
2a92fe2
Rollup merge of #41080 - cuviper:generic-powerpc, r=alexcrichton
frewsxcv Apr 7, 2017
25518db
Rollup merge of #41120 - clarcharr:c_str_transmute, r=alexcrichton
frewsxcv Apr 7, 2017
72308b1
Rollup merge of #41130 - petrhosek:fuchsia-ci-upstream, r=alexcrichton
frewsxcv Apr 7, 2017
cd2310b
Rollup merge of #41131 - euclio:collapse-animation, r=GuillaumeGomez
frewsxcv Apr 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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.
  • Loading branch information
@cuviper
cuviper committed Apr 5, 2017
commit 608e8fe16c3859b61f3a43ee233cbf0119ecd35f
7 changes: 1 addition & 6 deletions src/ci/docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,18 +152,13 @@ For targets: `powerpc-unknown-linux-gnu`
- Path and misc options > Patches origin = Bundled, then local
- Path and misc options > Local patch directory = /tmp/patches
- Target options > Target Architecture = powerpc
- Target options > Emit assembly for CPU = power4 -- (+)
- Target options > Tune for CPU = power6 -- (+)
- Target options > Emit assembly for CPU = powerpc -- pure 32-bit PowerPC
- Operating System > Target OS = linux
- Operating System > Linux kernel version = 2.6.32.68 -- ~RHEL6 kernel
- C-library > glibc version = 2.12.2 -- ~RHEL6 glibc
- C compiler > gcc version = 4.9.3
- C compiler > Core gcc extra config = --with-cpu-32=power4 --with-cpu=default32 -- (+)
- C compiler > gcc extra config = --with-cpu-32=power4 --with-cpu=default32 -- (+)
- C compiler > C++ = ENABLE -- to cross compile LLVM

(+) These CPU options match the configuration of the toolchains in RHEL6.

## `powerpc64-linux-gnu.config`

For targets: `powerpc64-unknown-linux-gnu`
Expand Down
8 changes: 4 additions & 4 deletions src/ci/docker/dist-powerpc-linux/powerpc-linux-gnu.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down