diff --git a/.gitattributes b/.gitattributes
index 77450626296..409e8b248bd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
-*	-text
+* -text
+* binary
diff --git a/.gitignore b/.gitignore
index 608a4f606a9..566da7e72a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ test/nashorn/lib
 NashornProfile.txt
 **/JTreport/**
 **/JTwork/**
+
+.vs/
diff --git a/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java b/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
index d424bc1494b..403e40a0b92 100644
--- a/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
+++ b/jdk/make/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
@@ -1,383 +1,383 @@
-/*
- * Copyright (c) 2001, 2015, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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 build.tools.generatecurrencydata;
-
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.DataOutputStream;
-import java.io.FileOutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.TimeZone;
-
-/**
- * Reads currency data in properties format from the file specified in the
- * command line and generates a binary data file as specified in the command line.
- *
- * Output of this tool is a binary file that contains the data in
- * the following order:
- *
- *     - magic number (int): always 0x43757244 ('CurD')
- *     - formatVersion (int)
- *     - dataVersion (int)
- *     - mainTable (int[26*26])
- *     - specialCaseCount (int)
- *     - specialCaseCutOverTimes (long[specialCaseCount])
- *     - specialCaseOldCurrencies (String[specialCaseCount])
- *     - specialCaseNewCurrencies (String[specialCaseCount])
- *     - specialCaseOldCurrenciesDefaultFractionDigits (int[specialCaseCount])
- *     - specialCaseNewCurrenciesDefaultFractionDigits (int[specialCaseCount])
- *     - specialCaseOldCurrenciesNumericCode (int[specialCaseCount])
- *     - specialCaseNewCurrenciesNumericCode (int[specialCaseCount])
- *     - otherCurrenciesCount (int)
- *     - otherCurrencies (String)
- *     - otherCurrenciesDefaultFractionDigits (int[otherCurrenciesCount])
- *     - otherCurrenciesNumericCode (int[otherCurrenciesCount])
- *
- * See CurrencyData.properties for the input format description and
- * Currency.java for the format descriptions of the generated tables.
- */
-public class GenerateCurrencyData {
-
-    private static DataOutputStream out;
-
-    // input data: currency data obtained from properties on input stream
-    private static Properties currencyData;
-    private static String formatVersion;
-    private static String dataVersion;
-    private static String validCurrencyCodes;
-
-    // handy constants - must match definitions in java.util.Currency
-    // magic number
-    private static final int MAGIC_NUMBER = 0x43757244;
-    // number of characters from A to Z
-    private static final int A_TO_Z = ('Z' - 'A') + 1;
-    // entry for invalid country codes
-    private static final int INVALID_COUNTRY_ENTRY = 0x0000007F;
-    // entry for countries without currency
-    private static final int COUNTRY_WITHOUT_CURRENCY_ENTRY = 0x00000200;
-    // mask for simple case country entries
-    private static final int SIMPLE_CASE_COUNTRY_MASK = 0x00000000;
-    // mask for simple case country entry final character
-    private static final int SIMPLE_CASE_COUNTRY_FINAL_CHAR_MASK = 0x0000001F;
-    // mask for simple case country entry default currency digits
-    private static final int SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_MASK = 0x000001E0;
-    // shift count for simple case country entry default currency digits
-    private static final int SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_SHIFT = 5;
-    // maximum number for simple case country entry default currency digits
-    private static final int SIMPLE_CASE_COUNTRY_MAX_DEFAULT_DIGITS = 9;
-    // mask for special case country entries
-    private static final int SPECIAL_CASE_COUNTRY_MASK = 0x00000200;
-    // mask for special case country index
-    private static final int SPECIAL_CASE_COUNTRY_INDEX_MASK = 0x0000001F;
-    // delta from entry index component in main table to index into special case tables
-    private static final int SPECIAL_CASE_COUNTRY_INDEX_DELTA = 1;
-    // mask for distinguishing simple and special case countries
-    private static final int COUNTRY_TYPE_MASK = SIMPLE_CASE_COUNTRY_MASK | SPECIAL_CASE_COUNTRY_MASK;
-    // mask for the numeric code of the currency
-    private static final int NUMERIC_CODE_MASK = 0x000FFC00;
-    // shift count for the numeric code of the currency
-    private static final int NUMERIC_CODE_SHIFT = 10;
-
-    // generated data
-    private static int[] mainTable = new int[A_TO_Z * A_TO_Z];
-
-    private static final int maxSpecialCases = 30;
-    private static int specialCaseCount = 0;
-    private static long[] specialCaseCutOverTimes = new long[maxSpecialCases];
-    private static String[] specialCaseOldCurrencies = new String[maxSpecialCases];
-    private static String[] specialCaseNewCurrencies = new String[maxSpecialCases];
-    private static int[] specialCaseOldCurrenciesDefaultFractionDigits = new int[maxSpecialCases];
-    private static int[] specialCaseNewCurrenciesDefaultFractionDigits = new int[maxSpecialCases];
-    private static int[] specialCaseOldCurrenciesNumericCode = new int[maxSpecialCases];
-    private static int[] specialCaseNewCurrenciesNumericCode = new int[maxSpecialCases];
-
-    private static final int maxOtherCurrencies = 128;
-    private static int otherCurrenciesCount = 0;
-    private static StringBuffer otherCurrencies = new StringBuffer();
-    private static int[] otherCurrenciesDefaultFractionDigits = new int[maxOtherCurrencies];
-    private static int[] otherCurrenciesNumericCode= new int[maxOtherCurrencies];
-
-    // date format for parsing cut-over times
-    private static SimpleDateFormat format;
-
-    // Minor Units
-    private static String[] currenciesWithDefinedMinorUnitDecimals =
-        new String[SIMPLE_CASE_COUNTRY_MAX_DEFAULT_DIGITS + 1];
-    private static String currenciesWithMinorUnitsUndefined;
-
-    public static void main(String[] args) {
-
-        // Look for "-o outputfilename" option
-        if ( args.length == 2 && args[0].equals("-o") ) {
-            try {
-                out = new DataOutputStream(new FileOutputStream(args[1]));
-            } catch ( FileNotFoundException e ) {
-                System.err.println("Error: " + e.getMessage());
-                e.printStackTrace(System.err);
-                System.exit(1);
-            }
-        } else {
-            System.err.println("Error: Illegal arg count");
-            System.exit(1);
-        }
-
-        format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US);
-        format.setTimeZone(TimeZone.getTimeZone("GMT"));
-        format.setLenient(false);
-
-        try {
-            readInput();
-            buildMainAndSpecialCaseTables();
-            buildOtherTables();
-            writeOutput();
-            out.flush();
-            out.close();
-        } catch (Exception e) {
-            System.err.println("Error: " + e.getMessage());
-            e.printStackTrace(System.err);
-            System.exit(1);
-        }
-    }
-
-    private static void readInput() throws IOException {
-        currencyData = new Properties();
-        currencyData.load(System.in);
-
-        // initialize other lookup strings
-        formatVersion = (String) currencyData.get("formatVersion");
-        dataVersion = (String) currencyData.get("dataVersion");
-        validCurrencyCodes = (String) currencyData.get("all");
-        for (int i = 0; i <= SIMPLE_CASE_COUNTRY_MAX_DEFAULT_DIGITS; i++) {
-            currenciesWithDefinedMinorUnitDecimals[i]
-                = (String) currencyData.get("minor"+i);
-        }
-        currenciesWithMinorUnitsUndefined  = (String) currencyData.get("minorUndefined");
-        if (formatVersion == null ||
-                dataVersion == null ||
-                validCurrencyCodes == null ||
-                currenciesWithMinorUnitsUndefined == null) {
-            throw new NullPointerException("not all required data is defined in input");
-        }
-    }
-
-    private static void buildMainAndSpecialCaseTables() throws Exception {
-        for (int first = 0; first < A_TO_Z; first++) {
-            for (int second = 0; second < A_TO_Z; second++) {
-                char firstChar = (char) ('A' + first);
-                char secondChar = (char) ('A' + second);
-                String countryCode = (new StringBuffer()).append(firstChar).append(secondChar).toString();
-                String currencyInfo = (String) currencyData.get(countryCode);
-                int tableEntry = 0;
-                if (currencyInfo == null) {
-                    // no entry -> must be invalid ISO 3166 country code
-                    tableEntry = INVALID_COUNTRY_ENTRY;
-                } else {
-                    int length = currencyInfo.length();
-                    if (length == 0) {
-                        // special case: country without currency
-                       tableEntry = COUNTRY_WITHOUT_CURRENCY_ENTRY;
-                    } else if (length == 3) {
-                        // valid currency
-                        if (currencyInfo.charAt(0) == firstChar && currencyInfo.charAt(1) == secondChar) {
-                            checkCurrencyCode(currencyInfo);
-                            int digits = getDefaultFractionDigits(currencyInfo);
-                            if (digits < 0 || digits > SIMPLE_CASE_COUNTRY_MAX_DEFAULT_DIGITS) {
-                                throw new RuntimeException("fraction digits out of range for " + currencyInfo);
-                            }
-                            int numericCode= getNumericCode(currencyInfo);
-                            if (numericCode < 0 || numericCode >= 1000 ) {
-                                throw new RuntimeException("numeric code out of range for " + currencyInfo);
-                            }
-                            tableEntry = SIMPLE_CASE_COUNTRY_MASK
-                                    | (currencyInfo.charAt(2) - 'A')
-                                    | (digits << SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_SHIFT)
-                                    | (numericCode << NUMERIC_CODE_SHIFT);
-                        } else {
-                            tableEntry = SPECIAL_CASE_COUNTRY_MASK | (makeSpecialCaseEntry(currencyInfo) + SPECIAL_CASE_COUNTRY_INDEX_DELTA);
-                        }
-                    } else {
-                        tableEntry = SPECIAL_CASE_COUNTRY_MASK | (makeSpecialCaseEntry(currencyInfo) + SPECIAL_CASE_COUNTRY_INDEX_DELTA);
-                    }
-                }
-                mainTable[first * A_TO_Z + second] = tableEntry;
-            }
-        }
-    }
-
-    private static int getDefaultFractionDigits(String currencyCode) {
-        for (int i = 0; i <= SIMPLE_CASE_COUNTRY_MAX_DEFAULT_DIGITS; i++) {
-            if (currenciesWithDefinedMinorUnitDecimals[i] != null &&
-                currenciesWithDefinedMinorUnitDecimals[i].indexOf(currencyCode) != -1) {
-                return i;
-            }
-        }
-
-        if (currenciesWithMinorUnitsUndefined.indexOf(currencyCode) != -1) {
-            return -1;
-        } else {
-            return 2;
-        }
-    }
-
-    private static int getNumericCode(String currencyCode) {
-        int index = validCurrencyCodes.indexOf(currencyCode);
-        String numericCode = validCurrencyCodes.substring(index + 3, index + 6);
-        return Integer.parseInt(numericCode);
-    }
-
-    static HashMap<String, Integer> specialCaseMap = new HashMap<>();
-
-    private static int makeSpecialCaseEntry(String currencyInfo) throws Exception {
-        Integer oldEntry = specialCaseMap.get(currencyInfo);
-        if (oldEntry != null) {
-            return oldEntry.intValue();
-        }
-        if (specialCaseCount == maxSpecialCases) {
-            throw new RuntimeException("too many special cases");
-        }
-        if (currencyInfo.length() == 3) {
-            checkCurrencyCode(currencyInfo);
-            specialCaseCutOverTimes[specialCaseCount] = Long.MAX_VALUE;
-            specialCaseOldCurrencies[specialCaseCount] = currencyInfo;
-            specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(currencyInfo);
-            specialCaseOldCurrenciesNumericCode[specialCaseCount] = getNumericCode(currencyInfo);
-            specialCaseNewCurrencies[specialCaseCount] = null;
-            specialCaseNewCurrenciesDefaultFractionDigits[specialCaseCount] = 0;
-            specialCaseNewCurrenciesNumericCode[specialCaseCount] = 0;
-        } else {
-            int length = currencyInfo.length();
-            if (currencyInfo.charAt(3) != ';' ||
-                    currencyInfo.charAt(length - 4) != ';') {
-                throw new RuntimeException("invalid currency info: " + currencyInfo);
-            }
-            String oldCurrency = currencyInfo.substring(0, 3);
-            String newCurrency = currencyInfo.substring(length - 3, length);
-            checkCurrencyCode(oldCurrency);
-            checkCurrencyCode(newCurrency);
-            String timeString = currencyInfo.substring(4, length - 4);
-            long time = format.parse(timeString).getTime();
-            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
-                throw new RuntimeException("time is more than 10 years from present: " + time);
-            }
-            specialCaseCutOverTimes[specialCaseCount] = time;
-            specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
-            specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency);
-            specialCaseOldCurrenciesNumericCode[specialCaseCount] = getNumericCode(oldCurrency);
-            specialCaseNewCurrencies[specialCaseCount] = newCurrency;
-            specialCaseNewCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(newCurrency);
-            specialCaseNewCurrenciesNumericCode[specialCaseCount] = getNumericCode(newCurrency);
-        }
-        specialCaseMap.put(currencyInfo, new Integer(specialCaseCount));
-        return specialCaseCount++;
-    }
-
-    private static void buildOtherTables() {
-        if (validCurrencyCodes.length() % 7 != 6) {
-            throw new RuntimeException("\"all\" entry has incorrect size");
-        }
-        for (int i = 0; i < (validCurrencyCodes.length() + 1) / 7; i++) {
-            if (i > 0 && validCurrencyCodes.charAt(i * 7 - 1) != '-') {
-                throw new RuntimeException("incorrect separator in \"all\" entry");
-            }
-            String currencyCode = validCurrencyCodes.substring(i * 7, i * 7 + 3);
-            int numericCode = Integer.parseInt(
-                validCurrencyCodes.substring(i * 7 + 3, i * 7 + 6));
-            checkCurrencyCode(currencyCode);
-            int tableEntry = mainTable[(currencyCode.charAt(0) - 'A') * A_TO_Z + (currencyCode.charAt(1) - 'A')];
-            if (tableEntry == INVALID_COUNTRY_ENTRY ||
-                    (tableEntry & SPECIAL_CASE_COUNTRY_MASK) != 0 ||
-                    (tableEntry & SIMPLE_CASE_COUNTRY_FINAL_CHAR_MASK) != (currencyCode.charAt(2) - 'A')) {
-                if (otherCurrenciesCount == maxOtherCurrencies) {
-                    throw new RuntimeException("too many other currencies");
-                }
-                if (otherCurrencies.length() > 0) {
-                    otherCurrencies.append('-');
-                }
-                otherCurrencies.append(currencyCode);
-                otherCurrenciesDefaultFractionDigits[otherCurrenciesCount] = getDefaultFractionDigits(currencyCode);
-                otherCurrenciesNumericCode[otherCurrenciesCount] = getNumericCode(currencyCode);
-                otherCurrenciesCount++;
-            }
-        }
-    }
-
-    private static void checkCurrencyCode(String currencyCode) {
-        if (currencyCode.length() != 3) {
-            throw new RuntimeException("illegal length for currency code: " + currencyCode);
-        }
-        for (int i = 0; i < 3; i++) {
-            char aChar = currencyCode.charAt(i);
-            if ((aChar < 'A' || aChar > 'Z') && !currencyCode.equals("XB5")) {
-                throw new RuntimeException("currency code contains illegal character: " + currencyCode);
-            }
-        }
-        if (validCurrencyCodes.indexOf(currencyCode) == -1) {
-            throw new RuntimeException("currency code not listed as valid: " + currencyCode);
-        }
-    }
-
-    private static void writeOutput() throws IOException {
-        out.writeInt(MAGIC_NUMBER);
-        out.writeInt(Integer.parseInt(formatVersion));
-        out.writeInt(Integer.parseInt(dataVersion));
-        writeIntArray(mainTable, mainTable.length);
-        out.writeInt(specialCaseCount);
-        writeLongArray(specialCaseCutOverTimes, specialCaseCount);
-        writeStringArray(specialCaseOldCurrencies, specialCaseCount);
-        writeStringArray(specialCaseNewCurrencies, specialCaseCount);
-        writeIntArray(specialCaseOldCurrenciesDefaultFractionDigits, specialCaseCount);
-        writeIntArray(specialCaseNewCurrenciesDefaultFractionDigits, specialCaseCount);
-        writeIntArray(specialCaseOldCurrenciesNumericCode, specialCaseCount);
-        writeIntArray(specialCaseNewCurrenciesNumericCode, specialCaseCount);
-        out.writeInt(otherCurrenciesCount);
-        out.writeUTF(otherCurrencies.toString());
-        writeIntArray(otherCurrenciesDefaultFractionDigits, otherCurrenciesCount);
-        writeIntArray(otherCurrenciesNumericCode, otherCurrenciesCount);
-    }
-
-    private static void writeIntArray(int[] ia, int count) throws IOException {
-        for (int i = 0; i < count; i ++) {
-            out.writeInt(ia[i]);
-        }
-    }
-
-    private static void writeLongArray(long[] la, int count) throws IOException  {
-        for (int i = 0; i < count; i ++) {
-            out.writeLong(la[i]);
-        }
-    }
-
-    private static void writeStringArray(String[] sa, int count) throws IOException  {
-        for (int i = 0; i < count; i ++) {
-            String str = (sa[i] != null) ? sa[i] : "";
-            out.writeUTF(str);
-        }
-    }
-}
+/*
+ * Copyright (c) 2001, 2015, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 build.tools.generatecurrencydata;
+
+import java.io.IOException;
+import java.io.FileNotFoundException;
+import java.io.DataOutputStream;
+import java.io.FileOutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.TimeZone;
+
+/**
+ * Reads currency data in properties format from the file specified in the
+ * command line and generates a binary data file as specified in the command line.
+ *
+ * Output of this tool is a binary file that contains the data in
+ * the following order:
+ *
+ *     - magic number (int): always 0x43757244 ('CurD')
+ *     - formatVersion (int)
+ *     - dataVersion (int)
+ *     - mainTable (int[26*26])
+ *     - specialCaseCount (int)
+ *     - specialCaseCutOverTimes (long[specialCaseCount])
+ *     - specialCaseOldCurrencies (String[specialCaseCount])
+ *     - specialCaseNewCurrencies (String[specialCaseCount])
+ *     - specialCaseOldCurrenciesDefaultFractionDigits (int[specialCaseCount])
+ *     - specialCaseNewCurrenciesDefaultFractionDigits (int[specialCaseCount])
+ *     - specialCaseOldCurrenciesNumericCode (int[specialCaseCount])
+ *     - specialCaseNewCurrenciesNumericCode (int[specialCaseCount])
+ *     - otherCurrenciesCount (int)
+ *     - otherCurrencies (String)
+ *     - otherCurrenciesDefaultFractionDigits (int[otherCurrenciesCount])
+ *     - otherCurrenciesNumericCode (int[otherCurrenciesCount])
+ *
+ * See CurrencyData.properties for the input format description and
+ * Currency.java for the format descriptions of the generated tables.
+ */
+public class GenerateCurrencyData {
+
+    private static DataOutputStream out;
+
+    // input data: currency data obtained from properties on input stream
+    private static Properties currencyData;
+    private static String formatVersion;
+    private static String dataVersion;
+    private static String validCurrencyCodes;
+
+    // handy constants - must match definitions in java.util.Currency
+    // magic number
+    private static final int MAGIC_NUMBER = 0x43757244;
+    // number of characters from A to Z
+    private static final int A_TO_Z = ('Z' - 'A') + 1;
+    // entry for invalid country codes
+    private static final int INVALID_COUNTRY_ENTRY = 0x0000007F;
+    // entry for countries without currency
+    private static final int COUNTRY_WITHOUT_CURRENCY_ENTRY = 0x00000200;
+    // mask for simple case country entries
+    private static final int SIMPLE_CASE_COUNTRY_MASK = 0x00000000;
+    // mask for simple case country entry final character
+    private static final int SIMPLE_CASE_COUNTRY_FINAL_CHAR_MASK = 0x0000001F;
+    // mask for simple case country entry default currency digits
+    private static final int SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_MASK = 0x000001E0;
+    // shift count for simple case country entry default currency digits
+    private static final int SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_SHIFT = 5;
+    // maximum number for simple case country entry default currency digits
+    private static final int SIMPLE_CASE_COUNTRY_MAX_DEFAULT_DIGITS = 9;
+    // mask for special case country entries
+    private static final int SPECIAL_CASE_COUNTRY_MASK = 0x00000200;
+    // mask for special case country index
+    private static final int SPECIAL_CASE_COUNTRY_INDEX_MASK = 0x0000001F;
+    // delta from entry index component in main table to index into special case tables
+    private static final int SPECIAL_CASE_COUNTRY_INDEX_DELTA = 1;
+    // mask for distinguishing simple and special case countries
+    private static final int COUNTRY_TYPE_MASK = SIMPLE_CASE_COUNTRY_MASK | SPECIAL_CASE_COUNTRY_MASK;
+    // mask for the numeric code of the currency
+    private static final int NUMERIC_CODE_MASK = 0x000FFC00;
+    // shift count for the numeric code of the currency
+    private static final int NUMERIC_CODE_SHIFT = 10;
+
+    // generated data
+    private static int[] mainTable = new int[A_TO_Z * A_TO_Z];
+
+    private static final int maxSpecialCases = 30;
+    private static int specialCaseCount = 0;
+    private static long[] specialCaseCutOverTimes = new long[maxSpecialCases];
+    private static String[] specialCaseOldCurrencies = new String[maxSpecialCases];
+    private static String[] specialCaseNewCurrencies = new String[maxSpecialCases];
+    private static int[] specialCaseOldCurrenciesDefaultFractionDigits = new int[maxSpecialCases];
+    private static int[] specialCaseNewCurrenciesDefaultFractionDigits = new int[maxSpecialCases];
+    private static int[] specialCaseOldCurrenciesNumericCode = new int[maxSpecialCases];
+    private static int[] specialCaseNewCurrenciesNumericCode = new int[maxSpecialCases];
+
+    private static final int maxOtherCurrencies = 128;
+    private static int otherCurrenciesCount = 0;
+    private static StringBuffer otherCurrencies = new StringBuffer();
+    private static int[] otherCurrenciesDefaultFractionDigits = new int[maxOtherCurrencies];
+    private static int[] otherCurrenciesNumericCode= new int[maxOtherCurrencies];
+
+    // date format for parsing cut-over times
+    private static SimpleDateFormat format;
+
+    // Minor Units
+    private static String[] currenciesWithDefinedMinorUnitDecimals =
+        new String[SIMPLE_CASE_COUNTRY_MAX_DEFAULT_DIGITS + 1];
+    private static String currenciesWithMinorUnitsUndefined;
+
+    public static void main(String[] args) {
+
+        // Look for "-o outputfilename" option
+        if ( args.length == 2 && args[0].equals("-o") ) {
+            try {
+                out = new DataOutputStream(new FileOutputStream(args[1]));
+            } catch ( FileNotFoundException e ) {
+                System.err.println("Error: " + e.getMessage());
+                e.printStackTrace(System.err);
+                System.exit(1);
+            }
+        } else {
+            System.err.println("Error: Illegal arg count");
+            System.exit(1);
+        }
+
+        format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US);
+        format.setTimeZone(TimeZone.getTimeZone("GMT"));
+        format.setLenient(false);
+
+        try {
+            readInput();
+            buildMainAndSpecialCaseTables();
+            buildOtherTables();
+            writeOutput();
+            out.flush();
+            out.close();
+        } catch (Exception e) {
+            System.err.println("Error: " + e.getMessage());
+            e.printStackTrace(System.err);
+            System.exit(1);
+        }
+    }
+
+    private static void readInput() throws IOException {
+        currencyData = new Properties();
+        currencyData.load(System.in);
+
+        // initialize other lookup strings
+        formatVersion = (String) currencyData.get("formatVersion");
+        dataVersion = (String) currencyData.get("dataVersion");
+        validCurrencyCodes = (String) currencyData.get("all");
+        for (int i = 0; i <= SIMPLE_CASE_COUNTRY_MAX_DEFAULT_DIGITS; i++) {
+            currenciesWithDefinedMinorUnitDecimals[i]
+                = (String) currencyData.get("minor"+i);
+        }
+        currenciesWithMinorUnitsUndefined  = (String) currencyData.get("minorUndefined");
+        if (formatVersion == null ||
+                dataVersion == null ||
+                validCurrencyCodes == null ||
+                currenciesWithMinorUnitsUndefined == null) {
+            throw new NullPointerException("not all required data is defined in input");
+        }
+    }
+
+    private static void buildMainAndSpecialCaseTables() throws Exception {
+        for (int first = 0; first < A_TO_Z; first++) {
+            for (int second = 0; second < A_TO_Z; second++) {
+                char firstChar = (char) ('A' + first);
+                char secondChar = (char) ('A' + second);
+                String countryCode = (new StringBuffer()).append(firstChar).append(secondChar).toString();
+                String currencyInfo = (String) currencyData.get(countryCode);
+                int tableEntry = 0;
+                if (currencyInfo == null) {
+                    // no entry -> must be invalid ISO 3166 country code
+                    tableEntry = INVALID_COUNTRY_ENTRY;
+                } else {
+                    int length = currencyInfo.length();
+                    if (length == 0) {
+                        // special case: country without currency
+                       tableEntry = COUNTRY_WITHOUT_CURRENCY_ENTRY;
+                    } else if (length == 3) {
+                        // valid currency
+                        if (currencyInfo.charAt(0) == firstChar && currencyInfo.charAt(1) == secondChar) {
+                            checkCurrencyCode(currencyInfo);
+                            int digits = getDefaultFractionDigits(currencyInfo);
+                            if (digits < 0 || digits > SIMPLE_CASE_COUNTRY_MAX_DEFAULT_DIGITS) {
+                                throw new RuntimeException("fraction digits out of range for " + currencyInfo);
+                            }
+                            int numericCode= getNumericCode(currencyInfo);
+                            if (numericCode < 0 || numericCode >= 1000 ) {
+                                throw new RuntimeException("numeric code out of range for " + currencyInfo);
+                            }
+                            tableEntry = SIMPLE_CASE_COUNTRY_MASK
+                                    | (currencyInfo.charAt(2) - 'A')
+                                    | (digits << SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_SHIFT)
+                                    | (numericCode << NUMERIC_CODE_SHIFT);
+                        } else {
+                            tableEntry = SPECIAL_CASE_COUNTRY_MASK | (makeSpecialCaseEntry(currencyInfo) + SPECIAL_CASE_COUNTRY_INDEX_DELTA);
+                        }
+                    } else {
+                        tableEntry = SPECIAL_CASE_COUNTRY_MASK | (makeSpecialCaseEntry(currencyInfo) + SPECIAL_CASE_COUNTRY_INDEX_DELTA);
+                    }
+                }
+                mainTable[first * A_TO_Z + second] = tableEntry;
+            }
+        }
+    }
+
+    private static int getDefaultFractionDigits(String currencyCode) {
+        for (int i = 0; i <= SIMPLE_CASE_COUNTRY_MAX_DEFAULT_DIGITS; i++) {
+            if (currenciesWithDefinedMinorUnitDecimals[i] != null &&
+                currenciesWithDefinedMinorUnitDecimals[i].indexOf(currencyCode) != -1) {
+                return i;
+            }
+        }
+
+        if (currenciesWithMinorUnitsUndefined.indexOf(currencyCode) != -1) {
+            return -1;
+        } else {
+            return 2;
+        }
+    }
+
+    private static int getNumericCode(String currencyCode) {
+        int index = validCurrencyCodes.indexOf(currencyCode);
+        String numericCode = validCurrencyCodes.substring(index + 3, index + 6);
+        return Integer.parseInt(numericCode);
+    }
+
+    static HashMap<String, Integer> specialCaseMap = new HashMap<>();
+
+    private static int makeSpecialCaseEntry(String currencyInfo) throws Exception {
+        Integer oldEntry = specialCaseMap.get(currencyInfo);
+        if (oldEntry != null) {
+            return oldEntry.intValue();
+        }
+        if (specialCaseCount == maxSpecialCases) {
+            throw new RuntimeException("too many special cases");
+        }
+        if (currencyInfo.length() == 3) {
+            checkCurrencyCode(currencyInfo);
+            specialCaseCutOverTimes[specialCaseCount] = Long.MAX_VALUE;
+            specialCaseOldCurrencies[specialCaseCount] = currencyInfo;
+            specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(currencyInfo);
+            specialCaseOldCurrenciesNumericCode[specialCaseCount] = getNumericCode(currencyInfo);
+            specialCaseNewCurrencies[specialCaseCount] = null;
+            specialCaseNewCurrenciesDefaultFractionDigits[specialCaseCount] = 0;
+            specialCaseNewCurrenciesNumericCode[specialCaseCount] = 0;
+        } else {
+            int length = currencyInfo.length();
+            if (currencyInfo.charAt(3) != ';' ||
+                    currencyInfo.charAt(length - 4) != ';') {
+                throw new RuntimeException("invalid currency info: " + currencyInfo);
+            }
+            String oldCurrency = currencyInfo.substring(0, 3);
+            String newCurrency = currencyInfo.substring(length - 3, length);
+            checkCurrencyCode(oldCurrency);
+            checkCurrencyCode(newCurrency);
+            String timeString = currencyInfo.substring(4, length - 4);
+            long time = format.parse(timeString).getTime();
+            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
+                throw new RuntimeException("time is more than 10 years from present: " + time);
+            }
+            specialCaseCutOverTimes[specialCaseCount] = time;
+            specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
+            specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency);
+            specialCaseOldCurrenciesNumericCode[specialCaseCount] = getNumericCode(oldCurrency);
+            specialCaseNewCurrencies[specialCaseCount] = newCurrency;
+            specialCaseNewCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(newCurrency);
+            specialCaseNewCurrenciesNumericCode[specialCaseCount] = getNumericCode(newCurrency);
+        }
+        specialCaseMap.put(currencyInfo, new Integer(specialCaseCount));
+        return specialCaseCount++;
+    }
+
+    private static void buildOtherTables() {
+        if (validCurrencyCodes.length() % 7 != 6) {
+            throw new RuntimeException("\"all\" entry has incorrect size");
+        }
+        for (int i = 0; i < (validCurrencyCodes.length() + 1) / 7; i++) {
+            if (i > 0 && validCurrencyCodes.charAt(i * 7 - 1) != '-') {
+                throw new RuntimeException("incorrect separator in \"all\" entry");
+            }
+            String currencyCode = validCurrencyCodes.substring(i * 7, i * 7 + 3);
+            int numericCode = Integer.parseInt(
+                validCurrencyCodes.substring(i * 7 + 3, i * 7 + 6));
+            checkCurrencyCode(currencyCode);
+            int tableEntry = mainTable[(currencyCode.charAt(0) - 'A') * A_TO_Z + (currencyCode.charAt(1) - 'A')];
+            if (tableEntry == INVALID_COUNTRY_ENTRY ||
+                    (tableEntry & SPECIAL_CASE_COUNTRY_MASK) != 0 ||
+                    (tableEntry & SIMPLE_CASE_COUNTRY_FINAL_CHAR_MASK) != (currencyCode.charAt(2) - 'A')) {
+                if (otherCurrenciesCount == maxOtherCurrencies) {
+                    throw new RuntimeException("too many other currencies");
+                }
+                if (otherCurrencies.length() > 0) {
+                    otherCurrencies.append('-');
+                }
+                otherCurrencies.append(currencyCode);
+                otherCurrenciesDefaultFractionDigits[otherCurrenciesCount] = getDefaultFractionDigits(currencyCode);
+                otherCurrenciesNumericCode[otherCurrenciesCount] = getNumericCode(currencyCode);
+                otherCurrenciesCount++;
+            }
+        }
+    }
+
+    private static void checkCurrencyCode(String currencyCode) {
+        if (currencyCode.length() != 3) {
+            throw new RuntimeException("illegal length for currency code: " + currencyCode);
+        }
+        for (int i = 0; i < 3; i++) {
+            char aChar = currencyCode.charAt(i);
+            if ((aChar < 'A' || aChar > 'Z') && !currencyCode.equals("XB5")) {
+                throw new RuntimeException("currency code contains illegal character: " + currencyCode);
+            }
+        }
+        if (validCurrencyCodes.indexOf(currencyCode) == -1) {
+            throw new RuntimeException("currency code not listed as valid: " + currencyCode);
+        }
+    }
+
+    private static void writeOutput() throws IOException {
+        out.writeInt(MAGIC_NUMBER);
+        out.writeInt(Integer.parseInt(formatVersion));
+        out.writeInt(Integer.parseInt(dataVersion));
+        writeIntArray(mainTable, mainTable.length);
+        out.writeInt(specialCaseCount);
+        writeLongArray(specialCaseCutOverTimes, specialCaseCount);
+        writeStringArray(specialCaseOldCurrencies, specialCaseCount);
+        writeStringArray(specialCaseNewCurrencies, specialCaseCount);
+        writeIntArray(specialCaseOldCurrenciesDefaultFractionDigits, specialCaseCount);
+        writeIntArray(specialCaseNewCurrenciesDefaultFractionDigits, specialCaseCount);
+        writeIntArray(specialCaseOldCurrenciesNumericCode, specialCaseCount);
+        writeIntArray(specialCaseNewCurrenciesNumericCode, specialCaseCount);
+        out.writeInt(otherCurrenciesCount);
+        out.writeUTF(otherCurrencies.toString());
+        writeIntArray(otherCurrenciesDefaultFractionDigits, otherCurrenciesCount);
+        writeIntArray(otherCurrenciesNumericCode, otherCurrenciesCount);
+    }
+
+    private static void writeIntArray(int[] ia, int count) throws IOException {
+        for (int i = 0; i < count; i ++) {
+            out.writeInt(ia[i]);
+        }
+    }
+
+    private static void writeLongArray(long[] la, int count) throws IOException  {
+        for (int i = 0; i < count; i ++) {
+            out.writeLong(la[i]);
+        }
+    }
+
+    private static void writeStringArray(String[] sa, int count) throws IOException  {
+        for (int i = 0; i < count; i ++) {
+            String str = (sa[i] != null) ? sa[i] : "";
+            out.writeUTF(str);
+        }
+    }
+}
diff --git a/jdk/src/share/native/common/jni_util.c b/jdk/src/share/native/common/jni_util.c
index a383ea6ed09..16e7b48f230 100644
--- a/jdk/src/share/native/common/jni_util.c
+++ b/jdk/src/share/native/common/jni_util.c
@@ -28,6 +28,8 @@
 #include <string.h>
 
 #include "jvm.h"
