From: Will Newton <will.newton@linaro.org>
Date: Mon, 17 Mar 2014 10:44:13 +0000 (+0000)
Subject: Fix HP_SMALL_TIMING_AVAIL -Wundef warnings
X-Git-Tag: glibc-2.20~735
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53f1bed39263541ef7f3d86f9701005524938016;p=thirdparty%2Fglibc.git

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 502008c8094..af65c1dd255 100644
--- 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 65cd709fef0..d61b9f9984a 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