[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 1:50 PM, Bill Wendling <isanbard at gmail.com> wrote:

> On Wed, Mar 18, 2009 at 8:57 AM, Misha Brukman <brukman+llvm at gmail.com<brukman%2Bllvm at gmail.com>>
> wrote:
> > Author: brukman
> > Date: Wed Mar 18 10:57:08 2009
> > New Revision: 67208
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=67208&view=rev
> > Log:
> > For non-MachO targets, #define MACHO_DYNAMIC_NO_PIC_P 0 .
> >
> > Modified:
> >    llvm-gcc-4.2/trunk/gcc/config/arm/arm.h
> >
> > Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.h
> > URL:
> http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/arm.h?rev=67208&r1=67207&r2=67208&view=diff
> >
> >
> ==============================================================================
> > --- llvm-gcc-4.2/trunk/gcc/config/arm/arm.h (original)
> > +++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.h Wed Mar 18 10:57:08 2009
> > @@ -30,6 +30,7 @@
> >  /* Overridden by arm/darwin.h, whether it is included first or not. */
> >  #ifndef TARGET_MACHO
> >  #define TARGET_MACHO 0
> > +#define MACHO_DYNAMIC_NO_PIC_P 0
>
> LLVM LOCAL markers, please! Otherwise, this will be deleted in the next
> merge.


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?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20090318/a713847f/attachment.html>