changeset 27241:9c85b81b33d3

Merge
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Mon, 25 Jan 2016 11:52:52 -0800
parents 152bc257f3fc 29153fced415
children 3183228df7fa
files make/aix/makefiles/defs.make make/aix/makefiles/vm.make make/aix/makefiles/xlc.make src/cpu/ppc/vm/assembler_ppc.cpp src/cpu/ppc/vm/frame_ppc.inline.hpp src/cpu/ppc/vm/interp_masm_ppc_64.hpp src/cpu/ppc/vm/interpreter_ppc.cpp src/cpu/ppc/vm/macroAssembler_ppc.cpp src/cpu/ppc/vm/macroAssembler_ppc.hpp src/cpu/ppc/vm/methodHandles_ppc.cpp src/cpu/ppc/vm/nativeInst_ppc.cpp src/cpu/ppc/vm/ppc.ad src/cpu/ppc/vm/stubGenerator_ppc.cpp src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp src/cpu/ppc/vm/templateInterpreter_ppc.cpp src/cpu/ppc/vm/templateTable_ppc_64.cpp src/cpu/ppc/vm/vm_version_ppc.cpp src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CallingConvention.java src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CodeUtil.java src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java src/jdk.vm.ci/share/classes/jdk.vm.ci.runtime/src/jdk/vm/ci/runtime/JVMCICompiler.java src/os/aix/vm/os_aix.cpp src/os/aix/vm/os_aix.hpp src/os/aix/vm/os_aix.inline.hpp src/os/aix/vm/perfMemory_aix.cpp src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp src/share/vm/compiler/compileBroker.cpp src/share/vm/jvmci/jvmciCompiler.cpp src/share/vm/jvmci/jvmciCompilerToVM.cpp src/share/vm/jvmci/jvmciCompilerToVM.hpp src/share/vm/jvmci/jvmciEnv.cpp src/share/vm/jvmci/jvmciEnv.hpp src/share/vm/jvmci/jvmciJavaClasses.hpp src/share/vm/jvmci/systemDictionary_jvmci.hpp src/share/vm/jvmci/vmSymbols_jvmci.hpp test/compiler/jvmci/common/CompilerToVMHelper.java test/compiler/jvmci/common/JVMCIHelpers.java test/runtime/7107135/Test7107135.sh test/runtime/7158988/FieldMonitor.java
diffstat 166 files changed, 251 insertions(+), 172 deletions(-) [+]
line wrap: on
line diff
--- a/make/aix/Makefile	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/Makefile	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2015 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2015 SAP SE. 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
--- a/make/aix/makefiles/buildtree.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/buildtree.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2013 SAP SE. 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
--- a/make/aix/makefiles/compiler2.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/compiler2.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2013 SAP SE. 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
--- a/make/aix/makefiles/debug.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/debug.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2013 SAP SE. 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
--- a/make/aix/makefiles/defs.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/defs.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2013 SAP SE. 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
--- a/make/aix/makefiles/fastdebug.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/fastdebug.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2013 SAP SE. 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
--- a/make/aix/makefiles/jsig.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/jsig.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2013 SAP SE. 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
--- a/make/aix/makefiles/jvmti.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/jvmti.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2013 SAP SE. 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
--- a/make/aix/makefiles/ppc64.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/ppc64.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2015 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2015 SAP SE. 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
--- a/make/aix/makefiles/product.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/product.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2013 SAP SE. 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
--- a/make/aix/makefiles/tiered.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/tiered.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2015 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2015 SAP SE. 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
--- a/make/aix/makefiles/vm.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/vm.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2013 SAP SE. 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
--- a/make/aix/makefiles/xlc.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/aix/makefiles/xlc.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2012, 2015 SAP. All rights reserved.
+# Copyright (c) 2012, 2015 SAP SE. 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
--- a/make/linux/makefiles/ppc64.make	Fri Jan 22 18:29:09 2016 -0800
+++ b/make/linux/makefiles/ppc64.make	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/assembler_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/assembler_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/assembler_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/assembler_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/assembler_ppc.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/assembler_ppc.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/bytes_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/bytes_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_Defs_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_Defs_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_FpuStackSim_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_FpuStackSim_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_LinearScan_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_LinearScan_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c1_globals_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c1_globals_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c2_globals_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c2_globals_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/c2_init_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/c2_init_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/codeBuffer_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/codeBuffer_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/compiledIC_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/compiledIC_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/copy_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/copy_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/debug_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/debug_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/depChecker_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/depChecker_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/disassembler_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/disassembler_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/frame_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/frame_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/frame_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/frame_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/frame_ppc.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/frame_ppc.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/globalDefinitions_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/globalDefinitions_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/globals_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/globals_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/icBuffer_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/icBuffer_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/icache_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/icache_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/icache_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/icache_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/interp_masm_ppc_64.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/interp_masm_ppc_64.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/interpreterRT_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/interpreterRT_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/interpreterRT_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/interpreterRT_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2014 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/cpu/ppc/vm/interpreter_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/interpreter_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2014 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/cpu/ppc/vm/jniFastGetField_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/jniFastGetField_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/jniTypes_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/jniTypes_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/jni_ppc.h	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/jni_ppc.h	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/macroAssembler_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/macroAssembler_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2016 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2016 SAP SE. 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
--- a/src/cpu/ppc/vm/macroAssembler_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/macroAssembler_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/metaspaceShared_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/metaspaceShared_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/methodHandles_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/methodHandles_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/methodHandles_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/methodHandles_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/nativeInst_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/nativeInst_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/nativeInst_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/nativeInst_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/ppc.ad	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/ppc.ad	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 //
 // Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
