diff -r 4ebc2e2fb97c -r 71c04702a3d5 src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. 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
+ * 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.
+ *
+ */
+
+#ifndef CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP
+#define CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP
+
+  void pd_init() { /* nothing to do */ }
+
+ public:
+  void try_allocate(
+    Register obj,                      // result: Pointer to object after successful allocation.
+    Register var_size_in_bytes,        // Object size in bytes if unknown at compile time; invalid otherwise.
+    int      con_size_in_bytes,        // Object size in bytes if   known at compile time.
+    Register t1,                       // temp register
+    Label&   slow_case                 // Continuation point if fast allocation fails.
+  );
+
+  void initialize_header(Register obj, Register klass, Register len, Register Rzero, Register t1);
+  void initialize_body(Register objectFields, Register len_in_bytes, Register Rzero);
+
+  // locking
+  // hdr     : Used to hold locked markOop to be CASed into obj, contents destroyed.
+  // obj     : Must point to the object to lock, contents preserved.
+  // disp_hdr: Must point to the displaced header location, contents preserved.
+  // Returns code offset at which to add null check debug information.
+  void lock_object(Register hdr, Register obj, Register disp_hdr, Label& slow_case);
+
+  // unlocking
+  // hdr     : Used to hold original markOop to be CASed back into obj, contents destroyed.
+  // obj     : Must point to the object to lock, contents preserved.
+  // disp_hdr: Must point to the displaced header location, contents destroyed.
+  void unlock_object(Register hdr, Register obj, Register lock, Label& slow_case);
+
+  void initialize_object(
+    Register obj,                      // result: Pointer to object after successful allocation.
+    Register klass,                    // object klass
+    Register var_size_in_bytes,        // Object size in bytes if unknown at compile time; invalid otherwise.
+    int      con_size_in_bytes,        // Object size in bytes if   known at compile time.
+    Register t1,                       // temp register
+    Register t2                        // temp register
+  );
+
+  // Allocation of fixed-size objects.
+  // This can also be used to allocate fixed-size arrays, by setting
+  // hdr_size correctly and storing the array length afterwards.
+  void allocate_object(
+    Register obj,                      // result: Pointer to object after successful allocation.
+    Register t1,                       // temp register
+    Register t2,                       // temp register
+    int      hdr_size,                 // object header size in words
+    int      obj_size,                 // object size in words
+    Register klass,                    // object klass
+    Label&   slow_case                 // Continuation point if fast allocation fails.
+  );
+
+  enum {
+    max_array_allocation_length = 0x01000000 // Sparc friendly value, requires sethi only.
+  };
+
+  // Allocation of arrays.
+  void allocate_array(
+    Register obj,                      // result: Pointer to array after successful allocation.
+    Register len,                      // array length
+    Register t1,                       // temp register
+    Register t2,                       // temp register
+    int      hdr_size,                 // object header size in words
+    int      elt_size,                 // element size in bytes
+    Register klass,                    // object klass
+    Label&   slow_case                 // Continuation point if fast allocation fails.
+  );
+
+  // Invalidates registers in this window.
+  void invalidate_registers(Register preserve1 = noreg, Register preserve2 = noreg,
+                            Register preserve3 = noreg) PRODUCT_RETURN;
+
+  void nop() { z_nop(); }
+
+  // This platform only uses signal-based null checks. The Label is not needed.
+  void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }
+
+#endif // CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP