S390: Use _HP_TIMING_S390_H instead of _HP_TIMING_H.

Use macro _HP_TIMING_S390_H instead of _HP_TIMING_H
in s390 specific hp-timing.h

ChangeLog:

	* sysdeps/s390/hp-timing.h (_HP_TIMING_H): Undefine.
	(_HP_TIMING_S390_H): Define.

diff --git a/ChangeLog b/ChangeLog
index d77574e22b005c38f6fcca60a2debf4044b55340..3e95dd17bc242813001ec3f0790963c2e6332888 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-19  Stefan Liebler  <stli@linux.ibm.com>
+
+       * sysdeps/s390/hp-timing.h (_HP_TIMING_H): Undefine.
+       (_HP_TIMING_S390_H): Define.
+
 2019-09-18  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/syscall-names.list: Update kernel

diff --git a/sysdeps/s390/hp-timing.h b/sysdeps/s390/hp-timing.h
index 793fb66a4d5a5036e3c6d801db70f43988e6e7a5..c5c605c93705d5f474608d89a810027b087da24d 100644 (file)
--- a/sysdeps/s390/hp-timing.h
+++ b/sysdeps/s390/hp-timing.h
@@ -16,12 +16,12 @@
    License along with the GNU C Library.  If not, see
    <https://www.gnu.org/licenses/>.  */
 
-#ifndef _HP_TIMING_H
+#ifndef _HP_TIMING_S390_H
+#define _HP_TIMING_S390_H      1
 
 /* The stckf instruction is available starting with z9-109 zarch CPUs.
    As there is no extra configure check for z9-109, the z10 one is used.  */
 #ifdef HAVE_S390_MIN_Z10_ZARCH_ASM_SUPPORT
-# define _HP_TIMING_H  1
 # include <hp-timing-common.h>
 
 /* We use 64 bit values for the times.