[Valgrind-developers] valgrind: r12815: Un-break the build on OSX < 10.8 following r12814

[<sv...@va...>]

sewardj	2012-08-02 19:51:51 +0100 (Thu, 02 Aug 2012)

  New Revision: 12815

  Log:
    Un-break the build on OSX < 10.8 following r12814
    (which was initial OSX 10.8 support)

  Modified files:
    trunk/coregrind/m_syswrap/syswrap-darwin.c
    trunk/coregrind/m_ume/macho.c


  Modified: trunk/coregrind/m_ume/macho.c (+4 -2)
===================================================================
--- trunk/coregrind/m_ume/macho.c	2012-08-02 19:25:04 +01:00 (rev 12814)
+++ trunk/coregrind/m_ume/macho.c	2012-08-02 19:51:51 +01:00 (rev 12815)
@@ -82,6 +82,7 @@
    }
 }
 
+#if DARWIN_VERS == DARWIN_10_8
 static void check_mmap_float(SysRes res, SizeT len, HChar* who)
 {
    if (sr_isError(res)) {
@@ -90,8 +91,8 @@
       VG_(exit)(1);
    }
 }
+#endif
 
-
 static int 
 load_thin_file(int fd, vki_off_t offset, vki_off_t size, unsigned long filetype, 
                const char *filename, 
@@ -385,6 +386,7 @@
    This is a really nasty hack -- allocates 64M+stack size, then
    deallocates the 64M, to guarantee that the stack is at least 64M
    above zero. */
+#if DARWIN_VERS == DARWIN_10_8
 static int
 handle_lcmain ( vki_uint8_t **out_stack_start,
                 vki_uint8_t **out_stack_end,
@@ -414,10 +416,10 @@
 
    return 0;
 }
+#endif /* DARWIN_VERS == DARWIN_10_8 */
 
 
 
-
 /* 
    Processes an LC_LOAD_DYLINKER command. 
    Returns 0 on success, -1 on any error.

  Modified: trunk/coregrind/m_syswrap/syswrap-darwin.c (+1 -1)
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-darwin.c	2012-08-02 19:25:04 +01:00 (rev 12814)
+++ trunk/coregrind/m_syswrap/syswrap-darwin.c	2012-08-02 19:51:51 +01:00 (rev 12815)
@@ -8395,7 +8395,7 @@
 #  if DARWIN_VERS == DARWIN_10_8
    MACXY(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(10), mach__10), 
 #  else
-   _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(10), 
+   _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(10)), 
 #  endif
 
    _____(VG_DARWIN_SYSCALL_CONSTRUCT_MACH(11)),