From 73d9051da47eda4c69397df6e7468087975fcf47 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Thu, 19 Sep 2019 12:24:10 +0200 Subject: 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. --- ChangeLog | 5 +++++ sysdeps/s390/hp-timing.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d77574e22b..3e95dd17bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-09-19 Stefan Liebler + + * sysdeps/s390/hp-timing.h (_HP_TIMING_H): Undefine. + (_HP_TIMING_S390_H): Define. + 2019-09-18 Joseph Myers * sysdeps/unix/sysv/linux/syscall-names.list: Update kernel diff --git a/sysdeps/s390/hp-timing.h b/sysdeps/s390/hp-timing.h index 793fb66a4d..c5c605c937 100644 --- 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 . */ -#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 /* We use 64 bit values for the times. -- cgit 1.4.1