+#include "jni.h"
+#include "jni_util.h"
 #include "io_util.h"
 
 /* Due to a bug in the win32 C runtime library strings
diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h
index c8a5e68c49f..e422453f256 100644
--- a/jdk/src/share/native/java/net/net_util.h
+++ b/jdk/src/share/native/java/net/net_util.h
@@ -131,7 +131,7 @@ jfieldID NET_GetFileDescriptorID(JNIEnv *env);
 
 JNIEXPORT jint JNICALL ipv6_available() ;
 
-void
+JNIEXPORT void JNICALL
 NET_AllocSockaddr(struct sockaddr **him, int *len);
 
 JNIEXPORT int JNICALL
diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c
index 24557cba416..20e8921837c 100644
--- a/jdk/src/solaris/native/sun/xawt/XToolkit.c
+++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c
@@ -27,7 +27,7 @@
 #include <X11/Xutil.h>
 #include <X11/Xos.h>
 #include <X11/Xatom.h>
-#ifdef __linux__
+#if defined __linux__ && !__MUSL__
 #include <execinfo.h>
 #endif
 
@@ -796,7 +796,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv
     return ret;
 }
 
-#ifdef __linux__
+#if defined __linux__ && !__MUSL__
 void print_stack(void)
 {
   void *array[10];
diff --git a/jdk/src/windows/native/sun/java2d/d3d/D3DPipeline.h b/jdk/src/windows/native/sun/java2d/d3d/D3DPipeline.h
index 20019851ebf..fcf7f038e8c 100644
--- a/jdk/src/windows/native/sun/java2d/d3d/D3DPipeline.h
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DPipeline.h
@@ -67,7 +67,7 @@
     #include "Trace.h"
 
     #define DebugPrintD3DError(res, msg) \
-        J2dTraceLn1(J2D_TRACE_ERROR, "D3D Error: " ## msg ## " res=%d", res)
+        J2dTraceLn1(J2D_TRACE_ERROR, "D3D Error: " msg " res=%d", res)
 
 #endif /*D3D_PPL_DLL*/
 
