Message ID | 1395059004-20960-3-git-send-email-will.newton@linaro.org |
---|---|
State | Rejected |
Headers | show |
On 17 March 2014 17:53, Will Newton <will.newton@linaro.org> wrote: > ChangeLog: > > 2014-03-17 Will Newton <will.newton@linaro.org> > > * sysdeps/generic/ldsodefs.h: Check whether > HP_SMALL_TIMING_AVAIL is defined with #ifdef rather > than #if. > --- > sysdeps/generic/ldsodefs.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h > index 65cd709..d61b9f9 100644 > --- a/sysdeps/generic/ldsodefs.h > +++ b/sysdeps/generic/ldsodefs.h > @@ -322,7 +322,7 @@ struct rtld_global > /* The object to be initialized first. */ > EXTERN struct link_map *_dl_initfirst; > > -#if HP_TIMING_AVAIL || HP_SMALL_TIMING_AVAIL > +#if HP_TIMING_AVAIL || defined HP_SMALL_TIMING_AVAIL > /* Start time on CPU clock. */ > EXTERN hp_timing_t _dl_cpuclock_offset; > #endif > @@ -535,7 +535,7 @@ struct rtld_global_ro > /* All search directories defined at startup. */ > EXTERN struct r_search_path_elem *_dl_init_all_dirs; > > -#if HP_TIMING_AVAIL || HP_SMALL_TIMING_AVAIL > +#if HP_TIMING_AVAIL || defined HP_SMALL_TIMING_AVAIL > /* Overhead of a high-precision timing measurement. */ > EXTERN hp_timing_t _dl_hp_timing_overhead; > #endif > -- > 1.8.1.4 > Looks good to me. Siddhesh
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 65cd709..d61b9f9 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -322,7 +322,7 @@ struct rtld_global /* The object to be initialized first. */ EXTERN struct link_map *_dl_initfirst; -#if HP_TIMING_AVAIL || HP_SMALL_TIMING_AVAIL +#if HP_TIMING_AVAIL || defined HP_SMALL_TIMING_AVAIL /* Start time on CPU clock. */ EXTERN hp_timing_t _dl_cpuclock_offset; #endif @@ -535,7 +535,7 @@ struct rtld_global_ro /* All search directories defined at startup. */ EXTERN struct r_search_path_elem *_dl_init_all_dirs; -#if HP_TIMING_AVAIL || HP_SMALL_TIMING_AVAIL +#if HP_TIMING_AVAIL || defined HP_SMALL_TIMING_AVAIL /* Overhead of a high-precision timing measurement. */ EXTERN hp_timing_t _dl_hp_timing_overhead; #endif