Back out r14781, which was unintended.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14782

diff --git a/Makefile.all.am b/Makefile.all.am
index a64950b6ebb812817adf064a370451f8fdd0724a..68f8fe57e02d1a7ee7f05b8173a8b78db565a978 100644 (file)
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -97,7 +97,7 @@ clean-noinst_DSYMS:
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
 AM_CFLAGS_BASE = \
-       -Og \
+       -O2 -g \
        -Wall \
        -Wcast-align \
        -Wmissing-prototypes \

diff --git a/Makefile.am b/Makefile.am
index 2859abcec79ca7971ff6c41ace17568a3ff8864c..d35fd36d34e11ad980686d7f37d857ac3169e363 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,20 +3,18 @@ AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2
 
 include $(top_srcdir)/Makefile.all.am 
 
-#TOOLS =               memcheck \
-#              cachegrind \
-#              callgrind \
-#              massif \
-#              lackey \
-#              none \
-#              helgrind \
-#              drd
-#
-#EXP_TOOLS =   exp-sgcheck \
-#              exp-bbv \
-#              exp-dhat
-TOOLS = none memcheck
-EXP_TOOLS =
+TOOLS =                memcheck \
+               cachegrind \
+               callgrind \
+               massif \
+               lackey \
+               none \
+               helgrind \
+               drd
+
+EXP_TOOLS =    exp-sgcheck \
+               exp-bbv \
+               exp-dhat
 
 # Put docs last because building the HTML is slow and we want to get
 # everything else working before we try it.

diff --git a/auxprogs/gsl16test b/auxprogs/gsl16test
index b34f6bdfeca1d5aef92697cd0fa66a8d29de58d9..bd127d76eaf0c1c3b1307c175ef103d67f0bbbcd 100755 (executable)
--- a/auxprogs/gsl16test
+++ b/auxprogs/gsl16test
@@ -89,10 +89,10 @@ runcmd "Untarring                     " \
        "rm -rf gsl-1.6-patched && tar xzf $GSL_FILE" && \
 \
 runcmd "Configuring                   " \
-       "(cd gsl-1.6-patched && CC=$GSL_CC CFLAGS=\"$GSL_CFLAGS\" ./configure --build=aarch64-unknown-linux-gnu)" && \
+       "(cd gsl-1.6-patched && CC=$GSL_CC CFLAGS=\"$GSL_CFLAGS\" ./configure)" && \
 \
 runcmd "Building                      " \
-       "(cd gsl-1.6-patched && make -j6 && make -k check)"
+       "(cd gsl-1.6-patched && make -j4 && make -k check)"
 
 echo -n "   Collecting reference results  "
 rm -f out-REF