i#975 static DR: fix Mac build (#2856)

Fixes a Mac build error introduced by 3bc3315. Fixes a Mac test build error that shows up on newer toolchains. Issue: #975
DynamoRIO · Mar 1, 2018 · 70998c5 · 70998c5
1 parent 3bc3315
commit 70998c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/core/unix/module.c b/core/unix/module.c
@@ -33,8 +33,8 @@
  */
 
 #include "../globals.h"
-#include "module_private.h"
 #include "../module_shared.h"
+#include "module_private.h"
 #include "os_private.h"
 #include "../utils.h"
 #include "instrument.h"

diff --git a/suite/tests/client-interface/memval-test.c b/suite/tests/client-interface/memval-test.c
@@ -1,5 +1,5 @@
 /* **********************************************************
- * Copyright (c) 2017 Google, Inc.  All rights reserved.
+ * Copyright (c) 2017-2018 Google, Inc.  All rights reserved.
  * **********************************************************/
 
 /*
@@ -90,9 +90,10 @@ GLOBAL_LABEL(FUNCNAME:)
         mov      REG_XDI, REG_XBP
         sub      REG_XDI, 12
         mov      [REG_XBP - 80], REG_XBP
-        jmp      test
+        /* We can't use "test" as a label on Mac NASM. */
+        jmp      test_start
 
-     test:
+     test_start:
         mov      REG_XCX, [REG_XDI + 12]
         mov      REG_XDX, [REG_XBP - 72]
         mov      REG_XBX, [REG_XBP - 80]