[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7160-g2f2cde5

[Rolf Eike Beer]

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  2f2cde570bf0faa2def116dc446869e0b332eb33 (commit)
       via  55f1c4b9541402ba035accf125df0ec60a2f7673 (commit)
      from  f1abf072f645013c234dba86554bfb0f0c3f78da (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=2f2cde570bf0faa2def116dc446869e0b332eb33
commit 2f2cde570bf0faa2def116dc446869e0b332eb33
Merge: f1abf07 55f1c4b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 16 16:32:21 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 16 16:32:21 2014 -0500

    Merge topic 'hppa-binutils-flag' into next
    
    55f1c4b9 Workaround binutils bug by only marking unique section starting by .text._


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55f1c4b9541402ba035accf125df0ec60a2f7673
commit 55f1c4b9541402ba035accf125df0ec60a2f7673
Author:     Guy Martin <gmsoft at tuxicoman.be>
AuthorDate: Thu Jan 16 09:26:30 2014 +0100
Commit:     Rolf Eike Beer <kde at opensource.sf-tec.de>
CommitDate: Thu Jan 16 22:28:01 2014 +0100

    Workaround binutils bug by only marking unique section starting by .text._
    
    This adds the HPPA workaround improved in
    b22a0f15de36d7b69f136b75e091adca145e0251 (bootstrap: improve ld flag for
    Linux/HPPA builds) not only to the bootstrap, but also to the normal build.

diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 20f5dec..24ac58d 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -66,5 +66,5 @@ endif ()
 # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
 if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
 endif ()

-----------------------------------------------------------------------

Summary of changes:
 CompileFlags.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake