[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-293-gf626df6

[Chuck Atkins]

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  f626df6b7ddecb0a981aa083bd3b499e439babd6 (commit)
       via  0ead59cc37465ae19341fa49691c29d50531bc3f (commit)
      from  3f54cf9a0dc45d14efe7cdfe3b692b9a62c48efd (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=f626df6b7ddecb0a981aa083bd3b499e439babd6
commit f626df6b7ddecb0a981aa083bd3b499e439babd6
Merge: 3f54cf9 0ead59c
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Tue Nov 4 11:25:01 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 4 11:25:01 2014 -0500

    Merge topic 'fix-gcc-hppa' into next
    
    0ead59cc Workaround for short jump tables on PA-RISC.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ead59cc37465ae19341fa49691c29d50531bc3f
commit 0ead59cc37465ae19341fa49691c29d50531bc3f
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:23:50 2014 -0500

    Workaround for short jump tables on PA-RISC.
    
    The PA-RISC architecture requires special options for 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:


hooks/post-receive
-- 
CMake