Skip to content

Commit d455f0f

Browse files
committed
Resolved build problems.
1 parent 79ce5fe commit d455f0f

File tree

4 files changed

+9
-0
lines changed

4 files changed

+9
-0
lines changed

truffle/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
This changelog summarizes major changes between Truffle versions relevant to languages implementors building upon the Truffle framework. The main focus is on APIs exported by Truffle.
44

5+
## Version 26.0
6+
* GR-65048 Added support for Truffle using the fallback runtime (`-Dtruffle.UseFallbackRuntime=true`) on IBM system z by introducing `CPUArchitecture.S390X` and `OS.ZOS`.
7+
58
## Version 25.0
69
* GR-31495 Added ability to specify language and instrument specific options using `Source.Builder.option(String, String)`. Languages may describe available source options by implementing `TruffleLanguage.getSourceOptionDescriptors()` and `TruffleInstrument.getSourceOptionDescriptors()` respectively.
710
* GR-61493 Added `RootNode.prepareForCall` which allows root nodes to prepare themselves for use as a call target (or to validate whether they can be used as a call target).

truffle/src/com.oracle.truffle.api/snapshot.sigtest

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ CLSS public final static !enum com.oracle.truffle.api.InternalResource$CPUArchit
175175
outer com.oracle.truffle.api.InternalResource
176176
fld public final static com.oracle.truffle.api.InternalResource$CPUArchitecture AARCH64
177177
fld public final static com.oracle.truffle.api.InternalResource$CPUArchitecture AMD64
178+
fld public final static com.oracle.truffle.api.InternalResource$CPUArchitecture S390X
178179
meth public java.lang.String toString()
179180
meth public static com.oracle.truffle.api.InternalResource$CPUArchitecture getCurrent()
180181
meth public static com.oracle.truffle.api.InternalResource$CPUArchitecture valueOf(java.lang.String)
@@ -208,6 +209,7 @@ CLSS public final static !enum com.oracle.truffle.api.InternalResource$OS
208209
fld public final static com.oracle.truffle.api.InternalResource$OS DARWIN
209210
fld public final static com.oracle.truffle.api.InternalResource$OS LINUX
210211
fld public final static com.oracle.truffle.api.InternalResource$OS WINDOWS
212+
fld public final static com.oracle.truffle.api.InternalResource$OS ZOS
211213
meth public java.lang.String toString()
212214
meth public static com.oracle.truffle.api.InternalResource$OS getCurrent()
213215
meth public static com.oracle.truffle.api.InternalResource$OS valueOf(java.lang.String)

truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/InternalResource.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,8 @@ enum OS {
488488

489489
/**
490490
* The IBM z/OS operating system.
491+
*
492+
* @since 26.0
491493
*/
492494
ZOS("z/OS");
493495

@@ -554,6 +556,7 @@ enum CPUArchitecture {
554556
/**
555557
* The IBM s390x 64-bit architecture.
556558
*
559+
* @since 26.0
557560
*/
558561
S390X("s390x");
559562

truffle/src/com.oracle.truffle.nfi.backend.panama.jdk22/src/com/oracle/truffle/nfi/backend/panama/ErrorContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public class ErrorContext extends AbstractErrorContext {
5555
case DARWIN -> "__error";
5656
case LINUX -> "__errno_location";
5757
case WINDOWS -> "_errno";
58+
default -> throw new IllegalStateException("Unsupported OS " + OS.getCurrent());
5859
};
5960

6061
public static final VarHandle INT_VAR_HANDLE = ValueLayout.JAVA_INT.varHandle();

0 commit comments

Comments
 (0)