diff options
| author | michelou <michelou@epfl.ch> | 2007-06-11 15:34:04 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-06-11 15:34:04 +0000 |
| commit | 1cf6fcfbfaedd1b1659554a0ecc9dd89a43d0a07 (patch) | |
| tree | 56c33c5aa067eade88784c42b486ee12c861180f /test | |
| parent | 9578a9df038aa39f343a1b685247f07d6537bec6 (diff) | |
| download | scala-1cf6fcfbfaedd1b1659554a0ecc9dd89a43d0a07.tar.gz scala-1cf6fcfbfaedd1b1659554a0ecc9dd89a43d0a07.tar.bz2 scala-1cf6fcfbfaedd1b1659554a0ecc9dd89a43d0a07.zip | |
added 64-bit library
Diffstat (limited to 'test')
| -rwxr-xr-x | test/files/jvm/libnatives-32.so (renamed from test/files/jvm/libnatives.so) | bin | 5359 -> 5359 bytes | |||
| -rwxr-xr-x | test/files/jvm/libnatives-64.so | bin | 0 -> 7466 bytes | |||
| -rw-r--r-- | test/files/jvm/natives.scala | 3 |
3 files changed, 2 insertions, 1 deletions
diff --git a/test/files/jvm/libnatives.so b/test/files/jvm/libnatives-32.so Binary files differindex ccbcdd646f..ccbcdd646f 100755 --- a/test/files/jvm/libnatives.so +++ b/test/files/jvm/libnatives-32.so diff --git a/test/files/jvm/libnatives-64.so b/test/files/jvm/libnatives-64.so Binary files differnew file mode 100755 index 0000000000..8cc6152057 --- /dev/null +++ b/test/files/jvm/libnatives-64.so diff --git a/test/files/jvm/natives.scala b/test/files/jvm/natives.scala index d3cb24a9d9..4cea731cd3 100644 --- a/test/files/jvm/natives.scala +++ b/test/files/jvm/natives.scala @@ -1,6 +1,7 @@ object Test { //println("java.library.path=" + System.getProperty("java.library.path")) - System.loadLibrary("natives") + val model = System.getProperty("sun.arch.data.model", "32") + System.loadLibrary("natives-" + model) @native def sayHello(s: String): String = null |