On 12/2/06, Jim Laskey <jlaskey at apple.com> wrote:> Rafael, > > 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 :-)> Cheers,Best Regards, Rafael -------------- next part -------------- A non-text attachment was scrubbed... Name: arm.patch.bz2 Type: application/x-bzip2 Size: 37063 bytes Desc: not available URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20061204/918751c9/attachment.bin>
Greatly appreciated, I attempt to make tomorrows mirror. Cheers, -- Jim On Dec 4, 2006, at 4:32 PM, Rafael Espíndola wrote:> On 12/2/06, Jim Laskey <jlaskey at apple.com> wrote: >> Rafael, >> >> 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 :-) > >> Cheers, > > Best Regards, > Rafael > <arm.patch.bz2> > _______________________________________________ > LLVM Developers mailing list > LLVMdev at cs.uiuc.edu http://llvm.cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev-------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 2417 bytes Desc: not available URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20061204/5f017839/attachment.bin>
Try again. I'll attempt to make tomorrows mirror. On Dec 4, 2006, at 9:05 PM, Jim Laskey wrote:> Greatly appreciated, I attempt to make tomorrows mirror. > > Cheers, > > -- Jim > > On Dec 4, 2006, at 4:32 PM, Rafael Espíndola wrote: > >> On 12/2/06, Jim Laskey <jlaskey at apple.com> wrote: >>> Rafael, >>> >>> 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 :-) >> >>> Cheers, >> >> Best Regards, >> Rafael >> <arm.patch.bz2> >> _______________________________________________ >> LLVM Developers mailing list >> LLVMdev at cs.uiuc.edu http://llvm.cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev > > _______________________________________________ > LLVM Developers mailing list > LLVMdev at cs.uiuc.edu http://llvm.cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev-------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 2417 bytes Desc: not available URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20061204/7de72ebb/attachment.bin>
This patch should be in today's mirror ~6am PST. Cheers, -- Jim On Dec 4, 2006, at 4:32 PM, Rafael Espíndola wrote:> On 12/2/06, Jim Laskey <jlaskey at apple.com> wrote: >> Rafael, >> >> 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 :-) > >> Cheers, > > Best Regards, > Rafael >-------------- next part -------------- A non-text attachment was scrubbed... Name: arm.patch.bz2 Type: application/x-bzip2 Size: 37063 bytes Desc: not available URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20061205/27236056/attachment.bin> -------------- next part --------------> _______________________________________________ > LLVM Developers mailing list > LLVMdev at cs.uiuc.edu http://llvm.cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev-------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 2417 bytes Desc: not available URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20061205/27236056/attachment-0001.bin>
I had to revert these changes. When I did a clean build I was inundated with errors. I'm not sure if I made the cut off time for the mirror. -- Jim On Dec 5, 2006, at 8:35 AM, Jim Laskey wrote:> This patch should be in today's mirror ~6am PST. > > Cheers, > > -- Jim > > On Dec 4, 2006, at 4:32 PM, Rafael Espíndola wrote: > >> On 12/2/06, Jim Laskey <jlaskey at apple.com> wrote: >>> Rafael, >>> >>> 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 :-) >> >>> Cheers, >> >> Best Regards, >> Rafael >> > > <arm.patch.bz2> >> _______________________________________________ >> LLVM Developers mailing list >> LLVMdev at cs.uiuc.edu http://llvm.cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits-------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 2417 bytes Desc: not available URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20061205/c3044c65/attachment.bin>