Author: baldrick Date: Sun Jul 15 06:58:12 2007 New Revision: 39870 URL: http://llvm.org/viewvc/llvm-project?rev=39870&view=rev Log: Move RTL checks inside ifndef ENABLE_LLVM. Restore some logic from llvm-gcc-4.0 that got lost.
Modified: llvm-gcc-4-2/trunk/gcc/varasm.c Modified: llvm-gcc-4-2/trunk/gcc/varasm.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4-2/trunk/gcc/varasm.c?rev=39870&r1=39869&r2=39870&view=diff ============================================================================== --- llvm-gcc-4-2/trunk/gcc/varasm.c (original) +++ llvm-gcc-4-2/trunk/gcc/varasm.c Sun Jul 15 06:58:12 2007 @@ -1861,10 +1861,10 @@ return; } - gcc_assert (MEM_P (decl_rtl)); - gcc_assert (GET_CODE (XEXP (decl_rtl, 0)) == SYMBOL_REF); /* LLVM LOCAL begin */ #ifndef ENABLE_LLVM /* register globals are not supported */ + gcc_assert (MEM_P (decl_rtl)); + gcc_assert (GET_CODE (XEXP (decl_rtl, 0)) == SYMBOL_REF); symbol = XEXP (decl_rtl, 0); name = XSTR (symbol, 0); #else @@ -1876,6 +1876,16 @@ /* Compute the alignment of this data. */ align_variable (decl, dont_output_data); + /* LLVM LOCAL begin */ +#ifdef ENABLE_LLVM + if (dont_output_data) { + fprintf(stderr, "LLVM must emit the data!"); + abort(); + } + emit_global_to_llvm(decl); + return; +#endif + /* LLVM LOCAL end */ set_mem_align (decl_rtl, DECL_ALIGN (decl)); if (TREE_PUBLIC (decl)) @@ -5111,7 +5121,7 @@ } #endif } -/* LLVM LCOAL */ +/* LLVM LOCAL */ #endif /* First pass of completing pending aliases. Make sure that cgraph knows _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits