[Cmake-commits] CMake branch, next, updated. v3.2.1-1401-g82c65ba

[Brad King]

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  82c65ba5c5c9a5bb5a0f4582c1e719a7159a763b (commit)
       via  82c51a8ac6c4a8fba127402d96f8269492f3a115 (commit)
      from  4ec4aa74ed6faac31eb752a18cc4978f74471bd1 (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=82c65ba5c5c9a5bb5a0f4582c1e719a7159a763b
commit 82c65ba5c5c9a5bb5a0f4582c1e719a7159a763b
Merge: 4ec4aa7 82c51a8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 2 13:21:10 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 2 13:21:10 2015 -0400

    Merge topic 'fix-liblzma-XL-optimize' into next
    
    82c51a8a liblzma: Disable XL compiler optimizations in one source to avoid crash


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82c51a8ac6c4a8fba127402d96f8269492f3a115
commit 82c51a8ac6c4a8fba127402d96f8269492f3a115
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 2 13:16:23 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 2 13:17:57 2015 -0400

    liblzma: Disable XL compiler optimizations in one source to avoid crash
    
    Somehow optimizations of lzma_lzma_optimum_normal by the IBM XL C
    compiler cause it to crash.  Simply disable optimizations of this source
    file with a pragma.

diff --git a/Utilities/cmliblzma/liblzma/lzma/lzma_encoder_optimum_normal.c b/Utilities/cmliblzma/liblzma/lzma/lzma_encoder_optimum_normal.c
index d3a6348..fc54d8d 100644
--- a/Utilities/cmliblzma/liblzma/lzma/lzma_encoder_optimum_normal.c
+++ b/Utilities/cmliblzma/liblzma/lzma/lzma_encoder_optimum_normal.c
@@ -8,6 +8,9 @@
 //  You can do whatever you want with this file.
 //
 ///////////////////////////////////////////////////////////////////////////////
+#if defined(__IBMC__)
+# pragma options optimize=0
+#endif
 
 #include "lzma_encoder_private.h"
 #include "fastpos.h"

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

Summary of changes:
 Utilities/cmliblzma/liblzma/lzma/lzma_encoder_optimum_normal.c |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake