On Tue, Nov 24, 2015 at 11:36:20AM +0300, Maxim Ostapenko wrote: > Ok, does it look better now?
Sure, this is ok for trunk. > diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog > index b97fc7d..c392c57 100644 > --- a/libsanitizer/ChangeLog > +++ b/libsanitizer/ChangeLog > @@ -1,3 +1,7 @@ > +2015-11-24 Maxim Ostapenko <m.ostape...@partner.samsung.com> > + > + * include/system/linux/asm/ptrace.h: New header. > + > 2015-11-23 Maxim Ostapenko <m.ostape...@partner.samsung.com> > > * All source files: Merge from upstream r253555. > diff --git a/libsanitizer/include/system/linux/asm/ptrace.h > b/libsanitizer/include/system/linux/asm/ptrace.h > new file mode 100644 > index 0000000..d4249fe > --- /dev/null > +++ b/libsanitizer/include/system/linux/asm/ptrace.h > @@ -0,0 +1,7 @@ > +#include_next <linux/asm/ptrace.h> > +/* ARM_VFPREGS_SIZE has been added in 3.0 */ > +#if defined(__arm__) && !defined(ARM_VFPREGS_SIZE) > +/* The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS > + and core dumps. */ > +#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ ) > +#endif Jakub