CVS commit: pkgsrc/x11/modular-xorg-server

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jan 25 15:06:10 UTC 2018

Modified Files:
        pkgsrc/x11/modular-xorg-server: distinfo
Added Files:
        pkgsrc/x11/modular-xorg-server/patches:
            patch-hw_xfree86_os-support_solaris_solaris-amd64.S

Log Message:
modular-xorg-server: Fix asm syntax to work with clang.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_solaris_solaris-amd64.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.86 pkgsrc/x11/modular-xorg-server/distinfo:1.87
--- pkgsrc/x11/modular-xorg-server/distinfo:1.86        Wed Dec 20 22:40:48 2017
+++ pkgsrc/x11/modular-xorg-server/distinfo     Thu Jan 25 15:06:10 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.86 2017/12/20 22:40:48 wiz Exp $
+$NetBSD: distinfo,v 1.87 2018/01/25 15:06:10 jperkin Exp $
 
 SHA1 (xorg-server-1.19.6.tar.bz2) = 2dd560ac49bdbda7f67166546af43541fabf517f
 RMD160 (xorg-server-1.19.6.tar.bz2) = c2b6f9fe3957c99cddd44bc3ae38343a1c4f314e
@@ -12,6 +12,7 @@ SHA1 (patch-hw_xfree86_os-support_bsd_ar
 SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
 SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
 SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60
+SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
 SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
 SHA1 (patch-hw_xfree86_sdksyms.sh) = c403149ad35ffb70ee44f70de94b4497b751c118

Added files:

Index: pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_solaris_solaris-amd64.S
diff -u /dev/null pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_solaris_solaris-amd64.S:1.1
--- /dev/null   Thu Jan 25 15:06:10 2018
+++ pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_solaris_solaris-amd64.S  Thu Jan 25 15:06:10 2018
@@ -0,0 +1,62 @@
+$NetBSD: patch-hw_xfree86_os-support_solaris_solaris-amd64.S,v 1.1 2018/01/25 15:06:10 jperkin Exp $
+
+Make assembly work with clang.
+
+--- hw/xfree86/os-support/solaris/solaris-amd64.S.orig 2017-12-20 20:32:33.000000000 +0000
++++ hw/xfree86/os-support/solaris/solaris-amd64.S
+@@ -1,3 +1,4 @@
++#if 0
+ / Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ / 
+ / Permission is hereby granted, free of charge, to any person obtaining a
+@@ -18,6 +19,7 @@
+ / LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ / FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ / DEALINGS IN THE SOFTWARE.
++#endif
+ 
+ #ifdef INLINE_ASM
+ #define FUNCTION_START(f,n)   .inline f,n
+@@ -32,36 +34,36 @@
+       FUNCTION_START(inb,4)
+       movq    %rdi, %rdx
+       xorq    %rax, %rax
+-      inb     (%dx)
++      inb     %dx
+       FUNCTION_END(inb)
+ 
+       FUNCTION_START(inw,4)
+       movq    %rdi, %rdx
+       xorq    %rax, %rax
+-      inw     (%dx)
++      inw     %dx
+       FUNCTION_END(inw)
+ 
+       FUNCTION_START(inl,4)
+       movq    %rdi, %rdx
+       xorq    %rax, %rax
+-      inl     (%dx)
++      inl     %dx
+       FUNCTION_END(inl)
+ 
+       FUNCTION_START(outb,8)
+       movq    %rdi, %rdx
+       movq    %rsi, %rax
+-      outb    (%dx)
++      outb    %dx
+       FUNCTION_END(outb)
+ 
+       FUNCTION_START(outw,8)
+       movq    %rdi, %rdx
+       movq    %rsi, %rax
+-      outw    (%dx)
++      outw    %dx
+       FUNCTION_END(outw)
+ 
+       FUNCTION_START(outl,8)
+       movq    %rdi, %rdx
+       movq    %rsi, %rax
+-      outl    (%dx)
++      outl    %dx
+       FUNCTION_END(outl)
+