From 6d49dc51a073b513ade102cc8a1bf57c050b7130 Mon Sep 17 00:00:00 2001
From: Miquel Moreto <mmoreto@ac.upc.edu>
Date: Tue, 16 Oct 2012 11:06:48 -0700
Subject: [PATCH] Fixed emulator Makefile + extra info in the README file

---
 README            | 6 ++++++
 emulator/Makefile | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/README b/README
index f8c326e6..0b827521 100644
--- a/README
+++ b/README
@@ -26,6 +26,12 @@ BUILDING THE TOOLCHAIN:
     cd riscv-asmtests-bmarks/riscv-bmarks/
     make
 
+  To build dramsim2 (tagged version 2.1):
+
+    cd dramsim2/
+    git checkout v2.1
+    make libdramsim.so
+
 
 BUILDING THE PROJECT:
 
diff --git a/emulator/Makefile b/emulator/Makefile
index 1509b15f..d88b6680 100644
--- a/emulator/Makefile
+++ b/emulator/Makefile
@@ -10,7 +10,7 @@ CXXSRCS := emulator disasm
 CXXFLAGS := $(CXXFLAGS) -Itestbench -I$(basedir)/chisel/csrc
 
 DRAMSIM2_PATH := ../dramsim2/
-CXXFLAGS := $(CXXFLAGS) -I$(DRAMSIM2_PATH) -L$(DRAMSIM2_PATH) -ldramsim
+CXXFLAGS := $(CXXFLAGS) -I$(DRAMSIM2_PATH) -L$(DRAMSIM2_PATH) -ldramsim -Wl,-rpath=$(DRAMSIM2_PATH) 
 DRAMSIM2_LIB := libdramsim.so
 
 generated-src/$(MODEL).cpp: $(basedir)/riscv-rocket/src/*.scala $(basedir)/riscv-hwacha/src/*.scala $(basedir)/chisel/src/main/scala/* $(basedir)/uncore/src/*.scala