From: Julian Seward <jseward@acm.org>
Date: Tue, 25 Nov 2014 11:43:54 +0000 (+0000)
Subject: Back out r14781, which was unintended.
X-Git-Tag: svn/VALGRIND_3_11_0~801
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f24896f10b7ef3407617c3806c7c0c307753272;p=thirdparty%2Fvalgrind.git

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 a64950b6eb..68f8fe57e0 100644
--- 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 2859abcec7..d35fd36d34 100644
--- 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 b34f6bdfec..bd127d76ea 100755
--- 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