[llvm-commits] [llvm-gcc-4.2] r67208 - /llvm-gcc-4.2/trunk/gcc/config/arm/arm.h

[Misha Brukman]

On Wed, Mar 18, 2009 at 4:25 PM, Dale Johannesen <dalej at apple.com> wrote:

>  On Mar 18, 2009, at 11:59 AMPDT, Bill Wendling wrote:
> >> I guess I'm a bit confused on the various markers: if APPLE LOCAL
> >> marks
> >> what's in Apple's trees, but not in FSF GCC, then does LLVM LOCAL
> >> mark
> >> what's in public LLVM SVN tree, but not in Apple's or FSF GCC?
> >>
> >> Can these markers be nested?
> >>
> > The LOCAL markers are confusing. Your assessment is essentially
> > correct. There are two types of markers used:
> >
> > * APPLE LOCAL - These are changes that are in Apple GCC but not in FSF
> > GCC. We merge from Apple GCC into LLVM and keep the APPLE LOCAL
> > markers in tact.
> >
> > * LLVM LOCAL - These are changes that are in LLVM-GCC but not in Apple
> > GCC. When I merge from Apple GCC, I use these markers to determine if
> > the difference from Apple GCC should be merged over into LLVM.
> >
> > The markers can be nested.
>
> This is fairly obvious from inspection, but:
> LLVM LOCAL begin
> and
> LLVM LOCAL end
> should be used around multi-line changes;  LLVM LOCAL without begin or
> end means only the following line changed.


Sorry, it wasn't obvious to me from just looking at arm.h -- I see this is
used elsewhere.  Fixed in SVN.


> Perhaps less obviously, this means deletions need to be indicated by
> an empty begin...end pair.
> (There's a script that's checks all this for the APPLE comments in the
> Apple gcc tree; nobody's thought it worthwhile to enhance it to
> understand LLVM comments.  Yet.)


I slightly modified Sandeep's earlier patch and added LLVM LOCAL markers,
see attached.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20090318/4dce4c25/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: llvm-gcc-arm.patch
Type: text/x-diff
Size: 2097 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20090318/4dce4c25/attachment.patch>