# HG changeset patch
# User bdelsart
# Date 1435075417 -7200
# Node ID 35a9eccdec071ee97309ac30d18445849bb17bb9
# Parent  8d526a6991e1a01f6fab5932fab1b81c62b94e7f# Parent  9776d0d8cacdc8f9cc194e8adc11d0f0a2e5df2d
Merge

diff -r 8d526a6991e1 -r 35a9eccdec07 hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp
--- a/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp	Tue Jun 23 17:48:34 2015 +0200
+++ b/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp	Tue Jun 23 18:03:37 2015 +0200
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,7 +84,7 @@
 
 #ifdef BUILTIN_SIM
 #define UseBuiltinSim           true
-#define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) \
+#define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct, range, constraint) \
                                                                         \
   product(bool, NotifySimulator, UseBuiltinSim,                         \
          "tell the AArch64 sim where we are in method code")            \
@@ -112,7 +112,7 @@
 #define NotifySimulator         false
 #define UseSimulatorCache       false
 #define DisableBCCheck          true
-#define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) \
+#define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct, range, constraint) \
                                                                         \
   product(bool, NearCpool, true,                                        \
          "constant pool is close to instructions")                      \