[llvm-commits] [llvm-gcc-4.0] r46194 - /llvm-gcc-4.0/trunk/gcc/llvm-convert.cpp

[Anton Korobeynikov]

Author: asl
Date: Sat Jan 19 18:22:06 2008
New Revision: 46194

URL: http://llvm.org/viewvc/llvm-project?rev=46194&view=rev
Log:
Propagate r40011 from 4.2 to 4.0. This also fixes PR1852

Modified:
    llvm-gcc-4.0/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.0/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/llvm-convert.cpp?rev=46194&r1=46193&r2=46194&view=diff

==============================================================================
--- llvm-gcc-4.0/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.0/trunk/gcc/llvm-convert.cpp Sat Jan 19 18:22:06 2008
@@ -4991,6 +4991,7 @@
 }
 
 bool TreeToLLVM::EmitBuiltinEHReturnDataRegno(tree exp, Value *&Result) {
+#ifdef EH_RETURN_DATA_REGNO
   tree arglist = TREE_OPERAND(exp, 1);
 
   if (!validate_arglist(arglist, INTEGER_TYPE, VOID_TYPE))
@@ -5012,6 +5013,7 @@
   iwhich = DWARF_FRAME_REGNUM (iwhich);
 
   Result = ConstantInt::get(ConvertType(TREE_TYPE(exp)), iwhich);
+#endif
 
   return true;
 }
@@ -5041,6 +5043,7 @@
 }
 
 bool TreeToLLVM::EmitBuiltinInitDwarfRegSizes(tree exp, Value *&Result) {
+#ifdef DWARF2_UNWIND_INFO
   unsigned int i;
   bool wrote_return_column = false;
   static bool reg_modes_initialized = false;
@@ -5094,6 +5097,8 @@
   Builder.CreateStore(Size, Builder.CreateGEP(Addr, Idx, "tmp"), false);
 #endif
 
+#endif /* DWARF2_UNWIND_INFO */
+
   // TODO: the RS6000 target needs extra initialization [gcc changeset 122468].
 
   return true;