From: Julian Seward <jseward@acm.org>
Date: Sun, 23 Oct 2016 05:56:27 +0000 (+0000)
Subject: Merge from branches/VALGRIND_3_12_BRANCH:
X-Git-Tag: svn/VALGRIND_3_13_0~320
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0661bc7e60b91a3bb78d6c712d7188e3e8836916;p=thirdparty%2Fvalgrind.git

Merge from branches/VALGRIND_3_12_BRANCH:
  16095 Build fixes for MacOS X 10.10.5.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16099
---

diff --git a/Makefile.all.am b/Makefile.all.am
index 14ce6cefec..02059a36c1 100644
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -210,7 +210,7 @@ AM_CCASFLAGS_ARM64_LINUX  = @FLAG_M64@ -g
 
 AM_FLAG_M3264_X86_DARWIN = -arch i386
 AM_CFLAGS_X86_DARWIN     = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \
-				-mmacosx-version-min=10.5 \
+				-mmacosx-version-min=10.6 \
 				-fno-stack-protector -fno-pic -fno-PIC
 
 AM_CFLAGS_PSO_X86_DARWIN = $(AM_CFLAGS_X86_DARWIN) $(AM_CFLAGS_PSO_BASE)
@@ -218,7 +218,7 @@ AM_CCASFLAGS_X86_DARWIN  = -arch i386 -g
 
 AM_FLAG_M3264_AMD64_DARWIN = -arch x86_64
 AM_CFLAGS_AMD64_DARWIN     = $(WERROR) -arch x86_64 $(AM_CFLAGS_BASE) \
-			    -mmacosx-version-min=10.5 -fno-stack-protector
+			    -mmacosx-version-min=10.6 -fno-stack-protector
 AM_CFLAGS_PSO_AMD64_DARWIN = $(AM_CFLAGS_AMD64_DARWIN) $(AM_CFLAGS_PSO_BASE)
 AM_CCASFLAGS_AMD64_DARWIN  = -arch x86_64 -g
 
diff --git a/coregrind/link_tool_exe_darwin.in b/coregrind/link_tool_exe_darwin.in
index bf483a9b82..d0e3c3ec30 100644
--- a/coregrind/link_tool_exe_darwin.in
+++ b/coregrind/link_tool_exe_darwin.in
@@ -36,7 +36,7 @@
 #
 #   (64-bit):
 #
-#   /usr/bin/ld -static -arch x86_64 -macosx_version_min 10.5 \
+#   /usr/bin/ld -static -arch x86_64 -macosx_version_min 10.6 \
 #      -o memcheck-amd64-darwin -u __start -e __start \
 #      -image_base 0x138000000 -stack_addr 0x13c000000 \
 #      -stack_size 0x800000 \
@@ -46,7 +46,7 @@
 #
 #   (32-bit)
 #
-#   /usr/bin/ld -static -arch i386 -macosx_version_min 10.5 \
+#   /usr/bin/ld -static -arch i386 -macosx_version_min 10.6 \
 #      -o memcheck-x86-darwin -u __start -e __start \
 #      -image_base 0x38000000 -stack_addr 0x3c000000 \
 #      -stack_size 0x800000 \
@@ -150,7 +150,7 @@ if ("$cc" =~ /clang$/) {
 }
 
 $cmd = "$cmd -arch $archstr";
-$cmd = "$cmd -macosx_version_min 10.5";
+$cmd = "$cmd -macosx_version_min 10.6";
 $cmd = "$cmd -o $outname";
 $cmd = "$cmd -u __start -e __start";
 
diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 1a327c1bcc..d008ab3ae9 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -4058,6 +4058,19 @@ UWord voucher_mach_msg_set ( UWord arg1 )
 
 #endif
 
+#if defined(VGO_darwin) && DARWIN_VERS == DARWIN_10_10
+
+/* This might also be needed for > DARWIN_10_10, but I have no way
+   to test for that.  Hence '==' rather than '>=' in the version
+   test above. */
+void __bzero ( void* s, UWord n );
+void __bzero ( void* s, UWord n )
+{
+   (void) VG_(memset)( s, 0, n );
+}
+
+#endif
+
 
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/