[Cmake-commits] CMake branch, next, updated. v2.8.8-3287-g991c026
Brad King
brad.king at kitware.com
Thu Jun 21 08:09:10 EDT 2012
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 991c026f5c8ab3d93c02ab8e299338bcd222748b (commit)
via 984c1760fb7fe49f2294d26ad51c907aebe05c5a (commit)
via ec1d35248510235483abdf1294afb96500ae910f (commit)
via 64d0e15627e72e4d96297096dd5c63598827ed10 (commit)
via 6dc053114b8fe213e7d1b41f99d1ec4ab436d29a (commit)
via 539064d4f73269a887ea032cac431f84fea594e7 (commit)
from 3bf552e8a7e0f36f082b27d2504e91e71b2d5a42 (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=991c026f5c8ab3d93c02ab8e299338bcd222748b
commit 991c026f5c8ab3d93c02ab8e299338bcd222748b
Merge: 3bf552e 984c176
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 21 08:09:08 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 21 08:09:08 2012 -0400
Merge topic 'update-KWIML' into next
984c176 Merge branch 'upstream-kwiml' into update-KWIML
ec1d352 KWIML: Teach INT about broken UINT32_C on old HP
64d0e15 KWIML: Teach INT.h that no HP platform implements SCN*8 formats
6dc0531 KWIML: Teach ABI.h about 'long long' and 'char' on old HP
539064d KWIML: Generalize interface to report broken integer literal macros
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=984c1760fb7fe49f2294d26ad51c907aebe05c5a
commit 984c1760fb7fe49f2294d26ad51c907aebe05c5a
Merge: 30305b9 ec1d352
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 21 08:05:20 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 21 08:05:20 2012 -0400
Merge branch 'upstream-kwiml' into update-KWIML
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec1d35248510235483abdf1294afb96500ae910f
commit ec1d35248510235483abdf1294afb96500ae910f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 20 13:48:11 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 21 08:04:16 2012 -0400
KWIML: Teach INT about broken UINT32_C on old HP
Old HP inttypes.h defines UINT32_C as:
#define __CONCAT__(_A,_B) _A ## _B
#define __CONCAT_U__(_A) _A ## u
#define UINT32_C(__c) __CONCAT__(__CONCAT_U__(__c),l)
The __CONCAT__ macro does not delay concatenation for an extra level so
standard preprocessor implementations like GNU complain that they cannot
concatenate the ")" and "l".
diff --git a/INT.h.in b/INT.h.in
index ee4c4bb..d2eda63 100644
--- a/INT.h.in
+++ b/INT.h.in
@@ -529,6 +529,12 @@ An includer may test the following macros after inclusion:
# define @KWIML at _INT_PRIX32 "X"
#endif
+#if defined(__hpux) && defined(__GNUC__) && !defined(__LP64__) \
+ && defined(__CONCAT__) && defined(__CONCAT_U__)
+ /* Some HPs define UINT32_C incorrectly and break GNU. */
+# define @KWIML at _INT_BROKEN_UINT32_C
+#endif
+
/* 32-bit constants */
#if defined(INT32_C) && !defined(@KWIML at _INT_BROKEN_INT32_C)
# define @KWIML at _INT_INT32_C(c) INT32_C(c)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64d0e15627e72e4d96297096dd5c63598827ed10
commit 64d0e15627e72e4d96297096dd5c63598827ed10
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 20 13:28:24 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 21 08:04:16 2012 -0400
KWIML: Teach INT.h that no HP platform implements SCN*8 formats
The "hh" class of scan formats is not implemented by the HP runtime.
diff --git a/INT.h.in b/INT.h.in
index c760b9e..ee4c4bb 100644
--- a/INT.h.in
+++ b/INT.h.in
@@ -260,8 +260,6 @@ An includer may test the following macros after inclusion:
# endif
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define @KWIML at _INT__NO_SCN8
-#elif defined(__HP_cc) || defined(__HP_aCC)
-# define @KWIML at _INT__NO_SCN8
#elif defined(__BORLANDC__)
# define @KWIML at _INT__NO_SCN8
# define @KWIML at _INT__NO_SCN64
@@ -269,6 +267,8 @@ An includer may test the following macros after inclusion:
# define @KWIML at _INT__NO_SCN8
#elif defined(__WATCOMC__)
# define @KWIML at _INT__NO_SCN8
+# elif defined(__hpux) /* HP runtime lacks support (any compiler) */
+# define @KWIML at _INT__NO_SCN8
#endif
/* 8-bit d, i */
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dc053114b8fe213e7d1b41f99d1ec4ab436d29a
commit 6dc053114b8fe213e7d1b41f99d1ec4ab436d29a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 20 13:16:48 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 21 08:03:47 2012 -0400
KWIML: Teach ABI.h about 'long long' and 'char' on old HP
The "HP92453-01 A.11.01.20 HP C Compiler" does not define any
identifying macros except for platform __hpux. If we see that platform
with no other compiler identification then assume this compiler. It has
'long long' and its 'char' is signed unless the +uc option is added.
diff --git a/ABI.h.in b/ABI.h.in
index e85a1c5..060a520 100644
--- a/ABI.h.in
+++ b/ABI.h.in
@@ -156,6 +156,8 @@ suppression macro @KWIML at _ABI_NO_VERIFY was defined.
# define @KWIML at _ABI_CHAR_IS_UNSIGNED 1
# elif defined(__BORLANDC__) /* Borland default */
# define @KWIML at _ABI_CHAR_IS_SIGNED 1
+# elif defined(__hpux) /* Old HP: no __HP_cc/__HP_aCC/__GNUC__ above */
+# define @KWIML at _ABI_CHAR_IS_SIGNED 1 /* (unless +uc) */
# endif
#endif
#if !defined(@KWIML at _ABI_CHAR_IS_UNSIGNED) && !defined(@KWIML at _ABI_CHAR_IS_SIGNED) \
@@ -251,6 +253,8 @@ suppression macro @KWIML at _ABI_NO_VERIFY was defined.
# else
# define @KWIML at _ABI_SIZEOF_LONG_LONG 0
# endif
+# elif defined(__hpux) && !defined(__GNUC__) /* Old HP: no __HP_cc/__HP_aCC above */
+# define @KWIML at _ABI_SIZEOF_LONG_LONG 8
# endif
#endif
#if !defined(@KWIML at _ABI_SIZEOF_LONG_LONG) && !defined(@KWIML at _ABI_NO_ERROR_LONG_LONG)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=539064d4f73269a887ea032cac431f84fea594e7
commit 539064d4f73269a887ea032cac431f84fea594e7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 20 08:17:05 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 20 08:17:05 2012 -0400
KWIML: Generalize interface to report broken integer literal macros
The <inttypes.h> header on some platforms define the integer literal
macros incorrectly for some of the integer types. Generalize the
documented interface reporting broken U/INT64_C to all integer sizes.
diff --git a/INT.h.in b/INT.h.in
index d40edcd..c760b9e 100644
--- a/INT.h.in
+++ b/INT.h.in
@@ -91,10 +91,11 @@ An includer may test the following macros after inclusion:
Some compilers define integer format macros incorrectly for their
own formatted print/scan implementations.
- @KWIML at _INT_BROKEN_INT64_C = macro INT64_C is incorrect if defined
- @KWIML at _INT_BROKEN_UINT64_C = macro UINT64_C is incorrect if defined
+ @KWIML at _INT_BROKEN_INT#_C = macro INT#_C is incorrect if defined
+ @KWIML at _INT_BROKEN_UINT#_C = macro UINT#_C is incorrect if defined
Some compilers define integer constant macros incorrectly and
- cannot handle literals as large as the integer type.
+ cannot handle literals as large as the integer type or even
+ produce bad preprocessor syntax.
@KWIML at _INT_BROKEN_INT8_T = type 'int8_t' is available but incorrect
Some compilers have a flag to make 'char' (un)signed but do not account
@@ -341,12 +342,12 @@ An includer may test the following macros after inclusion:
#endif
/* 8-bit constants */
-#if defined(INT8_C)
+#if defined(INT8_C) && !defined(@KWIML at _INT_BROKEN_INT8_C)
# define @KWIML at _INT_INT8_C(c) INT8_C(c)
#else
# define @KWIML at _INT_INT8_C(c) c
#endif
-#if defined(UINT8_C)
+#if defined(UINT8_C) && !defined(@KWIML at _INT_BROKEN_UINT8_C)
# define @KWIML at _INT_UINT8_C(c) UINT8_C(c)
#else
# define @KWIML at _INT_UINT8_C(c) c ## u
@@ -435,12 +436,12 @@ An includer may test the following macros after inclusion:
#endif
/* 16-bit constants */
-#if defined(INT16_C)
+#if defined(INT16_C) && !defined(@KWIML at _INT_BROKEN_INT16_C)
# define @KWIML at _INT_INT16_C(c) INT16_C(c)
#else
# define @KWIML at _INT_INT16_C(c) c
#endif
-#if defined(UINT16_C)
+#if defined(UINT16_C) && !defined(@KWIML at _INT_BROKEN_UINT16_C)
# define @KWIML at _INT_UINT16_C(c) UINT16_C(c)
#else
# define @KWIML at _INT_UINT16_C(c) c ## u
@@ -529,12 +530,12 @@ An includer may test the following macros after inclusion:
#endif
/* 32-bit constants */
-#if defined(INT32_C)
+#if defined(INT32_C) && !defined(@KWIML at _INT_BROKEN_INT32_C)
# define @KWIML at _INT_INT32_C(c) INT32_C(c)
#else
# define @KWIML at _INT_INT32_C(c) c
#endif
-#if defined(UINT32_C)
+#if defined(UINT32_C) && !defined(@KWIML at _INT_BROKEN_UINT32_C)
# define @KWIML at _INT_UINT32_C(c) UINT32_C(c)
#else
# define @KWIML at _INT_UINT32_C(c) c ## u
-----------------------------------------------------------------------
Summary of changes:
Utilities/KWIML/ABI.h.in | 4 ++++
Utilities/KWIML/INT.h.in | 29 ++++++++++++++++++-----------
2 files changed, 22 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list