hrev51920 adds 1 changeset to branch 'master'
old head: 891a743ac34cf265563f55455b452c61056234e3
new head: 51dfedd76b8108157b8015c30eac02ab7666b948
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=51dfedd76b81+%5E891a743ac34c
----------------------------------------------------------------------------
51dfedd76b81: libroot_x86: use the generic memset/memcpy when x86_64 is the
primary arch.
the standard x86 implementation uses the commpage, which is difficult to
setup. we could
also use the C++11 version instead.
Change-Id: I4be7e3466082ff2c91bc32bef377a664ce65f3fc
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51920
Commit: 51dfedd76b8108157b8015c30eac02ab7666b948
URL: https://git.haiku-os.org/haiku/commit/?id=51dfedd76b81
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Tue May 1 19:11:35 2018 UTC
----------------------------------------------------------------------------
2 files changed, 5 insertions(+), 5 deletions(-)
src/system/libroot/posix/string/arch/generic/memcpy.c | 4 ----
src/system/libroot/posix/string/arch/x86/Jamfile | 6 +++++-
----------------------------------------------------------------------------
diff --git a/src/system/libroot/posix/string/arch/generic/memcpy.c
b/src/system/libroot/posix/string/arch/generic/memcpy.c
index b197960154..5070e78bdf 100644
--- a/src/system/libroot/posix/string/arch/generic/memcpy.c
+++ b/src/system/libroot/posix/string/arch/generic/memcpy.c
@@ -6,8 +6,6 @@
#include <sys/types.h>
#include <string.h>
-/* do not build for for arches that have overridden this with an assembly
version */
-#if !defined(ARCH_x86)
typedef int word;
@@ -45,5 +43,3 @@ void *memcpy(void *dest, const void *src, size_t count)
return dest;
}
-#endif
-
diff --git a/src/system/libroot/posix/string/arch/x86/Jamfile
b/src/system/libroot/posix/string/arch/x86/Jamfile
index edd827a2d8..4190cbf535 100644
--- a/src/system/libroot/posix/string/arch/x86/Jamfile
+++ b/src/system/libroot/posix/string/arch/x86/Jamfile
@@ -7,8 +7,12 @@ for architectureObject in [ MultiArchSubDirSetup x86 x86_gcc2
] {
UsePrivateSystemHeaders ;
+ SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
+
MergeObject <$(architecture)>posix_string_arch_$(TARGET_ARCH).o
:
- arch_string.S
+ [ MultiArchIfPrimary memcpy.c memset.c :
+ arch_string.S : x86_64 ]
;
+
}
}
