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: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 15a805f278e4
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d5847885e70d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 29, 2015

  1. Copy the full SHA
    2316d08 View commit details
  2. Removed JIT disable hack.

    brixen committed Dec 29, 2015
    Copy the full SHA
    d584788 View commit details
Showing with 1 addition and 6 deletions.
  1. +1 −0 .travis.yml
  2. +0 −6 vm/jit/llvm/state.cpp
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -51,6 +51,7 @@ matrix:
env:
global:
- LANG="en_US.UTF-8"
- RBXOPT=-Xint
- secure: olbok/GN6rOYvPnHBYWGz7giCoCdLFpT/7WSBHukYO3E0uNeqAUOOgW2BFOwCVWdSEJ/iTvJXZQ4qVZHX+6jRfvILZeGv+D2P93VdD8UFQRoTOfFC7esAo525s9fuKm9ehUGWZxlzGOBHHckky1jn6pEf8mlXAVM5e76dlH0fck=
- secure: aqG9eB/PrzQ7XJQN6YX/00sNVvwSB77saxXQzguL2WFjAXB74h6168Hzq+awHtNX/vfOb6ta7fpWLHrA0D+gmZnvTR29VlP6nd0vs1tkdX1/jWbiBHjamRffp+NWVdKbJKYn5iLOGXcuUMOzY/opLKOdvxKZfkxGMxR2tTNLZUE=
- secure: eElvNLjuFZAuixJdgom4Kv8RDziE4ArFcSEwYctvprMe/414CAaJcFkjQKg0RrJzAxZ51oGjdcZhEfmjNXcUU1gA5l++IdnlQm0x4kt8r7aql+q2geHzrrjhhwPujT9a8JNtXs6dHnbi+quNlxyVItWzeGJsjyhJzH8hxiFhCYI=
6 changes: 0 additions & 6 deletions vm/jit/llvm/state.cpp
Original file line number Diff line number Diff line change
@@ -140,9 +140,6 @@ namespace rubinius {
void LLVMState::enable(STATE) {
utilities::thread::SpinLock::LockGuard lg(shared_.llvm_state_lock());

// TODO LLVM 3.6
return;

if(enabled_) return;

start(state);
@@ -153,9 +150,6 @@ namespace rubinius {
}

void LLVMState::initialize(STATE) {
// TODO LLVM 3.6
return;

InternalThread::initialize(state);

method_update_lock_.init();