Module Name:    xsrc
Committed By:   rin
Date:           Mon Feb 20 15:25:32 UTC 2017

Modified Files:
        xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd:
            bsd_ev56.c
        xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
            bsd_ev56.c

Log Message:
Fix -O0 build; <machine/bwx.h> should be included after ".arch ev56" pseudo-op.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
    xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/bsd_ev56.c
cvs rdiff -u -r1.3 -r1.4 \
    xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c

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

Modified files:

Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/bsd_ev56.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/bsd_ev56.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/bsd_ev56.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/bsd_ev56.c:1.1.1.1	Thu Jun  9 09:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/os-support/bsd/bsd_ev56.c	Mon Feb 20 15:25:32 2017
@@ -13,14 +13,13 @@
 #include "xf86_OSlib.h"
 #include "xf86OSpriv.h"
 
-#include <machine/bwx.h>
-
 /*
  * The following functions are used only on EV56 and greater CPUs,
  * and the assembler requires going to EV56 mode in order to emit
  * these instructions.
  */
 __asm(".arch ev56");
+#include <machine/bwx.h>
 
 int readDense8(pointer Base, register unsigned long Offset);
 int readDense16(pointer Base, register unsigned long Offset);

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c:1.3	Thu Aug 11 00:04:31 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c	Mon Feb 20 15:25:32 2017
@@ -13,14 +13,13 @@
 #include "xf86_OSlib.h"
 #include "xf86OSpriv.h"
 
-#include <machine/bwx.h>
-
 /*
  * The following functions are used only on EV56 and greater CPUs,
  * and the assembler requires going to EV56 mode in order to emit
  * these instructions.
  */
 __asm(".arch ev56");
+#include <machine/bwx.h>
 
 int readDense8(void *Base, register unsigned long Offset);
 int readDense16(void *Base, register unsigned long Offset);

Reply via email to