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

Commits on May 7, 2016

  1. Copy the full SHA
    e02ee0a View commit details
  2. Copy the full SHA
    7d5e7a8 View commit details
Showing with 12 additions and 18 deletions.
  1. +11 −17 configure
  2. +1 −1 machine/vm.hpp
28 changes: 11 additions & 17 deletions configure
Original file line number Diff line number Diff line change
@@ -325,11 +325,11 @@ class Configure

o.doc "\n Compiler settings"

o.on "--cc", "COMPILER", "Compiler to use for C code (eg gcc, clang)" do |cc|
o.on "--cc", "COMPILER", "Compiler to use for C code (NOTE only versions of clang are supported)" do |cc|
@cc = cc
end

o.on "--cxx", "COMPILER", "Compiler to use for C++ code (eg g++, clang++)" do |cxx|
o.on "--cxx", "COMPILER", "Compiler to use for C++ code (NOTE only versions of clang++ are supported)" do |cxx|
@cxx = cxx
end

@@ -689,12 +689,12 @@ int main() { LLVMContext &Context = getGlobalContext(); }

def default_cc
return 'clang' if `clang --version > /dev/null 2>&1` && $?.success?
return 'gcc'
failure "Unable to find default C compiler: clang. Use CC= or pass --cc"
end

def default_cxx
return 'clang++' if `clang++ --version > /dev/null 2>&1` && $?.success?
return 'g++'
failure "Unable to find default C++ compiler: clang++. Use CXX= or pass --cxx"
end

def check_tools
@@ -704,11 +704,13 @@ int main() { LLVMContext &Context = getGlobalContext(); }
check_tool_version @cc, '-dumpversion', [4, 1]
check_tool_version @cxx, '-dumpversion', [4, 1]

unless @cc =~ /clang/ and @cxx =~ /clang\+\+/
@log.deprecated <<-EOM
Support for compilers other than clang/clang++ is deprecated and will be
removed soon. If your platform does not have support for clang/clang++,
please notify us.
unless File.basename(@cc) =~ /^clang/ and File.basename(@cxx) =~ /^clang\+\+/
failure <<-EOM
The #{@cc} and #{@cxx} compilers are not supported for building Rubinius.
Only clang/clang++ compilers are supported. If your platform does not have
support for clang/clang++, please notify us by opening an issue at:
https://github.com/rubinius/rubinius/issues
EOM
end

@@ -718,13 +720,6 @@ please notify us.
@perl ||= ENV['PERL'] || 'perl'
@gem ||= ENV['GEM'] || 'gem'

@gcc_major = `#{@cc} -dumpversion`.strip.split(".")[0,2].join(".")
if @host == "i686-pc-linux-gnu" || @host == "x86_64-unknown-linux-gnu"
@llvm_generic_prebuilt = "llvm-#{@llvm_version}-#{@host}-#{@gcc_major}.tar.bz2"
else
@llvm_generic_prebuilt = "llvm-#{@llvm_version}-#{@host}.tar.bz2"
end

@system_cflags = ""
@system_cxxflags = ""
@system_cppflags = ""
@@ -1540,7 +1535,6 @@ int main() { return tgetnum(""); }
:cxx => @cxx,
:ldshared => @ldshared,
:ldsharedxx => @ldsharedxx,
:gcc_major => @gcc_major,
:user_cflags => "#{@user_cflags}",
:user_cxxflags => "#{@user_cxxflags}",
:user_cppflags => "#{@user_cppflags}",
2 changes: 1 addition & 1 deletion machine/vm.hpp
Original file line number Diff line number Diff line change
@@ -232,7 +232,7 @@ namespace rubinius {

if(stack_used < 0) stack_used = -stack_used;

if(stack_used > stack_size_) {
if(static_cast<size_t>(stack_used) > stack_size_) {
raise_stack_error(state);
return false;
}