-// Copyright 2012, 2015 SAP AG. All rights reserved.
+// Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/ppc_64.ad	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/ppc_64.ad	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 //
 // Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-// Copyright 2012, 2013 SAP AG. All rights reserved.
+// Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/registerMap_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/registerMap_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/register_definitions_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/register_definitions_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/register_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/register_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/register_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/register_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2014 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/cpu/ppc/vm/relocInfo_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/relocInfo_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/relocInfo_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/relocInfo_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/runtime_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/runtime_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/stubGenerator_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2016 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2016 SAP SE. 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
--- a/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/templateInterpreter_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/templateInterpreter_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/templateInterpreter_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/templateInterpreter_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2013, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/templateTable_ppc_64.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/templateTable_ppc_64.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2013, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2013, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/templateTable_ppc_64.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/templateTable_ppc_64.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2013, 2014 SAP AG. All rights reserved.
+ * Copyright (c) 2013, 2014 SAP SE. 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
--- a/src/cpu/ppc/vm/vmStructs_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/vmStructs_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/vm_version_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/vm_version_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/vm_version_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/vm_version_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/cpu/ppc/vm/vmreg_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/vmreg_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/vmreg_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/vmreg_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/vmreg_ppc.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/vmreg_ppc.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/cpu/ppc/vm/vtableStubs_ppc_64.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/cpu/ppc/vm/vtableStubs_ppc_64.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/attachListener_aix.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/attachListener_aix.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/c1_globals_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/c1_globals_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/c2_globals_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/c2_globals_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os/aix/vm/decoder_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/decoder_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2013 SAP SE. 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
--- a/src/os/aix/vm/globals_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/globals_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/interfaceSupport_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/interfaceSupport_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/jsig.c	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/jsig.c	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/jvm_aix.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/jvm_aix.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os/aix/vm/jvm_aix.h	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/jvm_aix.h	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os/aix/vm/libo4.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/libo4.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/libo4.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/libo4.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/libodm_aix.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/libodm_aix.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2015, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2015, 2015 SAP SE. 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
--- a/src/os/aix/vm/libodm_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/libodm_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2015, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2015, 2015 SAP SE. 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
--- a/src/os/aix/vm/libperfstat_aix.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/libperfstat_aix.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/libperfstat_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/libperfstat_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os/aix/vm/loadlib_aix.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/loadlib_aix.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/loadlib_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/loadlib_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os/aix/vm/misc_aix.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/misc_aix.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/src/os/aix/vm/misc_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/misc_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/mutex_aix.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/mutex_aix.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2014 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/os/aix/vm/osThread_aix.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/osThread_aix.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/osThread_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/osThread_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os/aix/vm/os_aix.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/os_aix.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/os_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/os_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2013, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2013, 2015 SAP SE. 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
--- a/src/os/aix/vm/os_aix.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/os_aix.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/perfMemory_aix.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/perfMemory_aix.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os/aix/vm/porting_aix.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/porting_aix.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os/aix/vm/porting_aix.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/porting_aix.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os/aix/vm/threadCritical_aix.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os/aix/vm/threadCritical_aix.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2014 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014, SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014, SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2014 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2014 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014, SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014, SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2015 SAP SE. 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
--- a/src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2014 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2014 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. 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
--- a/src/share/vm/jvmci/vmSymbols_jvmci.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/share/vm/jvmci/vmSymbols_jvmci.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -66,7 +66,6 @@
   template(jdk_vm_ci_code_Architecture,                           "jdk/vm/ci/code/Architecture")                           \
   template(jdk_vm_ci_code_BytecodeFrame,                          "jdk/vm/ci/code/BytecodeFrame")                          \
   template(jdk_vm_ci_code_BytecodePosition,                       "jdk/vm/ci/code/BytecodePosition")                       \
