I have integrated a fix for 6733531 to 1.4.2_21-rev at:

  /net/nightsvr.sfbay/export4/integration/1.4.2_21-rev/hotspot

and we have problems with the build.

3 platforms failed (see below) - windows-i586 has clearest indictment
directly related to the change:

---------

#### RETAG "Start RE Build" "" "06/19/09 14:04:33"
#### RETAG "Start Waiting for BringOver" "" "06/19/09 14:04:33"
#### RETAG "End Waiting for BringOver" "SUCCEEDED" "06/19/09 14:10:02"
#### RETAG "Start Waiting for CreateSrcBundles" "" "06/19/09 14:10:02"
#### RETAG "End Waiting for CreateSrcBundles" "SUCCEEDED" "06/19/09 14:12:02"
#### RETAG "Start Core Build" "" "06/19/09 14:12:02"
### local_ws= D:/BUILD_AREA/jdk142-update/ws/rev
### local_ws1= D:\BUILD_AREA\jdk142-update\ws\rev
### local_ws= D:/BUILD_AREA/jdk142-update/ws/rev
### local_ws1= D:\BUILD_AREA\jdk142-update\ws\rev
Line number 1490: D:/BUILD_AREA/jdk142-update/ws/rev/hotspot\src\share\vm\opto\output.cpp(2085) : error C2374: 'i' : redefinition; multiple initialization
Line number 1492: NMAKE : fatal error U1077: 'cl.exe' : return code '0x2'
Line number 1494: NMAKE : fatal error U1077: 'cd' : return code '0x2'
Line number 1496: NMAKE : fatal error U1077: 'cd' : return code '0x2'
Line number 1498: NMAKE : fatal error U1077: 'D:\PROGRA~1\MICROS~1\VC98\Bin\nmake.exe' : return code '0x2'
Line number 1500: gnumake: *** [hotspot-compiler2] Error 2

-----


I used the patches provided in the following two fix records:

  http://jpsesvr.sfbay.sun.com:8080/ctetools/html/ViewDetail.jsp?index=2979
  http://jpsesvr.sfbay.sun.com:8080/ctetools/html/ViewDetail.jsp?index=2980