Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/agent/src/os/linux/libproc.h	Fri Feb 20 17:05:39 2015 +0000
     1.2 +++ b/agent/src/os/linux/libproc.h	Tue Feb 24 15:04:52 2015 -0500
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -30,7 +30,7 @@
    1.11  #include <stdint.h>
    1.12  #include "proc_service.h"
    1.13  
    1.14 -#if defined(arm) || defined(ppc)
    1.15 +#ifdef ALT_SASRCDIR
    1.16  #include "libproc_md.h"
    1.17  #endif
    1.18  

     2.1 --- a/make/defs.make	Fri Feb 20 17:05:39 2015 +0000
     2.2 +++ b/make/defs.make	Tue Feb 24 15:04:52 2015 -0500
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2006, 2015, 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 @@ -273,7 +273,7 @@
    2.11  
    2.12    # Use uname output for SRCARCH, but deal with platform differences. If ARCH
    2.13    # is not explicitly listed below, it is treated as x86.
    2.14 -  SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc ppc64 zero,$(ARCH)))
    2.15 +  SRCARCH    ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc64 zero,$(ARCH)))
    2.16    ARCH/       = x86
    2.17    ARCH/sparc  = sparc
    2.18    ARCH/sparc64= sparc
    2.19 @@ -281,12 +281,10 @@
    2.20    ARCH/amd64  = x86
    2.21    ARCH/x86_64 = x86
    2.22    ARCH/ppc64  = ppc
    2.23 -  ARCH/ppc    = ppc
    2.24 -  ARCH/arm    = arm
    2.25    ARCH/zero   = zero
    2.26  
    2.27    # BUILDARCH is usually the same as SRCARCH, except for sparcv9
    2.28 -  BUILDARCH = $(SRCARCH)
    2.29 +  BUILDARCH ?= $(SRCARCH)
    2.30    ifeq ($(BUILDARCH), x86)
    2.31      ifdef LP64
    2.32        BUILDARCH = amd64
    2.33 @@ -306,18 +304,16 @@
    2.34    endif
    2.35  
    2.36    # LIBARCH is 1:1 mapping from BUILDARCH
    2.37 -  LIBARCH         = $(LIBARCH/$(BUILDARCH))
    2.38 +  LIBARCH        ?= $(LIBARCH/$(BUILDARCH))
    2.39    LIBARCH/i486    = i386
    2.40    LIBARCH/amd64   = amd64
    2.41    LIBARCH/sparc   = sparc
    2.42    LIBARCH/sparcv9 = sparcv9
    2.43    LIBARCH/ia64    = ia64
    2.44    LIBARCH/ppc64   = ppc64
    2.45 -  LIBARCH/ppc     = ppc
    2.46 -  LIBARCH/arm     = arm
    2.47    LIBARCH/zero    = $(ZERO_LIBARCH)
    2.48  
    2.49 -  LP64_ARCH = sparcv9 amd64 ia64 ppc64 zero
    2.50 +  LP64_ARCH += sparcv9 amd64 ia64 ppc64 zero
    2.51  endif
    2.52  
    2.53  # Required make macro settings for all platforms

     3.1 --- a/make/linux/makefiles/arm.make	Fri Feb 20 17:05:39 2015 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,31 +0,0 @@
     3.4 -#
     3.5 -# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
     3.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.7 -#
     3.8 -# This code is free software; you can redistribute it and/or modify it
     3.9 -# under the terms of the GNU General Public License version 2 only, as
    3.10 -# published by the Free Software Foundation.
    3.11 -#
    3.12 -# This code is distributed in the hope that it will be useful, but WITHOUT
    3.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.14 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    3.15 -# version 2 for more details (a copy is included in the LICENSE file that
    3.16 -# accompanied this code).
    3.17 -#
    3.18 -# You should have received a copy of the GNU General Public License version
    3.19 -# 2 along with this work; if not, write to the Free Software Foundation,
    3.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.21 -#
    3.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.23 -# or visit www.oracle.com if you need additional information or have any
    3.24 -# questions.
    3.25 -#  
    3.26 -#
    3.27 -
    3.28 -Obj_Files += linux_arm.o
    3.29 -
    3.30 -ifneq ($(EXT_LIBS_PATH),)
    3.31 -  LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 
    3.32 -endif
    3.33 -
    3.34 -CFLAGS += -DVM_LITTLE_ENDIAN

     4.1 --- a/make/linux/makefiles/buildtree.make	Fri Feb 20 17:05:39 2015 +0000
     4.2 +++ b/make/linux/makefiles/buildtree.make	Tue Feb 24 15:04:52 2015 -0500
     4.3 @@ -1,5 +1,5 @@
     4.4  #
     4.5 -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
     4.6 +# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
     4.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8  #
     4.9  # This code is free software; you can redistribute it and/or modify it
    4.10 @@ -70,6 +70,8 @@
    4.11      PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
    4.12    else
    4.13      PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
    4.14 +    ALT_PLATFORM_FILE = $(HS_ALT_MAKE)/$(OS_FAMILY)/platform_$(BUILDARCH)
    4.15 +    PLATFORM_FILE := $(if $(wildcard $(ALT_PLATFORM_FILE)),$(ALT_PLATFORM_FILE),$(PLATFORM_FILE))
    4.16    endif
    4.17  endif
    4.18  
    4.19 @@ -202,7 +204,7 @@
    4.20  	$(QUIETLY) ( \
    4.21  	$(BUILDTREE_COMMENT); \
    4.22  	echo; \
    4.23 -	echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \
    4.24 +	echo "Platform_file = $(PLATFORM_FILE)" | sed -e 's|$(HS_ALT_MAKE)|$$(HS_ALT_MAKE)|' -e 's|$(GAMMADIR)|$$(GAMMADIR)|'; \
    4.25  	sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \
    4.26  	echo; \
    4.27  	echo "GAMMADIR = $(GAMMADIR)"; \

     5.1 --- a/make/linux/makefiles/defs.make	Fri Feb 20 17:05:39 2015 +0000
     5.2 +++ b/make/linux/makefiles/defs.make	Tue Feb 24 15:04:52 2015 -0500
     5.3 @@ -1,5 +1,5 @@
     5.4  #
     5.5 -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
     5.6 +# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
     5.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8  #
     5.9  # This code is free software; you can redistribute it and/or modify it
    5.10 @@ -109,22 +109,6 @@
    5.11    HS_ARCH          = x86
    5.12  endif
    5.13  
    5.14 -# ARM
    5.15 -ifeq ($(ARCH), arm)
    5.16 -  ARCH_DATA_MODEL  = 32
    5.17 -  PLATFORM         = linux-arm
    5.18 -  VM_PLATFORM      = linux_arm
    5.19 -  HS_ARCH          = arm
    5.20 -endif
    5.21 -
    5.22 -# PPC
    5.23 -ifeq ($(ARCH), ppc)
    5.24 -  ARCH_DATA_MODEL  = 32
    5.25 -  PLATFORM         = linux-ppc
    5.26 -  VM_PLATFORM      = linux_ppc
    5.27 -  HS_ARCH          = ppc
    5.28 -endif
    5.29 -
    5.30  # PPC64
    5.31  ifeq ($(ARCH), ppc64)
    5.32    ARCH_DATA_MODEL  = 64

     6.1 --- a/make/linux/makefiles/gcc.make	Fri Feb 20 17:05:39 2015 +0000
     6.2 +++ b/make/linux/makefiles/gcc.make	Tue Feb 24 15:04:52 2015 -0500
     6.3 @@ -1,5 +1,5 @@
     6.4  #
     6.5 -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
     6.6 +# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
     6.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8  #
     6.9  # This code is free software; you can redistribute it and/or modify it
    6.10 @@ -176,11 +176,7 @@
    6.11  ARCHFLAG/ia64    =
    6.12  ARCHFLAG/sparc   = -m32 -mcpu=v9
    6.13  ARCHFLAG/sparcv9 = -m64 -mcpu=v9
    6.14 -ARCHFLAG/arm     =  -fsigned-char
    6.15  ARCHFLAG/zero    = $(ZERO_ARCHFLAG)
    6.16 -ifndef E500V2
    6.17 -ARCHFLAG/ppc     =  -mcpu=powerpc
    6.18 -endif
    6.19  ARCHFLAG/ppc64   =  -m64
    6.20  
    6.21  CFLAGS     += $(ARCHFLAG)
    6.22 @@ -188,10 +184,6 @@
    6.23  LFLAGS     += $(ARCHFLAG)
    6.24  ASFLAGS    += $(ARCHFLAG)
    6.25  
    6.26 -ifdef E500V2
    6.27 -CFLAGS += -DE500V2
    6.28 -endif
    6.29 -
    6.30  # Use C++ Interpreter
    6.31  ifdef CC_INTERP
    6.32    CFLAGS += -DCC_INTERP
    6.33 @@ -409,3 +401,5 @@
    6.34  ifndef USE_SUNCC
    6.35    CFLAGS += -fno-omit-frame-pointer
    6.36  endif
    6.37 +
    6.38 +-include $(HS_ALT_MAKE)/linux/makefiles/gcc.make

     7.1 --- a/make/linux/makefiles/ppc.make	Fri Feb 20 17:05:39 2015 +0000
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,33 +0,0 @@
     7.4 -#
     7.5 -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
     7.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.7 -#
     7.8 -# This code is free software; you can redistribute it and/or modify it
     7.9 -# under the terms of the GNU General Public License version 2 only, as
    7.10 -# published by the Free Software Foundation.
    7.11 -#
    7.12 -# This code is distributed in the hope that it will be useful, but WITHOUT
    7.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    7.14 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    7.15 -# version 2 for more details (a copy is included in the LICENSE file that
    7.16 -# accompanied this code).
    7.17 -#
    7.18 -# You should have received a copy of the GNU General Public License version
    7.19 -# 2 along with this work; if not, write to the Free Software Foundation,
    7.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    7.21 -#
    7.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    7.23 -# or visit www.oracle.com if you need additional information or have any
    7.24 -# questions.
    7.25 -#  
    7.26 -#
    7.27 -
    7.28 -# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
    7.29 -OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
    7.30 -
    7.31 -# Must also specify if CPU is big endian
    7.32 -CFLAGS += -DVM_BIG_ENDIAN
    7.33 -
    7.34 -ifdef E500V2
    7.35 -ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1 
    7.36 -endif

     8.1 --- a/make/linux/makefiles/saproc.make	Fri Feb 20 17:05:39 2015 +0000
     8.2 +++ b/make/linux/makefiles/saproc.make	Tue Feb 24 15:04:52 2015 -0500
     8.3 @@ -1,5 +1,5 @@
     8.4  #
     8.5 -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
     8.6 +# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
     8.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.8  #
     8.9  # This code is free software; you can redistribute it and/or modify it
    8.10 @@ -69,19 +69,21 @@
    8.11  endif
    8.12  
    8.13  ifneq ($(ALT_SASRCDIR),)
    8.14 -ALT_SAINCDIR=-I$(ALT_SASRCDIR)
    8.15 +ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR
    8.16  else
    8.17  ALT_SAINCDIR=
    8.18  endif
    8.19  SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
    8.20  
    8.21 +SAARCH ?= $(BUILDARCH)
    8.22 +
    8.23  $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
    8.24  	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
    8.25  	  echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
    8.26  	  exit 1; \
    8.27  	fi
    8.28  	@echo Making SA debugger back-end...
    8.29 -	$(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE                   \
    8.30 +	$(QUIETLY) $(CC) -D$(SAARCH) -D_GNU_SOURCE                      \
    8.31  		   -D_FILE_OFFSET_BITS=64                               \
    8.32                     $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG)     \
    8.33  	           -I$(SASRCDIR)                                        \

     9.1 --- a/make/linux/makefiles/vm.make	Fri Feb 20 17:05:39 2015 +0000
     9.2 +++ b/make/linux/makefiles/vm.make	Tue Feb 24 15:04:52 2015 -0500
     9.3 @@ -1,5 +1,5 @@
     9.4  #
     9.5 -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
     9.6 +# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
     9.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.8  #
     9.9  # This code is free software; you can redistribute it and/or modify it
    9.10 @@ -45,8 +45,9 @@
    9.11  ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
    9.12    include $(MAKEFILES_DIR)/zeroshark.make
    9.13  else
    9.14 -  include $(MAKEFILES_DIR)/$(BUILDARCH).make
    9.15 -  -include $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make
    9.16 +  BUILDARCH_MAKE = $(MAKEFILES_DIR)/$(BUILDARCH).make
    9.17 +  ALT_BUILDARCH_MAKE = $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make
    9.18 +  include $(if $(wildcard $(ALT_BUILDARCH_MAKE)),$(ALT_BUILDARCH_MAKE),$(BUILDARCH_MAKE))
    9.19  endif
    9.20  
    9.21  # set VPATH so make knows where to look for source files

    10.1 --- a/make/linux/platform_arm	Fri Feb 20 17:05:39 2015 +0000
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,17 +0,0 @@
    10.4 -os_family = linux
    10.5 -
    10.6 -arch = arm
    10.7 -
    10.8 -arch_model = arm
    10.9 -
   10.10 -os_arch = linux_arm
   10.11 -
   10.12 -os_arch_model = linux_arm
   10.13 -
   10.14 -lib_arch = arm
   10.15 -
   10.16 -compiler = gcc
   10.17 -
   10.18 -gnu_dis_arch = arm
   10.19 -
   10.20 -sysdefs = -DLINUX -D_GNU_SOURCE -DARM

    11.1 --- a/make/linux/platform_ppc	Fri Feb 20 17:05:39 2015 +0000
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,17 +0,0 @@
    11.4 -os_family = linux
    11.5 -
    11.6 -arch = ppc
    11.7 -
    11.8 -arch_model = ppc_32
    11.9 -
   11.10 -os_arch = linux_ppc
   11.11 -
   11.12 -os_arch_model = linux_ppc_32
   11.13 -
   11.14 -lib_arch = ppc
   11.15 -
   11.16 -compiler = gcc
   11.17 -
   11.18 -gnu_dis_arch = ppc
   11.19 -
   11.20 -sysdefs = -DLINUX -D_GNU_SOURCE -DPPC32

    12.1 --- a/src/os/linux/vm/os_linux.cpp	Fri Feb 20 17:05:39 2015 +0000
    12.2 +++ b/src/os/linux/vm/os_linux.cpp	Tue Feb 24 15:04:52 2015 -0500
    12.3 @@ -1,5 +1,5 @@
    12.4  /*
    12.5 - * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    12.6 + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
    12.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.8   *
    12.9   * This code is free software; you can redistribute it and/or modify it
   12.10 @@ -252,30 +252,7 @@
   12.11  #endif
   12.12  
   12.13  // Cpu architecture string
   12.14 -#if   defined(ZERO)
   12.15 -static char cpu_arch[] = ZERO_LIBARCH;
   12.16 -#elif defined(IA64)
   12.17 -static char cpu_arch[] = "ia64";
   12.18 -#elif defined(IA32)
   12.19 -static char cpu_arch[] = "i386";
   12.20 -#elif defined(AMD64)
   12.21 -static char cpu_arch[] = "amd64";
   12.22 -#elif defined(ARM)
   12.23 -static char cpu_arch[] = "arm";
   12.24 -#elif defined(PPC32)
   12.25 -static char cpu_arch[] = "ppc";
   12.26 -#elif defined(PPC64)
   12.27 -static char cpu_arch[] = "ppc64";
   12.28 -#elif defined(SPARC)
   12.29 -#  ifdef _LP64
   12.30 -static char cpu_arch[] = "sparcv9";
   12.31 -#  else
   12.32 -static char cpu_arch[] = "sparc";
   12.33 -#  endif
   12.34 -#else
   12.35 -#error Add appropriate cpu_arch setting
   12.36 -#endif
   12.37 -
   12.38 +static char cpu_arch[] = HOTSPOT_LIB_ARCH;
   12.39  
   12.40  // pid_t gettid()
   12.41  //

    13.1 --- a/src/share/vm/c1/c1_LIR.cpp	Fri Feb 20 17:05:39 2015 +0000
    13.2 +++ b/src/share/vm/c1/c1_LIR.cpp	Tue Feb 24 15:04:52 2015 -0500
    13.3 @@ -1,5 +1,5 @@
    13.4  /*
    13.5 - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
    13.6 + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
    13.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.8   *
    13.9   * This code is free software; you can redistribute it and/or modify it
   13.10 @@ -142,16 +142,11 @@
   13.11  
   13.12  
   13.13  #ifndef PRODUCT
   13.14 -void LIR_Address::verify() const {
   13.15 +void LIR_Address::verify0() const {
   13.16  #if defined(SPARC) || defined(PPC)
   13.17    assert(scale() == times_1, "Scaled addressing mode not available on SPARC/PPC and should not be used");
   13.18    assert(disp() == 0 || index()->is_illegal(), "can't have both");
   13.19  #endif
   13.20 -#ifdef ARM
   13.21 -  assert(disp() == 0 || index()->is_illegal(), "can't have both");
   13.22 -  // Note: offsets higher than 4096 must not be rejected here. They can
   13.23 -  // be handled by the back-end or will be rejected if not.
   13.24 -#endif
   13.25  #ifdef _LP64
   13.26    assert(base()->is_cpu_register(), "wrong base operand");
   13.27    assert(index()->is_illegal() || index()->is_double_cpu(), "wrong index operand");

    14.1 --- a/src/share/vm/c1/c1_LIR.hpp	Fri Feb 20 17:05:39 2015 +0000
    14.2 +++ b/src/share/vm/c1/c1_LIR.hpp	Tue Feb 24 15:04:52 2015 -0500
    14.3 @@ -1,5 +1,5 @@
    14.4  /*
    14.5 - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
    14.6 + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
    14.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.8   *
    14.9   * This code is free software; you can redistribute it and/or modify it
   14.10 @@ -25,6 +25,7 @@
   14.11  #ifndef SHARE_VM_C1_C1_LIR_HPP
   14.12  #define SHARE_VM_C1_C1_LIR_HPP
   14.13  
   14.14 +#include "c1/c1_Defs.hpp"
   14.15  #include "c1/c1_ValueType.hpp"
   14.16  #include "oops/method.hpp"
   14.17  
   14.18 @@ -561,7 +562,13 @@
   14.19    virtual BasicType type() const                 { return _type; }
   14.20    virtual void print_value_on(outputStream* out) const PRODUCT_RETURN;
   14.21  
   14.22 -  void verify() const PRODUCT_RETURN;
   14.23 +  void verify0() const PRODUCT_RETURN;
   14.24 +#if defined(LIR_ADDRESS_PD_VERIFY) && !defined(PRODUCT)
   14.25 +  void pd_verify() const;
   14.26 +  void verify() const { pd_verify(); }
   14.27 +#else
   14.28 +  void verify() const { verify0(); }
   14.29 +#endif
   14.30  
   14.31    static Scale scale(BasicType type);
   14.32  };
   14.33 @@ -610,19 +617,15 @@
   14.34                                                                               LIR_OprDesc::float_type           |
   14.35                                                                               LIR_OprDesc::fpu_register         |
   14.36                                                                               LIR_OprDesc::single_size); }
   14.37 -#if defined(ARM)
   14.38 -  static LIR_Opr double_fpu(int reg1, int reg2)    { return (LIR_Opr)((reg1 << LIR_OprDesc::reg1_shift) | (reg2 << LIR_OprDesc::reg2_shift) | LIR_OprDesc::double_type | LIR_OprDesc::fpu_register | LIR_OprDesc::double_size); }
   14.39 -  static LIR_Opr single_softfp(int reg)            { return (LIR_Opr)((reg  << LIR_OprDesc::reg1_shift) |                                     LIR_OprDesc::float_type  | LIR_OprDesc::cpu_register | LIR_OprDesc::single_size); }
   14.40 -  static LIR_Opr double_softfp(int reg1, int reg2) { return (LIR_Opr)((reg1 << LIR_OprDesc::reg1_shift) | (reg2 << LIR_OprDesc::reg2_shift) | LIR_OprDesc::double_type | LIR_OprDesc::cpu_register | LIR_OprDesc::double_size); }
   14.41 -#endif
   14.42 -#ifdef SPARC
   14.43 +#if defined(C1_LIR_MD_HPP)
   14.44 +# include C1_LIR_MD_HPP
   14.45 +#elif defined(SPARC)
   14.46    static LIR_Opr double_fpu(int reg1, int reg2) { return (LIR_Opr)(intptr_t)((reg1 << LIR_OprDesc::reg1_shift) |
   14.47                                                                               (reg2 << LIR_OprDesc::reg2_shift) |
   14.48                                                                               LIR_OprDesc::double_type          |
   14.49                                                                               LIR_OprDesc::fpu_register         |
   14.50                                                                               LIR_OprDesc::double_size); }
   14.51 -#endif
   14.52 -#ifdef X86
   14.53 +#elif defined(X86)
   14.54    static LIR_Opr double_fpu(int reg)            { return (LIR_Opr)(intptr_t)((reg  << LIR_OprDesc::reg1_shift) |
   14.55                                                                               (reg  << LIR_OprDesc::reg2_shift) |
   14.56                                                                               LIR_OprDesc::double_type          |
   14.57 @@ -640,8 +643,7 @@
   14.58                                                                               LIR_OprDesc::fpu_register         |
   14.59                                                                               LIR_OprDesc::double_size          |
   14.60                                                                               LIR_OprDesc::is_xmm_mask); }
   14.61 -#endif // X86
   14.62 -#ifdef PPC
   14.63 +#elif defined(PPC)
   14.64    static LIR_Opr double_fpu(int reg)            { return (LIR_Opr)(intptr_t)((reg  << LIR_OprDesc::reg1_shift) |
   14.65                                                                               (reg  << LIR_OprDesc::reg2_shift) |
   14.66                                                                               LIR_OprDesc::double_type          |

    15.1 --- a/src/share/vm/c1/c1_LIRGenerator.cpp	Fri Feb 20 17:05:39 2015 +0000
    15.2 +++ b/src/share/vm/c1/c1_LIRGenerator.cpp	Tue Feb 24 15:04:52 2015 -0500
    15.3 @@ -1,5 +1,5 @@
    15.4  /*
    15.5 - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    15.6 + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
    15.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.8   *
    15.9   * This code is free software; you can redistribute it and/or modify it
   15.10 @@ -23,6 +23,7 @@
   15.11   */
   15.12  
   15.13  #include "precompiled.hpp"
   15.14 +#include "c1/c1_Defs.hpp"
   15.15  #include "c1/c1_Compilation.hpp"
   15.16  #include "c1/c1_FrameMap.hpp"
   15.17  #include "c1/c1_Instruction.hpp"
   15.18 @@ -46,10 +47,7 @@
   15.19  #define __ gen()->lir()->
   15.20  #endif
   15.21  
   15.22 -// TODO: ARM - Use some recognizable constant which still fits architectural constraints
   15.23 -#ifdef ARM
   15.24 -#define PATCHED_ADDR  (204)
   15.25 -#else
   15.26 +#ifndef PATCHED_ADDR
   15.27  #define PATCHED_ADDR  (max_jint)
   15.28  #endif
   15.29  
   15.30 @@ -1599,25 +1597,9 @@
   15.31    }
   15.32    assert(addr->is_register(), "must be a register at this point");
   15.33  
   15.34 -#ifdef ARM
   15.35 -  // TODO: ARM - move to platform-dependent code
   15.36 -  LIR_Opr tmp = FrameMap::R14_opr;
   15.37 -  if (VM_Version::supports_movw()) {
   15.38 -    __ move((LIR_Opr)card_table_base, tmp);
   15.39 -  } else {
   15.40 -    __ move(new LIR_Address(FrameMap::Rthread_opr, in_bytes(JavaThread::card_table_base_offset()), T_ADDRESS), tmp);
   15.41 -  }
   15.42 -
   15.43 -  CardTableModRefBS* ct = (CardTableModRefBS*)_bs;
   15.44 -  LIR_Address *card_addr = new LIR_Address(tmp, addr, (LIR_Address::Scale) -CardTableModRefBS::card_shift, 0, T_BYTE);
   15.45 -  if(((int)ct->byte_map_base & 0xff) == 0) {
   15.46 -    __ move(tmp, card_addr);
   15.47 -  } else {
   15.48 -    LIR_Opr tmp_zero = new_register(T_INT);
   15.49 -    __ move(LIR_OprFact::intConst(0), tmp_zero);
   15.50 -    __ move(tmp_zero, card_addr);
   15.51 -  }
   15.52 -#else // ARM
   15.53 +#ifdef CARDTABLEMODREF_POST_BARRIER_HELPER
   15.54 +  CardTableModRef_post_barrier_helper(addr, card_table_base);
   15.55 +#else
   15.56    LIR_Opr tmp = new_pointer_register();
   15.57    if (TwoOperandLIRForm) {
   15.58      __ move(addr, tmp);
   15.59 @@ -1633,7 +1615,7 @@
   15.60                new LIR_Address(tmp, load_constant(card_table_base),
   15.61                                T_BYTE));
   15.62    }
   15.63 -#endif // ARM
   15.64 +#endif
   15.65  }
   15.66  
   15.67  
   15.68 @@ -2121,7 +2103,7 @@
   15.69    } else {
   15.70  #ifdef X86
   15.71      addr = new LIR_Address(base_op, index_op, LIR_Address::Scale(log2_scale), 0, dst_type);
   15.72 -#elif defined(ARM)
   15.73 +#elif defined(GENERATE_ADDRESS_IS_PREFERRED)
   15.74      addr = generate_address(base_op, index_op, log2_scale, 0, dst_type);
   15.75  #else
   15.76      if (index_op->is_illegal() || log2_scale == 0) {
   15.77 @@ -2175,6 +2157,9 @@
   15.78    LIR_Opr base_op = base.result();
   15.79    LIR_Opr index_op = idx.result();
   15.80  
   15.81 +#ifdef GENERATE_ADDRESS_IS_PREFERRED
   15.82 +  LIR_Address* addr = generate_address(base_op, index_op, log2_scale, 0, x->basic_type());
   15.83 +#else
   15.84  #ifndef _LP64
   15.85    if (base_op->type() == T_LONG) {
   15.86      base_op = new_register(T_INT);
   15.87 @@ -2208,6 +2193,7 @@
   15.88    }
   15.89  
   15.90    LIR_Address* addr = new LIR_Address(base_op, index_op, x->basic_type());
   15.91 +#endif // !GENERATE_ADDRESS_IS_PREFERRED
   15.92    __ move(value.result(), addr);
   15.93  }
   15.94  

    16.1 --- a/src/share/vm/c1/c1_LIRGenerator.hpp	Fri Feb 20 17:05:39 2015 +0000
    16.2 +++ b/src/share/vm/c1/c1_LIRGenerator.hpp	Tue Feb 24 15:04:52 2015 -0500
    16.3 @@ -1,5 +1,5 @@
    16.4  /*
    16.5 - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    16.6 + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
    16.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.8   *
    16.9   * This code is free software; you can redistribute it and/or modify it
   16.10 @@ -277,6 +277,9 @@
   16.11  
   16.12    void G1SATBCardTableModRef_post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val);
   16.13    void CardTableModRef_post_barrier(LIR_OprDesc* addr, LIR_OprDesc* new_val);
   16.14 +#ifdef CARDTABLEMODREF_POST_BARRIER_HELPER
   16.15 +  void CardTableModRef_post_barrier_helper(LIR_OprDesc* addr, LIR_Const* card_table_base);
   16.16 +#endif
   16.17  
   16.18  
   16.19    static LIR_Opr result_register_for(ValueType* type, bool callee = false);
   16.20 @@ -550,6 +553,10 @@
   16.21  #ifdef ASSERT
   16.22    virtual void do_Assert         (Assert*          x);
   16.23  #endif
   16.24 +
   16.25 +#ifdef C1_LIRGENERATOR_MD_HPP
   16.26 +#include C1_LIRGENERATOR_MD_HPP
   16.27 +#endif
   16.28  };
   16.29  
   16.30  

    17.1 --- a/src/share/vm/c1/c1_LinearScan.cpp	Fri Feb 20 17:05:39 2015 +0000
    17.2 +++ b/src/share/vm/c1/c1_LinearScan.cpp	Tue Feb 24 15:04:52 2015 -0500
    17.3 @@ -1,5 +1,5 @@
    17.4  /*
    17.5 - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    17.6 + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
    17.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.8   *
    17.9   * This code is free software; you can redistribute it and/or modify it
   17.10 @@ -2138,7 +2138,7 @@
   17.11          assert(interval->assigned_regHi() >= pd_first_fpu_reg && interval->assigned_regHi() <= pd_last_fpu_reg, "no fpu register");
   17.12          assert(assigned_reg % 2 == 0 && assigned_reg + 1 == interval->assigned_regHi(), "must be sequential and even");
   17.13          LIR_Opr result = LIR_OprFact::double_fpu(interval->assigned_regHi() - pd_first_fpu_reg, assigned_reg - pd_first_fpu_reg);
   17.14 -#elif defined(ARM)
   17.15 +#elif defined(ARM32)
   17.16          assert(assigned_reg >= pd_first_fpu_reg && assigned_reg <= pd_last_fpu_reg, "no fpu register");
   17.17          assert(interval->assigned_regHi() >= pd_first_fpu_reg && interval->assigned_regHi() <= pd_last_fpu_reg, "no fpu register");
   17.18          assert(assigned_reg % 2 == 0 && assigned_reg + 1 == interval->assigned_regHi(), "must be sequential and even");
   17.19 @@ -2727,7 +2727,7 @@
   17.20  #ifdef SPARC
   17.21        assert(opr->fpu_regnrLo() == opr->fpu_regnrHi() + 1, "assumed in calculation (only fpu_regnrHi is used)");
   17.22  #endif
   17.23 -#ifdef ARM
   17.24 +#ifdef ARM32
   17.25        assert(opr->fpu_regnrHi() == opr->fpu_regnrLo() + 1, "assumed in calculation (only fpu_regnrLo is used)");
   17.26  #endif
   17.27  #ifdef PPC

    18.1 --- a/src/share/vm/c1/c1_Runtime1.cpp	Fri Feb 20 17:05:39 2015 +0000
    18.2 +++ b/src/share/vm/c1/c1_Runtime1.cpp	Tue Feb 24 15:04:52 2015 -0500
    18.3 @@ -1,5 +1,5 @@
    18.4  /*
    18.5 - * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    18.6 + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
    18.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.8   *
    18.9   * This code is free software; you can redistribute it and/or modify it
   18.10 @@ -1085,7 +1085,7 @@
   18.11  #ifdef ARM
   18.12            if((load_klass_or_mirror_patch_id ||
   18.13                stub_id == Runtime1::load_appendix_patching_id) &&
   18.14 -             !VM_Version::supports_movw()) {
   18.15 +              nativeMovConstReg_at(copy_buff)->is_pc_relative()) {
   18.16              nmethod* nm = CodeCache::find_nmethod(instr_pc);
   18.17              address addr = NULL;
   18.18              assert(nm != NULL, "invalid nmethod_pc");

    19.1 --- a/src/share/vm/code/vmreg.hpp	Fri Feb 20 17:05:39 2015 +0000
    19.2 +++ b/src/share/vm/code/vmreg.hpp	Tue Feb 24 15:04:52 2015 -0500
    19.3 @@ -1,5 +1,5 @@
    19.4  /*
    19.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    19.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
    19.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.8   *
    19.9   * This code is free software; you can redistribute it and/or modify it
   19.10 @@ -32,25 +32,17 @@
   19.11  #ifdef COMPILER2
   19.12  #include "opto/adlcVMDeps.hpp"
   19.13  #include "utilities/ostream.hpp"
   19.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   19.15 +#if defined ADGLOBALS_MD_HPP
   19.16 +# include ADGLOBALS_MD_HPP
   19.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   19.18  # include "adfiles/adGlobals_x86_32.hpp"
   19.19 -#endif
   19.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   19.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   19.22  # include "adfiles/adGlobals_x86_64.hpp"
   19.23 -#endif
   19.24 -#ifdef TARGET_ARCH_MODEL_sparc
   19.25 +#elif defined TARGET_ARCH_MODEL_sparc
   19.26  # include "adfiles/adGlobals_sparc.hpp"
   19.27 -#endif
   19.28 -#ifdef TARGET_ARCH_MODEL_zero
   19.29 +#elif defined TARGET_ARCH_MODEL_zero
   19.30  # include "adfiles/adGlobals_zero.hpp"
   19.31 -#endif
   19.32 -#ifdef TARGET_ARCH_MODEL_arm
   19.33 -# include "adfiles/adGlobals_arm.hpp"
   19.34 -#endif
   19.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   19.36 -# include "adfiles/adGlobals_ppc_32.hpp"
   19.37 -#endif
   19.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   19.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   19.40  # include "adfiles/adGlobals_ppc_64.hpp"
   19.41  #endif
   19.42  #endif

    20.1 --- a/src/share/vm/interpreter/abstractInterpreter.hpp	Fri Feb 20 17:05:39 2015 +0000
    20.2 +++ b/src/share/vm/interpreter/abstractInterpreter.hpp	Tue Feb 24 15:04:52 2015 -0500
    20.3 @@ -1,5 +1,5 @@
    20.4  /*
    20.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    20.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    20.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    20.8   *
    20.9   * This code is free software; you can redistribute it and/or modify it
   20.10 @@ -30,22 +30,15 @@
   20.11  #include "runtime/thread.inline.hpp"
   20.12  #include "runtime/vmThread.hpp"
   20.13  #include "utilities/top.hpp"
   20.14 -#ifdef TARGET_ARCH_x86
   20.15 +#if defined INTERP_MASM_MD_HPP
   20.16 +# include INTERP_MASM_MD_HPP
   20.17 +#elif defined TARGET_ARCH_x86
   20.18  # include "interp_masm_x86.hpp"
   20.19 -#endif
   20.20 -#ifdef TARGET_ARCH_MODEL_sparc
   20.21 +#elif defined TARGET_ARCH_MODEL_sparc
   20.22  # include "interp_masm_sparc.hpp"
   20.23 -#endif
   20.24 -#ifdef TARGET_ARCH_MODEL_zero
   20.25 +#elif defined TARGET_ARCH_MODEL_zero
   20.26  # include "interp_masm_zero.hpp"
   20.27 -#endif
   20.28 -#ifdef TARGET_ARCH_MODEL_arm
   20.29 -# include "interp_masm_arm.hpp"
   20.30 -#endif
   20.31 -#ifdef TARGET_ARCH_MODEL_ppc_32
   20.32 -# include "interp_masm_ppc_32.hpp"
   20.33 -#endif
   20.34 -#ifdef TARGET_ARCH_MODEL_ppc_64
   20.35 +#elif defined TARGET_ARCH_MODEL_ppc_64
   20.36  # include "interp_masm_ppc_64.hpp"
   20.37  #endif
   20.38  

    21.1 --- a/src/share/vm/interpreter/templateTable.hpp	Fri Feb 20 17:05:39 2015 +0000
    21.2 +++ b/src/share/vm/interpreter/templateTable.hpp	Tue Feb 24 15:04:52 2015 -0500
    21.3 @@ -1,5 +1,5 @@
    21.4  /*
    21.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    21.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    21.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.8   *
    21.9   * This code is free software; you can redistribute it and/or modify it
   21.10 @@ -28,22 +28,15 @@
   21.11  #include "interpreter/bytecodes.hpp"
   21.12  #include "memory/allocation.hpp"
   21.13  #include "runtime/frame.hpp"
   21.14 -#ifdef TARGET_ARCH_x86
   21.15 +#if defined INTERP_MASM_MD_HPP
   21.16 +# include INTERP_MASM_MD_HPP
   21.17 +#elif defined TARGET_ARCH_x86
   21.18  # include "interp_masm_x86.hpp"
   21.19 -#endif
   21.20 -#ifdef TARGET_ARCH_MODEL_sparc
   21.21 +#elif defined TARGET_ARCH_MODEL_sparc
   21.22  # include "interp_masm_sparc.hpp"
   21.23 -#endif
   21.24 -#ifdef TARGET_ARCH_MODEL_zero
   21.25 +#elif defined TARGET_ARCH_MODEL_zero
   21.26  # include "interp_masm_zero.hpp"
   21.27 -#endif
   21.28 -#ifdef TARGET_ARCH_MODEL_arm
   21.29 -# include "interp_masm_arm.hpp"
   21.30 -#endif
   21.31 -#ifdef TARGET_ARCH_MODEL_ppc_32
   21.32 -# include "interp_masm_ppc_32.hpp"
   21.33 -#endif
   21.34 -#ifdef TARGET_ARCH_MODEL_ppc_64
   21.35 +#elif defined TARGET_ARCH_MODEL_ppc_64
   21.36  # include "interp_masm_ppc_64.hpp"
   21.37  #endif
   21.38  
   21.39 @@ -358,25 +351,17 @@
   21.40    static Template* template_for_wide(Bytecodes::Code code)  { Bytecodes::wide_check(code); return &_template_table_wide[code]; }
   21.41  
   21.42    // Platform specifics
   21.43 -#ifdef TARGET_ARCH_MODEL_x86_32
   21.44 +#if defined TEMPLATETABLE_MD_HPP
   21.45 +# include TEMPLATETABLE_MD_HPP
   21.46 +#elif defined TARGET_ARCH_MODEL_x86_32
   21.47  # include "templateTable_x86_32.hpp"
   21.48 -#endif
   21.49 -#ifdef TARGET_ARCH_MODEL_x86_64
   21.50 +#elif defined TARGET_ARCH_MODEL_x86_64
   21.51  # include "templateTable_x86_64.hpp"
   21.52 -#endif
   21.53 -#ifdef TARGET_ARCH_MODEL_sparc
   21.54 +#elif defined TARGET_ARCH_MODEL_sparc
   21.55  # include "templateTable_sparc.hpp"
   21.56 -#endif
   21.57 -#ifdef TARGET_ARCH_MODEL_zero
   21.58 +#elif defined TARGET_ARCH_MODEL_zero
   21.59  # include "templateTable_zero.hpp"
   21.60 -#endif
   21.61 -#ifdef TARGET_ARCH_MODEL_arm
   21.62 -# include "templateTable_arm.hpp"
   21.63 -#endif
   21.64 -#ifdef TARGET_ARCH_MODEL_ppc_32
   21.65 -# include "templateTable_ppc_32.hpp"
   21.66 -#endif
   21.67 -#ifdef TARGET_ARCH_MODEL_ppc_64
   21.68 +#elif defined TARGET_ARCH_MODEL_ppc_64
   21.69  # include "templateTable_ppc_64.hpp"
   21.70  #endif
   21.71  

    22.1 --- a/src/share/vm/memory/generation.hpp	Fri Feb 20 17:05:39 2015 +0000
    22.2 +++ b/src/share/vm/memory/generation.hpp	Tue Feb 24 15:04:52 2015 -0500
    22.3 @@ -1,5 +1,5 @@
    22.4  /*
    22.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    22.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    22.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.8   *
    22.9   * This code is free software; you can redistribute it and/or modify it
   22.10 @@ -145,7 +145,7 @@
   22.11      // GenGrain.
   22.12      // Note: on ARM we add 1 bit for card_table_base to be properly aligned
   22.13      // (we expect its low byte to be zero - see implementation of post_barrier)
   22.14 -    LogOfGenGrain = 16 ARM_ONLY(+1),
   22.15 +    LogOfGenGrain = 16 ARM32_ONLY(+1),
   22.16      GenGrain = 1 << LogOfGenGrain
   22.17    };
   22.18  

    23.1 --- a/src/share/vm/opto/c2compiler.cpp	Fri Feb 20 17:05:39 2015 +0000
    23.2 +++ b/src/share/vm/opto/c2compiler.cpp	Tue Feb 24 15:04:52 2015 -0500
    23.3 @@ -1,5 +1,5 @@
    23.4  /*
    23.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    23.6 + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
    23.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.8   *
    23.9   * This code is free software; you can redistribute it and/or modify it
   23.10 @@ -25,25 +25,17 @@
   23.11  #include "precompiled.hpp"
   23.12  #include "opto/c2compiler.hpp"
   23.13  #include "opto/runtime.hpp"
   23.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   23.15 +#if defined AD_MD_HPP
   23.16 +# include AD_MD_HPP
   23.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   23.18  # include "adfiles/ad_x86_32.hpp"
   23.19 -#endif
   23.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   23.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   23.22  # include "adfiles/ad_x86_64.hpp"
   23.23 -#endif
   23.24 -#ifdef TARGET_ARCH_MODEL_sparc
   23.25 +#elif defined TARGET_ARCH_MODEL_sparc
   23.26  # include "adfiles/ad_sparc.hpp"
   23.27 -#endif
   23.28 -#ifdef TARGET_ARCH_MODEL_zero
   23.29 +#elif defined TARGET_ARCH_MODEL_zero
   23.30  # include "adfiles/ad_zero.hpp"
   23.31 -#endif
   23.32 -#ifdef TARGET_ARCH_MODEL_arm
   23.33 -# include "adfiles/ad_arm.hpp"
   23.34 -#endif
   23.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   23.36 -# include "adfiles/ad_ppc_32.hpp"
   23.37 -#endif
   23.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   23.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   23.40  # include "adfiles/ad_ppc_64.hpp"
   23.41  #endif
   23.42  

    24.1 --- a/src/share/vm/opto/chaitin.cpp	Fri Feb 20 17:05:39 2015 +0000
    24.2 +++ b/src/share/vm/opto/chaitin.cpp	Tue Feb 24 15:04:52 2015 -0500
    24.3 @@ -1,5 +1,5 @@
    24.4  /*
    24.5 - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
    24.6 + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
    24.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.8   *
    24.9   * This code is free software; you can redistribute it and/or modify it
   24.10 @@ -840,7 +840,7 @@
   24.11          case Op_RegD:
   24.12            lrg.set_num_regs(2);
   24.13            // Define platform specific register pressure
   24.14 -#if defined(SPARC) || defined(ARM)
   24.15 +#if defined(SPARC) || defined(ARM32)
   24.16            lrg.set_reg_pressure(2);
   24.17  #elif defined(IA32)
   24.18            if( ireg == Op_RegL ) {

    25.1 --- a/src/share/vm/opto/compile.cpp	Fri Feb 20 17:05:39 2015 +0000
    25.2 +++ b/src/share/vm/opto/compile.cpp	Tue Feb 24 15:04:52 2015 -0500
    25.3 @@ -1,5 +1,5 @@
    25.4  /*
    25.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    25.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    25.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    25.8   *
    25.9   * This code is free software; you can redistribute it and/or modify it
   25.10 @@ -67,25 +67,17 @@
   25.11  #include "runtime/timer.hpp"
   25.12  #include "trace/tracing.hpp"
   25.13  #include "utilities/copy.hpp"
   25.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   25.15 +#if defined AD_MD_HPP
   25.16 +# include AD_MD_HPP
   25.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   25.18  # include "adfiles/ad_x86_32.hpp"
   25.19 -#endif
   25.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   25.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   25.22  # include "adfiles/ad_x86_64.hpp"
   25.23 -#endif
   25.24 -#ifdef TARGET_ARCH_MODEL_sparc
   25.25 +#elif defined TARGET_ARCH_MODEL_sparc
   25.26  # include "adfiles/ad_sparc.hpp"
   25.27 -#endif
   25.28 -#ifdef TARGET_ARCH_MODEL_zero
   25.29 +#elif defined TARGET_ARCH_MODEL_zero
   25.30  # include "adfiles/ad_zero.hpp"
   25.31 -#endif
   25.32 -#ifdef TARGET_ARCH_MODEL_arm
   25.33 -# include "adfiles/ad_arm.hpp"
   25.34 -#endif
   25.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   25.36 -# include "adfiles/ad_ppc_32.hpp"
   25.37 -#endif
   25.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   25.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   25.40  # include "adfiles/ad_ppc_64.hpp"
   25.41  #endif
   25.42  

    26.1 --- a/src/share/vm/opto/gcm.cpp	Fri Feb 20 17:05:39 2015 +0000
    26.2 +++ b/src/share/vm/opto/gcm.cpp	Tue Feb 24 15:04:52 2015 -0500
    26.3 @@ -1,5 +1,5 @@
    26.4  /*
    26.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    26.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    26.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.8   *
    26.9   * This code is free software; you can redistribute it and/or modify it
   26.10 @@ -35,25 +35,17 @@
   26.11  #include "opto/rootnode.hpp"
   26.12  #include "opto/runtime.hpp"
   26.13  #include "runtime/deoptimization.hpp"
   26.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   26.15 +#if defined AD_MD_HPP
   26.16 +# include AD_MD_HPP
   26.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   26.18  # include "adfiles/ad_x86_32.hpp"
   26.19 -#endif
   26.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   26.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   26.22  # include "adfiles/ad_x86_64.hpp"
   26.23 -#endif
   26.24 -#ifdef TARGET_ARCH_MODEL_sparc
   26.25 +#elif defined TARGET_ARCH_MODEL_sparc
   26.26  # include "adfiles/ad_sparc.hpp"
   26.27 -#endif
   26.28 -#ifdef TARGET_ARCH_MODEL_zero
   26.29 +#elif defined TARGET_ARCH_MODEL_zero
   26.30  # include "adfiles/ad_zero.hpp"
   26.31 -#endif
   26.32 -#ifdef TARGET_ARCH_MODEL_arm
   26.33 -# include "adfiles/ad_arm.hpp"
   26.34 -#endif
   26.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   26.36 -# include "adfiles/ad_ppc_32.hpp"
   26.37 -#endif
   26.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   26.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   26.40  # include "adfiles/ad_ppc_64.hpp"
   26.41  #endif
   26.42  

    27.1 --- a/src/share/vm/opto/lcm.cpp	Fri Feb 20 17:05:39 2015 +0000
    27.2 +++ b/src/share/vm/opto/lcm.cpp	Tue Feb 24 15:04:52 2015 -0500
    27.3 @@ -1,5 +1,5 @@
    27.4  /*
    27.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
    27.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
    27.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    27.8   *
    27.9   * This code is free software; you can redistribute it and/or modify it
   27.10 @@ -30,25 +30,17 @@
   27.11  #include "opto/cfgnode.hpp"
   27.12  #include "opto/machnode.hpp"
   27.13  #include "opto/runtime.hpp"
   27.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   27.15 +#if defined AD_MD_HPP
   27.16 +# include AD_MD_HPP
   27.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   27.18  # include "adfiles/ad_x86_32.hpp"
   27.19 -#endif
   27.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   27.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   27.22  # include "adfiles/ad_x86_64.hpp"
   27.23 -#endif
   27.24 -#ifdef TARGET_ARCH_MODEL_sparc
   27.25 +#elif defined TARGET_ARCH_MODEL_sparc
   27.26  # include "adfiles/ad_sparc.hpp"
   27.27 -#endif
   27.28 -#ifdef TARGET_ARCH_MODEL_zero
   27.29 +#elif defined TARGET_ARCH_MODEL_zero
   27.30  # include "adfiles/ad_zero.hpp"
   27.31 -#endif
   27.32 -#ifdef TARGET_ARCH_MODEL_arm
   27.33 -# include "adfiles/ad_arm.hpp"
   27.34 -#endif
   27.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   27.36 -# include "adfiles/ad_ppc_32.hpp"
   27.37 -#endif
   27.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   27.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   27.40  # include "adfiles/ad_ppc_64.hpp"
   27.41  #endif
   27.42  

    28.1 --- a/src/share/vm/opto/locknode.hpp	Fri Feb 20 17:05:39 2015 +0000
    28.2 +++ b/src/share/vm/opto/locknode.hpp	Tue Feb 24 15:04:52 2015 -0500
    28.3 @@ -1,5 +1,5 @@
    28.4  /*
    28.5 - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    28.6 + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
    28.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    28.8   *
    28.9   * This code is free software; you can redistribute it and/or modify it
   28.10 @@ -28,25 +28,17 @@
   28.11  #include "opto/node.hpp"
   28.12  #include "opto/opcodes.hpp"
   28.13  #include "opto/subnode.hpp"
   28.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   28.15 +#if defined AD_MD_HPP
   28.16 +# include AD_MD_HPP
   28.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   28.18  # include "adfiles/ad_x86_32.hpp"
   28.19 -#endif
   28.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   28.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   28.22  # include "adfiles/ad_x86_64.hpp"
   28.23 -#endif
   28.24 -#ifdef TARGET_ARCH_MODEL_sparc
   28.25 +#elif defined TARGET_ARCH_MODEL_sparc
   28.26  # include "adfiles/ad_sparc.hpp"
   28.27 -#endif
   28.28 -#ifdef TARGET_ARCH_MODEL_zero
   28.29 +#elif defined TARGET_ARCH_MODEL_zero
   28.30  # include "adfiles/ad_zero.hpp"
   28.31 -#endif
   28.32 -#ifdef TARGET_ARCH_MODEL_arm
   28.33 -# include "adfiles/ad_arm.hpp"
   28.34 -#endif
   28.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   28.36 -# include "adfiles/ad_ppc_32.hpp"
   28.37 -#endif
   28.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   28.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   28.40  # include "adfiles/ad_ppc_64.hpp"
   28.41  #endif
   28.42  

    29.1 --- a/src/share/vm/opto/matcher.cpp	Fri Feb 20 17:05:39 2015 +0000
    29.2 +++ b/src/share/vm/opto/matcher.cpp	Tue Feb 24 15:04:52 2015 -0500
    29.3 @@ -1,5 +1,5 @@
    29.4  /*
    29.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    29.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    29.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.8   *
    29.9   * This code is free software; you can redistribute it and/or modify it
   29.10 @@ -38,25 +38,17 @@
   29.11  #include "opto/vectornode.hpp"
   29.12  #include "runtime/atomic.hpp"
   29.13  #include "runtime/os.hpp"
   29.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   29.15 +#if defined AD_MD_HPP
   29.16 +# include AD_MD_HPP
   29.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   29.18  # include "adfiles/ad_x86_32.hpp"
   29.19 -#endif
   29.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   29.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   29.22  # include "adfiles/ad_x86_64.hpp"
   29.23 -#endif
   29.24 -#ifdef TARGET_ARCH_MODEL_sparc
   29.25 +#elif defined TARGET_ARCH_MODEL_sparc
   29.26  # include "adfiles/ad_sparc.hpp"
   29.27 -#endif
   29.28 -#ifdef TARGET_ARCH_MODEL_zero
   29.29 +#elif defined TARGET_ARCH_MODEL_zero
   29.30  # include "adfiles/ad_zero.hpp"
   29.31 -#endif
   29.32 -#ifdef TARGET_ARCH_MODEL_arm
   29.33 -# include "adfiles/ad_arm.hpp"
   29.34 -#endif
   29.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   29.36 -# include "adfiles/ad_ppc_32.hpp"
   29.37 -#endif
   29.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   29.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   29.40  # include "adfiles/ad_ppc_64.hpp"
   29.41  #endif
   29.42  

    30.1 --- a/src/share/vm/opto/output.hpp	Fri Feb 20 17:05:39 2015 +0000
    30.2 +++ b/src/share/vm/opto/output.hpp	Tue Feb 24 15:04:52 2015 -0500
    30.3 @@ -1,5 +1,5 @@
    30.4  /*
    30.5 - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
    30.6 + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
    30.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    30.8   *
    30.9   * This code is free software; you can redistribute it and/or modify it
   30.10 @@ -27,25 +27,17 @@
   30.11  
   30.12  #include "opto/block.hpp"
   30.13  #include "opto/node.hpp"
   30.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   30.15 +#if defined AD_MD_HPP
   30.16 +# include AD_MD_HPP
   30.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   30.18  # include "adfiles/ad_x86_32.hpp"
   30.19 -#endif
   30.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   30.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   30.22  # include "adfiles/ad_x86_64.hpp"
   30.23 -#endif
   30.24 -#ifdef TARGET_ARCH_MODEL_sparc
   30.25 +#elif defined TARGET_ARCH_MODEL_sparc
   30.26  # include "adfiles/ad_sparc.hpp"
   30.27 -#endif
   30.28 -#ifdef TARGET_ARCH_MODEL_zero
   30.29 +#elif defined TARGET_ARCH_MODEL_zero
   30.30  # include "adfiles/ad_zero.hpp"
   30.31 -#endif
   30.32 -#ifdef TARGET_ARCH_MODEL_arm
   30.33 -# include "adfiles/ad_arm.hpp"
   30.34 -#endif
   30.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   30.36 -# include "adfiles/ad_ppc_32.hpp"
   30.37 -#endif
   30.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   30.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   30.40  # include "adfiles/ad_ppc_64.hpp"
   30.41  #endif
   30.42  

    31.1 --- a/src/share/vm/opto/regmask.cpp	Fri Feb 20 17:05:39 2015 +0000
    31.2 +++ b/src/share/vm/opto/regmask.cpp	Tue Feb 24 15:04:52 2015 -0500
    31.3 @@ -1,5 +1,5 @@
    31.4  /*
    31.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    31.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    31.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    31.8   *
    31.9   * This code is free software; you can redistribute it and/or modify it
   31.10 @@ -25,25 +25,17 @@
   31.11  #include "precompiled.hpp"
   31.12  #include "opto/compile.hpp"
   31.13  #include "opto/regmask.hpp"
   31.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   31.15 +#if defined AD_MD_HPP
   31.16 +# include AD_MD_HPP
   31.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   31.18  # include "adfiles/ad_x86_32.hpp"
   31.19 -#endif
   31.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   31.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   31.22  # include "adfiles/ad_x86_64.hpp"
   31.23 -#endif
   31.24 -#ifdef TARGET_ARCH_MODEL_sparc
   31.25 +#elif defined TARGET_ARCH_MODEL_sparc
   31.26  # include "adfiles/ad_sparc.hpp"
   31.27 -#endif
   31.28 -#ifdef TARGET_ARCH_MODEL_zero
   31.29 +#elif defined TARGET_ARCH_MODEL_zero
   31.30  # include "adfiles/ad_zero.hpp"
   31.31 -#endif
   31.32 -#ifdef TARGET_ARCH_MODEL_arm
   31.33 -# include "adfiles/ad_arm.hpp"
   31.34 -#endif
   31.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   31.36 -# include "adfiles/ad_ppc_32.hpp"
   31.37 -#endif
   31.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   31.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   31.40  # include "adfiles/ad_ppc_64.hpp"
   31.41  #endif
   31.42  

    32.1 --- a/src/share/vm/opto/regmask.hpp	Fri Feb 20 17:05:39 2015 +0000
    32.2 +++ b/src/share/vm/opto/regmask.hpp	Tue Feb 24 15:04:52 2015 -0500
    32.3 @@ -1,5 +1,5 @@
    32.4  /*
    32.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    32.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    32.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    32.8   *
    32.9   * This code is free software; you can redistribute it and/or modify it
   32.10 @@ -28,25 +28,17 @@
   32.11  #include "code/vmreg.hpp"
   32.12  #include "libadt/port.hpp"
   32.13  #include "opto/optoreg.hpp"
   32.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   32.15 +#if defined ADGLOBALS_MD_HPP
   32.16 +# include ADGLOBALS_MD_HPP
   32.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   32.18  # include "adfiles/adGlobals_x86_32.hpp"
   32.19 -#endif
   32.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   32.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   32.22  # include "adfiles/adGlobals_x86_64.hpp"
   32.23 -#endif
   32.24 -#ifdef TARGET_ARCH_MODEL_sparc
   32.25 +#elif defined TARGET_ARCH_MODEL_sparc
   32.26  # include "adfiles/adGlobals_sparc.hpp"
   32.27 -#endif
   32.28 -#ifdef TARGET_ARCH_MODEL_zero
   32.29 +#elif defined TARGET_ARCH_MODEL_zero
   32.30  # include "adfiles/adGlobals_zero.hpp"
   32.31 -#endif
   32.32 -#ifdef TARGET_ARCH_MODEL_arm
   32.33 -# include "adfiles/adGlobals_arm.hpp"
   32.34 -#endif
   32.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   32.36 -# include "adfiles/adGlobals_ppc_32.hpp"
   32.37 -#endif
   32.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   32.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   32.40  # include "adfiles/adGlobals_ppc_64.hpp"
   32.41  #endif
   32.42  

    33.1 --- a/src/share/vm/opto/runtime.cpp	Fri Feb 20 17:05:39 2015 +0000
    33.2 +++ b/src/share/vm/opto/runtime.cpp	Tue Feb 24 15:04:52 2015 -0500
    33.3 @@ -1,5 +1,5 @@
    33.4  /*
    33.5 - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
    33.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
    33.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.8   *
    33.9   * This code is free software; you can redistribute it and/or modify it
   33.10 @@ -68,25 +68,17 @@
   33.11  #include "runtime/vframe_hp.hpp"
   33.12  #include "utilities/copy.hpp"
   33.13  #include "utilities/preserveException.hpp"
   33.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   33.15 +#if defined AD_MD_HPP
   33.16 +# include AD_MD_HPP
   33.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   33.18  # include "adfiles/ad_x86_32.hpp"
   33.19 -#endif
   33.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   33.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   33.22  # include "adfiles/ad_x86_64.hpp"
   33.23 -#endif
   33.24 -#ifdef TARGET_ARCH_MODEL_sparc
   33.25 +#elif defined TARGET_ARCH_MODEL_sparc
   33.26  # include "adfiles/ad_sparc.hpp"
   33.27 -#endif
   33.28 -#ifdef TARGET_ARCH_MODEL_zero
   33.29 +#elif defined TARGET_ARCH_MODEL_zero
   33.30  # include "adfiles/ad_zero.hpp"
   33.31 -#endif
   33.32 -#ifdef TARGET_ARCH_MODEL_arm
   33.33 -# include "adfiles/ad_arm.hpp"
   33.34 -#endif
   33.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   33.36 -# include "adfiles/ad_ppc_32.hpp"
   33.37 -#endif
   33.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   33.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   33.40  # include "adfiles/ad_ppc_64.hpp"
   33.41  #endif
   33.42  

    34.1 --- a/src/share/vm/runtime/deoptimization.cpp	Fri Feb 20 17:05:39 2015 +0000
    34.2 +++ b/src/share/vm/runtime/deoptimization.cpp	Tue Feb 24 15:04:52 2015 -0500
    34.3 @@ -1,5 +1,5 @@
    34.4  /*
    34.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    34.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    34.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    34.8   *
    34.9   * This code is free software; you can redistribute it and/or modify it
   34.10 @@ -66,25 +66,17 @@
   34.11  # include "vmreg_ppc.inline.hpp"
   34.12  #endif
   34.13  #ifdef COMPILER2
   34.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   34.15 +#if defined AD_MD_HPP
   34.16 +# include AD_MD_HPP
   34.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   34.18  # include "adfiles/ad_x86_32.hpp"
   34.19 -#endif
   34.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   34.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   34.22  # include "adfiles/ad_x86_64.hpp"
   34.23 -#endif
   34.24 -#ifdef TARGET_ARCH_MODEL_sparc
   34.25 +#elif defined TARGET_ARCH_MODEL_sparc
   34.26  # include "adfiles/ad_sparc.hpp"
   34.27 -#endif
   34.28 -#ifdef TARGET_ARCH_MODEL_zero
   34.29 +#elif defined TARGET_ARCH_MODEL_zero
   34.30  # include "adfiles/ad_zero.hpp"
   34.31 -#endif
   34.32 -#ifdef TARGET_ARCH_MODEL_arm
   34.33 -# include "adfiles/ad_arm.hpp"
   34.34 -#endif
   34.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   34.36 -# include "adfiles/ad_ppc_32.hpp"
   34.37 -#endif
   34.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   34.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   34.40  # include "adfiles/ad_ppc_64.hpp"
   34.41  #endif
   34.42  #endif // COMPILER2

    35.1 --- a/src/share/vm/runtime/frame.hpp	Fri Feb 20 17:05:39 2015 +0000
    35.2 +++ b/src/share/vm/runtime/frame.hpp	Tue Feb 24 15:04:52 2015 -0500
    35.3 @@ -1,5 +1,5 @@
    35.4  /*
    35.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    35.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    35.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    35.8   *
    35.9   * This code is free software; you can redistribute it and/or modify it
   35.10 @@ -31,25 +31,17 @@
   35.11  #include "runtime/registerMap.hpp"
   35.12  #include "utilities/top.hpp"
   35.13  #ifdef COMPILER2
   35.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   35.15 +#if defined ADGLOBALS_MD_HPP
   35.16 +# include ADGLOBALS_MD_HPP
   35.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   35.18  # include "adfiles/adGlobals_x86_32.hpp"
   35.19 -#endif
   35.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   35.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   35.22  # include "adfiles/adGlobals_x86_64.hpp"
   35.23 -#endif
   35.24 -#ifdef TARGET_ARCH_MODEL_sparc
   35.25 +#elif defined TARGET_ARCH_MODEL_sparc
   35.26  # include "adfiles/adGlobals_sparc.hpp"
   35.27 -#endif
   35.28 -#ifdef TARGET_ARCH_MODEL_zero
   35.29 +#elif defined TARGET_ARCH_MODEL_zero
   35.30  # include "adfiles/adGlobals_zero.hpp"
   35.31 -#endif
   35.32 -#ifdef TARGET_ARCH_MODEL_arm
   35.33 -# include "adfiles/adGlobals_arm.hpp"
   35.34 -#endif
   35.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   35.36 -# include "adfiles/adGlobals_ppc_32.hpp"
   35.37 -#endif
   35.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   35.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   35.40  # include "adfiles/adGlobals_ppc_64.hpp"
   35.41  #endif
   35.42  #endif // COMPILER2

    36.1 --- a/src/share/vm/runtime/stubRoutines.hpp	Fri Feb 20 17:05:39 2015 +0000
    36.2 +++ b/src/share/vm/runtime/stubRoutines.hpp	Tue Feb 24 15:04:52 2015 -0500
    36.3 @@ -1,5 +1,5 @@
    36.4  /*
    36.5 - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    36.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    36.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    36.8   *
    36.9   * This code is free software; you can redistribute it and/or modify it
   36.10 @@ -99,29 +99,20 @@
   36.11  
   36.12    // Dependencies
   36.13    friend class StubGenerator;
   36.14 -#ifdef TARGET_ARCH_MODEL_x86_32
   36.15 +#if defined STUBROUTINES_MD_HPP
   36.16 +# include STUBROUTINES_MD_HPP
   36.17 +#elif defined TARGET_ARCH_MODEL_x86_32
   36.18  # include "stubRoutines_x86_32.hpp"
   36.19 -#endif
   36.20 -#ifdef TARGET_ARCH_MODEL_x86_64
   36.21 +#elif defined TARGET_ARCH_MODEL_x86_64
   36.22  # include "stubRoutines_x86_64.hpp"
   36.23 -#endif
   36.24 -#ifdef TARGET_ARCH_MODEL_sparc
   36.25 +#elif defined TARGET_ARCH_MODEL_sparc
   36.26  # include "stubRoutines_sparc.hpp"
   36.27 -#endif
   36.28 -#ifdef TARGET_ARCH_MODEL_zero
   36.29 +#elif defined TARGET_ARCH_MODEL_zero
   36.30  # include "stubRoutines_zero.hpp"
   36.31 -#endif
   36.32 -#ifdef TARGET_ARCH_MODEL_arm
   36.33 -# include "stubRoutines_arm.hpp"
   36.34 -#endif
   36.35 -#ifdef TARGET_ARCH_MODEL_ppc_32
   36.36 -# include "stubRoutines_ppc_32.hpp"
   36.37 -#endif
   36.38 -#ifdef TARGET_ARCH_MODEL_ppc_64
   36.39 +#elif defined TARGET_ARCH_MODEL_ppc_64
   36.40  # include "stubRoutines_ppc_64.hpp"
   36.41  #endif
   36.42  
   36.43 -
   36.44    static jint    _verify_oop_count;
   36.45    static address _verify_oop_subroutine_entry;
   36.46  

    37.1 --- a/src/share/vm/runtime/vmStructs.cpp	Fri Feb 20 17:05:39 2015 +0000
    37.2 +++ b/src/share/vm/runtime/vmStructs.cpp	Tue Feb 24 15:04:52 2015 -0500
    37.3 @@ -192,25 +192,17 @@
    37.4  #include "opto/rootnode.hpp"
    37.5  #include "opto/subnode.hpp"
    37.6  #include "opto/vectornode.hpp"
    37.7 -#ifdef TARGET_ARCH_MODEL_x86_32
    37.8 +#if defined ADGLOBALS_MD_HPP
    37.9 +# include ADGLOBALS_MD_HPP
   37.10 +#elif defined TARGET_ARCH_MODEL_x86_32
   37.11  # include "adfiles/adGlobals_x86_32.hpp"
   37.12 -#endif
   37.13 -#ifdef TARGET_ARCH_MODEL_x86_64
   37.14 +#elif defined TARGET_ARCH_MODEL_x86_64
   37.15  # include "adfiles/adGlobals_x86_64.hpp"
   37.16 -#endif
   37.17 -#ifdef TARGET_ARCH_MODEL_sparc
   37.18 +#elif defined TARGET_ARCH_MODEL_sparc
   37.19  # include "adfiles/adGlobals_sparc.hpp"
   37.20 -#endif
   37.21 -#ifdef TARGET_ARCH_MODEL_zero
   37.22 +#elif defined TARGET_ARCH_MODEL_zero
   37.23  # include "adfiles/adGlobals_zero.hpp"
   37.24 -#endif
   37.25 -#ifdef TARGET_ARCH_MODEL_arm
   37.26 -# include "adfiles/adGlobals_arm.hpp"
   37.27 -#endif
   37.28 -#ifdef TARGET_ARCH_MODEL_ppc_32
   37.29 -# include "adfiles/adGlobals_ppc_32.hpp"
   37.30 -#endif
   37.31 -#ifdef TARGET_ARCH_MODEL_ppc_64
   37.32 +#elif defined TARGET_ARCH_MODEL_ppc_64
   37.33  # include "adfiles/adGlobals_ppc_64.hpp"
   37.34  #endif
   37.35  #endif // COMPILER2

    38.1 --- a/src/share/vm/runtime/vm_version.cpp	Fri Feb 20 17:05:39 2015 +0000
    38.2 +++ b/src/share/vm/runtime/vm_version.cpp	Tue Feb 24 15:04:52 2015 -0500
    38.3 @@ -1,5 +1,5 @@
    38.4  /*
    38.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
    38.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
    38.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    38.8   *
    38.9   * This code is free software; you can redistribute it and/or modify it
   38.10 @@ -180,17 +180,17 @@
   38.11                   AIX_ONLY("aix")                 \
   38.12                   BSD_ONLY("bsd")
   38.13  
   38.14 +#ifndef CPU
   38.15  #ifdef ZERO
   38.16  #define CPU      ZERO_LIBARCH
   38.17  #else
   38.18  #define CPU      IA32_ONLY("x86")                \
   38.19                   IA64_ONLY("ia64")               \
   38.20                   AMD64_ONLY("amd64")             \
   38.21 -                 ARM_ONLY("arm")                 \
   38.22 -                 PPC32_ONLY("ppc")               \
   38.23                   PPC64_ONLY("ppc64")             \
   38.24                   SPARC_ONLY("sparc")
   38.25  #endif // ZERO
   38.26 +#endif
   38.27  
   38.28  const char *Abstract_VM_Version::vm_platform_string() {
   38.29    return OS "-" CPU;
   38.30 @@ -251,12 +251,6 @@
   38.31    #ifndef FLOAT_ARCH
   38.32      #if defined(__SOFTFP__)
   38.33        #define FLOAT_ARCH_STR "-sflt"
   38.34 -    #elif defined(E500V2)
   38.35 -      #define FLOAT_ARCH_STR "-e500v2"
   38.36 -    #elif defined(ARM)
   38.37 -      #define FLOAT_ARCH_STR "-vfp"
   38.38 -    #elif defined(PPC32)
   38.39 -      #define FLOAT_ARCH_STR "-hflt"
   38.40      #else
   38.41        #define FLOAT_ARCH_STR ""
   38.42      #endif

    39.1 --- a/src/share/vm/utilities/globalDefinitions_gcc.hpp	Fri Feb 20 17:05:39 2015 +0000
    39.2 +++ b/src/share/vm/utilities/globalDefinitions_gcc.hpp	Tue Feb 24 15:04:52 2015 -0500
    39.3 @@ -1,5 +1,5 @@
    39.4  /*
    39.5 - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
    39.6 + * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
    39.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    39.8   *
    39.9   * This code is free software; you can redistribute it and/or modify it
   39.10 @@ -220,7 +220,7 @@
   39.11  
   39.12  #define DEBUG_EXCEPTION ::abort();
   39.13  
   39.14 -#ifdef ARM
   39.15 +#ifdef ARM32
   39.16  #ifdef SOLARIS
   39.17  #define BREAKPOINT __asm__ volatile (".long 0xe1200070")
   39.18  #else

    40.1 --- a/src/share/vm/utilities/macros.hpp	Fri Feb 20 17:05:39 2015 +0000
    40.2 +++ b/src/share/vm/utilities/macros.hpp	Tue Feb 24 15:04:52 2015 -0500
    40.3 @@ -1,5 +1,5 @@
    40.4  /*
    40.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    40.6 + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
    40.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    40.8   *
    40.9   * This code is free software; you can redistribute it and/or modify it
   40.10 @@ -392,7 +392,6 @@
   40.11  #define NOT_E500V2(code) code
   40.12  #endif
   40.13  
   40.14 -
   40.15  #ifdef ARM
   40.16  #define ARM_ONLY(code) code
   40.17  #define NOT_ARM(code)
   40.18 @@ -401,6 +400,14 @@
   40.19  #define NOT_ARM(code) code
   40.20  #endif
   40.21  
   40.22 +#ifdef ARM32
   40.23 +#define ARM32_ONLY(code) code
   40.24 +#define NOT_ARM32(code)
   40.25 +#else
   40.26 +#define ARM32_ONLY(code)
   40.27 +#define NOT_ARM32(code) code
   40.28 +#endif
   40.29 +
   40.30  #ifdef JAVASE_EMBEDDED
   40.31  #define EMBEDDED_ONLY(code) code
   40.32  #define NOT_EMBEDDED(code)