# HG changeset patch # User kvn # Date 1346865517 25200 # Node ID 78b56e53050e7aed371ec8cfa2982d14cd2b5933 # Parent 044a77cd0c8b1f39f309fa9c927e348025183e55 7196167: NPG: mismerge in make/solaris/makefiles/fastdebug.make Summary: Remove the workaround of 7187454 problem which was restored incorrectly during NPG merge. Reviewed-by: coleenp, dholmes diff -r 044a77cd0c8b -r 78b56e53050e make/solaris/makefiles/fastdebug.make --- a/make/solaris/makefiles/fastdebug.make Wed Sep 05 10:39:29 2012 +0200 +++ b/make/solaris/makefiles/fastdebug.make Wed Sep 05 10:18:37 2012 -0700 @@ -41,9 +41,6 @@ OPT_CFLAGS/simpleThresholdPolicy.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) # CC 5.10 has bug XXXXX with -xO4 OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/SLOWER) -# jvm98 crashes on solaris-i586-fastdebug and solaris-sparc-fastdebug with stack overflow -OPT_CFLAGS/escape.o = $(OPT_CFLAGS) -xspace -OPT_CFLAGS/matcher.o = $(OPT_CFLAGS) -xspace endif # COMPILER_REV_NUMERIC == 510 ifeq ($(COMPILER_REV_NUMERIC), 509)