<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Still looks good, that should be Billproof.<div><br><div><div><div>On Mar 18, 2009, at 3:38 PMPDT, Misha Brukman wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite">On Wed, Mar 18, 2009 at 4:25 PM, Dale Johannesen <span dir="ltr"><<a href="mailto:dalej@apple.com" target="_blank">dalej@apple.com</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"> <div> On Mar 18, 2009, at 11:59 AMPDT, Bill Wendling wrote:<br> >> I guess I'm a bit confused on the various markers: if APPLE LOCAL<br> >> marks<br> >> what's in Apple's trees, but not in FSF GCC, then does LLVM LOCAL<br> >> mark<br> >> what's in public LLVM SVN tree, but not in Apple's or FSF GCC?<br> >><br> >> Can these markers be nested?<br> >><br> > The LOCAL markers are confusing. Your assessment is essentially<br> > correct. There are two types of markers used:<br> ><br> > * APPLE LOCAL - These are changes that are in Apple GCC but not in FSF<br> > GCC. We merge from Apple GCC into LLVM and keep the APPLE LOCAL<br> > markers in tact.<br> ><br> > * LLVM LOCAL - These are changes that are in LLVM-GCC but not in Apple<br> > GCC. When I merge from Apple GCC, I use these markers to determine if<br> > the difference from Apple GCC should be merged over into LLVM.<br> ><br> > The markers can be nested.<br> <br> </div>This is fairly obvious from inspection, but:<br> LLVM LOCAL begin<br> and<br> LLVM LOCAL end<br> should be used around multi-line changes; LLVM LOCAL without begin or<br> end means only the following line changed.</blockquote><div><br>Sorry, it wasn't obvious to me from just looking at arm.h -- I see this is used elsewhere. Fixed in SVN.<br> </div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"> Perhaps less obviously, this means deletions need to be indicated by<br> an empty begin...end pair.<br> (There's a script that's checks all this for the APPLE comments in the<br> Apple gcc tree; nobody's thought it worthwhile to enhance it to<br> understand LLVM comments. Yet.)</blockquote><div><br>I slightly modified Sandeep's earlier patch and added LLVM LOCAL markers, see attached.<br><br></div></div><br> </blockquote></div></div></div></body></html>