The big Zero deletion

[Xerxes Rånby]

On 2010-06-17 20:23, Andrew John Hughes wrote:
> On 17 June 2010 19:08, Andrew John Hughes <ahughes at redhat.com> wrote:
>   
>> On 17 June 2010 18:39, Gary Benson <gbenson at redhat.com> wrote:
>>     
>>> Andrew John Hughes wrote:
>>>       
>>>> There also seem to be a few minor differences that haven't been
>>>> upstreamed.
>>>>         
>>> There shouldn't be :(
>>>       
>>>> ports/hotspot/src/./cpu/zero/vm/globals_zero.hpp:
>>>>
>>>> Has the following differences left.
>>>>
>>>> (- is IcedTea6, + is OpenJDK6)
>>>>
>>>> @@ -35,7 +35,6 @@
>>>>  define_pd_global(bool,  UncommonNullCast,     true);
>>>>
>>>>  define_pd_global(intx,  CodeEntryAlignment,   32);
>>>> -define_pd_global(intx,  OptoLoopAlignment,    16);
>>>>  define_pd_global(intx,  InlineFrequencyCount, 100);
>>>>  define_pd_global(intx,  PreInflateSpin,       10);
>>>>
>>>> @@ -45,5 +44,3 @@
>>>>
>>>>  define_pd_global(bool,  RewriteBytecodes,     true);
>>>>  define_pd_global(bool,  RewriteFrequentPairs, true);
>>>> -
>>>> -define_pd_global(intx,  InlineSmallCode,      1000);
>>>>
>>>> plus old Sun copyright.
>>>>         
>>> We should be able to ignore this one and just use whatever comes from
>>> upstream.  If we're changing things like this to make it build then
>>> presumably that means upstream doesn't build?
>>>
>>>       
>> Upstream builds.  I wouldn't have pushed it otherwise.  But upstream
>> doesn't have Shark.  Are these additions not needed for Shark?
>>
>>     
> Ok the IcedTea6 local changes actually break the build:
>
> /mnt/builder/icedtea6-hg/openjdk/hotspot/src/share/vm/runtime/globals.hpp:50:1:
> error: redefinition of 'const intx pd_InlineSmallCode'
> /mnt/builder/icedtea6-hg/openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp:49:1:
> error: 'const intx pd_InlineSmallCode' previously defined here
>
> I presume they were added for hs14, when we're now on hs17.  I'm
> dropping these changes.
>
>   

Hi

Now after the bump to openjdk-b20 in icedtea6 and bump to hs17-b16
im hitting this new shark build error that seems related to the above
pd_InlineSmallCode to be or not to be discussion:
 
../icedtea6/configure --enable-shark --with-openjdk -disable-docs
make

...

Compiling
/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp
rm -f globals.o
g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DIA32
-DZERO_LIBARCH=\"i386\" -DPRODUCT -I. -I../generated/adfiles
-I../generated/jvmtifiles
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/asm
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/c1
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/ci
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/classfile
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/code
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/compiler
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation/g1
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation/parNew
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_implementation/shared
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/gc_interface
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/interpreter
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/memory
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/oops
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/prims
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/services
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/shark
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/utilities
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/cpu/zero/vm
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/os/linux/vm
-I/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/os_cpu/linux_zero/vm
-I../generated -DHOTSPOT_RELEASE_VERSION="\"17.0-b16\""
-DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"xerxes\""
-DHOTSPOT_LIB_ARCH=\"i386\" -DJRE_RELEASE_VERSION="\"1.6.0_20-b20\""
-DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea6
1.9pre+ra4bc545c483a\"" -DDISTRIBUTION_ID="\"Built on Ubuntu 10.04 LTS
(Thu Jun 24 10:15:19 CEST 2010)\"" -DSHARK  -I/usr/local/include
-D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
-DSHARK_LLVM_VERSION=27 -fpic -fno-rtti -fno-exceptions -D_REENTRANT
-fcheck-new -m32 -pipe -g -O3 -fno-strict-aliasing -DVM_LITTLE_ENDIAN
-Werror -Wpointer-arith -Wsign-compare    -c -o globals.o
/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp

/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/runtime/globals.cpp:34:
error: 'pd_InlineSmallCode' was not declared in this scope
make[7]: *** [globals.o] Error 1

Any idea?

Cheers
Xerxes