From 11b308e7363e937966b035b4891db32b4eece3bf Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Fri, 1 Oct 2010 08:55:28 -0800 Subject: integrating recent changes from fermi-test into fermi (i'll use "fermi" for more disruptive changes to the pipeline model such as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...) [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7805] --- src/intersim/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/intersim/Makefile') diff --git a/src/intersim/Makefile b/src/intersim/Makefile index 41525fd..c4f4702 100644 --- a/src/intersim/Makefile +++ b/src/intersim/Makefile @@ -20,7 +20,7 @@ CPPFLAGS = -g -Wall ifneq ($(DEBUG),1) CPPFLAGS = -O3 -g else -CPPFLAGS += -D_GLIBCXX_DEBUG -DGLIBCXX_DEBUG_PEDANTIC +CPPFLAGS += endif TEST = -DUNIT_TEST -- cgit v1.3