[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-291-g3f54cf9
Chuck Atkins
chuck.atkins at kitware.com
Tue Nov 4 11:13:24 EST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 3f54cf9a0dc45d14efe7cdfe3b692b9a62c48efd (commit)
via 13aa4e24219c80dd1a3f0a26d8a7e12e5f22332b (commit)
via 38be87caa4c1470151d012e46c70f09bcbe7d334 (commit)
from bd34ac897765254bdab60c8c0a28d968f78b46d3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f54cf9a0dc45d14efe7cdfe3b692b9a62c48efd
commit 3f54cf9a0dc45d14efe7cdfe3b692b9a62c48efd
Merge: bd34ac8 13aa4e2
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Tue Nov 4 11:13:23 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 4 11:13:23 2014 -0500
Merge topic 'fix-gcc-hppa' into next
13aa4e24 Workaround for short jump tables on PA-RISC.
38be87ca CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13aa4e24219c80dd1a3f0a26d8a7e12e5f22332b
commit 13aa4e24219c80dd1a3f0a26d8a7e12e5f22332b
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Tue Nov 4 11:01:56 2014 -0500
Commit: Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Tue Nov 4 11:11:57 2014 -0500
Workaround for short jump tables on PA-RISC.
The PA-RISC architecture requires special options GCC to prevent linker
errors when libraries reach a certain size and / or complexity. See
http://mraw.org/blog/2007/10/10/Linking_on_hppa and gcc documentation
on -mlong-calls.
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 5d86876..2909cb5 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -65,6 +65,16 @@ if(CMAKE_SYSTEM_NAME MATCHES "HP-UX" AND CMAKE_CXX_COMPILER_ID MATCHES "HP")
endif()
endif()
+# Workaround for short jump tables on PA-RISC
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
+ if(CMAKE_COMPILER_IS_GNUC)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-calls")
+ endif()
+ if(CMAKE_COMPILER_IS_GNUCXX)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-calls")
+ endif()
+endif()
+
# use the ansi CXX compile flag for building cmake
if (CMAKE_ANSI_CXXFLAGS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}")
-----------------------------------------------------------------------
Summary of changes:
CompileFlags.cmake | 10 ++++++++++
Source/CMakeVersion.cmake | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list