git.libre-soc.org Git - buildroot.git/blob

   1 From fe4cd0e7f5c58fa94db36326aadc1bd4e6d73eba Mon Sep 17 00:00:00 2001
   2 From: Olivier Fourdan <ofourdan@redhat.com>
   3 Date: Mon, 1 Jul 2019 13:20:39 +0200
   4 Subject: [PATCH] compiler.h: Do not include sys/io.h on ARM with glibc
   5
   6 <sys/io.h> on ARM hasn't worked for a long, long time, so it was removed
   7 it from glibc upstream.
   8
   9 Remove the include to avoid a compilation failure on ARM with glibc.
  10
  11 Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
  12 Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/840
  13 [Upstream: https://gitlab.freedesktop.org/xorg/xserver/commit/fe4cd0e7f5c58fa94db36326aadc1bd4e6d73eba.patch]
  14 Signed-off-by: Thomas Preston <thomas.preston@codethink.co.uk>
  15 ---
  16  hw/xfree86/common/compiler.h | 30 ------------------------------
  17  1 file changed, 30 deletions(-)
  18
  19 diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
  20 index fb53ced80..2b2008b3f 100644
  21 --- a/hw/xfree86/common/compiler.h
  22 +++ b/hw/xfree86/common/compiler.h
  23 @@ -758,36 +758,6 @@ inl(unsigned short port)
  24      return xf86ReadMmio32Le((void *) ioBase, port);
  25  }
  26
  27 -#elif defined(__arm__) && defined(__GLIBC__)
  28 -
  29 -/* for glibc on ARM, we use the LIBC inx/outx routines */
  30 -/* note that the appropriate setup via "ioperm" needs to be done */
  31 -/*  *before* any inx/outx is done. */
  32 -
  33 -#include <sys/io.h>
  34 -
  35 -static __inline__ void
  36 -xf_outb(unsigned short port, unsigned char val)
  37 -{
  38 -    outb(val, port);
  39 -}
  40 -
  41 -static __inline__ void
  42 -xf_outw(unsigned short port, unsigned short val)
  43 -{
  44 -    outw(val, port);
  45 -}
  46 -
  47 -static __inline__ void
  48 -xf_outl(unsigned short port, unsigned int val)
  49 -{
  50 -    outl(val, port);
  51 -}
  52 -
  53 -#define outb xf_outb
  54 -#define outw xf_outw
  55 -#define outl xf_outl
  56 -
  57  #elif defined(__nds32__)
  58
  59  /*
  60 --
  61 2.23.0
  62