[haiku-commits] BRANCH mmadia-github.separate-build-environment - in headers/build: os_target os
- From: mmadia-github.separate-build-environment <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 3 Aug 2012 03:49:12 +0200 (CEST)
added 3 changesets to branch
'refs/remotes/mmadia-github/separate-build-environment'
old head: 22142d098b60014995cebad90ce85ef48ce34e09
new head: 37dfa8bbb433c915e0e71491515b6eb0a5da5d64
----------------------------------------------------------------------------
936081c: Updated os/BeBuild.h and added os_target/target_BeBuild.h
c72668a: Added missing #endif. Should have been part of previous commit.
37dfa8b: Add posix_target to the included header directories.
This allows target_Errors.h to locate target_limits.h
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 156 insertions(+), 74 deletions(-)
headers/build/os/BeBuild.h | 78 +------------
headers/build/os_target/target_BeBuild.h | 151 ++++++++++++++++++++++++++
src/build/libroot/Jamfile | 1 +
############################################################################
Commit: 936081c62403322b2bb5011d4a0cbc0c6439872b
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Thu Aug 2 21:01:29 2012 UTC
Updated os/BeBuild.h and added os_target/target_BeBuild.h
----------------------------------------------------------------------------
diff --git a/headers/build/os/BeBuild.h b/headers/build/os/BeBuild.h
index 3130e03..fb0d527 100644
--- a/headers/build/os/BeBuild.h
+++ b/headers/build/os/BeBuild.h
@@ -1,82 +1,12 @@
/*
- * 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
-#define _BE_BUILD_H
+#ifndef _HAIKU_BUILD_BE_BUILD_H
+#define _HAIKU_BUILD_BE_BUILD_H
-#include <config_build/HaikuConfig.h>
+#include "os_target/target_BeBuild.h"
-#define B_BEOS_VERSION_4 0x0400
-#define B_BEOS_VERSION_4_5 0x0450
-#define B_BEOS_VERSION_5 0x0500
-
-#define B_BEOS_VERSION B_BEOS_VERSION_5
-#define B_BEOS_VERSION_MAUI B_BEOS_VERSION_5
-
-/* Haiku (API) version */
-#define B_HAIKU_VERSION_BEOS 0x00000001
-#define B_HAIKU_VERSION_BONE 0x00000002
-#define B_HAIKU_VERSION_DANO 0x00000003
-#define B_HAIKU_VERSION_1_ALPHA_1 0x00000100
-#define B_HAIKU_VERSION_1_PRE_ALPHA_2 0x00000101
-#define B_HAIKU_VERSION_1 0x00010000
-
-#define B_HAIKU_VERSION
B_HAIKU_VERSION_1_PRE_ALPHA_2
-
-/* Haiku ABI */
-#define B_HAIKU_ABI_MAJOR 0xffff0000
-#define B_HAIKU_ABI_GCC_2 0x00020000
-#define B_HAIKU_ABI_GCC_4 0x00040000
-
-#define B_HAIKU_ABI_GCC_2_ANCIENT 0x00020000
-#define B_HAIKU_ABI_GCC_2_BEOS 0x00020001
-#define B_HAIKU_ABI_GCC_2_HAIKU 0x00020002
-
-#if __GNUC__ == 2
-# define B_HAIKU_ABI
B_HAIKU_ABI_GCC_2_HAIKU
-#elif __GNUC__ == 3 || __GNUC__ == 4
-# define B_HAIKU_ABI
B_HAIKU_ABI_GCC_4
-#else
-# error Unsupported gcc version!
#endif
-
-
-#define B_HAIKU_BITS __HAIKU_ARCH_BITS
-#define B_HAIKU_PHYSICAL_BITS __HAIKU_ARCH_PHYSICAL_BITS
-
-#ifdef __HAIKU_ARCH_64_BIT
-# define B_HAIKU_64_BIT 1
-#else
-# define B_HAIKU_32_BIT 1
-#endif
-
-#ifdef __HAIKU_ARCH_PHYSICAL_64_BIT
-# define B_HAIKU_PHYSICAL_64_BIT 1
-#else
-# define B_HAIKU_PHYSICAL_32_BIT 1
-#endif
-
-#ifdef __HAIKU_BEOS_COMPATIBLE
-# define B_HAIKU_BEOS_COMPATIBLE 1
-#endif
-
-
-#define _UNUSED(argument) argument
-#define _PACKED __attribute__((packed))
-#define _PRINTFLIKE(_format_, _args_) \
- __attribute__((format(__printf__, _format_, _args_)))
-#define _EXPORT
-#define _IMPORT
-
-#define B_DEFINE_SYMBOL_VERSION(function, versionedSymbol) \
- __asm__(".symver " function "," versionedSymbol)
-
-
-#define _IMPEXP_ROOT
-#define _IMPEXP_BE
-
-
-#endif /* _BE_BUILD_H */
diff --git a/headers/build/os_target/target_BeBuild.h
b/headers/build/os_target/target_BeBuild.h
new file mode 100644
index 0000000..edcb085
--- /dev/null
+++ b/headers/build/os_target/target_BeBuild.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2007-2010, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _BE_BUILD_H
+#define _BE_BUILD_H
+
+
+#include <config_target/target_types.h>
+
+
+#define _HAIKU_BUILD_B_BEOS_VERSION_4 0x0400
+#define _HAIKU_BUILD_B_BEOS_VERSION_4_5 0x0450
+#define _HAIKU_BUILD_B_BEOS_VERSION_5 0x0500
+
+#define _HAIKU_BUILD_B_BEOS_VERSION
_HAIKU_BUILD_B_BEOS_VERSION_5
+#define _HAIKU_BUILD_B_BEOS_VERSION_MAUI
_HAIKU_BUILD_B_BEOS_VERSION_5
+
+/* Haiku (API) version */
+#define _HAIKU_BUILD_B_HAIKU_VERSION_BEOS 0x00000001
+#define _HAIKU_BUILD_B_HAIKU_VERSION_BONE 0x00000002
+#define _HAIKU_BUILD_B_HAIKU_VERSION_DANO 0x00000003
+#define _HAIKU_BUILD_B_HAIKU_VERSION_1_ALPHA_1 0x00000100
+#define _HAIKU_BUILD_B_HAIKU_VERSION_1_PRE_ALPHA_2 0x00000101
+#define _HAIKU_BUILD_B_HAIKU_VERSION_1 0x00010000
+
+#define _HAIKU_BUILD_B_HAIKU_VERSION
_HAIKU_BUILD_B_HAIKU_VERSION_1_PRE_ALPHA_2
+
+/* Haiku ABI */
+#define _HAIKU_BUILD_B_HAIKU_ABI_MAJOR 0xffff0000
+#define _HAIKU_BUILD_B_HAIKU_ABI_GCC_2 0x00020000
+#define _HAIKU_BUILD_B_HAIKU_ABI_GCC_4 0x00040000
+
+#define _HAIKU_BUILD_B_HAIKU_ABI_GCC_2_ANCIENT 0x00020000
+#define _HAIKU_BUILD_B_HAIKU_ABI_GCC_2_BEOS 0x00020001
+#define _HAIKU_BUILD_B_HAIKU_ABI_GCC_2_HAIKU 0x00020002
+
+#if __GNUC__ == 2
+# define _HAIKU_BUILD_B_HAIKU_ABI
_HAIKU_BUILD_B_HAIKU_ABI_GCC_2_HAIKU
+#elif __GNUC__ == 3 || __GNUC__ == 4
+# define _HAIKU_BUILD_B_HAIKU_ABI
_HAIKU_BUILD_B_HAIKU_ABI_GCC_4
+#else
+# error Unsupported gcc version!
+#endif
+
+
+#define _HAIKU_BUILD_B_HAIKU_BITS
__HAIKU_BUILD_HAIKU_ARCH_BITS
+#define _HAIKU_BUILD_B_HAIKU_PHYSICAL_BITS
__HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_64_BIT
+# define _HAIKU_BUILD_B_HAIKU_64_BIT 1
+#else
+# define _HAIKU_BUILD_B_HAIKU_32_BIT 1
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_64_BIT
+# define _HAIKU_BUILD_B_HAIKU_PHYSICAL_64_BIT 1
+#else
+# define _HAIKU_BUILD_B_HAIKU_PHYSICAL_32_BIT 1
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_BEOS_COMPATIBLE
+# define _HAIKU_BUILD_B_HAIKU_BEOS_COMPATIBLE 1
+#endif
+
+
+#define __HAIKU_BUILD_HAIKU_BUILD_UNUSED(argument) argument
+#define __HAIKU_BUILD_HAIKU_BUILD_PACKED __attribute__((packed))
+#define __HAIKU_BUILD_HAIKU_BUILD_PRINTFLIKE(_format_, _args_) \
+ __attribute__((format(__printf__, _format_, _args_)))
+#define __HAIKU_BUILD_HAIKU_BUILD_EXPORT
+#define __HAIKU_BUILD_HAIKU_BUILD_IMPORT
+
+#define _HAIKU_BUILD_B_DEFINE_SYMBOL_VERSION(function, versionedSymbol)
\
+ __asm__(".symver " function "," versionedSymbol)
+
+
+#define __HAIKU_BUILD_HAIKU_BUILD_IMPEXP_ROOT
+#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
_HAIKU_BUILD_B_BEOS_VERSION
+# define B_BEOS_VERSION_MAUI
_HAIKU_BUILD_B_BEOS_VERSION_MAUI
+
+/* Haiku (API) version */
+# define B_HAIKU_VERSION_BEOS
_HAIKU_BUILD_B_HAIKU_VERSION_BEOS
+# define B_HAIKU_VERSION_BONE
_HAIKU_BUILD_B_HAIKU_VERSION_BONE
+# define B_HAIKU_VERSION_DANO
_HAIKU_BUILD_B_HAIKU_VERSION_DANO
+# define B_HAIKU_VERSION_1_ALPHA_1
_HAIKU_BUILD_B_HAIKU_VERSION_1_ALPHA_1
+# define B_HAIKU_VERSION_1_PRE_ALPHA_2
_HAIKU_BUILD_B_HAIKU_VERSION_1_PRE_ALPHA_2
+# define B_HAIKU_VERSION_1
_HAIKU_BUILD_B_HAIKU_VERSION_1
+
+# define B_HAIKU_VERSION
_HAIKU_BUILD_B_HAIKU_VERSION
+
+/* Haiku ABI */
+# define B_HAIKU_ABI_MAJOR
_HAIKU_BUILD_B_HAIKU_ABI_MAJOR
+# define B_HAIKU_ABI_GCC_2
_HAIKU_BUILD_B_HAIKU_ABI_GCC_2
+# define B_HAIKU_ABI_GCC_4
_HAIKU_BUILD_B_HAIKU_ABI_GCC_4
+
+# define B_HAIKU_ABI_GCC_2_ANCIENT
_HAIKU_BUILD_B_HAIKU_ABI_GCC_2_ANCIENT
+# define B_HAIKU_ABI_GCC_2_BEOS
_HAIKU_BUILD_B_HAIKU_ABI_GCC_2_BEOS
+# define B_HAIKU_ABI_GCC_2_HAIKU
_HAIKU_BUILD_B_HAIKU_ABI_GCC_2_HAIKU
+
+# if __GNUC__ == 2 || __GNUC__ == 3 || __GNUC__ == 4
+# define B_HAIKU_ABI
_HAIKU_BUILD_B_HAIKU_ABI
+# else
+# error Unsupported gcc version!
+# endif
+
+
+# define B_HAIKU_BITS
_HAIKU_BUILD_B_HAIKU_BITS
+# define B_HAIKU_PHYSICAL_BITS
_HAIKU_BUILD_B_HAIKU_PHYSICAL_BITS
+
+# ifdef __HAIKU_ARCH_64_BIT
+# define B_HAIKU_64_BIT
_HAIKU_BUILD_B_HAIKU_64_BIT
+# else
+# define B_HAIKU_32_BIT
_HAIKU_BUILD_B_HAIKU_32_BIT
+# endif
+
+# ifdef __HAIKU_ARCH_PHYSICAL_64_BIT
+# define B_HAIKU_PHYSICAL_64_BIT
_HAIKU_BUILD_B_HAIKU_PHYSICAL_64_BIT
+# else
+# define B_HAIKU_PHYSICAL_32_BIT
_HAIKU_BUILD_B_HAIKU_PHYSICAL_32_BIT
+# endif
+
+# ifdef __HAIKU_BEOS_COMPATIBLE
+# define B_HAIKU_BEOS_COMPATIBLE
_HAIKU_BUILD_B_HAIKU_BEOS_COMPATIBLE
+# endif
+
+
+# define _UNUSED(argument) __HAIKU_BUILD_HAIKU_BUILD_UNUSED(argument)
+# define _PACKED __HAIKU_BUILD_HAIKU_BUILD_PACKED
+# define _PRINTFLIKE(_format_, _args_) \
+ __HAIKU_BUILD_HAIKU_BUILD_PRINTFLIKE(_format_, _args_)
+# define _EXPORT
+# define _IMPORT
+
+# define B_DEFINE_SYMBOL_VERSION(function, versionedSymbol) \
+ _HAIKU_BUILD_B_DEFINE_SYMBOL_VERSION(function, versionedSymbol)
+
+
+# define _IMPEXP_ROOT
+# define _IMPEXP_BE
+
+
+#endif /* _BE_BUILD_H */
############################################################################
Commit: c72668ab9aaa16cfda79ee5dc135788648dbb7fc
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Thu Aug 2 21:03:36 2012 UTC
Added missing #endif. Should have been part of previous commit.
----------------------------------------------------------------------------
diff --git a/headers/build/os_target/target_BeBuild.h
b/headers/build/os_target/target_BeBuild.h
index edcb085..a1ebcd3 100644
--- a/headers/build/os_target/target_BeBuild.h
+++ b/headers/build/os_target/target_BeBuild.h
@@ -145,6 +145,7 @@
# define _IMPEXP_ROOT
# define _IMPEXP_BE
+#endif /* _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER */
#endif /* _BE_BUILD_H */
############################################################################
Commit: 37dfa8bbb433c915e0e71491515b6eb0a5da5d64
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Thu Aug 2 21:25:43 2012 UTC
Add posix_target to the included header directories.
This allows target_Errors.h to locate target_limits.h
----------------------------------------------------------------------------
diff --git a/src/build/libroot/Jamfile b/src/build/libroot/Jamfile
index dc05049..853758b 100644
--- a/src/build/libroot/Jamfile
+++ b/src/build/libroot/Jamfile
@@ -8,6 +8,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers build os_target
kernel ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) headers build os_target interface ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) headers build os_target storage ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) headers build os_target support ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) headers build posix_target ] : true ;
UsePrivateBuildHeaders kernel system ;
Other related posts:
- » [haiku-commits] BRANCH mmadia-github.separate-build-environment - in headers/build: os_target os - mmadia-github . separate-build-environment