-  template(jdk_vm_ci_code_CompilationRequest,                     "jdk/vm/ci/code/CompilationRequest")                     \
   template(jdk_vm_ci_code_CompilationRequestResult,               "jdk/vm/ci/code/CompilationRequestResult")               \
   template(jdk_vm_ci_code_DebugInfo,                              "jdk/vm/ci/code/DebugInfo")                              \
   template(jdk_vm_ci_code_InstalledCode,                          "jdk/vm/ci/code/InstalledCode")                          \
--- a/src/share/vm/runtime/orderAccess.inline.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/share/vm/runtime/orderAccess.inline.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2014 SAP AG. All rights reserved.
+ * Copyright (c) 2014 SAP SE. 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
--- a/src/share/vm/utilities/elfFuncDescTable.cpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/share/vm/utilities/elfFuncDescTable.cpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/share/vm/utilities/elfFuncDescTable.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/share/vm/utilities/elfFuncDescTable.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/src/share/vm/utilities/globalDefinitions_xlc.hpp	Fri Jan 22 18:29:09 2016 -0800
+++ b/src/share/vm/utilities/globalDefinitions_xlc.hpp	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/test/compiler/c2/6880034/Test6880034.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/c2/6880034/Test6880034.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2009 SAP SE. 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
--- a/test/compiler/c2/6910484/Test.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/c2/6910484/Test.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 SAP.  All Rights Reserved.
+ * Copyright (c) 2009 SAP SE. 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
--- a/test/compiler/codegen/8005033/Test8005033.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/codegen/8005033/Test8005033.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2012 SAP SE. 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
--- a/test/compiler/codegen/IntRotateWithImmediate.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/codegen/IntRotateWithImmediate.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/test/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/escapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2014 SAP SE. 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
--- a/test/compiler/intrinsics/string/TestStringIntrinsics2.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/intrinsics/string/TestStringIntrinsics2.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2016 SAP AG. All rights reserved.
+ * Copyright (c) 2016 SAP SE. 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/jvmci/code/InterpreterFrameSizeTest.java	Mon Jan 25 11:52:52 2016 -0800
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
+ * @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.jvmci.code.InterpreterFrameSizeTest
+ */
+
+package compiler.jvmci.code;
+
+import java.lang.reflect.Method;
+
+import jdk.vm.ci.code.BytecodeFrame;
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.JavaValue;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+
+import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class InterpreterFrameSizeTest extends CodeInstallationTest {
+
+    HotSpotCodeCacheProvider hotspotCodeCache() {
+        return (HotSpotCodeCacheProvider) codeCache;
+    }
+
+    @Test
+    public void testNull() {
+        try {
+            hotspotCodeCache().interpreterFrameSize(null);
+        } catch (NullPointerException npe) {
+            System.out.println("threw NPE as expected");
+            return;
+        }
+        Assert.fail("expected NullPointerException");
+    }
+
+    @Test
+    public void test() {
+        ResolvedJavaMethod resolvedMethod = metaAccess.lookupJavaMethod(getMethod("testNull"));
+
+        int bci = 0;
+        int numLocals = resolvedMethod.getMaxLocals();
+        int numStack = 0;
+        JavaValue[] values = new JavaValue[numLocals];
+        JavaKind[] slotKinds = new JavaKind[numLocals];
+        BytecodeFrame frame = new BytecodeFrame(null, resolvedMethod, bci, false, false, values, slotKinds, numLocals, numStack, 0);
+        int size = hotspotCodeCache().interpreterFrameSize(frame);
+        System.out.println("Frame size is " + size + " bytes");
+        if (size <= 0) {
+            Assert.fail("expected non-zero result");
+        }
+    }
+}
--- a/test/compiler/jvmci/code/amd64/AMD64TestAssembler.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/jvmci/code/amd64/AMD64TestAssembler.java	Mon Jan 25 11:52:52 2016 -0800
@@ -25,13 +25,13 @@
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
-import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.DebugInfo;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.site.ConstantReference;
 import jdk.vm.ci.code.site.DataSectionReference;
