Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7afede96098
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 65cd0dd1c3b8
Choose a head ref
  • 2 commits
  • 19 files changed
  • 2 contributors

Commits on Nov 14, 2016

  1. [Truffle] Update platform description for sparcv9-solaris. 

    * The native data was actually from 32-bit Solaris.
* Patching files since they are wrong anyway but this should get upstream.
    @eregon
    Stefan Anzinger authored and eregon committed Nov 14, 2016
    Copy the full SHA
    c112b89 View commit details

  2. [Truffle] Solaris SPARCv9 uses 64-bit words for a fd_set.

    @eregon
    eregon committed Nov 14, 2016
    Copy the full SHA
    65cd0dd View commit details
Showing with 453 additions and 313 deletions.
  1. +8 −8 lib/ruby/stdlib/ffi/platform/sparcv9-solaris/etc.rb
  2. +18 −0 lib/ruby/stdlib/ffi/platform/sparcv9-solaris/fcntl-flock.rb
  3. +4 −4 lib/ruby/stdlib/ffi/platform/sparcv9-solaris/fcntl.rb
  4. +107 −106 lib/ruby/stdlib/ffi/platform/sparcv9-solaris/platform.conf
  5. +8 −8 lib/ruby/stdlib/ffi/platform/sparcv9-solaris/socket.rb
  6. +10 −10 lib/ruby/stdlib/ffi/platform/sparcv9-solaris/stat.rb
  7. +1 −1 lib/ruby/stdlib/ffi/platform/sparcv9-solaris/syslog.rb
  8. +54 −53 lib/ruby/stdlib/ffi/platform/sparcv9-solaris/types.conf
  9. +15 −15 lib/ruby/stdlib/ffi/platform/sparcv9-solaris/zlib.rb
  10. +3 −3 truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java
  11. +22 −0 truffle/src/main/java/org/jruby/truffle/platform/FDSet.java
  12. +2 −0 truffle/src/main/java/org/jruby/truffle/platform/NativePlatform.java
  13. +7 −0 truffle/src/main/java/org/jruby/truffle/platform/darwin/DarwinPlatform.java
  14. +7 −0 truffle/src/main/java/org/jruby/truffle/platform/java/JavaPlatform.java
  15. +7 −0 truffle/src/main/java/org/jruby/truffle/platform/linux/LinuxPlatform.java
  16. +4 −2 truffle/src/main/java/org/jruby/truffle/platform/posix/{FDSet.java → PosixFDSet4Bytes.java}
  17. +65 −0 truffle/src/main/java/org/jruby/truffle/platform/posix/PosixFDSet8Bytes.java
  18. +7 −0 truffle/src/main/java/org/jruby/truffle/platform/solaris/SolarisPlatform.java
  19. +104 −103 truffle/src/main/java/org/jruby/truffle/platform/solaris/SolarisSparcV9RubiniusConfiguration.java
16 changes: 8 additions & 8 deletions lib/ruby/stdlib/ffi/platform/sparcv9-solaris/etc.rb
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
module Platform; end
module Platform::Etc
class Passwd < FFI::Struct
self.size = 36
layout :pw_name, :string, 0,
:pw_passwd, :string, 4,
:pw_uid, :uint, 8,
:pw_gid, :uint, 12,
:pw_dir, :string, 28,
:pw_shell, :string, 32
:pw_passwd, :string, 8,
:pw_uid, :uint, 16,
:pw_gid, :uint, 20,
:pw_dir, :string, 48,
:pw_shell, :string, 56




@@ -18,9 +18,9 @@ class Passwd < FFI::Struct

end
class Group < FFI::Struct
self.size = 16
layout :gr_name, :string, 0,
:gr_gid, :uint, 8
:gr_gid, :uint, 16




18 changes: 18 additions & 0 deletions lib/ruby/stdlib/ffi/platform/sparcv9-solaris/fcntl-flock.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file is generated by rake. Do not edit.

module Fcntl
class Flock < FFI::Struct
layout :l_type, :short, 0,
:l_whence, :short, 2,
:l_start, :off_t, 8,
:l_len, :off_t, 16,
:l_sysid, :int, 24,
:l_pid, :int, 28,
:l_pad, :int, 32





end
end
8 changes: 4 additions & 4 deletions lib/ruby/stdlib/ffi/platform/sparcv9-solaris/fcntl.rb
View file
Original file line number Diff line number Diff line change
@@ -5,15 +5,15 @@ module Fcntl
F_DUPFD = 0
F_GETFD = 1
F_GETFL = 3
F_GETLK = 33
F_GETLK = 14
F_RDLCK = 1
F_SETFD = 2
F_SETFL = 4
F_SETLK = 34
F_SETLKW = 35
F_SETLK = 6
F_SETLKW = 7
F_UNLCK = 3
F_WRLCK = 2
O_ACCMODE = 3
O_ACCMODE = 6291459
O_APPEND = 8
O_CREAT = 256
O_EXCL = 1024
Loading