Fix HP_SMALL_TIMING_AVAIL -Wundef warnings

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.

diff --git a/ChangeLog b/ChangeLog
index 502008c8094c631e606d9ac81946603843f6875a..af65c1dd255d75a927cb7e9ea68a17563bc41949 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 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.
+
        * nptl/sysdeps/pthread/pthread.h: Check
        __PTHREAD_MUTEX_HAVE_ELISION is defined before testing
        its value.

diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 65cd709fef045b18c2e35db5fd267e38fabb83d4..d61b9f9984adf0444e3091fe69b9472543d20bdc 100644 (file)
--- 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