--- /dev/null	2016-12-30 14:52:30.584485998 -0500
+++ new/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/pecoff/PECoffContainer.java	2017-02-08 13:55:11.025167253 -0500
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+package jdk.tools.jaotc.binformat.pecoff;
+
+import java.io.File;
+import java.io.FileOutputStream;
+
+public class PECoffContainer {
+
+    File outputFile;
+    FileOutputStream outputStream;
+    long fileOffset;
+
+    public PECoffContainer(String fileName, String aotVersion) {
+        String baseName;
+
+        outputFile = new File(fileName);
+        if (outputFile.exists()) {
+            outputFile.delete();
+        }
+
+        try {
+            outputStream = new FileOutputStream(outputFile);
+        } catch (Exception e) {
+            System.out.println("PECoffContainer: Can't create file " + fileName);
+        }
+        fileOffset = 0;
+    }
+
+    public void close() {
+        try {
+            outputStream.close();
+        } catch (Exception e) {
+            System.out.println("PECoffContainer: close failed");
+        }
+    }
+
+    public void writeBytes(byte [] bytes) {
+        if (bytes == null) return;
+        try {
+            outputStream.write(bytes);
+        } catch (Exception e) {
+            System.out.println("PECoffContainer: writeBytes failed");
+        }
+        fileOffset += bytes.length;
+    }
+
+    // Write bytes to output file with up front alignment padding
+    public void writeBytes(byte [] bytes, int alignment) {
+        if (bytes == null) return;
+        try {
+            // Pad to alignment
+            while ((fileOffset & (long)(alignment-1)) != 0) {
+                outputStream.write(0);
+                fileOffset++;
+            }
+            outputStream.write(bytes);
+        } catch (Exception e) {
+            System.out.println("PECoffContainer: writeBytes failed");
+        }
+        fileOffset += bytes.length;
+    }
+}
+