Skip to content

Commit 446db80

Browse files
Fix ARM64 Crash with Meowice flags (#3498)
1 parent d09d9d7 commit 446db80

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

docs/configuration/server-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ be configured by setting `LEVEL_TYPE` to [an expected type listed here](https://
396396

397397
For some of the level types, `GENERATOR_SETTINGS` can be used to further customize the world generation.
398398

399-
To configure the `GENERATOR_SEETINGS` you need to add the appropriate `GeneratorOptions` JSON configuration. In the case of a superflat world, you may omit the `flat_world_options`.
399+
To configure the `GENERATOR_SETTINGS` you need to add the appropriate `GeneratorOptions` JSON configuration. In the case of a superflat world, you may omit the `flat_world_options`.
400400

401401
The layers are applied from -64 and up and are added in the order of the list
402402

scripts/start-deployLimbo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ fi
6565
export LEVEL
6666

6767
export FAMILY=LIMBO
68-
exec ${SCRIPTS:-/}start-setupWorld $@
68+
exec ${SCRIPTS:-/}start-setupWorld "$@"

scripts/start-deployNanoLimbo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ fi
1616
export SERVER
1717
export FAMILY=LIMBO
1818

19-
exec ${SCRIPTS:-/}start-setupMounts $@
19+
exec ${SCRIPTS:-/}start-setupMounts "$@"

scripts/start-finalExec

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -253,14 +253,8 @@ if isTrue "${USE_MEOWICE_FLAGS}"; then
253253
-XX:+RewriteBytecodes
254254
-XX:+RewriteFrequentPairs
255255
-XX:+UseFPUForSpilling
256-
-XX:+UseFastStosb
257-
-XX:+UseNewLongLShift
258256
-XX:+UseVectorCmov
259257
-XX:+UseXMMForArrayCopy
260-
-XX:+UseXmmI2D
261-
-XX:+UseXmmI2F
262-
-XX:+UseXmmLoadAndClearUpper
263-
-XX:+UseXmmRegToRegMoveAll
264258
-XX:+EliminateLocks
265259
-XX:+DoEscapeAnalysis
266260
-XX:+AlignVector
@@ -269,13 +263,25 @@ if isTrue "${USE_MEOWICE_FLAGS}"; then
269263
-XX:+UseCharacterCompareIntrinsics
270264
-XX:+UseCopySignIntrinsic
271265
-XX:+UseVectorStubs
272-
-XX:UseAVX=2
273-
-XX:UseSSE=4
274266
"
267+
if [[ $(arch) == "x86_64" ]]; then
268+
JVM_XX_OPTS="${JVM_XX_OPTS}
269+
-XX:+UseFastStosb
270+
-XX:+UseNewLongLShift
271+
-XX:+UseXmmI2D
272+
-XX:+UseXmmI2F
273+
-XX:+UseXmmLoadAndClearUpper
274+
-XX:+UseXmmRegToRegMoveAll
275+
-XX:UseAVX=2
276+
-XX:UseSSE=4
277+
"
278+
else
279+
log "cpu not x86_64, disabling architecture specific flags"
280+
fi
275281
fi
276282

277283
if isTrue "${USE_MEOWICE_GRAALVM_FLAGS}"; then
278-
if [[ $java_major_version -lt 25 ]]; then
284+
if [[ $java_major_version -gt 23 ]]; then
279285
log "Java 24 or higher detected, using modified GraalVM flags"
280286
JVM_XX_OPTS="${JVM_XX_OPTS}
281287
-XX:+UseFastJNIAccessors

0 commit comments

Comments
 (0)