From ca412676cfd167ec672ef735352b3fb39d90bbec Mon Sep 17 00:00:00 2001
From: Laurent Sansonetti <lrz@hipbyte.com>
Date: Mon, 9 Sep 2013 00:03:35 +0200
Subject: [PATCH] no longer need llc

---
 Rakefile                      |  2 +-
 bin/Rakefile                  |  2 --
 lib/motion/project/builder.rb | 16 +++-------------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/Rakefile b/Rakefile
index 7aa3f6d5..b6f0fb4d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -85,7 +85,7 @@ desc "Install"
 task :install do
   public_binaries = ['./bin/motion']
   binaries = public_binaries.dup.concat(['./bin/ios/deploy', './bin/ios/sim',
-    './bin/osx/sim', './bin/llc', './bin/ruby', './bin/ctags', './bin/nfd',
+    './bin/osx/sim', './bin/ruby', './bin/ctags', './bin/nfd',
     'lib/yard/bin/yard', 'lib/yard/bin/yardoc', 'lib/yard/bin/yri', './lldb/lldb.py'])
   data = ['./NEWS']
   data.concat(Dir.glob('./lib/**/*', File::FNM_DOTMATCH) - ['./lib/Rakefile'])
diff --git a/bin/Rakefile b/bin/Rakefile
index c87d2567..f19c3574 100644
--- a/bin/Rakefile
+++ b/bin/Rakefile
@@ -7,9 +7,7 @@ STRIP = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xcto
 
 task :files do
   install '../vm/miniruby', 'ruby'
-  install '/usr/local/bin/llc', 'llc'  
   sh "#{STRIP} -x ruby"
-  sh "#{STRIP} -x llc"
 end
 
 task :deploy do
diff --git a/lib/motion/project/builder.rb b/lib/motion/project/builder.rb
index e1d66b89..3c7da3c1 100644
--- a/lib/motion/project/builder.rb
+++ b/lib/motion/project/builder.rb
@@ -113,26 +113,16 @@ module Motion; module Project;
             kernel = File.join(datadir, platform, "kernel-#{arch}.bc")
             raise "Can't locate kernel file" unless File.exist?(kernel)
    
-            # LLVM bitcode.
-            bc = File.join(files_build_dir, "#{path}.#{arch}.bc")
-            arch_cmd = (arch =~ /^arm/) ? "/usr/bin/arch -arch i386" : "/usr/bin/arch -arch #{arch}"
-            sh "/usr/bin/env VM_KERNEL_PATH=\"#{kernel}\" VM_OPT_LEVEL=\"#{config.opt_level}\" #{arch_cmd} #{ruby} #{rubyc_bs_flags} --emit-llvm \"#{bc}\" #{init_func} \"#{path}\""
-   
             # Assembly.
             asm = File.join(files_build_dir, "#{path}.#{arch}.s")
-            llc_arch = case arch
-              when 'i386'; 'x86'
-              when 'x86_64'; 'x86-64'
-              when /^arm/; 'arm'
-              else; arch
-            end
-            sh "#{llc} \"#{bc}\" -o=\"#{asm}\" -march=#{llc_arch} -relocation-model=pic -disable-fp-elim -disable-cfi"
+            arch_cmd = (arch =~ /^arm/) ? "/usr/bin/arch -arch i386" : "/usr/bin/arch -arch #{arch}"
+            sh "/usr/bin/env VM_KERNEL_PATH=\"#{kernel}\" VM_OPT_LEVEL=\"#{config.opt_level}\" #{arch_cmd} #{ruby} #{rubyc_bs_flags} --emit-llvm \"#{asm}\" #{init_func} \"#{path}\""
    
             # Object.
             arch_obj = File.join(files_build_dir, "#{path}.#{arch}.o")
             sh "#{cc} -fexceptions -c -arch #{arch} \"#{asm}\" -o \"#{arch_obj}\""
   
-            [bc, asm].each { |x| File.unlink(x) } unless ENV['keep_temps']
+            [asm].each { |x| File.unlink(x) } unless ENV['keep_temps']
             arch_objs << arch_obj
           end