Ping. It's not merged yet, and I don't see any rejection on it.
Thanks, Jackie > -----Original Message----- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > jackie.hu...@windriver.com > Sent: Saturday, November 19, 2016 10:11 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH] ltp: fix an incorrect macro checking > > From: Jackie Huang <jackie.hu...@windriver.com> > > The previous patch added a check but incorrectly > change the elif to if, then it always return 0 > for cpuid if the machine is not __i386__ > > getcpu01 1 TFAIL : getcpu01.c:140: getcpu() returned wrong value > expected > cpuid:7, returned value cpuid: 0 > > After this fix: > getcpu01 1 TPASS : getcpu() returned proper cpuid:7, node id:0 > > Signed-off-by: Jackie Huang <jackie.hu...@windriver.com> > --- > .../0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch | 7 > ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is- > defined-before-using-it.patch b/meta/recipes-extended/ltp/ltp/0008-Check-if- > __GLIBC_PREREQ-is-defined-before-using-it.patch > index d123074..41f2623 100644 > --- a/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is- > defined-before-using-it.patch > +++ b/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is- > defined-before-using-it.patch > @@ -88,22 +88,19 @@ index c927512..921b107 100644 > > void cleanup(void); > void setup(void); > -@@ -164,9 +172,14 @@ static inline int getcpu(unsigned *cpu_id, unsigned > *node_id, > +@@ -164,7 +172,11 @@ static inline int getcpu(unsigned *cpu_id, unsigned > *node_id, > { > #if defined(__i386__) > return syscall(318, cpu_id, node_id, cache_struct); > -#elif __GLIBC_PREREQ(2,6) > -+#if defined(__GLIBC__) > ++#elif defined(__GLIBC__) > +#if __GLIBC_PREREQ(2,6) > + *cpu_id = sched_getcpu(); > +#endif > +#else > *cpu_id = sched_getcpu(); > #endif > -+#endif > return 0; > - } > - > @@ -191,15 +204,20 @@ unsigned int set_cpu_affinity(void) > cpu_set_t *set; > size_t size; > -- > 2.8.3 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
