[Cmake-commits] CMake branch, next, updated. v2.8.6-1952-gd70cc1d
Brad King
brad.king at kitware.com
Fri Nov 18 13:59:29 EST 2011
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 d70cc1d0164ac8d17b999e177104c11012c93612 (commit)
via 5796f88d92832739889cc613d911d4d581b29365 (commit)
via ae7cf91b1376cc313dc39e41c7d3e2026ac79b6b (commit)
from 75b9d46db36db77a3ff58dcaeaad08de78091e84 (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=d70cc1d0164ac8d17b999e177104c11012c93612
commit d70cc1d0164ac8d17b999e177104c11012c93612
Merge: 75b9d46 5796f88
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 18 13:59:26 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 18 13:59:26 2011 -0500
Merge topic 'update-KWIML' into next
5796f88 Merge branch 'upstream-kwiml' into update-KWIML
ae7cf91 KWIML: Teach ABI.h about PGI compiler
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5796f88d92832739889cc613d911d4d581b29365
commit 5796f88d92832739889cc613d911d4d581b29365
Merge: aaf3765 ae7cf91
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 18 13:52:15 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 18 13:52:15 2011 -0500
Merge branch 'upstream-kwiml' into update-KWIML
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae7cf91b1376cc313dc39e41c7d3e2026ac79b6b
commit ae7cf91b1376cc313dc39e41c7d3e2026ac79b6b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 18 13:46:22 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 18 13:46:22 2011 -0500
KWIML: Teach ABI.h about PGI compiler
The PGI compiler appears to define "long long" as size 8 but does not
provide a feature macro for it. It does provide options for the
signedness of char (-Mschar, -Muchar) but does not define a feature
macro indicating the choice. The default is signed, at least on Linux.
diff --git a/ABI.h.in b/ABI.h.in
index 0ec6d0e..e95a4ff 100644
--- a/ABI.h.in
+++ b/ABI.h.in
@@ -148,6 +148,8 @@ suppression macro @KWIML at _ABI_NO_VERIFY was defined.
# define @KWIML at _ABI_CHAR_IS_SIGNED 1
# elif defined(_SGI_COMPILER_VERSION) /* SGI MIPSpro default */
# define @KWIML at _ABI_CHAR_IS_UNSIGNED 1
+# elif defined(__PGIC__) /* PGI default */
+# define @KWIML at _ABI_CHAR_IS_SIGNED 1
# elif defined(_MSC_VER) /* MSVC default */
# define @KWIML at _ABI_CHAR_IS_SIGNED 1
# elif defined(__WATCOMC__) /* Watcom default */
@@ -231,6 +233,8 @@ suppression macro @KWIML at _ABI_NO_VERIFY was defined.
# define @KWIML at _ABI_SIZEOF_LONG_LONG 8
# elif defined(__HP_cc) || defined(__HP_aCC) /* HP */
# define @KWIML at _ABI_SIZEOF_LONG_LONG 8
+# elif defined(__PGIC__) /* PGI */
+# define @KWIML at _ABI_SIZEOF_LONG_LONG 8
# elif defined(__WATCOMC__) /* Watcom */
# define @KWIML at _ABI_SIZEOF_LONG_LONG 8
# elif defined(__INTEL_COMPILER) /* Intel */
-----------------------------------------------------------------------
Summary of changes:
Utilities/KWIML/ABI.h.in | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list