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: 445922b72e13
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9e9da39c9dd4
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 30, 2016

  1. 1
    Copy the full SHA
    b7d25d0 View commit details
  2. Copy the full SHA
    9e9da39 View commit details
4 changes: 2 additions & 2 deletions test/truffle/integration/backtraces/javascript.backtrace
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/javascript.rb:19:in `foo'
(eval):1
(eval):1:in `bar'
/javascript.rb:31:in `execute'
/javascript.rb:31:in `bar'
/javascript.rb:31:in `baz'
(eval):1
(eval):1:in `bob'
/javascript.rb:55:in `execute'
/javascript.rb:55:in `bob'
/javascript.rb:55:in `block in <main>'
Original file line number Diff line number Diff line change
@@ -76,4 +76,14 @@ public boolean signalsSafe() {

}

@CoreMethod(names = "processes_safe?", onSingleton = true)
public abstract static class AreProcessesSafeNode extends CoreMethodNode {

@Specialization
public boolean processesSafe() {
return getContext().getOptions().PLATFORM_SAFE_PROCESSES;
}

}

}
13 changes: 9 additions & 4 deletions truffle/src/main/ruby/core/rbconfig.rb
Original file line number Diff line number Diff line change
@@ -38,9 +38,7 @@ module RbConfig
}

MAKEFILE_CONFIG = {
'CC' => "mx -p #{ENV['SULONG_HOME']} su-clang -I#{ENV['SULONG_HOME']}/include",
'configure_args' => ' ',
'CFLAGS' => " -S -emit-llvm -I#{ENV['OPENSSL_HOME']}/include -DRUBY_EXTCONF_H=\"extconf.h\" -DHAVE_OPENSSL_110_THREADING_API -DHAVE_HMAC_CTX_COPY -DHAVE_EVP_CIPHER_CTX_COPY -DHAVE_BN_RAND_RANGE -DHAVE_BN_PSEUDO_RAND_RANGE -DHAVE_X509V3_EXT_NCONF_NID -Wall -Wno-int-conversion -Wno-int-to-pointer-cast -Wno-unused-variable -Wno-uninitialized -Wno-unused-function -Werror ",
'ARCH_FLAG' => '',
'CPPFLAGS' => '',
'LDFLAGS' => '',
@@ -61,10 +59,17 @@ module RbConfig
'ruby_install_name' => 'jruby-truffle',
'RUBY_SO_NAME' => '$(RUBY_BASE_NAME)',
'hdrdir' => "#{jruby_home}/lib/ruby/truffle/cext",
'COMPILE_C' => '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$< -o $@',
'LINK_SO' => "mx -p #{ENV['SULONG_HOME']} su-link -o $@ $(OBJS)"
'COMPILE_C' => '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$< -o $@'
}

if Truffle::Safe.memory_safe? && Truffle::Safe.processes_safe?
MAKEFILE_CONFIG.merge!({
'CC' => "mx -p #{ENV['SULONG_HOME']} su-clang -I#{ENV['SULONG_HOME']}/include",
'CFLAGS' => " -S -emit-llvm -I#{ENV['OPENSSL_HOME']}/include -DRUBY_EXTCONF_H=\"extconf.h\" -DHAVE_OPENSSL_110_THREADING_API -DHAVE_HMAC_CTX_COPY -DHAVE_EVP_CIPHER_CTX_COPY -DHAVE_BN_RAND_RANGE -DHAVE_BN_PSEUDO_RAND_RANGE -DHAVE_X509V3_EXT_NCONF_NID -Wall -Wno-int-conversion -Wno-int-to-pointer-cast -Wno-unused-variable -Wno-uninitialized -Wno-unused-function -Werror ",
'LINK_SO' => "mx -p #{ENV['SULONG_HOME']} su-link -o $@ $(OBJS)"
})
end

def self.ruby
# TODO (eregon, 30 Sep 2016): should be the one used by the launcher!
File.join CONFIG['bindir'], CONFIG['ruby_install_name'], CONFIG['exeext']