Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7196167: NPG: mismerge in make/solaris/makefiles/fastdebug.make
authorkvn
Wed, 05 Sep 2012 10:18:37 -0700
changeset 13735 c6d01e4bc0ac
parent 13734 4b74094540f3
child 13736 5b15a8f57979
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
hotspot/make/solaris/makefiles/fastdebug.make file | annotate | diff | comparison | revisions 
--- a/hotspot/make/solaris/makefiles/fastdebug.make	Wed Sep 05 10:39:29 2012 +0200
+++ b/hotspot/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)
jdk-sandbox