Use v2.30 of binutils

bin/zafl.sh

@@ -6,12 +6,15 @@ shift
 shift
 
 echo "Zafl: Transforming input binary $input_binary into $output_zafl_binary"
-cmd="$PSZ $input_binary $output_zafl_binary -c move_globals=on -c zafl=on -o move_globals:--elftables -o zipr:--traceplacement:on -o zipr:true -o zafl:--stars $*"
+cmd="$PSZ $input_binary $output_zafl_binary -c move_globals=on -c zafl=on -o move_globals:--elftables -o zipr:--traceplacement:on -o zafl:--stars $*"
+#cmd="$PSZ $input_binary $output_zafl_binary -s meds_static=off -s rida=on -c move_globals=on -c zafl=on -o move_globals:--elftables -o zipr:--traceplacement:on -o zafl:--stars -o zafl:--autozafl $*"
 echo "Zafl: Issuing command: $cmd"
 eval $cmd
 if [ $? -eq 0 ]; then
-	ldd $output_zafl_binary | grep libzafl >/dev/null 2>&1
+	ldd $output_zafl_binary | grep -e libzafl -e libautozafl >/dev/null 2>&1
 	if [ ! $? -eq 0 ]; then
-		echo "Zafl: error: output binary does not show a dependence on the Zafl support library"
+		ldd $output_zafl_binary
+		echo
+		echo Zafl: error: output binary does not show a dependence on the Zafl support library
 	fi
 fi

test/bench/binutils.spec

 #tools can be aflgcc zafl qemu dyninst
 tools="aflgcc zafl qemu"
 
-binutils_binaries="objdump size readelf strings cxxfilt nm-new strip-new ar"
+#binutils_binaries="objdump size readelf strings cxxfilt nm-new strip-new ar"
+binutils_binaries="objdump readelf nm-new"
 
 # specify how to run under afl
 declare -A fuzz_map

test/bench/build_aflgcc.sh

@@ -10,5 +10,5 @@ do
 		mkdir ${b}_aflgcc
 	fi
 
-	cp binutils-gdb/binutils/$b ${b}_aflgcc/${b}.aflgcc
+	cp binutils-2.30/binutils/$b ${b}_aflgcc/${b}.aflgcc
 done

test/bench/build_dyninst.sh

@@ -12,7 +12,7 @@ do
 		mkdir ${b}_dyninst
 	fi
 
-	cp binutils-gdb/binutils/$b ${b}_dyninst
+	cp binutils-2.30/binutils/$b ${b}_dyninst
 
 	pushd $dyninst_dir
 	echo "Building Zafl version of $b"

test/bench/build_qemu.sh

@@ -9,5 +9,5 @@ do
 		mkdir ${b}_qemu
 	fi
 
-	cp binutils-gdb/binutils/$b ${b}_qemu/${b}.qemu
+	cp binutils-2.30/binutils/$b ${b}_qemu/${b}.qemu
 done

test/bench/build_zafl.sh

@@ -13,7 +13,7 @@ do
 		mkdir ${b}_zafl
 	fi
 
-	cp binutils-gdb/binutils/$b ${b}_zafl/
+	cp binutils-2.30/binutils/$b ${b}_zafl/
 
 	pushd $zafl_dir
 	echo "Remove any remnants of previous analysis runs"

test/bench/download.sh

@@ -4,4 +4,6 @@ tar -zxf gzip*.tar.gz
 wget http://ftp.gnu.org/gnu/bc/bc-1.07.tar.gz
 tar -zxf bc*.tar.gz 
 
-git clone git://sourceware.org/git/binutils-gdb.git
+wget http://ftp.gnu.org/gnu/binutils/binutils-2.30.tar.gz
+tar -zxf binut*.tar.gz 
+

test/bench/setup_aflgcc.sh

-pushd binutils-gdb
+pushd binutils-2.30
 make clean distclean
 rm -fr config.cache
 rm -fr */config.cache

test/bench/setup_binutils.sh

-pushd binutils-gdb
+pushd binutils-2.30
 make clean distclean
 rm -fr config.cache
 rm -fr */config.cache