Skip to content
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.

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

ppc64 build cleanups and updated openblas for power #18301

Merged
merged 2 commits into from
Sep 1, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4839fd98bce2900aa780cf1b1d387478
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2be2a191817959841bcfb07972601f74f3112744fe8ac8c6f280525fd282ecbe4060513f72f5bf5386296be43489405567b04b418617152e6be54ac42e34dd62
4 changes: 2 additions & 2 deletions deps/llvm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ LLVM_CMAKE += -DLLDB_DISABLE_PYTHON=ON
endif # LLDB_DISABLE_PYTHON
endif # BUILD_LLDB

ifeq ($(ARCH), ppc64)
ifneq (,$(filter $(ARCH), powerpc64le ppc64le))
LLVM_CXXFLAGS += -mminimal-toc
endif # ARCH == ppc64
endif

# LLVM bug #24157
ifeq ($(USE_LLVM_SHLIB),1)
Expand Down
5 changes: 5 additions & 0 deletions deps/openblas.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
ifneq (,$(filter $(ARCH), powerpc64le ppc64le))
OPENBLAS_BRANCH=v0.2.19
OPENBLAS_SHA1=85636ff1a015d04d3a8f960bc644b85ee5157135
else
OPENBLAS_BRANCH=v0.2.18
OPENBLAS_SHA1=12ab1804b6ebcd38b26960d65d254314d8bc33d6
endif
2 changes: 1 addition & 1 deletion deps/unwind.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ endif
#todo: libunwind tests are known to fail, so they aren't run
$(LIBUNWIND_TARGET_OBJ): $(LIBUNWIND_TARGET_SOURCE)
$(call make-install,libunwind-$(UNWIND_VER),)
ifeq ($(ARCH), ppc64)
ifneq (,$(filter $(ARCH), powerpc64le ppc64le))
@# workaround for configure script bug
mv $(build_prefix)/lib64/libunwind*.a $(build_libdir)
endif
Expand Down