oracle
diff --git a/‎docs/user/README.md
Lines changed: 13 additions & 2 deletions b/‎docs/user/README.md
Lines changed: 13 additions & 2 deletions
diff --git a/‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java
Lines changed: 10 additions & 1 deletion b/‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java
Lines changed: 10 additions & 1 deletion
diff --git a/‎graalpython/lib-graalpython/modules/standalone/__main__.py
Lines changed: 6 additions & 3 deletions b/‎graalpython/lib-graalpython/modules/standalone/__main__.py
Lines changed: 6 additions & 3 deletions
@@ -48,8 +48,19 @@ To try GraalPy with a full GraalVM, including support for Java embedding and int
 
 ### Windows
 
-There is currently no installer for Windows.
-Instead, follow [these instructions](https://github.com/oracle/graalpython#user-content-building-from-source) to build GraalPy from source.
+There is a preview binary build of Windows that you can download via [www.graalvm.org](https://www.graalvm.org/downloads/).
+The Windows build has several known issues:
+
+  - JLine treats Windows a dumb terminal, no autocomplete and limited editing capabilities in the REPL
+  - Interactive help() in the REPL doesn't work
+  - Oracle GraalPy builds cannot create venvs or install packages, use community GraalPy builds to do those things.
+  - Inside venvs:
+      - graalpy.cmd and graalpy.exe are broken
+      - pip.exe cannot be used directly
+      - pip has trouble with cache file loading, use `--no-cache-dir`
+      - Only pure Python binary wheels can be installed, no native extensions or source builds
+      - To install a package, use `myvenv/Scripts/python.cmd -m pip --no-cache-dir install <pkg>`
+  - Running from PowerShell works better than running from CMD, various scripts will fail on the latter
 
 ## Running Python
 
 
@@ -1875,7 +1875,16 @@ static Object doGeneric(GraalHPyContext hpyContext, Object charPtr,
 
         @TruffleBoundary
         static Encoding getFSDefault() {
-            return Encoding.fromJCodingName(System.getProperty("file.encoding"));
+            String fileEncoding = System.getProperty("file.encoding");
+            if (fileEncoding != null) {
+                try {
+                    return Encoding.valueOf(fileEncoding.replace('-', '_'));
+                } catch (IllegalArgumentException e) {
+                    // avoid any fatal Java exceptions; fall through
+                }
+            }
+            // fall back to UTF-8
+            return Encoding.UTF_8;
         }
     }
 
 
@@ -420,9 +420,9 @@ def get_executable(file):
 
     def get_graalvm_url(self):
         if "." in self.jdk_version:
-            major_version = jdk_version[:jdk_version.index(".")]
+            major_version = self.jdk_version[:self.jdk_version.index(".")]
         else:
-            major_version = jdk_version
+            major_version = self.jdk_version
 
         system = platform.system()
         sufix = 'tar.gz'
@@ -444,7 +444,7 @@ def get_graalvm_url(self):
         else:
             raise RuntimeError("Unknown platform machine", machine)
 
-        return f"{GRAALVM_URL_BASE}{major_version}/archive/graalvm-jdk-{jdk_version}_{system}-{machine}_bin.{sufix}"
+        return f"{GRAALVM_URL_BASE}{major_version}/archive/graalvm-jdk-{self.jdk_version}_{system}-{machine}_bin.{sufix}"
 
     def get_tools(self):
         if os.getenv("JAVA_HOME"):
@@ -543,6 +543,9 @@ def build_binary(self, ni, jc):
                     "-Dtruffle.TruffleRuntime=com.oracle.truffle.api.impl.DefaultTruffleRuntime",
                     "-Dpolyglot.engine.WarnInterpreterOnly=false",
                 ]
+                # Remove once GR-48563 is fixed
+                if "Oracle GraalVM" in subprocess.check_output([ni, "--version"], text=True):
+                    cmd.append("-H:-OptConditionalMoves")
             cmd += [
                 "--no-fallback",
                 "-H:-CopyLanguageResources",