[llvm-commits] [llvm-gcc-4.2] r40011 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

[Scott Michel]

Author: pingbak
Date: Wed Jul 18 13:27:26 2007
New Revision: 40011

URL: http://llvm.org/viewvc/llvm-project?rev=40011&view=rev
Log:
Conditionalize code to fix today's daily compile problem:

- TreeToLLVM::EmitBuiltinEHReturnDataRegno() is only called if preprocessor
  symbol EH_RETURN_DATA_REGNO is defined, 

- TreeToLLVM::EmitBuiltinInitDwarfRegSizes() is only called if preprocessor
  symbol DWARF2_UNWIND_INFO is defined

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

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=40011&r1=40010&r2=40011&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Wed Jul 18 13:27:26 2007
@@ -4634,6 +4634,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))
@@ -4655,6 +4656,7 @@
   iwhich = DWARF_FRAME_REGNUM (iwhich);
 
   Result = ConstantInt::get(ConvertType(TREE_TYPE(exp)), iwhich);
+#endif
 
   return true;
 }
@@ -4680,6 +4682,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;
@@ -4733,6 +4736,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;