[haiku-commits] BRANCH mmadia-github.separate-build-environment - headers/build/config_build src/build/libroot build/jam headers/build src/tools
- From: mmadia-github.separate-build-environment <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 21 Jul 2012 23:49:16 +0200 (CEST)
added 2 changesets to branch
'refs/remotes/mmadia-github/separate-build-environment'
old head: 0000000000000000000000000000000000000000
new head: d35712854313a97573cfb0c1c8370eb9fd9b6e80
----------------------------------------------------------------------------
58961f9: Brutally remove references to [BeOS|Haiku]BuildCompatibility.h
d357128: Applied HaikuBuild.h and HaikuConfig.h changes from Ingo's patch.
From full-host-abstraction.diff attached to #8730.
I'm not sure if the defined value for __HAIKU_BUILD_HAIKU_ARCH_HEADER(header)
should be adjusted to <arch/__HAIKU_BUILD_HAIKU_ARCH/header>, instead of the
original value of <arch/__HAIKU_ARCH/header>
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
18 files changed, 180 insertions(+), 76 deletions(-)
build/jam/BuildSetup | 22 +++--
headers/build/HaikuBuild.h | 28 ++++++
headers/build/config_build/HaikuConfig.h | 133 +++++++++++++++++++-------
src/build/libhaikucompat/Jamfile | 6 +-
src/build/libroot/atomic.cpp | 8 +-
src/build/libroot/byteorder.cpp | 10 +-
src/build/libroot/fs.cpp | 5 +-
src/build/libroot/fs_attr_generic.cpp | 2 +-
src/build/libroot/fs_attr_untyped.cpp | 2 +-
src/build/libroot/fs_descriptors.cpp | 4 +-
src/build/libroot/misc.cpp | 2 +-
src/build/libroot/sem.cpp | 2 +-
src/build/libroot/thread.cpp | 4 +-
src/tools/Jamfile | 5 +-
src/tools/bfs_shell/Jamfile | 2 +-
src/tools/fs_shell/Jamfile | 2 +-
src/tools/fs_shell/compatibility.h | 14 +--
src/tools/locale/Jamfile | 5 +-
############################################################################
Commit: 58961f9acb3d945d6ebf85623bc3229bc46387ac
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sat Jul 21 16:35:50 2012 UTC
Brutally remove references to [BeOS|Haiku]BuildCompatibility.h
----------------------------------------------------------------------------
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 87129f4..28808ff 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -778,10 +778,10 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
HOST_LIBRARY_NAME_MAP_input_server = /system/servers/input_server ;
HOST_DEFINES += __STDC_FORMAT_MACROS __STDC_LIMIT_MACROS ;
- local compatibilityHeader = -include [ FDirName $(HAIKU_TOP) headers
build
- HaikuBuildCompatibility.h ] ;
- HOST_CCFLAGS += $(compatibilityHeader) ;
- HOST_C++FLAGS += $(compatibilityHeader) ;
+# local compatibilityHeader = -include [ FDirName $(HAIKU_TOP) headers
build
+# HaikuBuildCompatibility.h ] ;
+# HOST_CCFLAGS += $(compatibilityHeader) ;
+# HOST_C++FLAGS += $(compatibilityHeader) ;
# compatibility library
HOST_HAIKU_COMPATIBILITY_LIBS = libhaikucompat.a ;
@@ -924,8 +924,12 @@ if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
[ FDirName $(HAIKU_TOP) headers build os support ]
[ FDirName $(HAIKU_TOP) headers build private ]
;
- HOST_BE_API_CCFLAGS = -include BeOSBuildCompatibility.h ;
+# HOST_BE_API_CCFLAGS = -include BeOSBuildCompatibility.h ;
+# NOTE: -nostdinc was taken from full-host-abstraction.diff
+# uncertain if needed.
+ HOST_BE_API_CCFLAGS += -nostdinc ;
HOST_BE_API_C++FLAGS = $(HOST_BE_API_CCFLAGS) ;
+ HOST_BE_API_C++FLAGS += -nostdinc++ ;
}
# Add directory with system headers we need when building something for the
host
@@ -1068,10 +1072,10 @@ if $(HOST_PLATFORM_IS_64_BIT) {
if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) && $(TARGET_PLATFORM_BEOS_COMPATIBLE)
{
# headers and flags
- local compatibilityHeader = -include [ FDirName $(HAIKU_TOP) headers
build
- HaikuBuildCompatibility.h ] ;
- TARGET_CCFLAGS += $(compatibilityHeader) ;
- TARGET_C++FLAGS += $(compatibilityHeader) ;
+# local compatibilityHeader = -include [ FDirName $(HAIKU_TOP) headers
build
+# HaikuBuildCompatibility.h ] ;
+# TARGET_CCFLAGS += $(compatibilityHeader) ;
+# TARGET_C++FLAGS += $(compatibilityHeader) ;
# compatibility library
TARGET_HAIKU_COMPATIBILITY_LIBS = libhaikucompat.a ;
diff --git a/src/build/libhaikucompat/Jamfile b/src/build/libhaikucompat/Jamfile
index 2003b8d..b199a7f 100644
--- a/src/build/libhaikucompat/Jamfile
+++ b/src/build/libhaikucompat/Jamfile
@@ -38,9 +38,9 @@ if $(HOST_PLATFORM) in r5 bone dano {
ObjectDefines $(libbePatchSources) : _IMPEXP_BE=
USING_HAIKU_TYPE_CONSTANTS_H= ;
}
- ObjectC++Flags $(libbePatchSources)
- : -include [ FDirName $(HAIKU_TOP) headers build
- HaikuBuildCompatibility.h ] ;
+# ObjectC++Flags $(libbePatchSources)
+# : -include [ FDirName $(HAIKU_TOP) headers build
+# HaikuBuildCompatibility.h ] ;
}
BuildPlatformStaticLibrary libhaikucompat_build.a :
diff --git a/src/build/libroot/atomic.cpp b/src/build/libroot/atomic.cpp
index f7a7269..b929f16 100644
--- a/src/build/libroot/atomic.cpp
+++ b/src/build/libroot/atomic.cpp
@@ -1,8 +1,8 @@
-#include <BeOSBuildCompatibility.h>
+//#include <BeOSBuildCompatibility.h>
-#include <string.h>
+//#include <string.h>
-#include <OS.h>
+//#include <OS.h>
#include <SupportDefs.h>
@@ -44,7 +44,7 @@ atomic_and(vint32 *value, int32 andValue)
int32
-atomic_or(vint32 *value, int32 orValue)
+atomic_or(vint32 *value, int32 orValue)
{
int32 oldValue = *value;
*value |= orValue;
diff --git a/src/build/libroot/byteorder.cpp b/src/build/libroot/byteorder.cpp
index fdcbf32..49274ae 100644
--- a/src/build/libroot/byteorder.cpp
+++ b/src/build/libroot/byteorder.cpp
@@ -1,9 +1,9 @@
-#ifdef BUILDING_FS_SHELL
-# include "compat.h"
-#else
-# include <BeOSBuildCompatibility.h>
-#endif
+//#ifdef BUILDING_FS_SHELL
+//# include "compat.h"
+//#else
+//# include <BeOSBuildCompatibility.h>
+//#endif
#include <ByteOrder.h>
diff --git a/src/build/libroot/fs.cpp b/src/build/libroot/fs.cpp
index 13a0fdd..3747777 100644
--- a/src/build/libroot/fs.cpp
+++ b/src/build/libroot/fs.cpp
@@ -4,7 +4,7 @@
*/
-#include <BeOSBuildCompatibility.h>
+//#include <BeOSBuildCompatibility.h>
#include "fs_impl.h"
@@ -13,6 +13,7 @@
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <utime.h>
#include <sys/stat.h>
@@ -119,7 +120,7 @@ utimes_helper(File& file, const struct timespec times[2])
timeBuffer[1] = now;
}
- return file.SetTimes(timeBuffer);
+ return file.SetTimes(timeBuffer);
}
#endif // _HAIKU_BUILD_NO_FUTIMENS || _HAIKU_BUILD_NO_FUTIMENS
diff --git a/src/build/libroot/fs_attr_generic.cpp
b/src/build/libroot/fs_attr_generic.cpp
index c43875b..3db1968 100644
--- a/src/build/libroot/fs_attr_generic.cpp
+++ b/src/build/libroot/fs_attr_generic.cpp
@@ -1,5 +1,5 @@
-#include <BeOSBuildCompatibility.h>
+//#include <BeOSBuildCompatibility.h>
#include <syscalls.h>
#include <dirent.h>
diff --git a/src/build/libroot/fs_attr_untyped.cpp
b/src/build/libroot/fs_attr_untyped.cpp
index 02ea2af..e47b30c 100644
--- a/src/build/libroot/fs_attr_untyped.cpp
+++ b/src/build/libroot/fs_attr_untyped.cpp
@@ -17,7 +17,7 @@
# define B_ENTRY_NOT_FOUND ENOENT
# define B_NO_MEMORY ENOMEM
#else
-# include <BeOSBuildCompatibility.h>
+//# include <BeOSBuildCompatibility.h>
# include <syscalls.h>
# include "fs_impl.h"
diff --git a/src/build/libroot/fs_descriptors.cpp
b/src/build/libroot/fs_descriptors.cpp
index 68103e3..6b1017a 100644
--- a/src/build/libroot/fs_descriptors.cpp
+++ b/src/build/libroot/fs_descriptors.cpp
@@ -8,8 +8,8 @@
# include "compat.h"
# define B_OK 0
# define B_FILE_ERROR EBADF
-#else
-# include <BeOSBuildCompatibility.h>
+//#else
+//# include <BeOSBuildCompatibility.h>
#endif
#include "fs_descriptors.h"
diff --git a/src/build/libroot/misc.cpp b/src/build/libroot/misc.cpp
index 52c74f6..b11a324 100644
--- a/src/build/libroot/misc.cpp
+++ b/src/build/libroot/misc.cpp
@@ -1,5 +1,5 @@
-#include <BeOSBuildCompatibility.h>
+//#include <BeOSBuildCompatibility.h>
#include <errno.h>
#include <stdio.h>
diff --git a/src/build/libroot/sem.cpp b/src/build/libroot/sem.cpp
index 0e2d0c9..1a9116b 100644
--- a/src/build/libroot/sem.cpp
+++ b/src/build/libroot/sem.cpp
@@ -1,5 +1,5 @@
-#include <BeOSBuildCompatibility.h>
+//#include <BeOSBuildCompatibility.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/build/libroot/thread.cpp b/src/build/libroot/thread.cpp
index 7998694..2441c48 100644
--- a/src/build/libroot/thread.cpp
+++ b/src/build/libroot/thread.cpp
@@ -1,5 +1,5 @@
-#include <BeOSBuildCompatibility.h>
+//#include <BeOSBuildCompatibility.h>
#include <OS.h>
@@ -33,7 +33,7 @@ find_thread(const char *name)
{
if (name != NULL)
return B_ENTRY_NOT_FOUND;
-
+
return kMainThreadID;
}
diff --git a/src/tools/Jamfile b/src/tools/Jamfile
index dbb92b2..bb37fc0 100644
--- a/src/tools/Jamfile
+++ b/src/tools/Jamfile
@@ -27,8 +27,9 @@ local libHaikuCompat ;
if $(HOST_PLATFORM) in r5 bone dano {
ObjectC++Flags database_support.cpp UpdateMimeInfoThread.cpp
MimeUpdateThread.cpp
- : -include [ FDirName $(HAIKU_TOP) headers build
- HaikuBuildCompatibility.h ] ;
+# TODO: ticket8730
+# : -include [ FDirName $(HAIKU_TOP) headers build
+# HaikuBuildCompatibility.h ] ;
libHaikuCompat = libhaikucompat_build.a ;
}
diff --git a/src/tools/bfs_shell/Jamfile b/src/tools/bfs_shell/Jamfile
index 264275e..5540c58 100644
--- a/src/tools/bfs_shell/Jamfile
+++ b/src/tools/bfs_shell/Jamfile
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src tools bfs_shell ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems bfs ]
;
# prevent inclusion of HaikuBuildCompatibility.h
-DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
+#DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
# set some additional defines
{
diff --git a/src/tools/fs_shell/Jamfile b/src/tools/fs_shell/Jamfile
index 1ef5e33..2febcad 100644
--- a/src/tools/fs_shell/Jamfile
+++ b/src/tools/fs_shell/Jamfile
@@ -15,7 +15,7 @@ UsePrivateHeaders shared ;
DEFINES += FS_SHELL=1 ;
# prevent inclusion of HaikuBuildCompatibility.h
-DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
+#DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
# platform specific sources/libraries
local fsShellCommandSources ;
diff --git a/src/tools/fs_shell/compatibility.h
b/src/tools/fs_shell/compatibility.h
index 2a88aa5..60d4169 100644
--- a/src/tools/fs_shell/compatibility.h
+++ b/src/tools/fs_shell/compatibility.h
@@ -5,13 +5,13 @@
#ifndef _FSSH_COMPATIBILITY_H
#define _FSSH_COMPATIBILITY_H
-#if (defined(__BEOS__) || defined(__HAIKU__))
-# ifndef HAIKU_HOST_PLATFORM_HAIKU
-# include <HaikuBuildCompatibility.h>
-# endif
-#else
-# include <BeOSBuildCompatibility.h>
-#endif
+//#if (defined(__BEOS__) || defined(__HAIKU__))
+//# ifndef HAIKU_HOST_PLATFORM_HAIKU
+//# include <HaikuBuildCompatibility.h>
+//# endif
+//#else
+//# include <BeOSBuildCompatibility.h>
+//#endif
#endif // _FSSH_COMPATIBILITY_H
diff --git a/src/tools/locale/Jamfile b/src/tools/locale/Jamfile
index 1e47eaa..e2a285b 100644
--- a/src/tools/locale/Jamfile
+++ b/src/tools/locale/Jamfile
@@ -25,8 +25,9 @@ local libHaikuCompat ;
if $(HOST_PLATFORM) in r5 bone dano {
ObjectC++Flags database_support.cpp UpdateMimeInfoThread.cpp
MimeUpdateThread.cpp
- : -include [ FDirName $(HAIKU_TOP) headers build
- HaikuBuildCompatibility.h ] ;
+#TODO: ticket8730
+# : -include [ FDirName $(HAIKU_TOP) headers build
+# HaikuBuildCompatibility.h ] ;
libHaikuCompat = libhaikucompat_build.a ;
}
############################################################################
Commit: d35712854313a97573cfb0c1c8370eb9fd9b6e80
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sat Jul 21 16:47:26 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8730
Applied HaikuBuild.h and HaikuConfig.h changes from Ingo's patch.
From full-host-abstraction.diff attached to #8730.
I'm not sure if the defined value for __HAIKU_BUILD_HAIKU_ARCH_HEADER(header)
should be adjusted to <arch/__HAIKU_BUILD_HAIKU_ARCH/header>, instead of the
original value of <arch/__HAIKU_ARCH/header>
----------------------------------------------------------------------------
diff --git a/headers/build/HaikuBuild.h b/headers/build/HaikuBuild.h
new file mode 100644
index 0000000..79b5933
--- /dev/null
+++ b/headers/build/HaikuBuild.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2012 Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _HAIKU_BUILD_H
+#define _HAIKU_BUILD_H
+
+
+#include <HaikuHostBuildConfig.h>
+
+
+#define _HAIKU_BUILD_STRING(string)
+#define _HAIKU_BUILD_ASMNAME(name) \
+ _HAIKU_BUILD_STRING(__USER_LABEL_PREFIX__) name
+
+
+#ifdef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
+# define _HAIKU_BUILD_DECLARE_FUNCTION(returnValue, name, parameters)
\
+ returnValue _haiku_build_##name parameters;
+#else
+# define _HAIKU_BUILD_DECLARE_FUNCTION(returnValue, name, parameters)
\
+ returnValue _haiku_build_##name parameters;
\
+ returnValue name parameters
\
+ __asm__(_HAIKU_BUILD_ASMNAME("_haiku_build_" #name));
+#endif
+
+
+#endif /* _HAIKU_BUILD_H */
diff --git a/headers/build/config_build/HaikuConfig.h
b/headers/build/config_build/HaikuConfig.h
index 8d49522..2d44499 100644
--- a/headers/build/config_build/HaikuConfig.h
+++ b/headers/build/config_build/HaikuConfig.h
@@ -1,11 +1,14 @@
/*
- * Copyright 2009-2010, Haiku, Inc. All Rights Reserved.
+ * Copyright 2009-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _CONFIG_HAIKU_CONFIG_H
#define _CONFIG_HAIKU_CONFIG_H
+#include <HaikuBuild.h>
+
+
/* Determine the architecture and define macros for some fundamental
properties:
__HAIKU_ARCH - short name of the
architecture (used in paths)
@@ -18,26 +21,26 @@
(defaults to
undefined)
*/
#ifdef __INTEL__
-# define __HAIKU_ARCH x86
-# define __HAIKU_ARCH_X86 1
+# define __HAIKU_BUILD_HAIKU_ARCH x86
+# define __HAIKU_BUILD_HAIKU_ARCH_X86 1
#elif __x86_64__
-# define __HAIKU_ARCH x86_64
-# define __HAIKU_ARCH_X86_64 1
-# define __HAIKU_ARCH_BITS 64
+# define __HAIKU_BUILD_HAIKU_ARCH x86_64
+# define __HAIKU_BUILD_HAIKU_ARCH_X86_64 1
+# define __HAIKU_BUILD_HAIKU_ARCH_BITS 64
#elif __POWERPC__
-# define __HAIKU_ARCH ppc
-# define __HAIKU_ARCH_PPC 1
-# define __HAIKU_BIG_ENDIAN 1
+# define __HAIKU_BUILD_HAIKU_ARCH ppc
+# define __HAIKU_BUILD_HAIKU_ARCH_PPC 1
+# define __HAIKU_BUILD_HAIKU_BIG_ENDIAN 1
#elif __M68K__
-# define __HAIKU_ARCH m68k
-# define __HAIKU_ARCH_M68K 1
-# define __HAIKU_BIG_ENDIAN 1
+# define __HAIKU_BUILD_HAIKU_ARCH m68k
+# define __HAIKU_BUILD_HAIKU_ARCH_M68K 1
+# define __HAIKU_BUILD_HAIKU_BIG_ENDIAN 1
#elif __MIPSEL__
-# define __HAIKU_ARCH mipsel
-# define __HAIKU_ARCH_MIPSEL 1
+# define __HAIKU_BUILD_HAIKU_ARCH mipsel
+# define __HAIKU_BUILD_HAIKU_ARCH_MIPSEL 1
#elif __ARM__
-# define __HAIKU_ARCH arm
-# define __HAIKU_ARCH_ARM 1
+# define __HAIKU_BUILD_HAIKU_ARCH arm
+# define __HAIKU_BUILD_HAIKU_ARCH_ARM 1
#else
# error Unsupported architecture!
#endif
@@ -53,40 +56,106 @@
*/
/* bitness */
-#ifndef __HAIKU_ARCH_BITS
-# define __HAIKU_ARCH_BITS 32
+#ifndef __HAIKU_BUILD_HAIKU_ARCH_BITS
+# define __HAIKU_BUILD_HAIKU_ARCH_BITS 32
#endif
-#if __HAIKU_ARCH_BITS == 32
-# define __HAIKU_ARCH_32_BIT 1
-#elif __HAIKU_ARCH_BITS == 64
-# define __HAIKU_ARCH_64_BIT 1
+#if __HAIKU_BUILD_HAIKU_ARCH_BITS == 32
+# define __HAIKU_BUILD_HAIKU_ARCH_32_BIT 1
+#elif __HAIKU_BUILD_HAIKU_ARCH_BITS == 64
+# define __HAIKU_BUILD_HAIKU_ARCH_64_BIT 1
#else
# error Unsupported bitness!
#endif
/* physical bitness */
-#ifndef __HAIKU_ARCH_PHYSICAL_BITS
-# define __HAIKU_ARCH_PHYSICAL_BITS __HAIKU_ARCH_BITS
+#ifndef __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS
+# define __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS \
+ __HAIKU_BUILD_HAIKU_ARCH_BITS
#endif
-#if __HAIKU_ARCH_PHYSICAL_BITS == 32
-# define __HAIKU_ARCH_PHYSICAL_32_BIT 1
-#elif __HAIKU_ARCH_PHYSICAL_BITS == 64
-# define __HAIKU_ARCH_PHYSICAL_64_BIT 1
+#if __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS == 32
+# define __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_32_BIT 1
+#elif __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS == 64
+# define __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_64_BIT 1
#else
# error Unsupported physical bitness!
#endif
/* endianess */
-#ifndef __HAIKU_BIG_ENDIAN
-# define __HAIKU_LITTLE_ENDIAN 1
+#ifndef __HAIKU_BUILD_HAIKU_BIG_ENDIAN
+# define __HAIKU_BUILD_HAIKU_LITTLE_ENDIAN 1
#endif
/* architecture specific include macros */
-#define __HAIKU_ARCH_HEADER(header)
<arch/__HAIKU_ARCH/header>
+#define __HAIKU_BUILD_HAIKU_ARCH_HEADER(header)
<arch/__HAIKU_ARCH/header>
+// NOTE: Should the above define be this following line instead?
+// #define __HAIKU_BUILD_HAIKU_ARCH_HEADER(header)
<arch/__HAIKU_BUILD_HAIKU_ARCH/header>
+#define __HAIKU_BUILD_HAIKU_SUBDIR_ARCH_HEADER(subdir, header) \
+ <subdir/arch/__HAIKU_BUILD_HAIKU_ARCH/header>
+
+
+/* map the macros, if not building the libroot mapper functions */
+
+#ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
+
+#define __HAIKU_ARCH __HAIKU_BUILD_HAIKU_ARCH
+#define __HAIKU_ARCH_BITS __HAIKU_BUILD_HAIKU_ARCH_BITS
+#define __HAIKU_ARCH_PHYSICAL_BITS __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_X86
+# define __HAIKU_ARCH_X86 __HAIKU_BUILD_HAIKU_ARCH_X86
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_X86_64
+# define __HAIKU_ARCH_X86_64 __HAIKU_BUILD_HAIKU_ARCH_X86_64
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_PPC
+# define __HAIKU_ARCH_PPC __HAIKU_BUILD_HAIKU_ARCH_PPC
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_M68K
+# define __HAIKU_ARCH_M68K __HAIKU_BUILD_HAIKU_ARCH_M68K
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_MIPSEL
+# define __HAIKU_ARCH_MIPSEL __HAIKU_BUILD_HAIKU_ARCH_MIPSEL
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_ARM
+# define __HAIKU_ARCH_ARM __HAIKU_BUILD_HAIKU_ARCH_ARM
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_32_BIT
+# define __HAIKU_ARCH_32_BIT __HAIKU_BUILD_HAIKU_ARCH_32_BIT
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_64_BIT
+# define __HAIKU_ARCH_64_BIT __HAIKU_BUILD_HAIKU_ARCH_64_BIT
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_32_BIT
+# define __HAIKU_ARCH_PHYSICAL_32_BIT
__HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_32_BIT
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_64_BIT
+# define __HAIKU_ARCH_PHYSICAL_64_BIT
__HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_64_BIT
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_LITTLE_ENDIAN
+# define __HAIKU_ARCH_LITTLE_ENDIAN
__HAIKU_BUILD_HAIKU_ARCH_LITTLE_ENDIAN
+#endif
+
+#ifdef __HAIKU_BUILD_HAIKU_ARCH_BIG_ENDIAN
+# define __HAIKU_ARCH_BIG_ENDIAN __HAIKU_BUILD_HAIKU_ARCH_BIG_ENDIAN
+#endif
+
+
+#define __HAIKU_ARCH_HEADER(header) __HAIKU_BUILD_HAIKU_ARCH_HEADER(header)
#define __HAIKU_SUBDIR_ARCH_HEADER(subdir, header) \
- <subdir/arch/__HAIKU_ARCH/header>
+ __HAIKU_BUILD_HAIKU_SUBDIR_ARCH_HEADER(subdir, header)
+#endif /* _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER */
#endif /* _CONFIG_HAIKU_CONFIG_H */
Other related posts:
- » [haiku-commits] BRANCH mmadia-github.separate-build-environment - headers/build/config_build src/build/libroot build/jam headers/build src/tools - mmadia-github . separate-build-environment