pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qemu-git: Fix build on SmartOS



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Sep 3 16:46:52 2017 +0200
Changeset:	a63e66fcacbe0527fd650b3b4b77943a0b0bab24

Modified Files:
	qemu-git/distinfo
Added Files:
	qemu-git/patches/patch-hw_net_e1000.c
	qemu-git/patches/patch-hw_net_e1000__regs.h
	qemu-git/patches/patch-hw_net_e1000e__core.c
	qemu-git/patches/patch-hw_net_e1000x__common.h
	qemu-git/patches/patch-hw_scsi_esp.c
	qemu-git/patches/patch-hw_usb_dev-mtp.c
	qemu-git/patches/patch-memory.c
	qemu-git/patches/patch-target_m68k_fpu__helper.c
	qemu-git/patches/patch-tests_Makefile.include

Log Message:
qemu-git: Fix build on SmartOS

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a63e66fcacbe0527fd650b3b4b77943a0b0bab24

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

diffstat:
 qemu-git/distinfo                                |   9 ++
 qemu-git/patches/patch-hw_net_e1000.c            |  22 ++++
 qemu-git/patches/patch-hw_net_e1000__regs.h      |  13 +++
 qemu-git/patches/patch-hw_net_e1000e__core.c     |  13 +++
 qemu-git/patches/patch-hw_net_e1000x__common.h   |  13 +++
 qemu-git/patches/patch-hw_scsi_esp.c             |  49 +++++++++
 qemu-git/patches/patch-hw_usb_dev-mtp.c          |  15 +++
 qemu-git/patches/patch-memory.c                  |  83 +++++++++++++++
 qemu-git/patches/patch-target_m68k_fpu__helper.c | 126 +++++++++++++++++++++++
 qemu-git/patches/patch-tests_Makefile.include    |  15 +++
 10 files changed, 358 insertions(+)

diffs:
diff --git a/qemu-git/distinfo b/qemu-git/distinfo
index 59a5133180..bf769d9ac2 100644
--- a/qemu-git/distinfo
+++ b/qemu-git/distinfo
@@ -4,3 +4,12 @@ SHA1 (qemu-2.8.1.tar.bz2) = 224289c5e568e400920363820a0647e2aca569e7
 RMD160 (qemu-2.8.1.tar.bz2) = 93f71138d19c871195c9e0b1a7ba66275773f93a
 SHA512 (qemu-2.8.1.tar.bz2) = 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda
 Size (qemu-2.8.1.tar.bz2) = 28366270 bytes
