Merge branch 'master' into ppc64

Resolved conflicts in:configure	powerpc/Asmexpand.ml

1 files changed, 2 insertions, 1 deletions

diff --git a/configure b/configure
index 9646449e..9bbc5019 100755
--- a/configure
+++ b/configure
@@ -124,7 +124,8 @@ case "$target" in
         casmruntime="${toolprefix}gcc -c -Wa,-mregnames"
         clinker="${toolprefix}gcc"
         libmath="-lm"
-        cchecklink=${build_checklink};;
+        cchecklink=${build_checklink}
+        advanced_debug=true;;
     esac;;
   arm*-*)
     arch="arm"