Reviewed-by: Jeremy Huddleston <[email protected]> It's not an ad. It's an apology for brevity, and I'm too lazy to change it.
On Dec 29, 2011, at 6:42 PM, Cyril Brulebois wrote: > Side effect of aa0bfb0f133481c57762012e8e30c05ffa151423: > | CCLD Xorg > | sdksyms.o:(.data.rel+0x27d8): undefined reference to `outl' > | collect2: ld returned 1 exit status > > Since the linux/ia64 domain I/O support code got removed in that > commit, there's no reason to keep on declaring those functions > (inb, inl, inw, outb, outl, outw). > > Bugzilla: https://bugs.freedesktop.org/43985 > > Signed-off-by: Cyril Brulebois <[email protected]> > --- > hw/xfree86/common/compiler.h | 19 ------------------- > 1 files changed, 0 insertions(+), 19 deletions(-) > > > v2: Yes, we can remove all of them, confirmed passing make && make check > when applied to 1.11.99.2 (1.12 RC1 wants newer input proto, which I > don't have right now in that ia64 chroot). > > (BTW, there's already “X-Mailer: iPad Mail (9A405)” in your mail > headers, there's no need for a “Sent from my iPad” ad…) > > diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h > index 9e00d75..34e60c5 100644 > --- a/hw/xfree86/common/compiler.h > +++ b/hw/xfree86/common/compiler.h > @@ -397,25 +397,6 @@ extern _X_EXPORT unsigned int inl(unsigned int port); > #include <machine/pio.h> > #endif /* __NetBSD__ */ > > -# elif defined(linux) && defined(__ia64__) > - > -# include <inttypes.h> > - > -# include <sys/io.h> > - > -# undef outb > -# undef outw > -# undef outl > -# undef inb > -# undef inw > -# undef inl > -extern _X_EXPORT void outb(unsigned long port, unsigned char val); > -extern _X_EXPORT void outw(unsigned long port, unsigned short val); > -extern _X_EXPORT void outl(unsigned long port, unsigned int val); > -extern _X_EXPORT unsigned int inb(unsigned long port); > -extern _X_EXPORT unsigned int inw(unsigned long port); > -extern _X_EXPORT unsigned int inl(unsigned long port); > - > # elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__) > > # include <inttypes.h> > -- > 1.7.7.3 > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
