[Valgrind-developers] Valgrind: r14782 - in /trunk: Makefile.all.am Makefile.am auxprogs/gsl16test

[<sv...@va...>]

Author: sewardj
Date: Tue Nov 25 11:43:54 2014
New Revision: 14782

Log:
Back out r14781, which was unintended.

Modified:
    trunk/Makefile.all.am
    trunk/Makefile.am
    trunk/auxprogs/gsl16test

Modified: trunk/Makefile.all.am
==============================================================================
--- trunk/Makefile.all.am (original)
+++ trunk/Makefile.all.am Tue Nov 25 11:43:54 2014
@@ -97,7 +97,7 @@
 # -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 \

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Tue Nov 25 11:43:54 2014
@@ -3,20 +3,18 @@
 
 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.

Modified: trunk/auxprogs/gsl16test
==============================================================================
--- trunk/auxprogs/gsl16test (original)
+++ trunk/auxprogs/gsl16test Tue Nov 25 11:43:54 2014
@@ -89,10 +89,10 @@
        "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