Skip to content
Snippets Groups Projects
Commit a50d0ef4 authored by Stefan Anzinger's avatar Stefan Anzinger
Browse files

Add build support for Linux/SPARC

parent fe2ff93e
Branches
No related tags found
No related merge requests found
...@@ -60,7 +60,7 @@ ifeq ($(OS_NAME),Darwin) ...@@ -60,7 +60,7 @@ ifeq ($(OS_NAME),Darwin)
# check if we captured libpcre/libz, rpath those in libR # check if we captured libpcre/libz, rpath those in libR
mx rupdatelib $(FASTR_LIB_DIR) mx rupdatelib $(FASTR_LIB_DIR)
else else
$(DYLIB_LD) $(DYLIB_LDFLAGS) -Wl,-rpath,'$$ORIGIN' -o $(R_LIB) $(wildcard lib/*.o) -L$(FASTR_LIB_DIR) -lRblas -lRlapack -lpcre -lz $(DYLIB_LD) $(DYLIB_LDFLAGS) $(shell echo $(PKG_LDFLAGS_OVERRIDE)) -Wl,-rpath,'$$ORIGIN' -o $(R_LIB) $(wildcard lib/*.o) -L$(FASTR_LIB_DIR) -lRblas -lRlapack -lpcre -lz
endif endif
jni.done: jni.done:
......
...@@ -92,7 +92,11 @@ public enum RVersionInfo { ...@@ -92,7 +92,11 @@ public enum RVersionInfo {
* GnuR, this value on Linux has to be x86_64-unknown-linux-gnu * GnuR, this value on Linux has to be x86_64-unknown-linux-gnu
*/ */
if (osName.equals("linux")) { if (osName.equals("linux")) {
data.value = "x86_64-unknown-linux-gnu"; if (Arch.value.equals("sparcv9")) {
data.value = "sparc64-unknown-linux-gnu";
} else {
data.value = "x86_64-unknown-linux-gnu";
}
} else if (osName.toLowerCase().equals("sunos")) { } else if (osName.toLowerCase().equals("sunos")) {
data.value = "sparc-sun-solaris2.11"; data.value = "sparc-sun-solaris2.11";
} else { } else {
......
...@@ -118,7 +118,7 @@ def copylib(args): ...@@ -118,7 +118,7 @@ def copylib(args):
return 0 return 0
if os.environ.has_key('FASTR_RELEASE'): if os.environ.has_key('FASTR_RELEASE'):
if args[0] == 'quadmath' and platform.system() == 'SunOS': if args[0] == 'quadmath' and (mx.get_arch() == 'sparcv9' or mx.get_os() == 'solaris'):
return 0 return 0
mx.abort(args[0] + ' not found in PKG_LDFLAGS_OVERRIDE, but required with FASTR_RELEASE') mx.abort(args[0] + ' not found in PKG_LDFLAGS_OVERRIDE, but required with FASTR_RELEASE')
......
...@@ -336,42 +336,48 @@ suite = { ...@@ -336,42 +336,48 @@ suite = {
"linux" : { "linux" : {
"amd64" : { "amd64" : {
"path" : "mxbuild/dists/linux/amd64/fastr-unit-tests-native.jar", "path" : "mxbuild/dists/linux/amd64/fastr-unit-tests-native.jar",
} },
"sparcv9" : {
"path" : "mxbuild/dists/linux/sparcv9/fastr-unit-tests-native.jar",
},
}, },
"darwin" : { "darwin" : {
"amd64" : { "amd64" : {
"path" : "mxbuild/dists/darwin/amd64/fastr-unit-tests-native.jar", "path" : "mxbuild/dists/darwin/amd64/fastr-unit-tests-native.jar",
}, },
}, },
"solaris" : { "solaris" : {
"sparcv9" : { "sparcv9" : {
"path" : "mxbuild/dists/solaris/sparcv9/fastr-unit-tests-native.jar", "path" : "mxbuild/dists/solaris/sparcv9/fastr-unit-tests-native.jar",
} },
}, },
}, },
}, },
"FASTR_NATIVE_DEV": { "FASTR_NATIVE_DEV": {
"description" : "support for overriding the native project implementation in a separate suite", "description" : "support for overriding the native project implementation in a separate suite",
"dependencies" : ["com.oracle.truffle.r.native"], "dependencies" : ["com.oracle.truffle.r.native"],
"exclude" : [ "exclude" : [
"GNUR", "GNUR",
"GNU_ICONV", "GNU_ICONV",
], ],
"os_arch" : { "os_arch" : {
"linux" : { "linux" : {
"amd64" : { "amd64" : {
"path" : "mxbuild/dists/linux/amd64/fastr-native-dev.jar", "path" : "mxbuild/dists/linux/amd64/fastr-native-dev.jar",
}, },
"sparcv9" : {
"path" : "mxbuild/dists/linux/sparcv9/fastr-native-dev.jar",
},
}, },
"darwin" : { "darwin" : {
"amd64" : { "amd64" : {
"path" : "mxbuild/dists/darwin/amd64/fastr-native-dev.jar", "path" : "mxbuild/dists/darwin/amd64/fastr-native-dev.jar",
}, },
}, },
"solaris" : { "solaris" : {
"sparcv9" : { "sparcv9" : {
"path" : "mxbuild/dists/solaris/sparcv9/fastr-native-dev.jar", "path" : "mxbuild/dists/solaris/sparcv9/fastr-native-dev.jar",
}, },
}, },
}, },
...@@ -382,19 +388,22 @@ suite = { ...@@ -382,19 +388,22 @@ suite = {
"dependencies" : ["com.oracle.truffle.r.release"], "dependencies" : ["com.oracle.truffle.r.release"],
"os_arch" : { "os_arch" : {
"linux" : { "linux" : {
"amd64" : { "amd64" : {
"path" : "mxbuild/dists/linux/amd64/fastr-release.jar", "path" : "mxbuild/dists/linux/amd64/fastr-release.jar",
} },
"sparcv9" : {
"path" : "mxbuild/dists/linux/sparcv9/fastr-release.jar",
},
}, },
"darwin" : { "darwin" : {
"amd64" : { "amd64" : {
"path" : "mxbuild/dists/darwin/amd64/fastr-release.jar", "path" : "mxbuild/dists/darwin/amd64/fastr-release.jar",
} },
}, },
"solaris" : { "solaris" : {
"sparcv9" : { "sparcv9" : {
"path" : "mxbuild/dists/solaris/sparcv9/fastr-release.jar", "path" : "mxbuild/dists/solaris/sparcv9/fastr-release.jar",
} },
}, },
}, },
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment