added 4 changesets to branch 'refs/remotes/mmadia-github/separate-build-environment' old head: 8ae39d402e149014b65a45856c82561e881140cb new head: ae1d7d1579b2a5f8235889a5e76b9e106f275df7 ---------------------------------------------------------------------------- 8f35e4f: Add the definitions from float.h to HaikuHostBuildConfig.h The definition names are taken from Haiku's * gcc-2.95.3-haiku-111122/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-111122/include * gcc-4.6.2-haiku-120121/lib/gcc/i586-pc-haiku/4.6.2/include 1038942: Print comments to indicate which header is used for HaikuHostBuildConfig.h f99660f: Don't include float.h, as HaikuHostBuildConfig. will contain the defs. ae1d7d1: Removed completed TODO. No functional changes. [ Matt Madia <mattmadia@xxxxxxxxx> ] ---------------------------------------------------------------------------- 5 files changed, 92 insertions(+), 9 deletions(-) headers/build/posix_target/target_limits.h | 9 --- src/build/configure/Jamfile | 1 + src/build/configure/test_float_header.cpp | 86 ++++++++++++++++++++++++ src/build/configure/test_int_types.cpp | 3 + src/build/configure/test_limits_header.cpp | 2 + ############################################################################ Commit: 8f35e4f1b3bad4c6431ec05bb866dc45b9aacc34 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Aug 5 16:05:24 2012 UTC Add the definitions from float.h to HaikuHostBuildConfig.h The definition names are taken from Haiku's * gcc-2.95.3-haiku-111122/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-111122/include * gcc-4.6.2-haiku-120121/lib/gcc/i586-pc-haiku/4.6.2/include ---------------------------------------------------------------------------- diff --git a/src/build/configure/Jamfile b/src/build/configure/Jamfile index 7235afb..53e1577 100644 --- a/src/build/configure/Jamfile +++ b/src/build/configure/Jamfile @@ -67,6 +67,7 @@ actions ConfigureRunProgram1 ConfigureRunProgram test_int_types : test_int_types.cpp : $(HOST_LIBSTDC++) ; ConfigureRunProgram test_limits_header : test_limits_header.cpp : $(HOST_LIBSTDC++) ; +ConfigureRunProgram test_float_header : test_float_header.cpp : $(HOST_LIBSTDC++) ; Depends configure_build : $(configureTargets) ; diff --git a/src/build/configure/test_float_header.cpp b/src/build/configure/test_float_header.cpp new file mode 100644 index 0000000..74abfab --- /dev/null +++ b/src/build/configure/test_float_header.cpp @@ -0,0 +1,84 @@ +/* + * Copyright 2012, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + */ + + +#include <float.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() +{ + PRINT_MACRO(__LDBL_UNION__); + PRINT_MACRO(DBL_DECIMAL_DIG); + PRINT_MACRO(DBL_DIG); + PRINT_MACRO(DBL_EPSILON); + PRINT_MACRO(DBL_HAS_SUBNORM); + PRINT_MACRO(DBL_MANT_DIG); + PRINT_MACRO(DBL_MAX_10_EXP); + PRINT_MACRO(DBL_MAX_EXP); + PRINT_MACRO(DBL_MAX); + PRINT_MACRO(DBL_MIN_10_EXP); + PRINT_MACRO(DBL_MIN_EXP); + PRINT_MACRO(DBL_MIN); + PRINT_MACRO(DBL_TRUE_MIN); + PRINT_MACRO(DEC_EVAL_METHOD); + PRINT_MACRO(DEC128_EPSILON); + PRINT_MACRO(DEC128_MANT_DIG); + PRINT_MACRO(DEC128_MAX_EXP); + PRINT_MACRO(DEC128_MAX); + PRINT_MACRO(DEC128_MIN_EXP); + PRINT_MACRO(DEC128_MIN); + PRINT_MACRO(DEC128_SUBNORMAL_MIN); + PRINT_MACRO(DEC32_EPSILON); + PRINT_MACRO(DEC32_MANT_DIG); + PRINT_MACRO(DEC32_MAX_EXP); + PRINT_MACRO(DEC32_MAX); + PRINT_MACRO(DEC32_MIN_EXP); + PRINT_MACRO(DEC32_MIN); + PRINT_MACRO(DEC32_SUBNORMAL_MIN); + PRINT_MACRO(DEC64_EPSILON); + PRINT_MACRO(DEC64_MANT_DIG); + PRINT_MACRO(DEC64_MAX_EXP); + PRINT_MACRO(DEC64_MAX); + PRINT_MACRO(DEC64_MIN_EXP); + PRINT_MACRO(DEC64_MIN); + PRINT_MACRO(DEC64_SUBNORMAL_MIN); + PRINT_MACRO(DECIMAL_DIG); + PRINT_MACRO(FLT_DECIMAL_DIG); + PRINT_MACRO(FLT_DIG); + PRINT_MACRO(FLT_EPSILON); + PRINT_MACRO(FLT_EVAL_METHOD); + PRINT_MACRO(FLT_HAS_SUBNORM); + PRINT_MACRO(FLT_MANT_DIG); + PRINT_MACRO(FLT_MAX_10_EXP); + PRINT_MACRO(FLT_MAX_EXP); + PRINT_MACRO(FLT_MAX); + PRINT_MACRO(FLT_MIN_10_EXP); + PRINT_MACRO(FLT_MIN_EXP); + PRINT_MACRO(FLT_MIN); + PRINT_MACRO(FLT_RADIX); + PRINT_MACRO(FLT_ROUNDS); + PRINT_MACRO(FLT_TRUE_MIN); + PRINT_MACRO(LDBL_DECIMAL_DIG); + PRINT_MACRO(LDBL_DIG); + PRINT_MACRO(LDBL_EPSILON); + PRINT_MACRO(LDBL_HAS_SUBNORM); + PRINT_MACRO(LDBL_MANT_DIG); + PRINT_MACRO(LDBL_MAX_10_EXP); + PRINT_MACRO(LDBL_MAX_EXP); + PRINT_MACRO(LDBL_MAX); + PRINT_MACRO(LDBL_MIN_10_EXP); + PRINT_MACRO(LDBL_MIN_EXP); + PRINT_MACRO(LDBL_MIN); + PRINT_MACRO(LDBL_TRUE_MIN); + + return 0; +} ############################################################################ Commit: 1038942177b177cf03f347d76f5454077d45a718 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Aug 5 16:11:16 2012 UTC Print comments to indicate which header is used for HaikuHostBuildConfig.h ---------------------------------------------------------------------------- diff --git a/src/build/configure/test_float_header.cpp b/src/build/configure/test_float_header.cpp index 74abfab..c21c036 100644 --- a/src/build/configure/test_float_header.cpp +++ b/src/build/configure/test_float_header.cpp @@ -16,6 +16,7 @@ int main() { + printf("/* float.h */\n"); PRINT_MACRO(__LDBL_UNION__); PRINT_MACRO(DBL_DECIMAL_DIG); PRINT_MACRO(DBL_DIG); @@ -79,6 +80,7 @@ main() PRINT_MACRO(LDBL_MIN_EXP); PRINT_MACRO(LDBL_MIN); PRINT_MACRO(LDBL_TRUE_MIN); + printf("\n"); return 0; } diff --git a/src/build/configure/test_int_types.cpp b/src/build/configure/test_int_types.cpp index 6937c2b..32ea8c1 100644 --- a/src/build/configure/test_int_types.cpp +++ b/src/build/configure/test_int_types.cpp @@ -63,9 +63,12 @@ struct PrintTypeInfo { int main() { + printf("/* inttypes.h */\n"); PRINT_TYPE_INFO_SIGNED_AND_UNSIGNED(int8); PRINT_TYPE_INFO_SIGNED_AND_UNSIGNED(int16); PRINT_TYPE_INFO_SIGNED_AND_UNSIGNED(int32); PRINT_TYPE_INFO_SIGNED_AND_UNSIGNED(int64); + printf("\n"); + return 0; } diff --git a/src/build/configure/test_limits_header.cpp b/src/build/configure/test_limits_header.cpp index 7a3e8ee..0a29a03 100644 --- a/src/build/configure/test_limits_header.cpp +++ b/src/build/configure/test_limits_header.cpp @@ -16,6 +16,7 @@ int main() { + printf("/* limits.h */\n"); PRINT_MACRO(__INT_MAX__); PRINT_MACRO(__LONG_LONG_MAX__); PRINT_MACRO(__LONG_MAX__); @@ -43,6 +44,7 @@ main() PRINT_MACRO(ULONG_LONG_MAX); PRINT_MACRO(ULONG_MAX); PRINT_MACRO(USHRT_MAX); + printf("\n"); return 0; } ############################################################################ Commit: f99660f62b31b01275d367c4ec1bdf3fe67f790b Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Aug 5 16:13:21 2012 UTC Don't include float.h, as HaikuHostBuildConfig. will contain the defs. ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/target_limits.h b/headers/build/posix_target/target_limits.h index 53f7024..7e86881 100644 --- a/headers/build/posix_target/target_limits.h +++ b/headers/build/posix_target/target_limits.h @@ -8,8 +8,6 @@ #include <config_target/target_types.h> -#include <float.h> /* for DBL_DIG, FLT_DIG, etc */ - /* TODO: #8730 -- The values for _HAIKU_BUILD_LONGLONG_MIN, _HAIKU_BUILD_LONGLONG_MAX are compiler specific. Their values could be incorrect (when long long isn't 64 bit). ############################################################################ Commit: ae1d7d1579b2a5f8235889a5e76b9e106f275df7 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Aug 5 16:14:53 2012 UTC Removed completed TODO. No functional changes. ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/target_limits.h b/headers/build/posix_target/target_limits.h index 7e86881..aa4415e 100644 --- a/headers/build/posix_target/target_limits.h +++ b/headers/build/posix_target/target_limits.h @@ -8,13 +8,6 @@ #include <config_target/target_types.h> -/* TODO: #8730 -- The values for _HAIKU_BUILD_LONGLONG_MIN, - _HAIKU_BUILD_LONGLONG_MAX are compiler specific. - Their values could be incorrect (when long long isn't 64 bit). - - Get the values via HaikuHostBuildConfig.h -*/ - #define _HAIKU_BUILD_LONGLONG_MIN _HAIKU_BUILD_FEATURE_LLONG_MIN #define _HAIKU_BUILD_LONGLONG_MAX _HAIKU_BUILD_FEATURE_LLONG_MAX #define _HAIKU_BUILD_ULONGLONG_MAX _HAIKU_BUILD_FEATURE_ULLONG_MAX