new fixes

rlavaee · Nov 16, 2018 · 95125eb · 95125eb
1 parent 3cc7e19
commit 95125eb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/install.sh b/install.sh
@@ -63,7 +63,7 @@ echo "downloading base sources..."
 if [ "$BINUTILS_STATE" -eq "0" ]; then
 	rm -rf ${BINUTILS_SRC_DIR}
 	echo "downloading binutils-2.30"
-	wget http://ftp.gnu.org/gnu/binutils/binutils-2.30.tar.xz -P ${SOURCE_DIR} -q
+	wget http://ftp.gnu.org/gnu/binutils/binutils-2.30.tar.xz -O ${SOURCE_DIR}/binutils-2.30.tar.xz -q
 	tar -xf ${SOURCE_DIR}/binutils-2.30.tar.xz -C ${SOURCE_DIR}
 	rm ${SOURCE_DIR}/binutils-2.30.tar.xz
 	BINUTILS_STATE=1

diff --git a/patches/llvm/llvm.patch b/patches/llvm/llvm.patch
@@ -1,4 +1,3 @@
-#NCSA-License
 Index: include/llvm/CodeGen/AsmPrinter.h
 ===================================================================
 --- include/llvm/CodeGen/AsmPrinter.h	(revision 301135)
@@ -2829,3 +2828,15 @@ Index: lib/Support/BranchProbability.cpp
  }
 
  LLVM_DUMP_METHOD void BranchProbability::dump() const { print(dbgs()) << '\n'; }
+Index: lib/Target/X86/X86AsmPrinter.h
+===================================================================
+--- lib/Target/X86/X86AsmPrinter.h	(revision 301135)
++++ lib/Target/X86/X86AsmPrinter.h	(working copy)
+@@ -137,6 +137,7 @@
+   void EmitInstruction(const MachineInstr *MI) override;
+
+   void EmitBasicBlockEnd(const MachineBasicBlock &MBB) override {
++    AsmPrinter::EmitBasicBlockEnd(MBB);
+     SMShadowTracker.emitShadowPadding(*OutStreamer, getSubtargetInfo());
+   }
+
diff --git a/scripts/code_layout.rb b/scripts/code_layout.rb
@@ -577,7 +577,6 @@ def merge_all_chains
     end
 
 
-    
     @dso.functions.each do |func|
       @in_edges[func].each do |pred_func,c|
         func_chain = @hot_chain_map[func]
@@ -815,7 +814,7 @@ def coalesce_cold(func)
     if(!cold_chain_set.empty?)
       chain_a = cold_chain_set.to_a
       top_chain = chain_a.shift
-      top_chain = chain_a.inject(top_chain) do |res,chain| 
+      top_chain = chain_a.inject(top_chain) do |res,chain|
         res.concat(chain)
         @all_chains.delete(chain)
         res
@@ -1029,7 +1028,7 @@ def set_triple_chain_edge(lchain,mchain,rchain,elm,emr,distance_limit)
           if(distance < distance_limit)
             w = v[0] + v[1]
             w *= (distance_limit - distance) if distance_limit.is_page?
-            ltr_w += w  
+            ltr_w += w
           end
         end
       end

diff --git a/scripts/profile.rb b/scripts/profile.rb
@@ -3,6 +3,8 @@
 
 require 'fileutils'
 
+LLVM_BIN = File.join(File.expand_path(File.dirname(__FILE__)), "..", "build", "llvm", "bin", "llvm-nm")
+
 class Profile < Hash
   attr_reader :prof_dso
   attr_accessor :updated