From f1735cefcfdee5260ea6961cf785f545a340ff85 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Sun, 11 May 2014 19:31:23 -0400
Subject: [PATCH] make sure jemalloc valgrind support is enabled

This requires pointing it at the valgrind headers we carry in-tree.
---
 .gitattributes                     | 2 +-
 mk/rt.mk                           | 1 +
 mk/tests.mk                        | 4 ++--
 src/rt/rust_builtin.c              | 2 +-
 src/rt/{vg => valgrind}/memcheck.h | 0
 src/rt/{vg => valgrind}/valgrind.h | 0
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename src/rt/{vg => valgrind}/memcheck.h (100%)
 rename src/rt/{vg => valgrind}/valgrind.h (100%)

diff --git a/.gitattributes b/.gitattributes
index d65c979a074..c15f7aba7c9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,4 +7,4 @@
 src/etc/pkg/rust-logo.ico binary
 src/etc/pkg/rust-logo.png binary
 src/rt/msvc/* -whitespace
-src/rt/vg/* -whitespace
+src/rt/valgrind/* -whitespace
diff --git a/mk/rt.mk b/mk/rt.mk
index b18b13c25c0..67ca5fefffc 100644
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -260,6 +260,7 @@ $$(JEMALLOC_LIB_$(1)): $$(JEMALLOC_DEPS) $$(MKFILE_DEPS)
 		CC="$$(CC_$(1))" \
 		AR="$$(AR_$(1))" \
 		RANLIB="$$(AR_$(1)) s" \
+		CPPFLAGS="-I $(S)src/rt/" \
 		EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1))"
 	$$(Q)$$(MAKE) -C "$$(JEMALLOC_BUILD_DIR_$(1))" build_lib_static
 	$$(Q)cp $$(JEMALLOC_BUILD_DIR_$(1))/lib/$$(JEMALLOC_REAL_NAME_$(1)) $$(JEMALLOC_LIB_$(1))
diff --git a/mk/tests.mk b/mk/tests.mk
index 71d56d11a73..9ce7077e03c 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -227,8 +227,8 @@ ALL_HS := $(wildcard $(S)src/rt/*.h \
                      $(S)src/rt/*/*.h \
                      $(S)src/rt/*/*/*.h \
                      $(S)src/rustllvm/*.h)
-ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
-                       $(S)src/rt/vg/memcheck.h \
+ALL_HS := $(filter-out $(S)src/rt/valgrind/valgrind.h \
+                       $(S)src/rt/valgrind/memcheck.h \
                        $(S)src/rt/msvc/typeof.h \
                        $(S)src/rt/msvc/stdint.h \
                        $(S)src/rt/msvc/inttypes.h \
diff --git a/src/rt/rust_builtin.c b/src/rt/rust_builtin.c
index 9c27fe1c5e4..6ab36f1db7a 100644
--- a/src/rt/rust_builtin.c
+++ b/src/rt/rust_builtin.c
@@ -10,7 +10,7 @@
 
 /* Foreign builtins. */
 
-#include "vg/valgrind.h"
+#include "valgrind/valgrind.h"
 
 #include <stdint.h>
 #include <time.h>
diff --git a/src/rt/vg/memcheck.h b/src/rt/valgrind/memcheck.h
similarity index 100%
rename from src/rt/vg/memcheck.h
rename to src/rt/valgrind/memcheck.h
diff --git a/src/rt/vg/valgrind.h b/src/rt/valgrind/valgrind.h
similarity index 100%
rename from src/rt/vg/valgrind.h
rename to src/rt/valgrind/valgrind.h