--- /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/PECoffTargetInfo.java	2017-02-08 13:55:43.783055684 -0500
@@ -0,0 +1,74 @@
+/*
+ * 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.nio.ByteOrder;
+import jdk.tools.jaotc.binformat.pecoff.PECoff;
+import jdk.tools.jaotc.binformat.pecoff.PECoff.IMAGE_FILE_HEADER;
+
+/**
+ * Class that abstracts MACH-O target details.
+ *
+ */
+public class PECoffTargetInfo {
+    /**
+     * Target architecture.
+     */
+    private static final char arch;
+
+    /**
+     * Target OS string.
+     */
+    private static String osName;
+
+    static {
+        // Find the target arch details
+        String archStr = System.getProperty("os.arch").toLowerCase();
+        if (ByteOrder.nativeOrder() != ByteOrder.LITTLE_ENDIAN) {
+            System.out.println("Only Little Endian byte order supported!");
+        }
+
+        if (archStr.equals("amd64") || archStr.equals("x86_64")) {
+            arch = IMAGE_FILE_HEADER.IMAGE_FILE_MACHINE_AMD64;
+        } else {
+            System.out.println("Unsupported architecture " + archStr);
+            arch = IMAGE_FILE_HEADER.IMAGE_FILE_MACHINE_UNKNOWN;
+        }
+
+        osName = System.getProperty("os.name").toLowerCase();
+        if (!osName.contains("windows")) {
+            System.out.println("Unsupported Operating System " + osName);
+            osName = "Unknown";
+        }
+    }
+
+    public static char getPECoffArch() {
+        return arch;
+    }
+
+    public static String getOsName() {
+        return osName;
+    }
+}
+