--- a/make/hotspot.script	Tue Apr 01 14:09:03 2014 +0200
+++ b/make/hotspot.script	Tue Apr 01 13:57:07 2014 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, 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
@@ -49,7 +49,7 @@
     GDB=gdb
 fi
 
-# This is the name of the dbx binary to use
+# This is the name of the gdb binary to use
 if [ ! "$DBX" ]
 then
     DBX=dbx
@@ -68,16 +68,9 @@
 # End of user changeable parameters -----------------------------------------
 #
 
-OS=`uname -s`
-
 # Make sure the paths are fully specified, i.e. they must begin with /.
 REL_MYDIR=`dirname $0`
 MYDIR=`cd $REL_MYDIR && pwd`
-case "$OS" in
-CYGWIN*)
-    MYDIR=`cygpath -m "$MYDIR"`
-    ;;
-esac
 
 #
 # Look whether the user wants to run inside gdb
@@ -109,17 +102,8 @@
     JDK=@@JDK_IMPORT_PATH@@
 fi
 
-if [ "${JDK}" != "" ]; then
-    case "$OS" in
-    CYGWIN*)
-        JDK=`cygpath -m "$JDK"`
-        ;;
-	esac
-
-else
-    echo "Failed to find JDK." \
-        "Either ALT_JAVA_HOME is not set or JDK_IMPORT_PATH is empty."
-    exit 1
+if [ "${JDK}" = "" ]; then
+    echo "Failed to find JDK.  Either ALT_JAVA_HOME is not set or JDK_IMPORT_PATH is empty."
 fi
 
 # We will set the LD_LIBRARY_PATH as follows:
@@ -136,6 +120,7 @@
 
 
 # Set up a suitable LD_LIBRARY_PATH or DYLD_LIBRARY_PATH
+OS=`uname -s`
 if [ "${OS}" = "Darwin" ]
 then
     if [ -z "$DYLD_LIBRARY_PATH" ]
@@ -156,7 +141,7 @@
     export LD_LIBRARY_PATH
 fi
 
-JPARMS="-XXaltjvm=$MYDIR -Dsun.java.launcher.is_altjvm=true $@ $JAVA_ARGS";
+JPARMS="-Dsun.java.launcher=gamma -XXaltjvm=$MYDIR $@ $JAVA_ARGS";
 
 # Locate the java launcher
 LAUNCHER=$JDK/bin/java
@@ -167,11 +152,6 @@
 
 GDBSRCDIR=$MYDIR
 BASEDIR=`cd $MYDIR/../../.. && pwd`
-case "$OS" in
-CYGWIN*)
-    BASEDIR=`cygpath -m "$BASEDIR"`
-    ;;
-esac
 
 init_gdb() {
 # Create a gdb script in case we should run inside gdb