[haiku-commits] BRANCH mmadia-github.separate-build-environment - src/build/configure headers/build/posix_target headers/build/os_target
- From: mmadia-github.separate-build-environment <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 5 Aug 2012 16:49:43 +0200 (CEST)
added 4 changesets to branch
'refs/remotes/mmadia-github/separate-build-environment'
old head: b26d178f0952890f82e4e514063afbb03f32da80
new head: b95dc538154d9abb4de3fca1365397e62a2d0628
----------------------------------------------------------------------------
bf8289e: Add the host compiler's limits.h definitions to HaikuHostBuildConfig.h
5be46aa: Cleanup. No functional change.
70af6ab: Remove inlcusion of <limits.h>, as HaikuHostBuildConfig.h provides the
values.
b95dc53: Whitespace cleanup. No functional change.
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
5 files changed, 59 insertions(+), 19 deletions(-)
headers/build/os_target/target_BeBuild.h | 8 ++--
headers/build/posix_target/target_limits.h | 9 -----
headers/build/posix_target/target_stdint.h | 12 +++---
src/build/configure/Jamfile | 1 +
src/build/configure/test_limits_header.cpp | 48 ++++++++++++++++++++++++
############################################################################
Commit: bf8289e414f60f817d3fbc3162c8935029b15cf9
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 10:00:44 2012 UTC
Add the host compiler's limits.h definitions to HaikuHostBuildConfig.h
----------------------------------------------------------------------------
diff --git a/src/build/configure/Jamfile b/src/build/configure/Jamfile
index 259021e..7235afb 100644
--- a/src/build/configure/Jamfile
+++ b/src/build/configure/Jamfile
@@ -66,6 +66,7 @@ actions ConfigureRunProgram1
ConfigureRunProgram test_int_types : test_int_types.cpp : $(HOST_LIBSTDC++) ;
+ConfigureRunProgram test_limits_header : test_limits_header.cpp :
$(HOST_LIBSTDC++) ;
Depends configure_build : $(configureTargets) ;
diff --git a/src/build/configure/test_limits_header.cpp
b/src/build/configure/test_limits_header.cpp
new file mode 100644
index 0000000..bc6a162
--- /dev/null
+++ b/src/build/configure/test_limits_header.cpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#include <limits.h>
+#include <stdio.h>
+
+
+#define TO_STRING(x) #x
+#define PRINT_MACRO(x) \
+ printf("#define _HAIKU_BUILD_FEATURE_" #x " %s\n", TO_STRING(x))
+
+
+int
+main()
+{
+ // NOTE: #8730 -- these are the combined definitions from
+ //
/boot/develop/abi/x86/gcc2/tools/gcc-2.95.3-haiku-111122/lib/gcc-lib/\
+ // i586-pc-haiku/2.95.3-haiku-111122/include/limits.h
+ // /boot/develop/abi/x86/gcc4/tools/gcc-4.6.2-haiku-120121/lib/gcc/\
+ // i586-pc-haiku/4.6.2/install-tools/include/limits.h
+ // sed -n -e '/\define[^d]/p' limits.h | sed -e 's/\#//' \
+ // | awk '{ print "\tPRINT_MACRO\("$2"\);"}' | sort -u >
defs.cpp
+ PRINT_MACRO(__INT_MAX__);
+ PRINT_MACRO(__LONG_LONG_MAX__);
+ PRINT_MACRO(__LONG_MAX__);
+ PRINT_MACRO(_LIMITS_H___);
+ PRINT_MACRO(_MACH_MACHLIMITS_H_);
+ PRINT_MACRO(CHAR_BIT);
+ PRINT_MACRO(CHAR_MAX);
+ PRINT_MACRO(CHAR_MIN);
+ PRINT_MACRO(INT_MAX);
+ PRINT_MACRO(INT_MIN);
+ PRINT_MACRO(LLONG_MAX);
+ PRINT_MACRO(LLONG_MIN);
+ PRINT_MACRO(LONG_LONG_MAX);
+ PRINT_MACRO(LONG_LONG_MIN);
+ PRINT_MACRO(LONG_MAX);
+ PRINT_MACRO(LONG_MIN);
+ PRINT_MACRO(MB_LEN_MAX);
+ PRINT_MACRO(SCHAR_MAX);
+ PRINT_MACRO(SCHAR_MIN);
+ PRINT_MACRO(SHRT_MAX);
+ PRINT_MACRO(SHRT_MIN);
+ PRINT_MACRO(UCHAR_MAX);
+ PRINT_MACRO(UINT_MAX);
+ PRINT_MACRO(ULLONG_MAX);
+ PRINT_MACRO(ULONG_LONG_MAX);
+ PRINT_MACRO(ULONG_MAX);
+ PRINT_MACRO(USHRT_MAX);
+
+ return 0;
+}
############################################################################
Commit: 5be46aaea5af9cc5e863a2d7b848e4355e2699da
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 10:03:17 2012 UTC
Cleanup. No functional change.
----------------------------------------------------------------------------
diff --git a/src/build/configure/test_limits_header.cpp
b/src/build/configure/test_limits_header.cpp
index bc6a162..7a3e8ee 100644
--- a/src/build/configure/test_limits_header.cpp
+++ b/src/build/configure/test_limits_header.cpp
@@ -2,6 +2,8 @@
* Copyright 2012, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
+
+
#include <limits.h>
#include <stdio.h>
@@ -14,13 +16,6 @@
int
main()
{
- // NOTE: #8730 -- these are the combined definitions from
- //
/boot/develop/abi/x86/gcc2/tools/gcc-2.95.3-haiku-111122/lib/gcc-lib/\
- // i586-pc-haiku/2.95.3-haiku-111122/include/limits.h
- // /boot/develop/abi/x86/gcc4/tools/gcc-4.6.2-haiku-120121/lib/gcc/\
- // i586-pc-haiku/4.6.2/install-tools/include/limits.h
- // sed -n -e '/\define[^d]/p' limits.h | sed -e 's/\#//' \
- // | awk '{ print "\tPRINT_MACRO\("$2"\);"}' | sort -u >
defs.cpp
PRINT_MACRO(__INT_MAX__);
PRINT_MACRO(__LONG_LONG_MAX__);
PRINT_MACRO(__LONG_MAX__);
############################################################################
Commit: 70af6abab7a5c75bc9288c437dc7dcd0c676ecaf
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 10:05:31 2012 UTC
Remove inlcusion of <limits.h>, as HaikuHostBuildConfig.h provides the values.
----------------------------------------------------------------------------
diff --git a/headers/build/posix_target/target_limits.h
b/headers/build/posix_target/target_limits.h
index 57f8b94..4fdf6d4 100644
--- a/headers/build/posix_target/target_limits.h
+++ b/headers/build/posix_target/target_limits.h
@@ -147,13 +147,4 @@
# define _POSIX2_LINE_MAX _HAIKU_BUILD_POSIX2_LINE_MAX
#endif
-/* _GCC_LIMITS_H_ is defined by GCC's internal limits.h to avoid
- * collisions with any defines in this file.
- */
-// TODO: #8730 Don't include_next limits.h here. ...
-// Instead define its contents here or defined in
HaikuHostBuildConfig.h
-#ifndef _GCC_LIMITS_H_
-# include_next <limits.h>
-#endif
-
#endif /* _LIBC_LIMITS_H_ */
############################################################################
Commit: b95dc538154d9abb4de3fca1365397e62a2d0628
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 10:36:19 2012 UTC
Whitespace cleanup. No functional change.
----------------------------------------------------------------------------
diff --git a/headers/build/os_target/target_BeBuild.h
b/headers/build/os_target/target_BeBuild.h
index a1ebcd3..e7c8975 100644
--- a/headers/build/os_target/target_BeBuild.h
+++ b/headers/build/os_target/target_BeBuild.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2010, Haiku, Inc. All Rights Reserved.
+ * Copyright 2007-2012, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _BE_BUILD_H
@@ -79,9 +79,9 @@
#define __HAIKU_BUILD_HAIKU_BUILD_IMPEXP_BE
#ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
-# define B_BEOS_VERSION_4
_HAIKU_BUILD_B_BEOS_VERSION_4
-# define B_BEOS_VERSION_4_5
_HAIKU_BUILD_B_BEOS_VERSION_4_5
-# define B_BEOS_VERSION_5
_HAIKU_BUILD_B_BEOS_VERSION_5
+# define B_BEOS_VERSION_4
_HAIKU_BUILD_B_BEOS_VERSION_4
+# define B_BEOS_VERSION_4_5
_HAIKU_BUILD_B_BEOS_VERSION_4_5
+# define B_BEOS_VERSION_5
_HAIKU_BUILD_B_BEOS_VERSION_5
# define B_BEOS_VERSION
_HAIKU_BUILD_B_BEOS_VERSION
# define B_BEOS_VERSION_MAUI
_HAIKU_BUILD_B_BEOS_VERSION_MAUI
diff --git a/headers/build/posix_target/target_stdint.h
b/headers/build/posix_target/target_stdint.h
index 9b067cd..07d3b00 100644
--- a/headers/build/posix_target/target_stdint.h
+++ b/headers/build/posix_target/target_stdint.h
@@ -91,8 +91,8 @@ typedef __haiku_build_uint64_t
_haiku_build_uintmax_t;
#define _HAIKU_BUILD_UINT_LEAST64_MAX UINT64_MAX
/* Limits of fastest minimum-width integer types */
-#define _HAIKU_BUILD_INT_FAST8_MIN INT8_MIN
-#define _HAIKU_BUILD_INT_FAST8_MAX INT8_MAX
+#define _HAIKU_BUILD_INT_FAST8_MIN INT8_MIN
+#define _HAIKU_BUILD_INT_FAST8_MAX INT8_MAX
#define _HAIKU_BUILD_UINT_FAST8_MAX UINT8_MAX
#define _HAIKU_BUILD_INT_FAST16_MIN INT16_MIN
@@ -151,10 +151,10 @@ typedef __haiku_build_uint64_t
_haiku_build_uintmax_t;
/* BSD compatibility */
-typedef __haiku_build_uint8_t u_int8_t;
-typedef __haiku_build_uint16_t u_int16_t;
-typedef __haiku_build_uint32_t u_int32_t;
-typedef __haiku_build_uint64_t u_int64_t;
+typedef __haiku_build_uint8_t u_int8_t;
+typedef __haiku_build_uint16_t u_int16_t;
+typedef __haiku_build_uint32_t u_int32_t;
+typedef __haiku_build_uint64_t u_int64_t;
#ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
/* Exact-width integer types */
Other related posts:
- » [haiku-commits] BRANCH mmadia-github.separate-build-environment - src/build/configure headers/build/posix_target headers/build/os_target - mmadia-github . separate-build-environment