+SHA1 (patch-hw_net_e1000.c) = 04c528fa18e16a8360785c82793c6e9b09fb5be4
+SHA1 (patch-hw_net_e1000__regs.h) = de19b1044fb7dc12101551b18316a891620027f0
+SHA1 (patch-hw_net_e1000e__core.c) = b36b84fcd76da62a4fb4009448f6bbd2b82032e2
+SHA1 (patch-hw_net_e1000x__common.h) = d7977a94289bcf30b68b7a0cd4e6e9c23692f8ac
+SHA1 (patch-hw_scsi_esp.c) = aa7030ac8d09082bd57044e6a0d4e2fc5c066a45
+SHA1 (patch-hw_usb_dev-mtp.c) = abd0146b4369146bdcd1038906b057c3d0362e80
+SHA1 (patch-memory.c) = 30074f7f93c79dfc22ad4fb745f9e34941f831e6
+SHA1 (patch-target_m68k_fpu__helper.c) = ed491c47190287d3d32dcd6adea7627608aab43c
+SHA1 (patch-tests_Makefile.include) = a1dab206f61947079602d1bafcefc419b5d17881
diff --git a/qemu-git/patches/patch-hw_net_e1000.c b/qemu-git/patches/patch-hw_net_e1000.c
new file mode 100644
index 0000000000..235d5eae76
--- /dev/null
+++ b/qemu-git/patches/patch-hw_net_e1000.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- hw/net/e1000.c.orig	2017-08-25 15:26:30.000000000 +0000
++++ hw/net/e1000.c
+@@ -1127,7 +1127,7 @@ static uint32_t (*macreg_readops[])(E100
+     getreg(TADV),     getreg(ITR),      getreg(FCRUC),    getreg(IPAV),
+     getreg(WUC),      getreg(WUS),      getreg(SCC),      getreg(ECOL),
+     getreg(MCC),      getreg(LATECOL),  getreg(COLC),     getreg(DC),
+-    getreg(TNCRS),    getreg(SEC),      getreg(CEXTERR),  getreg(RLEC),
++    getreg(TNCRS),    getreg(SEQEC),    getreg(CEXTERR),  getreg(RLEC),
+     getreg(XONRXC),   getreg(XONTXC),   getreg(XOFFRXC),  getreg(XOFFTXC),
+     getreg(RFC),      getreg(RJC),      getreg(RNBC),     getreg(TSCTFC),
+     getreg(MGTPRC),   getreg(MGTPDC),   getreg(MGTPTC),   getreg(GORCL),
+@@ -1223,7 +1223,7 @@ static const uint8_t mac_reg_access[0x80
+     [FFLT]    = markflag(MAC),    [FFMT]    = markflag(MAC),
+     [SCC]     = markflag(MAC),    [FCRUC]   = markflag(MAC),
+     [LATECOL] = markflag(MAC),    [COLC]    = markflag(MAC),
+-    [SEC]     = markflag(MAC),    [CEXTERR] = markflag(MAC),
++    [SEQEC]   = markflag(MAC),    [CEXTERR] = markflag(MAC),
+     [XONTXC]  = markflag(MAC),    [XOFFRXC] = markflag(MAC),
+     [RJC]     = markflag(MAC),    [RNBC]    = markflag(MAC),
+     [MGTPDC]  = markflag(MAC),    [MGTPTC]  = markflag(MAC),
diff --git a/qemu-git/patches/patch-hw_net_e1000__regs.h b/qemu-git/patches/patch-hw_net_e1000__regs.h
new file mode 100644
index 0000000000..b91d8db857
--- /dev/null
+++ b/qemu-git/patches/patch-hw_net_e1000__regs.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- hw/net/e1000_regs.h.orig	2017-08-25 15:26:30.000000000 +0000
++++ hw/net/e1000_regs.h
+@@ -260,7 +260,7 @@
+ #define E1000_COLC     0x04028  /* Collision Count - R/clr */
+ #define E1000_DC       0x04030  /* Defer Count - R/clr */
+ #define E1000_TNCRS    0x04034  /* TX-No CRS - R/clr */
+-#define E1000_SEC      0x04038  /* Sequence Error Count - R/clr */
++#define E1000_SEQEC    0x04038  /* Sequence Error Count - R/clr */
+ #define E1000_CEXTERR  0x0403C  /* Carrier Extension Error Count - R/clr */
+ #define E1000_RLEC     0x04040  /* Receive Length Error Count - R/clr */
+ #define E1000_XONRXC   0x04048  /* XON RX Count - R/clr */
diff --git a/qemu-git/patches/patch-hw_net_e1000e__core.c b/qemu-git/patches/patch-hw_net_e1000e__core.c
new file mode 100644
index 0000000000..e6c96e4b55
--- /dev/null
+++ b/qemu-git/patches/patch-hw_net_e1000e__core.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- hw/net/e1000e_core.c.orig	2017-08-25 15:26:30.000000000 +0000
++++ hw/net/e1000e_core.c
+@@ -2855,7 +2855,7 @@ static uint32_t (*e1000e_macreg_readops[
+     e1000e_getreg(RDLEN0),
+     e1000e_getreg(RDH1),
+     e1000e_getreg(LATECOL),
+-    e1000e_getreg(SEC),
++    e1000e_getreg(SEQEC),
+     e1000e_getreg(XONTXC),
+     e1000e_getreg(WUS),
+     e1000e_getreg(GORCL),
diff --git a/qemu-git/patches/patch-hw_net_e1000x__common.h b/qemu-git/patches/patch-hw_net_e1000x__common.h
new file mode 100644
index 0000000000..0342f6a2b9
--- /dev/null
+++ b/qemu-git/patches/patch-hw_net_e1000x__common.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- hw/net/e1000x_common.h.orig	2017-08-25 15:26:30.000000000 +0000
++++ hw/net/e1000x_common.h
+@@ -40,7 +40,7 @@ enum {
+     defreg(VFTA),    defreg(VET),     defreg(RDTR),    defreg(RADV),
+     defreg(TADV),    defreg(ITR),     defreg(SCC),     defreg(ECOL),
+     defreg(MCC),     defreg(LATECOL), defreg(COLC),    defreg(DC),
+-    defreg(TNCRS),   defreg(SEC),     defreg(CEXTERR), defreg(RLEC),
++    defreg(TNCRS),   defreg(SEQEC),   defreg(CEXTERR), defreg(RLEC),
+     defreg(XONRXC),  defreg(XONTXC),  defreg(XOFFRXC), defreg(XOFFTXC),
+     defreg(FCRUC),   defreg(AIT),     defreg(TDFH),    defreg(TDFT),
+     defreg(TDFHS),   defreg(TDFTS),   defreg(TDFPC),   defreg(WUC),
diff --git a/qemu-git/patches/patch-hw_scsi_esp.c b/qemu-git/patches/patch-hw_scsi_esp.c
new file mode 100644
index 0000000000..84164b4e1e
--- /dev/null
+++ b/qemu-git/patches/patch-hw_scsi_esp.c
@@ -0,0 +1,49 @@
+$NetBSD$
+
+--- hw/scsi/esp.c.orig	2017-08-25 15:26:30.000000000 +0000
++++ hw/scsi/esp.c
+@@ -593,7 +593,7 @@ const VMStateDescription vmstate_esp = {
+ };
+ 
+ #define TYPE_ESP "esp"
+-#define ESP(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP)
++#define QESP(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP)
+ 
+ typedef struct {
+     /*< private >*/
+@@ -644,7 +644,7 @@ void esp_init(hwaddr espaddr, int it_shi
+     ESPState *esp;
+ 
+     dev = qdev_create(NULL, TYPE_ESP);
+-    sysbus = ESP(dev);
++    sysbus = QESP(dev);
+     esp = &sysbus->esp;
+     esp->dma_memory_read = dma_memory_read;
+     esp->dma_memory_write = dma_memory_write;
+@@ -672,7 +672,7 @@ static const struct SCSIBusInfo esp_scsi
+ 
+ static void sysbus_esp_gpio_demux(void *opaque, int irq, int level)
+ {
+-    SysBusESPState *sysbus = ESP(opaque);
++    SysBusESPState *sysbus = QESP(opaque);
+     ESPState *s = &sysbus->esp;
+ 
+     switch (irq) {
+@@ -688,7 +688,7 @@ static void sysbus_esp_gpio_demux(void *
+ static void sysbus_esp_realize(DeviceState *dev, Error **errp)
+ {
+     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+-    SysBusESPState *sysbus = ESP(dev);
++    SysBusESPState *sysbus = QESP(dev);
+     ESPState *s = &sysbus->esp;
+ 
+     sysbus_init_irq(sbd, &s->irq);
+@@ -706,7 +706,7 @@ static void sysbus_esp_realize(DeviceSta
+ 
+ static void sysbus_esp_hard_reset(DeviceState *dev)
+ {
+-    SysBusESPState *sysbus = ESP(dev);
++    SysBusESPState *sysbus = QESP(dev);
+     esp_hard_reset(&sysbus->esp);
+ }
+ 
diff --git a/qemu-git/patches/patch-hw_usb_dev-mtp.c b/qemu-git/patches/patch-hw_usb_dev-mtp.c
new file mode 100644
index 0000000000..cb15a69e6d
--- /dev/null
+++ b/qemu-git/patches/patch-hw_usb_dev-mtp.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- hw/usb/dev-mtp.c.orig	2017-08-25 15:26:30.000000000 +0000
++++ hw/usb/dev-mtp.c
+@@ -26,6 +26,10 @@
+ #include "hw/usb.h"
+ #include "hw/usb/desc.h"
+ 
++#ifndef NAME_MAX
++#define NAME_MAX 255
++#endif
++
+ /* ----------------------------------------------------------------------- */
+ 
+ enum mtp_container_type {
diff --git a/qemu-git/patches/patch-memory.c b/qemu-git/patches/patch-memory.c
new file mode 100644
index 0000000000..0ef2d0f5ee
--- /dev/null
+++ b/qemu-git/patches/patch-memory.c
@@ -0,0 +1,83 @@
+$NetBSD$
+
+--- memory.c.orig	2017-08-25 15:26:31.000000000 +0000
++++ memory.c
+@@ -2701,10 +2701,10 @@ typedef struct MemoryRegionList MemoryRe
+ 
+ struct MemoryRegionList {
+     const MemoryRegion *mr;
+-    QTAILQ_ENTRY(MemoryRegionList) queue;
++    QTAILQ_ENTRY(MemoryRegionList) mrqueue;
+ };
+ 
+-typedef QTAILQ_HEAD(queue, MemoryRegionList) MemoryRegionListHead;
++typedef QTAILQ_HEAD(mrqueue, MemoryRegionList) MemoryRegionListHead;
+ 
+ #define MR_SIZE(size) (int128_nz(size) ? (hwaddr)int128_get64( \
+                            int128_sub((size), int128_one())) : 0)
+@@ -2746,7 +2746,7 @@ static void mtree_print_mr(fprintf_funct
+         bool found = false;
+ 
+         /* check if the alias is already in the queue */
+-        QTAILQ_FOREACH(ml, alias_print_queue, queue) {
++        QTAILQ_FOREACH(ml, alias_print_queue, mrqueue) {
+             if (ml->mr == mr->alias) {
+                 found = true;
+             }
+@@ -2755,7 +2755,7 @@ static void mtree_print_mr(fprintf_funct
+         if (!found) {
+             ml = g_new(MemoryRegionList, 1);
+             ml->mr = mr->alias;
+-            QTAILQ_INSERT_TAIL(alias_print_queue, ml, queue);
++            QTAILQ_INSERT_TAIL(alias_print_queue, ml, mrqueue);
+         }
+         mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx
+                    " (prio %d, %s): alias %s @%s " TARGET_FMT_plx
+@@ -2783,26 +2783,26 @@ static void mtree_print_mr(fprintf_funct
+     QTAILQ_FOREACH(submr, &mr->subregions, subregions_link) {
+         new_ml = g_new(MemoryRegionList, 1);
+         new_ml->mr = submr;
+-        QTAILQ_FOREACH(ml, &submr_print_queue, queue) {
++        QTAILQ_FOREACH(ml, &submr_print_queue, mrqueue) {
+             if (new_ml->mr->addr < ml->mr->addr ||
+                 (new_ml->mr->addr == ml->mr->addr &&
+                  new_ml->mr->priority > ml->mr->priority)) {
+-                QTAILQ_INSERT_BEFORE(ml, new_ml, queue);
++                QTAILQ_INSERT_BEFORE(ml, new_ml, mrqueue);
+                 new_ml = NULL;
+                 break;
+             }
+         }
+         if (new_ml) {
+-            QTAILQ_INSERT_TAIL(&submr_print_queue, new_ml, queue);
++            QTAILQ_INSERT_TAIL(&submr_print_queue, new_ml, mrqueue);
+         }
+     }
+ 
+-    QTAILQ_FOREACH(ml, &submr_print_queue, queue) {
++    QTAILQ_FOREACH(ml, &submr_print_queue, mrqueue) {
+         mtree_print_mr(mon_printf, f, ml->mr, level + 1, cur_start,
+                        alias_print_queue);
+     }
+ 
+-    QTAILQ_FOREACH_SAFE(ml, &submr_print_queue, queue, next_ml) {
++    QTAILQ_FOREACH_SAFE(ml, &submr_print_queue, mrqueue, next_ml) {
+         g_free(ml);
+     }
+ }
+@@ -2872,13 +2872,13 @@ void mtree_info(fprintf_function mon_pri
+     }
+ 
+     /* print aliased regions */
+-    QTAILQ_FOREACH(ml, &ml_head, queue) {
++    QTAILQ_FOREACH(ml, &ml_head, mrqueue) {
+         mon_printf(f, "memory-region: %s\n", memory_region_name(ml->mr));
+         mtree_print_mr(mon_printf, f, ml->mr, 1, 0, &ml_head);
+         mon_printf(f, "\n");
+     }
+ 
+-    QTAILQ_FOREACH_SAFE(ml, &ml_head, queue, ml2) {
++    QTAILQ_FOREACH_SAFE(ml, &ml_head, mrqueue, ml2) {
+         g_free(ml);
+     }
+ }
diff --git a/qemu-git/patches/patch-target_m68k_fpu__helper.c b/qemu-git/patches/patch-target_m68k_fpu__helper.c
new file mode 100644
index 0000000000..6a896690ca
--- /dev/null
+++ b/qemu-git/patches/patch-target_m68k_fpu__helper.c
@@ -0,0 +1,126 @@
+$NetBSD$
+
+--- target/m68k/fpu_helper.c.orig	2017-08-25 15:26:31.000000000 +0000
++++ target/m68k/fpu_helper.c
+@@ -24,35 +24,6 @@
+ #include "exec/exec-all.h"
+ #include "exec/cpu_ldst.h"
+ 
+-/* Undefined offsets may be different on various FPU.
+- * On 68040 they return 0.0 (floatx80_zero)
+- */
+-
+-static const floatx80 fpu_rom[128] = {
+-    [0x00] = floatx80_pi,                                   /* Pi */
+-    [0x0b] = make_floatx80(0x3ffd, 0x9a209a84fbcff798ULL),  /* Log10(2) */
+-    [0x0c] = make_floatx80(0x4000, 0xadf85458a2bb4a9aULL),  /* e        */
+-    [0x0d] = make_floatx80(0x3fff, 0xb8aa3b295c17f0bcULL),  /* Log2(e)  */
+-    [0x0e] = make_floatx80(0x3ffd, 0xde5bd8a937287195ULL),  /* Log10(e) */
+-    [0x0f] = floatx80_zero,                                 /* Zero     */
+-    [0x30] = floatx80_ln2,                                  /* ln(2)    */
+-    [0x31] = make_floatx80(0x4000, 0x935d8dddaaa8ac17ULL),  /* ln(10)   */
+-    [0x32] = floatx80_one,                                  /* 10^0     */
+-    [0x33] = make_floatx80(0x4002, 0xa000000000000000ULL),  /* 10^1     */
+-    [0x34] = make_floatx80(0x4005, 0xc800000000000000ULL),  /* 10^2     */
+-    [0x35] = make_floatx80(0x400c, 0x9c40000000000000ULL),  /* 10^4     */
+-    [0x36] = make_floatx80(0x4019, 0xbebc200000000000ULL),  /* 10^8     */
+-    [0x37] = make_floatx80(0x4034, 0x8e1bc9bf04000000ULL),  /* 10^16    */
+-    [0x38] = make_floatx80(0x4069, 0x9dc5ada82b70b59eULL),  /* 10^32    */
+-    [0x39] = make_floatx80(0x40d3, 0xc2781f49ffcfa6d5ULL),  /* 10^64    */
+-    [0x3a] = make_floatx80(0x41a8, 0x93ba47c980e98ce0ULL),  /* 10^128   */
+-    [0x3b] = make_floatx80(0x4351, 0xaa7eebfb9df9de8eULL),  /* 10^256   */
+-    [0x3c] = make_floatx80(0x46a3, 0xe319a0aea60e91c7ULL),  /* 10^512   */
+-    [0x3d] = make_floatx80(0x4d48, 0xc976758681750c17ULL),  /* 10^1024  */
+-    [0x3e] = make_floatx80(0x5a92, 0x9e8b3b5dc53d5de5ULL),  /* 10^2048  */
+-    [0x3f] = make_floatx80(0x7525, 0xc46052028a20979bULL),  /* 10^4096  */
+-};
+-
+ int32_t HELPER(reds32)(CPUM68KState *env, FPReg *val)
+ {
+     return floatx80_to_int32(val->d, &env->fp_status);
+@@ -387,7 +358,84 @@ void HELPER(ftst)(CPUM68KState *env, FPR
+ 
+ void HELPER(fconst)(CPUM68KState *env, FPReg *val, uint32_t offset)
+ {
+-    val->d = fpu_rom[offset];
++    floatx80 tmp;
++
++    /* Undefined offsets may be different on various FPU.
++     * On 68040 they return 0.0 (floatx80_zero)
++     */
++    switch(offset) {
++    case 0x00:
++        tmp = floatx80_pi;                                   /* Pi */
++        break;
++    case 0x0b:
++        tmp = make_floatx80(0x3ffd, 0x9a209a84fbcff798ULL);  /* Log10(2) */
++        break;
++    case 0x0c:
++        tmp = make_floatx80(0x4000, 0xadf85458a2bb4a9aULL);  /* e        */
++        break;
++    case 0x0d:
++        tmp = make_floatx80(0x3fff, 0xb8aa3b295c17f0bcULL);  /* Log2(e)  */
++        break;
++    case 0x0e:
++        tmp = make_floatx80(0x3ffd, 0xde5bd8a937287195ULL);  /* Log10(e) */
++        break;
++    case 0x0f:
++        tmp = floatx80_zero;                                 /* Zero     */
++        break;
++    case 0x30:
++        tmp = floatx80_ln2;                                  /* ln(2)    */
++        break;
++    case 0x31:
++        tmp = make_floatx80(0x4000, 0x935d8dddaaa8ac17ULL);  /* ln(10)   */
++        break;
++    case 0x32:
++        tmp = floatx80_one;                                  /* 10^0     */
++        break;
++    case 0x33:
++        tmp = make_floatx80(0x4002, 0xa000000000000000ULL);  /* 10^1     */
++        break;
++    case 0x34:
++        tmp = make_floatx80(0x4005, 0xc800000000000000ULL);  /* 10^2     */
++        break;
++    case 0x35:
++        tmp = make_floatx80(0x400c, 0x9c40000000000000ULL);  /* 10^4     */
++        break;
++    case 0x36:
++        tmp = make_floatx80(0x4019, 0xbebc200000000000ULL);  /* 10^8     */
++        break;
++    case 0x37:
++        tmp = make_floatx80(0x4034, 0x8e1bc9bf04000000ULL);  /* 10^16    */
++        break;
++    case 0x38:
++        tmp = make_floatx80(0x4069, 0x9dc5ada82b70b59eULL);  /* 10^32    */
++        break;
++    case 0x39:
++        tmp = make_floatx80(0x40d3, 0xc2781f49ffcfa6d5ULL);  /* 10^64    */
++        break;
++    case 0x3a:
++        tmp = make_floatx80(0x41a8, 0x93ba47c980e98ce0ULL);  /* 10^128   */
++        break;
++    case 0x3b:
++        tmp = make_floatx80(0x4351, 0xaa7eebfb9df9de8eULL);  /* 10^256   */
++        break;
++    case 0x3c:
++        tmp = make_floatx80(0x46a3, 0xe319a0aea60e91c7ULL);  /* 10^512   */
++        break;
++    case 0x3d:
++        tmp = make_floatx80(0x4d48, 0xc976758681750c17ULL);  /* 10^1024  */
++        break;
++    case 0x3e:
++        tmp = make_floatx80(0x5a92, 0x9e8b3b5dc53d5de5ULL);  /* 10^2048  */
++        break;
++    case 0x3f:
++        tmp = make_floatx80(0x7525, 0xc46052028a20979bULL);  /* 10^4096  */
++        break;
++    default:
++        tmp = floatx80_zero;
++        break;
++    }
++
++    val->d = tmp;
+ }
+ 
+ typedef int (*float_access)(CPUM68KState *env, uint32_t addr, FPReg *fp,
diff --git a/qemu-git/patches/patch-tests_Makefile.include b/qemu-git/patches/patch-tests_Makefile.include
new file mode 100644
index 0000000000..b61a4c25da
--- /dev/null
+++ b/qemu-git/patches/patch-tests_Makefile.include
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- tests/Makefile.include.orig	2017-08-31 16:26:03.000000000 +0000
++++ tests/Makefile.include
+@@ -810,8 +810,10 @@ tests/migration/initrd-stress.img: tests
+ 	rmdir $(INITRD_WORK_DIR)
+ 
+ ifeq ($(CONFIG_POSIX),y)
++ifneq ($(CONFIG_SOLARIS),y)
+ LIBS += -lutil
+ endif
++endif
+ 
+ # QTest rules
+ 


Home | Main Index | Thread Index | Old Index