[llvm-commits] [llvm-gcc-4.2] r51601 - /llvm-gcc-4.2/trunk/gcc/unwind-c.c

[Anton Korobeynikov]

Author: asl
Date: Tue May 27 13:13:34 2008
New Revision: 51601

URL: http://llvm.org/viewvc/llvm-project?rev=51601&view=rev
Log:
Fix 4.0 => 4.2 merge error

Modified:
    llvm-gcc-4.2/trunk/gcc/unwind-c.c

Modified: llvm-gcc-4.2/trunk/gcc/unwind-c.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/unwind-c.c?rev=51601&r1=51600&r2=51601&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/unwind-c.c (original)
+++ llvm-gcc-4.2/trunk/gcc/unwind-c.c Tue May 27 13:13:34 2008
@@ -95,22 +95,6 @@
 #define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND
 #endif
 
-/* LLVM LOCAL begin */
-#ifdef __ARM_EABI_UNWINDER__
-/* ARM EABI personality routines must also unwind the stack.  */
-#define CONTINUE_UNWINDING \
-  do								\
-    {								\
-      if (__gnu_unwind_frame (ue_header, context) != _URC_OK)	\
-	return _URC_FAILURE;					\
-      return _URC_CONTINUE_UNWIND;				\
-    }								\
-  while (0)
-#else
-#define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND
-#endif
-/* LLVM LOCAL end */
-
 #ifdef __USING_SJLJ_EXCEPTIONS__
 #define PERSONALITY_FUNCTION    __gcc_personality_sj0
 #define __builtin_eh_return_data_regno(x) x