From db9297cfbd058e977dfac88b419ed237acd2f33e Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Wed, 29 Dec 2010 20:16:59 +0000
Subject: [PATCH] Changes to support symbol transport from MEDS to grace's
controller automatically.
---
examples/Makefile | 5 +++--
tools/do_concolic.sh | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/examples/Makefile b/examples/Makefile
index 7ed52a8e6..5d71bb80f 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -5,7 +5,7 @@
CC=gcc -fno-stack-protector
CXX=g++ -fno-stack-protector
-all: env_check hanoi hanoi_overrun hanoi_heap_overrun hanoi_stack_overrun print_ptr malloc block_copy hello hanoi_overrun_tainted hanoi_overrun_taintedenv memcpy cmd_args_005
+all: env_check hanoi hanoi_overrun hanoi_heap_overrun hanoi_stack_overrun print_ptr malloc block_copy hello hanoi_overrun_tainted hanoi_overrun_taintedenv memcpy cmd_args_005 dumbledore dumbledore_cmd
@@ -173,7 +173,8 @@ dumbledore_cmd: dumbledore_cmd.o ${STRATA}/lib/x86_linux/libstrata_normal.a .PHO
.PHONY: env_check
.c.o:
- $(CC) -O3 -fomit-frame-pointer $< -c
+ # $(CC) -O3 -fomit-frame-pointer $< -c
+ $(CC) $< -c
.cpp.o:
$(CXX) -O3 $< -c
diff --git a/tools/do_concolic.sh b/tools/do_concolic.sh
index b6806b648..5a58b6b2f 100755
--- a/tools/do_concolic.sh
+++ b/tools/do_concolic.sh
@@ -39,7 +39,7 @@ for i in `ipcs -q|grep $whoami |cut -d" " -f 2`;
do
ipcrm -q $i
done
-STRATA_GRACE=1 controller $extra_args --start $start_ea --stop $stop_ea $strata_exe --symbols $sym
+STRATA_GRACE=1 controller $extra_args --start $start_ea --stop $stop_ea --symbols $sym $strata_exe
echo cleaning up
killall -q controller
--
GitLab