diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2014-05-18 04:59:13 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2014-05-18 04:59:13 +0000 |
| commit | 865d1703280ace39b09f656d1de22a73118e39ae (patch) | |
| tree | 63d0806b7c5c2f1af7d67384b3263b97e5d3f163 /graphics/grx/files/patch-src__fdrivers__driver16.h | |
| parent | - Fix build with clang (diff) | |
- Fix build on i386
- Stage support
PR: 188139
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=354392
Diffstat (limited to 'graphics/grx/files/patch-src__fdrivers__driver16.h')
| -rw-r--r-- | graphics/grx/files/patch-src__fdrivers__driver16.h | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/graphics/grx/files/patch-src__fdrivers__driver16.h b/graphics/grx/files/patch-src__fdrivers__driver16.h new file mode 100644 index 000000000000..04fe19edafa5 --- /dev/null +++ b/graphics/grx/files/patch-src__fdrivers__driver16.h @@ -0,0 +1,36 @@ +--- src/fdrivers/driver16.h.orig ++++ src/fdrivers/driver16.h +@@ -46,7 +46,7 @@ + # define repfill16_and repfill_w_f_and + # define repfill16 repfill_w_f + # define SETFARSEL(sel) setup_far_selector(sel) +-# if defined(__GNUC__) && defined(__i386__) ++# if defined(__GNUC__) && defined(__i386__) && !defined(__clang__) + # define ASM_386_SEL I386_GCC_FAR_SELECTOR + # endif /* GCC i386 */ + #else /* defined FAR_ACCESS */ +@@ -180,7 +180,7 @@ + GRX_LEAVE(); + } + +-#if defined(__GNUC__) && defined(__i386__) ++#if defined(__GNUC__) && defined(__i386__) && !defined(__clang__) + static void drawline(int x,int y,int dx,int dy,GrColor color) + { + struct { +@@ -196,6 +196,7 @@ + + # ifdef __GNUC__ + # ifdef __i386__ ++# ifndef __clang__ + # define ASM_LINE1(OPC) asm volatile("" \ + " .align 2,0x90 \n" \ + "0: "#OPC"w %6,"ASM_386_SEL"(%0) \n" \ +@@ -236,6 +237,7 @@ + ) + # endif + # endif ++# endif + + if(dy < 0) { + y -= (dy = (-dy)); |