[LLVMdev] combined arm patch
jlaskey at apple.com
Mon Dec 4 17:05:05 PST 2006
Greatly appreciated, I attempt to make tomorrows mirror.
On Dec 4, 2006, at 4:32 PM, Rafael Espíndola wrote:
> On 12/2/06, Jim Laskey <jlaskey at apple.com> wrote:
>> Please bracket portions of your changes that involve modification of
>> C/C++ source code. For cases of modifying configuration scripts and
>> make files, use your best judgement. Obviously having the brackets
>> emitted in generated code is problematic (line numbers et cetera), so
>> don't bother in those cases.
>> Beside marking the changes we've made, the purpose of APPLE LOCAL
>> brackets is reduce confusion when we merge with the main branch
>> (sometimes a very hairy task when there are lots of conflicts.)
> I think that adding the marks may actually increase the number of
> spurious conflicts (I had some problem with them while backporting
> patches from 4.1).
> Anyway, I have attached a version with the brackets. Is it ok? I
> believe that it is mostly ARM specific. A bootstrap on a AMD64 breaks
> on the same spot as before :-)
> Best Regards,
> LLVM Developers mailing list
> LLVMdev at cs.uiuc.edu http://llvm.cs.uiuc.edu
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 2417 bytes
Desc: not available
More information about the llvm-dev