Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/jprt.properties	Wed Jun 27 15:23:36 2012 +0200
     1.2 +++ b/make/jprt.properties	Thu Jun 28 04:21:07 2012 -0400
     1.3 @@ -102,6 +102,11 @@
     1.4  jprt.my.linux.armvfp.jdk7u6=${jprt.my.linux.armvfp.jdk7}
     1.5  jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
     1.6  
     1.7 +jprt.my.linux.armv6.jdk8=linux_armv6_2.6
     1.8 +jprt.my.linux.armv6.jdk7=linux_armv6_2.6
     1.9 +jprt.my.linux.armv6.jdk7u6=${jprt.my.linux.armv6.jdk7}
    1.10 +jprt.my.linux.armv6=${jprt.my.linux.armv6.${jprt.tools.default.release}}
    1.11 +
    1.12  jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
    1.13  jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
    1.14  jprt.my.linux.armsflt.jdk7u6=${jprt.my.linux.armsflt.jdk7}
    1.15 @@ -134,7 +139,7 @@
    1.16      ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \
    1.17      ${jprt.my.windows.i586}-{product|fastdebug|debug}, \
    1.18      ${jprt.my.windows.x64}-{product|fastdebug|debug}, \
    1.19 -    ${jprt.my.linux.armvfp}-{product|fastdebug}
    1.20 +    ${jprt.my.linux.armv6}-{product|fastdebug}
    1.21  
    1.22  jprt.build.targets.open= \
    1.23      ${jprt.my.solaris.i586}-{productOpen}, \

     2.1 --- a/make/pic.make	Wed Jun 27 15:23:36 2012 +0200
     2.2 +++ b/make/pic.make	Thu Jun 28 04:21:07 2012 -0400
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10 @@ -30,6 +30,13 @@
    2.11  
    2.12  ifneq ($(OSNAME), windows)
    2.13    ifndef LP64
    2.14 +    PARTIAL_NONPIC=1
    2.15 +  endif
    2.16 +  PIC_ARCH = ppc
    2.17 +  ifneq ("$(filter $(PIC_ARCH),$(BUILDARCH))","")
    2.18 +    PARTIAL_NONPIC=0
    2.19 +  endif
    2.20 +  ifeq ($(PARTIAL_NONPIC),1)
    2.21      NONPIC_DIRS  = memory oops gc_implementation gc_interface 
    2.22      NONPIC_DIRS  := $(foreach dir,$(NONPIC_DIRS), $(GAMMADIR)/src/share/vm/$(dir))
    2.23      # Look for source files under NONPIC_DIRS

     3.1 --- a/src/share/vm/runtime/fieldDescriptor.cpp	Wed Jun 27 15:23:36 2012 +0200
     3.2 +++ b/src/share/vm/runtime/fieldDescriptor.cpp	Thu Jun 28 04:21:07 2012 -0400
     3.3 @@ -39,6 +39,10 @@
     3.4  }
     3.5  
     3.6  Symbol* fieldDescriptor::generic_signature() const {
     3.7 +  if (!has_generic_signature()) {
     3.8 +    return NULL;
     3.9 +  }
    3.10 +
    3.11    int idx = 0;
    3.12    instanceKlass* ik = instanceKlass::cast(field_holder());
    3.13    for (AllFieldStream fs(ik); !fs.done(); fs.next()) {

     4.1 --- a/src/share/vm/runtime/fieldDescriptor.hpp	Wed Jun 27 15:23:36 2012 +0200
     4.2 +++ b/src/share/vm/runtime/fieldDescriptor.hpp	Thu Jun 28 04:21:07 2012 -0400
     4.3 @@ -100,6 +100,7 @@
     4.4    bool is_field_access_watched() const    { return access_flags().is_field_access_watched(); }
     4.5    bool is_field_modification_watched() const
     4.6                                            { return access_flags().is_field_modification_watched(); }
     4.7 +  bool has_generic_signature() const      { return access_flags().field_has_generic_signature(); }
     4.8  
     4.9    void set_is_field_access_watched(const bool value) {
    4.10      _access_flags.set_is_field_access_watched(value);

     5.1 --- a/src/share/vm/runtime/reflection.cpp	Wed Jun 27 15:23:36 2012 +0200
     5.2 +++ b/src/share/vm/runtime/reflection.cpp	Thu Jun 28 04:21:07 2012 -0400
     5.3 @@ -829,7 +829,7 @@
     5.4    java_lang_reflect_Field::set_modifiers(rh(), fd->access_flags().as_int() & JVM_RECOGNIZED_FIELD_MODIFIERS);
     5.5    java_lang_reflect_Field::set_override(rh(), false);
     5.6    if (java_lang_reflect_Field::has_signature_field() &&
     5.7 -      fd->generic_signature() != NULL) {
     5.8 +      fd->has_generic_signature()) {
     5.9      Symbol*  gs = fd->generic_signature();
    5.10      Handle sig = java_lang_String::create_from_symbol(gs, CHECK_NULL);
    5.11      java_lang_reflect_Field::set_signature(rh(), sig());