[systemd-devel] [gummiboot][PATCH 4/5] util: confine x86 asm to x86 architectures

[David Herrmann]

Hi

On Sat, Apr 11, 2015 at 10:23 AM, Koen Kooi <koen.kooi at linaro.org> wrote:
> Also add a stub function that just returns '1' to avoid missing symbols.
>
> Signed-off-by: Koen Kooi <koen.kooi at linaro.org>
> ---
>  src/efi/util.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/src/efi/util.c b/src/efi/util.c
> index 689bc7c..6ce1f18 100644
> --- a/src/efi/util.c
> +++ b/src/efi/util.c
> @@ -33,14 +33,17 @@ UINT64 ticks_read(VOID) {
>          __asm__ volatile ("rdtsc" : "=a" (a), "=d" (d));
>          return (d << 32) | a;
>  }
> -#endif
> -
> -#ifdef __i386__
> +#elif __i386__

I dropped that hunk as I already fixed it in patch 2/5. This, I also
adjusted the commit-message to "add ticks_read() stub".

Applied! Thanks
David

>  UINT64 ticks_read(VOID) {
>          UINT64 val;
>          __asm__ volatile ("rdtsc" : "=A" (val));
>          return val;
>  }
> +#else
> +UINT64 ticks_read(VOID) {
> +        UINT64 val = 1;
> +        return val;
> +}
>  #endif
>
>  /* count TSC ticks during a millisecond delay */
> --
> 2.0.1
>
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel