From 3ec1c6f10884863d7aa39875c7753d3b1d3a98b4 Mon Sep 17 00:00:00 2001
From: Kelly O'Hair <ohair@openjdk.org>
Date: Thu, 3 Jul 2008 10:46:50 -0700
Subject: [PATCH] 6695777: Queens.class should be built from source, not put in
 source repo

Reviewed-by: kvn
---
 hotspot/make/linux/Queens.class               | Bin 1308 -> 0 bytes
 hotspot/make/linux/makefiles/buildtree.make   |   5 +++--
 hotspot/make/solaris/Queens.class             | Bin 1308 -> 0 bytes
 hotspot/make/solaris/makefiles/buildtree.make |   5 +++--
 4 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 hotspot/make/linux/Queens.class
 delete mode 100644 hotspot/make/solaris/Queens.class

diff --git a/hotspot/make/linux/Queens.class b/hotspot/make/linux/Queens.class
deleted file mode 100644
index d4582a04411926caafaedea4a9f33463e83ba547..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1308
zcmZuxOK%fb6#j1J&Wt^t#FNKBgA)jkwiCy3+62riJfk8-GPo^Pq}G+<NjyOlIkxMJ
zDJ(%OS#{SX4=F1aurLvg`U8+!@prl@{jTj`MZ_bWd(S!FIrDwz-tqhY-u(p)v$zq%
zi5R9$d~4#IiJXb^CN7w`XhFxA1rx3^N8*U#s0E2Hlo_{Jd`#_9Dm$UvNec#!+eqW2
zGGE#_i!(MZW6s7RPAS9KBEGV5MM17&%EmQ#Hm>8efS3{(^QQBg{(XP0>eueg-Hn=I
z?cQYp&6{2kklvD7TyObMP{#Yb^mE|N*2YHAWKZ`nINR%9X<5DIh*vtK9}~7$`nmHg
zcW?t)@-`O3S{Pj=$EA8D5Exvl*R~_S7OnWz7Jcix2kSv23K<nh=EGWWr?s^fG>iUP
zm1(#8rm#NuJrzgP9r#=1IFzri`_&b{87dr0jUQS;pn4>_o2(iZ+uyCXn(M)>P&G6B
zMkA<I1V%fPJlIsg>Cd;Ywi&EP2SVMEQ+*%R4Rz;s5c_aD3bv?u%MWWjq<V|J^oCL(
zV0P9j<FTl|-&K#A4_8Ab@2jyCHZa9&qeJ~9uNUtE1ZL>{!<%Gsee9SyUFM7(Y|psH
z!XF6Ju5^tucdHp!cV*c%Ds+CFRpA0LTCt1Jil6dY(Unf@Ifm0S8RBGl7b80`XLpfg
zf$SB?et|4LF@$S4v6mm8z9tKSEbS!>(Z<O%0Sh*{4l+K31tfXL9o)h&N*KW^Mp3~S
zs&Mfev5%-M&g!pw+Fnty(iS+wdou6D_vCFSxhL;%XI+v?u=B4{JWp=VkW@TgAeK=~
zT|<9{Scf#j<_jcdIRvA;PuO|+@$Ye|X$1-$my$aB^mC*Or1<g)(w`*h<0N<j<2cD<
zIE8tf=4W{ZdHO3PTf#JD93y#tu|4XqS*@|luW9X<tSlGOTGp|iBk>0Ih-hPo>z^=x
zVt5y$Z()rLw2^3Im?^oqgKwN0sj{s6eucP+HU{_MseL$m^x#i~NU8aMAf^qcFC)u|
zf@ICk+|S}D&e6-^JfCa0z*D#gpZ+G#q=5{v{5$H=pX4eS(bI1c@3%BML1h=19Kihl
DZB_fr

diff --git a/hotspot/make/linux/makefiles/buildtree.make b/hotspot/make/linux/makefiles/buildtree.make
index 54a30d2ad0a..c1da749d185 100644
--- a/hotspot/make/linux/makefiles/buildtree.make
+++ b/hotspot/make/linux/makefiles/buildtree.make
@@ -328,7 +328,7 @@ JAVA_FLAG/64 = -d64
 WRONG_DATA_MODE_MSG = \
 	echo "JAVA_HOME must point to $(DATA_MODE)bit JDK."
 
-test_gamma:  $(BUILDTREE_MAKE)
+test_gamma:  $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
 	@echo Creating $@ ...
 	$(QUIETLY) ( \
 	echo '#!/bin/sh'; \
@@ -339,7 +339,8 @@ test_gamma:  $(BUILDTREE_MAKE)
 	echo "then"; \
 	echo "  $(WRONG_DATA_MODE_MSG); exit 0;"; \
 	echo "fi"; \
-	echo 'CLASSPATH="$(GAMMADIR)/make/$(OS_FAMILY):$$CLASSPATH"'; \
+	echo "rm -f Queens.class"; \
+	echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
 	echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
 	echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
 	) > $@
diff --git a/hotspot/make/solaris/Queens.class b/hotspot/make/solaris/Queens.class
deleted file mode 100644
index d4582a04411926caafaedea4a9f33463e83ba547..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1308
zcmZuxOK%fb6#j1J&Wt^t#FNKBgA)jkwiCy3+62riJfk8-GPo^Pq}G+<NjyOlIkxMJ
zDJ(%OS#{SX4=F1aurLvg`U8+!@prl@{jTj`MZ_bWd(S!FIrDwz-tqhY-u(p)v$zq%
zi5R9$d~4#IiJXb^CN7w`XhFxA1rx3^N8*U#s0E2Hlo_{Jd`#_9Dm$UvNec#!+eqW2
zGGE#_i!(MZW6s7RPAS9KBEGV5MM17&%EmQ#Hm>8efS3{(^QQBg{(XP0>eueg-Hn=I
z?cQYp&6{2kklvD7TyObMP{#Yb^mE|N*2YHAWKZ`nINR%9X<5DIh*vtK9}~7$`nmHg
zcW?t)@-`O3S{Pj=$EA8D5Exvl*R~_S7OnWz7Jcix2kSv23K<nh=EGWWr?s^fG>iUP
zm1(#8rm#NuJrzgP9r#=1IFzri`_&b{87dr0jUQS;pn4>_o2(iZ+uyCXn(M)>P&G6B
zMkA<I1V%fPJlIsg>Cd;Ywi&EP2SVMEQ+*%R4Rz;s5c_aD3bv?u%MWWjq<V|J^oCL(
zV0P9j<FTl|-&K#A4_8Ab@2jyCHZa9&qeJ~9uNUtE1ZL>{!<%Gsee9SyUFM7(Y|psH
z!XF6Ju5^tucdHp!cV*c%Ds+CFRpA0LTCt1Jil6dY(Unf@Ifm0S8RBGl7b80`XLpfg
zf$SB?et|4LF@$S4v6mm8z9tKSEbS!>(Z<O%0Sh*{4l+K31tfXL9o)h&N*KW^Mp3~S
zs&Mfev5%-M&g!pw+Fnty(iS+wdou6D_vCFSxhL;%XI+v?u=B4{JWp=VkW@TgAeK=~
zT|<9{Scf#j<_jcdIRvA;PuO|+@$Ye|X$1-$my$aB^mC*Or1<g)(w`*h<0N<j<2cD<
zIE8tf=4W{ZdHO3PTf#JD93y#tu|4XqS*@|luW9X<tSlGOTGp|iBk>0Ih-hPo>z^=x
zVt5y$Z()rLw2^3Im?^oqgKwN0sj{s6eucP+HU{_MseL$m^x#i~NU8aMAf^qcFC)u|
zf@ICk+|S}D&e6-^JfCa0z*D#gpZ+G#q=5{v{5$H=pX4eS(bI1c@3%BML1h=19Kihl
DZB_fr

diff --git a/hotspot/make/solaris/makefiles/buildtree.make b/hotspot/make/solaris/makefiles/buildtree.make
index 1fb22360dca..5ce7b1ff31e 100644
--- a/hotspot/make/solaris/makefiles/buildtree.make
+++ b/hotspot/make/solaris/makefiles/buildtree.make
@@ -340,7 +340,7 @@ JAVA_FLAG/64 = -d64
 WRONG_DATA_MODE_MSG = \
 	echo "JAVA_HOME must point to $(DATA_MODE)bit JDK."
 
-test_gamma:  $(BUILDTREE_MAKE)
+test_gamma:  $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
 	@echo Creating $@ ...
 	$(QUIETLY) ( \
 	echo '#!/bin/ksh'; \
@@ -351,7 +351,8 @@ test_gamma:  $(BUILDTREE_MAKE)
 	echo "then"; \
 	echo "  $(WRONG_DATA_MODE_MSG); exit 0;"; \
 	echo "fi"; \
-	echo 'CLASSPATH="$(GAMMADIR)/make/$(OS_FAMILY):$$CLASSPATH"'; \
+	echo "rm -f Queens.class"; \
+	echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
 	echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
 	echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
 	) > $@