This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH 1/3] Cleanup hp-timing defines
- From: Tulio Magno Quites Machado Filho <tuliom at ascii dot art dot br>
- To: Wilco Dijkstra <Wilco dot Dijkstra at arm dot com>, 'GNU C Library' <libc-alpha at sourceware dot org>
- Cc: nd <nd at arm dot com>
- Cc:
- Date: Mon, 21 Jan 2019 17:23:02 -0200
- Subject: Re: [PATCH 1/3] Cleanup hp-timing defines
- References: <DB5PR08MB1030D94CF1FE225CA7F0745683810@DB5PR08MB1030.eurprd08.prod.outlook.com>
Wilco Dijkstra <Wilco.Dijkstra@arm.com> writes:
> Cleanup the defines in the hp-timing header: Replace HP_TIMING_AVAIL
> with HP_TIMING_INLINE since these are equivalent. Remove conflicting
> uses of HP_SMALL_TIMING_AVAIL and HP_TIMING_NONAVAIL. Reserve
> HP_TIMING_NONAVAIL only for rtld internal timing. No functional changes
> (apart from not using rtld timing on alpha).
>
> OK for commit?
I can't apply this patch on master:
$ git am patches/testing/hp-timing-cleanup.mbox
Applying: Cleanup hp-timing defines
error: patch failed: sysdeps/posix/clock_getres.c:87
error: sysdeps/posix/clock_getres.c: patch does not apply
error: patch failed: sysdeps/unix/clock_gettime.c:105
error: sysdeps/unix/clock_gettime.c: patch does not apply
error: patch failed: sysdeps/unix/clock_settime.c:21
error: sysdeps/unix/clock_settime.c: patch does not apply
Patch failed at 0001 Cleanup hp-timing defines
> diff --git a/sysdeps/posix/clock_getres.c b/sysdeps/posix/clock_getres.c
> index dac4761fcc2c86cb0d53425cab4e88d587696540..9365e0edaf5601f5d1e039203977f0d965ac7d28 100644
> --- a/sysdeps/posix/clock_getres.c
> +++ b/sysdeps/posix/clock_getres.c
> @@ -87,7 +87,7 @@ __clock_getres (clockid_t clock_id, struct timespec *res)
> break;
>
> default:
> -#if HP_TIMING_AVAIL
> +#if HP_TIMING_INLINE
The patch doesn't apply because current master has the following code here:
#ifdef SYSDEP_GETRES_CPU
SYSDEP_GETRES_CPU;
#endif
--
Tulio Magno