Fix hard-coded fencepost value.

Merge from internal master.

(cherry-picked from commit 1685d00d0a6b905a820a76c9686b6b4b077dfe4a)

Change-Id: Ie9d64844c28ea720091acfefc21f888827fecb4b

diff --git a/libc_test/main.cpp b/libc_test/main.cpp
index 8a5315b..8b012b6 100644 (file)
--- a/libc_test/main.cpp
+++ b/libc_test/main.cpp
@@ -447,7 +447,7 @@ bool runMemcpyTest(void* (*test_memcpy)(void *dst, const void *src, size_t n),
 
       // Don't add a pre fencepost if we are using the value from the malloc.
       if (dst_align != dst) {
-        setFencepost(&dst_align[-FENCEPOST_LENGTH]);
+        setFencepost(&dst_align[-8]);
       }
       setFencepost(&dst_align[len]);
 
@@ -545,7 +545,7 @@ bool runMemsetTest(void* (*test_memset)(void *s, int c, size_t n),
 
       // Don't add a pre fencepost if we are using the value from the malloc.
       if (buf_align != buf) {
-        setFencepost(&buf_align[-FENCEPOST_LENGTH]);
+        setFencepost(&buf_align[-8]);
       }
       setFencepost(&buf_align[len]);