+import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
 import jdk.vm.ci.hotspot.HotSpotConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.LIRKind;
@@ -76,12 +76,12 @@
 
     @Override
     public Register emitIntArg0() {
-        return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCall, JavaKind.Int)[0];
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCall, JavaKind.Int)[0];
     }
 
     @Override
     public Register emitIntArg1() {
-        return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCall, JavaKind.Int)[1];
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCall, JavaKind.Int)[1];
     }
 
     private void emitREX(boolean w, int r, int x, int b) {
--- a/test/compiler/jvmci/code/sparc/SPARCTestAssembler.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/jvmci/code/sparc/SPARCTestAssembler.java	Mon Jan 25 11:52:52 2016 -0800
@@ -23,13 +23,13 @@
 
 package compiler.jvmci.code.sparc;
 
-import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.DebugInfo;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.site.ConstantReference;
 import jdk.vm.ci.code.site.DataSectionReference;
+import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
 import jdk.vm.ci.hotspot.HotSpotCompiledCode;
 import jdk.vm.ci.hotspot.HotSpotConstant;
 import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
@@ -83,12 +83,12 @@
 
     @Override
     public Register emitIntArg0() {
-        return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCallee, JavaKind.Int)[0];
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCallee, JavaKind.Int)[0];
     }
 
     @Override
     public Register emitIntArg1() {
-        return codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCallee, JavaKind.Int)[1];
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCallee, JavaKind.Int)[1];
     }
 
     @Override
--- a/test/compiler/jvmci/common/JVMCIHelpers.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/jvmci/common/JVMCIHelpers.java	Mon Jan 25 11:52:52 2016 -0800
@@ -25,6 +25,7 @@
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CompilationRequest;
+import jdk.vm.ci.code.CompilationRequestResult;
 import jdk.vm.ci.hotspot.HotSpotVMEventListener;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.runtime.JVMCICompiler;
@@ -43,8 +44,9 @@
     public static class EmptyHotspotCompiler implements JVMCICompiler {
 
         @Override
-        public void compileMethod(CompilationRequest request) {
+        public CompilationRequestResult compileMethod(CompilationRequest request) {
             // do nothing
+            return CompilationRequestResult.failure("no compiler configured", true);
         }
     }
 
--- a/test/compiler/loopopts/superword/TestBestAlign.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/loopopts/superword/TestBestAlign.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/test/compiler/membars/DekkerTest.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/membars/DekkerTest.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2013 SAP SE. 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
--- a/test/compiler/runtime/7141637/SpreadNullArg.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/runtime/7141637/SpreadNullArg.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2011 SAP SE. 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
--- a/test/compiler/stringopts/TestOptimizeStringConcat.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/stringopts/TestOptimizeStringConcat.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/test/runtime/7100935/TestConjointAtomicArraycopy.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/runtime/7100935/TestConjointAtomicArraycopy.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2011 SAP SE. 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
--- a/test/runtime/7100935/TestShortArraycopy.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/runtime/7100935/TestShortArraycopy.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2011 SAP SE. 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
--- a/test/runtime/7107135/Test.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/runtime/7107135/Test.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011 SAP SE. 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
--- a/test/runtime/7107135/Test7107135.sh	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/runtime/7107135/Test7107135.sh	Mon Jan 25 11:52:52 2016 -0800
@@ -2,7 +2,7 @@
 
 #
 #  Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
-#  Copyright (c) 2011 SAP AG.  All Rights Reserved.
+#  Copyright (c) 2011 SAP SE. 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
--- a/test/runtime/7107135/TestMT.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/runtime/7107135/TestMT.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011 SAP SE. 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
--- a/test/runtime/7107135/test.c	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/runtime/7107135/test.c	Mon Jan 25 11:52:52 2016 -0800
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011 SAP SE. 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
--- a/test/runtime/7158988/FieldMonitor.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/runtime/7158988/FieldMonitor.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2012 SAP SE. 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
--- a/test/runtime/7158988/TestPostFieldModification.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/runtime/7158988/TestPostFieldModification.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2012 SAP SE. 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
--- a/test/serviceability/jvmti/8036666/GetObjectLockCount.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/serviceability/jvmti/8036666/GetObjectLockCount.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2014 SAP SE. 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
--- a/test/serviceability/jvmti/8036666/RecursiveObjectLock.java	Fri Jan 22 18:29:09 2016 -0800
+++ b/test/serviceability/jvmti/8036666/RecursiveObjectLock.java	Mon Jan 25 11:52:52 2016 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2014 SAP SE. 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