Skip to content

Commit b364041

Browse files
committed
[GR-54502] Update mx version.
PullRequest: graal/18054
2 parents 5e9a8f7 + 22d9977 commit b364041

File tree

4 files changed

+2
-22
lines changed

4 files changed

+2
-22
lines changed

common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.25.14",
7+
"mx_version": "7.26.0",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

substratevm/mx.substratevm/mx_substratevm.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,17 +2021,6 @@ def isJDKDependent(self):
20212021
return True
20222022

20232023

2024-
class GDBDebugHelpers(mx.ArchivableProject):
2025-
def output_dir(self):
2026-
return os.path.join(self.dir, 'src', self.name, 'gdbpy')
2027-
2028-
def archive_prefix(self):
2029-
return ''
2030-
2031-
def getResults(self):
2032-
return [os.path.join(self.output_dir(), 'gdb-debughelpers.py')]
2033-
2034-
20352024
class SubstrateCompilerFlagsBuilder(mx.ArchivableProject):
20362025

20372026
flags_build_dependencies = [

substratevm/mx.substratevm/suite.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -735,10 +735,6 @@
735735
"spotbugs" : "false",
736736
},
737737

738-
"com.oracle.svm.hosted.image.debug": {
739-
"class": "GDBDebugHelpers",
740-
},
741-
742738
# Native libraries below explicitly set _FORTIFY_SOURCE to 0. This constant controls how glibc handles some
743739
# functions that can cause a stack overflow like snprintf. If set to 1 or 2, it causes glibc to use internal
744740
# functions with extra checking that are not available in all libc implementations. Different distros use
@@ -2167,17 +2163,12 @@
21672163
},
21682164
},
21692165

2170-
"SVM_DEBUG_HELPER": {
2171-
"dependencies": ["com.oracle.svm.hosted.image.debug"],
2172-
"javaCompliance" : "21+",
2173-
},
2174-
21752166
"SVM_GRAALVM_SUPPORT" : {
21762167
"native" : True,
21772168
"platformDependent" : True,
21782169
"description" : "SubstrateVM support distribution for the GraalVM",
21792170
"layout" : {
2180-
"debug/": ["extracted-dependency:substratevm:SVM_DEBUG_HELPER"],
2171+
"debug/": ["file:debug/gdbpy/gdb-debughelpers.py"],
21812172
"clibraries/" : ["extracted-dependency:substratevm:SVM_HOSTED_NATIVE"],
21822173
"builder/clibraries/" : ["extracted-dependency:substratevm:SVM_HOSTED_NATIVE"],
21832174
"builder/lib/" : ["dependency:com.oracle.svm.native.reporterchelper"],

0 commit comments

Comments
 (0)