--- scummvm-1.6.0/configure~	2013-05-26 22:21:47.000000000 +0200
+++ scummvm-1.6.0/configure	2013-07-16 01:07:53.563063545 +0200
@@ -3786,11 +3786,7 @@
 					append_var NASMFLAGS "-f aout"
 				;;
 				*)
-					append_var NASMFLAGS "-f elf"
-					if $LD $LDFLAGS -Wl,--version 2>/dev/null | grep -q -e 'GNU gold'; then
-						# gold throws an internal error when nasm uses dwarf, force older stabs in this case
-						append_var NASMFLAGS "-F stabs"
-					fi
+					append_var NASMFLAGS "-f elf -F dwarf"
 				;;
 			esac
 			_nasm=yes