[llvm-commits] [llvm-gcc-4.2] r49362 - in /llvm-gcc-4.2/trunk/gcc: config/i386/llvm-i386-target.h llvm-backend.cpp

[Dale Johannesen]

Author: johannes
Date: Mon Apr  7 19:11:19 2008
New Revision: 49362

URL: http://llvm.org/viewvc/llvm-project?rev=49362&view=rev
Log:
Redo flag-unwind-tables handling to use
-disable-required-unwind-tables.


Modified:
    llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386-target.h
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386-target.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386-target.h?rev=49362&r1=49361&r2=49362&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386-target.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386-target.h Mon Apr  7 19:11:19 2008
@@ -83,8 +83,6 @@
     }                                                           \
   }
 
-#define LLVM_PRESERVE_UNWIND_TABLES (TARGET_MACHO && TARGET_64BIT)
-
 #ifdef LLVM_ABI_H
 
 /* Objects containing SSE vectors are 16 byte aligned, everything else 4. */

Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=49362&r1=49361&r2=49362&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Mon Apr  7 19:11:19 2008
@@ -131,6 +131,8 @@
   if (optimize_size)
     // Reduce inline limit. Default limit is 200.
     Args.push_back("--inline-threshold=100");
+  if (!flag_unwind_tables)
+    Args.push_back("--disable-required-unwind-tables");
 
   // If there are options that should be passed through to the LLVM backend
   // directly from the command line, do so now.  This is mainly for debugging
@@ -297,10 +299,6 @@
   OptimizationPassesCreated = false;
 }
 
-#ifndef LLVM_PRESERVE_UNWIND_TABLES
-#define LLVM_PRESERVE_UNWIND_TABLES 0
-#endif
-
 static void createOptimizationPasses() {
   assert(OptimizationPassesCreated ||
          (!PerFunctionPasses && !PerModulePasses && !CodeGenPasses));
@@ -355,8 +353,7 @@
     // DISABLE PREDSIMPLIFY UNTIL PR967 is fixed.
     //PM->add(createPredicateSimplifierPass());   // Canonicalize registers
     PM->add(createCFGSimplificationPass());       // Clean up after IPCP & DAE
-    if (flag_unit_at_a_time && 
-        (!flag_unwind_tables || !LLVM_PRESERVE_UNWIND_TABLES))
+    if (flag_unit_at_a_time)
       PM->add(createPruneEHPass());               // Remove dead EH info
 
     if (optimize > 1) {