Thanks, applied to master.

On Tue, Nov 11, 2014 at 01:43:20PM -0800, Jarno Rajahalme wrote:
> Acked-by: Jarno Rajahalme <jrajaha...@nicira.com>
> 
> On Nov 11, 2014, at 8:20 AM, Ben Pfaff <b...@nicira.com> wrote:
> 
> > On my Debian "jessie" system, <stdatomic.h> provided by GCC 4.9 is busted
> > when Clang 3.5 tries to use it.  Even a trivial program like this:
> > 
> >    #include <stdatomic.h>
> > 
> >    void
> >    foo(void)
> >    {
> >         _Atomic(int) x;
> >         atomic_fetch_add(&x, 1);
> > }
> > 
> > yields:
> > 
> >     atomic.c:7:5: error: address argument to atomic operation must be a
> >        pointer to integer or pointer ('_Atomic(int) *' invalid)
> > 
> > The Clang-specific version of ovs-atomic.h stills works, though, so this
> > commit works around the problem.
> > 
> > Signed-off-by: Ben Pfaff <b...@nicira.com>
> > ---
> > lib/ovs-atomic.h | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/lib/ovs-atomic.h b/lib/ovs-atomic.h
> > index 6a21372..9ead907 100644
> > --- a/lib/ovs-atomic.h
> > +++ b/lib/ovs-atomic.h
> > @@ -321,10 +321,10 @@
> >     #if __CHECKER__
> >         /* sparse doesn't understand some GCC extensions we use. */
> >         #include "ovs-atomic-pthreads.h"
> > -    #elif HAVE_STDATOMIC_H
> > -        #include "ovs-atomic-c11.h"
> >     #elif __has_extension(c_atomic)
> >         #include "ovs-atomic-clang.h"
> > +    #elif HAVE_STDATOMIC_H
> > +        #include "ovs-atomic-c11.h"
> >     #elif __GNUC__ >= 4 && __GNUC_MINOR__ >= 7
> >         #include "ovs-atomic-gcc4.7+.h"
> >     #elif __GNUC__ && defined(__x86_64__)
> > -- 
> > 2.1.1
> > 
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
> 
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to