[llvm-commits] [llvm-gcc-4.2] r60073 - /llvm-gcc-4.2/trunk/gcc/config/arm/arm.c

[Dale Johannesen]

On Nov 25, 2008, at 5:18 PMPST, Evan Cheng wrote:

> Author: evancheng
> Date: Tue Nov 25 19:18:51 2008
> New Revision: 60073
>
> URL: http://llvm.org/viewvc/llvm-project?rev=60073&view=rev
> Log:
> Do not declare is_jump_table with ENABLE_LLVM. This gets added  
> everytime we do a gcc4.2 merge. Hopefully this commit fix it once  
> for all.

It probably won't unless you put LOCAL comments in the right places.

> Modified:
>    llvm-gcc-4.2/trunk/gcc/config/arm/arm.c
>
> Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.c
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/arm.c?rev=60073&r1=60072&r2=60073&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm-gcc-4.2/trunk/gcc/config/arm/arm.c (original)
> +++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.c Tue Nov 25 19:18:51 2008
> @@ -84,7 +84,9 @@
> static const char *fp_const_from_val (REAL_VALUE_TYPE *);
> static arm_cc get_arm_condition_code (rtx);
> static HOST_WIDE_INT int_log2 (HOST_WIDE_INT);
> +#ifndef ENABLE_LLVM
> static rtx is_jump_table (rtx);
> +#endif
> static const char *output_multi_immediate (rtx *, const char *,  
> const char *,
> 					   int, HOST_WIDE_INT);
> static const char *shift_op (rtx, HOST_WIDE_INT *);
> @@ -97,7 +99,6 @@
> /* APPLE LOCAL end compact switch tables */
> /* LLVM LOCAL */
> #ifndef ENABLE_LLVM
> -static rtx is_jump_table (rtx);
> static HOST_WIDE_INT get_jump_table_size (rtx);
> static Mnode *move_minipool_fix_forward_ref (Mnode *, Mnode *,  
> HOST_WIDE_INT);
> static Mnode *add_minipool_forward_ref (Mfix *);
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits