From 3719fb863be60d384dd1cc4d2970e3d0cd62c564 Mon Sep 17 00:00:00 2001 From: jkim Date: Thu, 19 Feb 2015 00:25:57 +0000 Subject: Make the previous patch conditional as we always did. --- emulators/virtualbox-ose-additions/Makefile | 3 +- ...ns-x11-x11include-xorg-server-1.17.1-compiler.h | 51 ++++++++++++++++++++++ ...ns-x11-x11include-xorg-server-1.17.1-compiler.h | 51 ---------------------- 3 files changed, 53 insertions(+), 52 deletions(-) create mode 100644 emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h delete mode 100644 emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h (limited to 'emulators') diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index f910bdf7424c..6f6eaeb0d22e 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -106,7 +106,8 @@ KMK_ARCH= freebsd.${ARCH} .if ${COMPILER_TYPE} == clang EXTRA_PATCHES= ${PATCHDIR}/extrapatch-Config.kmk \ - ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk + ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk \ + ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h .if ${COMPILER_FEATURES:Mlibc++} EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk .endif diff --git a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h new file mode 100644 index 000000000000..90db3b3cfeda --- /dev/null +++ b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h @@ -0,0 +1,51 @@ +--- src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h.orig 2015-02-12 11:08:51.000000000 -0500 ++++ src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h 2015-02-18 17:44:16.919457000 -0500 +@@ -972,26 +972,26 @@ + static __inline__ void + outb(unsigned short port, unsigned char val) + { +- __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port)); ++ __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port)); + } + + static __inline__ void + outw(unsigned short port, unsigned short val) + { +- __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port)); ++ __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port)); + } + + static __inline__ void + outl(unsigned short port, unsigned int val) + { +- __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port)); ++ __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port)); + } + + static __inline__ unsigned int + inb(unsigned short port) + { + unsigned char ret; +- __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port)); ++ __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port)); + + return ret; + } +@@ -1000,7 +1000,7 @@ + inw(unsigned short port) + { + unsigned short ret; +- __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port)); ++ __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port)); + + return ret; + } +@@ -1009,7 +1009,7 @@ + inl(unsigned short port) + { + unsigned int ret; +- __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port)); ++ __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port)); + + return ret; + } diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h deleted file mode 100644 index 90db3b3cfeda..000000000000 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h +++ /dev/null @@ -1,51 +0,0 @@ ---- src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h.orig 2015-02-12 11:08:51.000000000 -0500 -+++ src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h 2015-02-18 17:44:16.919457000 -0500 -@@ -972,26 +972,26 @@ - static __inline__ void - outb(unsigned short port, unsigned char val) - { -- __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port)); -+ __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port)); - } - - static __inline__ void - outw(unsigned short port, unsigned short val) - { -- __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port)); -+ __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port)); - } - - static __inline__ void - outl(unsigned short port, unsigned int val) - { -- __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port)); -+ __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port)); - } - - static __inline__ unsigned int - inb(unsigned short port) - { - unsigned char ret; -- __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port)); -+ __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port)); - - return ret; - } -@@ -1000,7 +1000,7 @@ - inw(unsigned short port) - { - unsigned short ret; -- __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port)); -+ __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port)); - - return ret; - } -@@ -1009,7 +1009,7 @@ - inl(unsigned short port) - { - unsigned int ret; -- __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port)); -+ __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port)); - - return ret; - } -- cgit