From c423bb6e8858559d044f21fb412dabe09ffbe35c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Tue, 9 Aug 2011 20:38:47 +0200
Subject: [PATCH] Use 'setarch i386 -R' on linux to be usre that ASLR won't
 break things.

---
 package/linux/dfhack | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/linux/dfhack b/package/linux/dfhack
index 28ec21e98..da70301d8 100755
--- a/package/linux/dfhack
+++ b/package/linux/dfhack
@@ -45,21 +45,21 @@ case "$1" in
     ;;
   -h | --helgrind)
     shift
-    LD_PRELOAD=./libdfhack.so valgrind $DF_HELGRIND_OPTS --tool=helgrind --log-file=helgrind.log ./libs/Dwarf_Fortress $*
+    LD_PRELOAD=./libdfhack.so setarch i386 -R valgrind $DF_HELGRIND_OPTS --tool=helgrind --log-file=helgrind.log ./libs/Dwarf_Fortress $*
     ret=$?
     ;;
   -v | --valgrind)
     shift
-    LD_PRELOAD=./libdfhack.so valgrind $DF_VALGRIND_OPTS --log-file=valgrind.log ./libs/Dwarf_Fortress $*
+    LD_PRELOAD=./libdfhack.so setarch i386 -R valgrind $DF_VALGRIND_OPTS --log-file=valgrind.log ./libs/Dwarf_Fortress $*
     ret=$?
     ;;
   -c | --callgrind)
     shift
-    LD_PRELOAD=./libdfhack.so valgrind $DF_CALLGRIND_OPTS --tool=callgrind --separate-threads=yes --dump-instr=yes --instr-atstart=no --log-file=callgrind.log ./libs/Dwarf_Fortress $*
+    LD_PRELOAD=./libdfhack.so setarch i386 -R valgrind $DF_CALLGRIND_OPTS --tool=callgrind --separate-threads=yes --dump-instr=yes --instr-atstart=no --log-file=callgrind.log ./libs/Dwarf_Fortress $*
     ret=$?
     ;;
   *)
-    LD_PRELOAD=./libdfhack.so ./libs/Dwarf_Fortress $*
+    LD_PRELOAD=./libdfhack.so setarch i386 -R ./libs/Dwarf_Fortress $*
     ret=$?
     ;;
 esac