Index: Makefile.programs
===================================================================
--- Makefile.programs
+++ Makefile.programs
@@ -500,6 +500,11 @@
 # If the program wants its output hashed, add an output filter.
 ifdef ENABLE_HASHED_PROGRAM_OUTPUT
 ifdef HASH_PROGRAM_OUTPUT
+# If the program also wants a floating-point comparison, give
+# and error.
+ifdef FP_TOLERANCE
+$(error Cannot use both FP_TOLERNANCE and HASH_PROGRAM_OUTPUT)
+endif
 PROGRAM_OUTPUT_FILTER := $(PROGDIR)/HashProgramOutput.sh
 endif
 endif
Index: MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile
===================================================================
--- MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile
+++ MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile
@@ -2,7 +2,6 @@
 
 PROG     = automotive-basicmath
 LDFLAGS  = -lm
-FP_TOLERANCE :=  0.00000000001
 HASH_PROGRAM_OUTPUT = 1
 
 include $(LEVEL)/MultiSource/Makefile.multisrc
Index: MultiSource/Benchmarks/Olden/voronoi/Makefile
===================================================================
--- MultiSource/Benchmarks/Olden/voronoi/Makefile
+++ MultiSource/Benchmarks/Olden/voronoi/Makefile
@@ -4,7 +4,6 @@
 INCLUDES = defines.h
 CPPFLAGS = -DTORONTO
 LDFLAGS  = -lm
-FP_TOLERANCE = 0.0001
 ifdef LARGE_PROBLEM_SIZE
 RUN_OPTIONS = 1000000 20 32 7
 else
Index: MultiSource/Benchmarks/VersaBench/beamformer/Makefile
===================================================================
--- MultiSource/Benchmarks/VersaBench/beamformer/Makefile
+++ MultiSource/Benchmarks/VersaBench/beamformer/Makefile
@@ -2,7 +2,6 @@
 LDFLAGS += -lm
 
 PROG     = beamformer
-FP_TOLERANCE = 0.000001
 ifdef LARGE_PROBLEM_SIZE
 RUN_OPTIONS = -i 400
 else 
Index: MultiSource/Benchmarks/mafft/Makefile
===================================================================
--- MultiSource/Benchmarks/mafft/Makefile
+++ MultiSource/Benchmarks/mafft/Makefile
@@ -10,7 +10,6 @@
 RUN_OPTIONS = -b 62 -g 0.100 -f 2.00 -h 0.100 -L
 STDIN_FILENAME = $(PROJ_SRC_DIR)/pyruvate_decarboxylase.fasta
 LDFLAGS = -lm
-FP_TOLERANCE = 0.00001
 HASH_PROGRAM_OUTPUT = 1
 
 ifeq ($(ARCH),XCore)