[LLVMdev] [llvm-gcc] backport patch 98010

[Devang Patel]

On Nov 29, 2006, at 11:27 AM, Devang Patel wrote:

> When we back port patches from FSF GCC mainline, we decorate them  
> with 'mainline' markers, for example
>
> 	/* APPLE LOCAL begin 4229621 mainline */
> 	....
> 	/* APPLE LOCAL end 4229621 mainline */
>
> There are many examples of such markers in source. These markers  
> help us resolve conflicts when
> we merge current sources in mass with FSF GCC mainline. They also  
> help solve mysterious failures
> when CVS silently remerges patches, which is quiet easy to miss  
> while doing such huge merge.
>
> Would it be possible for you to decorate this patch with such  
> markers ?

Actually in this case it is sufficient to say "APPLE LOCAL begin LLVM"  
and "APPLE LOCAL end LLVM".  This allows us to easily identify patches  
used for llvm development.
Thanks,
-
Devang

> Thanks,
> -
> Devang
>
> On Nov 29, 2006, at 8:26 AM, Rafael Espíndola wrote:
>
>> The attached patch is a backport of patch 98010 from the gcc svn. It
>> is useful mostly to make the porting of more ARM patches easier, but
>> will be needed when we start to use C++ on ARM.
>>
>> Could someone please commit it to the svn?
>>
>> Thanks,
>> Rafael
>> <llvm-gcc-98010.patch>
>> _______________________________________________
>> LLVM Developers mailing list
>> LLVMdev at cs.uiuc.edu         http://llvm.cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev
>