@@ -92,9 +92,9 @@ do {                      \
 #define SAFE_PRINTLN(RES) \
 do {                      \
     if ((RES)!= NULL) {   \
-        J2dTraceLn1(J2D_TRACE_VERBOSE, "  " ## #RES ## "=0x%x", (RES)); \
+        J2dTraceLn1(J2D_TRACE_VERBOSE, "  " #RES "=0x%x", (RES)); \
     } else {              \
-        J2dTraceLn(J2D_TRACE_VERBOSE, "  " ## #RES ## "=NULL"); \
+        J2dTraceLn(J2D_TRACE_VERBOSE, "  " #RES "=NULL"); \
     }                     \
 } while (0);
 #else // DEBUG
@@ -109,7 +109,7 @@ do {                      \
 #define ACT_IF_NULL(ACTION, value)         \
     if ((value) == NULL) {                 \
         J2dTraceLn3(J2D_TRACE_ERROR,       \
-                    "%s is null in %s:%d", #value, THIS_FILE, __LINE__); \
+                    "%s is null in %s:%d", #value, __FILE__, __LINE__); \
         ACTION;                            \
     } else do { } while (0)
 #define RETURN_IF_NULL(value)   ACT_IF_NULL(return, value)
@@ -119,12 +119,12 @@ do {                      \
 
 #define RETURN_STATUS_IF_EXP_FAILED(EXPR) \
     if (FAILED(res = (EXPR))) {                    \
-        DebugPrintD3DError(res, " " ## #EXPR ## " failed in " ## THIS_FILE); \
+        DebugPrintD3DError(res, " " #EXPR " failed in " __FILE__); \
         return res;                   \
     } else do { } while (0)
 
 #define RETURN_STATUS_IF_FAILED(status) \
     if (FAILED((status))) {                    \
-        DebugPrintD3DError((status), " failed in " ## THIS_FILE ## ", return;");\
+        DebugPrintD3DError((status), " failed in " __FILE__ ", return;");\
         return (status);                   \
     } else do { } while (0)
diff --git a/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c b/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c
index 0a18e0b607b..2b52b8148bf 100644
--- a/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c
+++ b/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c
@@ -36,7 +36,7 @@
 #include <windows.h>
 #include <aclapi.h>
 #include <winioctl.h>
-#include <Sddl.h>
+#include <sddl.h>
 
 #include "jni.h"
 #include "jni_util.h"
diff --git a/jdk/src/windows/native/sun/security/jgss/sspi_bridge/sspi.cpp b/jdk/src/windows/native/sun/security/jgss/sspi_bridge/sspi.cpp
index b1de9934a00..66808655b31 100644
--- a/jdk/src/windows/native/sun/security/jgss/sspi_bridge/sspi.cpp
+++ b/jdk/src/windows/native/sun/security/jgss/sspi_bridge/sspi.cpp
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <Strsafe.h>
+#include <strsafe.h>
 #include <ntsecapi.h>
 #include <new>
 
@@ -648,7 +648,7 @@ gss_acquire_cred(OM_uint32 *minor_status,
         if (cred->phCredK == NULL) {
             goto err;
         }
-        ss = AcquireCredentialsHandle(
+        ss = ::AcquireCredentialsHandle(
                 NULL,
                 L"Kerberos",
                 cred_usage == 0 ? SECPKG_CRED_BOTH :
@@ -678,7 +678,7 @@ gss_acquire_cred(OM_uint32 *minor_status,
         auth.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE;
         auth.PackageList = (unsigned short*)L"Kerberos";
         auth.PackageListLength = 8;
-        ss = AcquireCredentialsHandle(
+        ss = ::AcquireCredentialsHandle(
                 NULL,
                 L"Negotiate",
                 cred_usage == 0 ? SECPKG_CRED_BOTH :
@@ -936,9 +936,9 @@ gss_init_sec_context(OM_uint32 *minor_status,
             auth.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE;
             auth.PackageList = (unsigned short*)L"Kerberos";
             auth.PackageListLength = 8;
-            ss = AcquireCredentialsHandle(
+            ss = ::AcquireCredentialsHandle(
                     NULL,
-                    isSPNEGO ? L"Negotiate" : L"Kerberos",
+                    isSPNEGO ? (LPTSTR)L"Negotiate" : (LPTSTR)L"Kerberos",
                     SECPKG_CRED_OUTBOUND,
                     NULL,
                     isSPNEGO ? &auth : NULL,
diff --git a/jdk/src/windows/native/sun/security/mscapi/security.cpp b/jdk/src/windows/native/sun/security/mscapi/security.cpp
index 73488cbcc3c..b85077860ec 100644
--- a/jdk/src/windows/native/sun/security/mscapi/security.cpp
+++ b/jdk/src/windows/native/sun/security/mscapi/security.cpp
@@ -1247,7 +1247,7 @@ void showProperty(NCRYPT_HANDLE hKey) {
     BCryptBuffer bb;
     bb.BufferType = NCRYPTBUFFER_PKCS_SECRET;
     bb.cbBuffer = 18;
-    bb.pvBuffer = L"changeit";
+    bb.pvBuffer = (PVOID)L"changeit";
     BCryptBufferDesc bbd;
     bbd.ulVersion = 0;
     bbd.cBuffers = 1;
diff --git a/jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c b/jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
index 33b11bfd07e..b7f9303a992 100644
--- a/jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
+++ b/jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
@@ -30,6 +30,7 @@
 #include <jni_util.h>
 
 #include "j2secmod.h"
+#include "wrapper/pkcs11wrapper.h"
 
 void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
     HINSTANCE hModule = (HINSTANCE)jHandle;
diff --git a/jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h b/jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
index 7cff0c7c249..3e578366366 100644
--- a/jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
+++ b/jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
@@ -60,6 +60,9 @@
 
 /* defines for WIN32 platform *************************************************/
 
+#ifndef _P11_MD_H
+#define _P11_MD_H 1
+
 #include <windows.h>
 
 /* statement according to PKCS11 docu */
@@ -101,3 +104,5 @@ struct ModuleData {
 
 };
 typedef struct ModuleData ModuleData;
+
+#endif /* _P11_MD_H */
diff --git a/jdk/src/windows/native/sun/windows/awt.h b/jdk/src/windows/native/sun/windows/awt.h
index 95b0e1ed568..9af043348d5 100644
--- a/jdk/src/windows/native/sun/windows/awt.h
+++ b/jdk/src/windows/native/sun/windows/awt.h
@@ -339,7 +339,7 @@ class JavaStringBuffer
     jsize  m_dwSize;
     LPWSTR getNonEmptyString() {
         return (NULL==m_pStr)
-                ? L""
+                ? (LPWSTR)L""
                 : m_pStr;
     }
 
diff --git a/jdk/src/windows/native/sun/windows/awt_Component.cpp b/jdk/src/windows/native/sun/windows/awt_Component.cpp
index c0553af57c7..9486de3bfae 100644
--- a/jdk/src/windows/native/sun/windows/awt_Component.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp
@@ -3579,7 +3579,7 @@ UINT AwtComponent::WindowsKeyToJavaChar(UINT wkey, UINT modifiers, TransOps ops,
     } else {
         UINT scancode = ::MapVirtualKey(wkey, 0);
         converted = ::ToUnicodeEx(wkey, scancode, keyboardState,
-                                              wChar, 2, 0, GetKeyboardLayout());
+                                              (LPWSTR)&wChar, 2, 0, GetKeyboardLayout());
     }
 
     UINT translation;
diff --git a/jdk/src/windows/native/sun/windows/awt_PrintControl.cpp b/jdk/src/windows/native/sun/windows/awt_PrintControl.cpp
index 5772cff66f8..711aa5843c1 100644
--- a/jdk/src/windows/native/sun/windows/awt_PrintControl.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_PrintControl.cpp
@@ -1019,7 +1019,7 @@ BOOL AwtPrintControl::UpdateAttributes(JNIEnv *env,
         DASSERT(!IsBadReadPtr(devnames, sizeof(DEVNAMES)));
         LPTSTR lpcNames = (LPTSTR)devnames;
         LPTSTR pbuf = (_tcslen(lpcNames + devnames->wDeviceOffset) == 0 ?
-                      TEXT("") : lpcNames + devnames->wDeviceOffset);
+                      (LPTSTR)TEXT("") : lpcNames + devnames->wDeviceOffset);
         if (pbuf != NULL) {
             jstring jstr = JNU_NewStringPlatform(env, pbuf);
             env->CallVoidMethod(printCtrl,
@@ -1028,7 +1028,7 @@ BOOL AwtPrintControl::UpdateAttributes(JNIEnv *env,
             env->DeleteLocalRef(jstr);
         }
         pbuf = (_tcslen(lpcNames + devnames->wOutputOffset) == 0 ?
-                      TEXT("") : lpcNames + devnames->wOutputOffset);
+                      (LPTSTR)TEXT("") : lpcNames + devnames->wOutputOffset);
         if (pbuf != NULL) {
             if (wcscmp(pbuf, L"FILE:") == 0) {
                 pdFlags |= PD_PRINTTOFILE;
diff --git a/jdk/src/windows/native/sun/windows/awt_new.cpp b/jdk/src/windows/native/sun/windows/awt_new.cpp
index b2d133f2350..1636bdc2be6 100644
--- a/jdk/src/windows/native/sun/windows/awt_new.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_new.cpp
@@ -114,17 +114,6 @@ void *safe_Realloc(void *memblock, size_t size) throw (std::bad_alloc) {
     return ret_val;
 }
 
-#if !defined(DEBUG)
-// This function exists because VC++ 5.0 currently does not conform to the
-// Standard C++ specification which requires that operator new throw
-// std::bad_alloc in an out of memory situation. Instead, VC++ 5.0 returns 0.
-//
-// This function can be safely removed when the problem is corrected.
-void * CDECL operator new(size_t size) throw (std::bad_alloc) {
-    return safe_Malloc(size);
-}
-#endif
-
 // This function is called at the beginning of an entry point.
 // Entry points are functions which are declared:
 //   1. CALLBACK,