Re: UPDATE: QEMU 1.7.0
On 12/08/13 23:28, Brad Smith wrote: On 08/12/13 6:22 PM, Fred wrote: On 11/29/13 20:42, Brad Smith wrote: On 27/11/13 6:16 PM, Brad Smith wrote: Here is an update to QEMU 1.7.0. OK? Not really related to this update but does anyone use QEMU on powerpc or sparc64 or could anyone do some quick tests to see how things fare as is? Hi Brad, On my iBook G4 running current (OpenBSD 5.4-current (GENERIC) #92: Mon Dec 2 02:35:38 MST 2013) qemu is failing with the following error on a make install: cc1: out of memory allocating 4072 bytes after a total of 0 bytes /usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/rules.mak:25: recipe for target 'target-i386/translate.o' failed The last call before the error is shown below [1]. If you need more info let me know. That means you need to increase the maximum data size, .e.g. ulimit -d. Hi Brad, qemu-1.7.0 is now built on both sparc64 and powerpc - but I have not tested them yet. cheers Fred
Re: UPDATE: QEMU 1.7.0
On 11/29/13 20:42, Brad Smith wrote: On 27/11/13 6:16 PM, Brad Smith wrote: Here is an update to QEMU 1.7.0. OK? Not really related to this update but does anyone use QEMU on powerpc or sparc64 or could anyone do some quick tests to see how things fare as is? Hi Brad, On my iBook G4 running current (OpenBSD 5.4-current (GENERIC) #92: Mon Dec 2 02:35:38 MST 2013) qemu is failing with the following error on a make install: cc1: out of memory allocating 4072 bytes after a total of 0 bytes /usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/rules.mak:25: recipe for target 'target-i386/translate.o' failed The last call before the error is shown below [1]. If you need more info let me know. Cheers Fred PS it's still building on sparc64 [1] cc -I/usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/tcg -I/usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/tcg/ppc -I. -I/usr/ports/pobj/qemu-1.7.0/qemu-1.7.0 -I/usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/include -I/usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/target-i386 -Itarget-i386 -m32 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -I/usr/local/include -I/usr/X11R6/include -Wno-redundant-decls -DTIME_MAX=LLONG_MAX -Wendif-labels -Wmissing-include-dirs -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wold-style-definition -fstack-protector-all -I/usr/local/include -I/usr/local/include/p11-kit-1 -I/usr/include -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/include -I/usr/X11R6/include/pixman-1 -I.. -I/usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/target-i386 -DNEED_CPU_H -I/usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/include -pthread -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include -MMD -MP -MT target-i386/translate.o -MF target-i386/translate.d -O2 -pipe -c -o target-i386/translate.o /usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/target-i386/translate.c cc1: out of memory allocating 4072 bytes after a total of 0 bytes /usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/rules.mak:25: recipe for target 'target-i386/translate.o' failed gmake[1]: *** [target-i386/translate.o] Error 1 gmake[1]: Leaving directory '/usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/x86_64-softmmu' Makefile:144: recipe for target 'subdir-x86_64-softmmu' failed gmake: *** [subdir-x86_64-softmmu] Error 2 *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2661 '/usr/ports/pobj/qemu-1.7.0/.build_done') *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1862 '/usr/ports/packages/powerpc/all/qemu-1.7.0.tgz') *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2414 '_internal-package') *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2394 'package') *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1879 '/var/db/pkg/qemu-1.7.0/+CONTENTS') *** Error 1 in /usr/ports/emulators/qemu (/usr/ports/infrastructure/mk/bsd.port.mk:2394 'install') [1] OpenBSD 5.4-current (GENERIC) #92: Mon Dec 2 02:35:38 MST 2013 dera...@macppc.openbsd.org:/usr/src/sys/arch/macppc/compile/GENERIC real mem = 536870912 (512MB) avail mem = 507731968 (484MB) mainbus0 at root: model PowerBook6,5 cpu0 at mainbus0: 7447A (Revision 0x102): 1199 MHz: 512KB L2 cache
Re: UPDATE: QEMU 1.7.0
On 08/12/13 6:22 PM, Fred wrote: On 11/29/13 20:42, Brad Smith wrote: On 27/11/13 6:16 PM, Brad Smith wrote: Here is an update to QEMU 1.7.0. OK? Not really related to this update but does anyone use QEMU on powerpc or sparc64 or could anyone do some quick tests to see how things fare as is? Hi Brad, On my iBook G4 running current (OpenBSD 5.4-current (GENERIC) #92: Mon Dec 2 02:35:38 MST 2013) qemu is failing with the following error on a make install: cc1: out of memory allocating 4072 bytes after a total of 0 bytes /usr/ports/pobj/qemu-1.7.0/qemu-1.7.0/rules.mak:25: recipe for target 'target-i386/translate.o' failed The last call before the error is shown below [1]. If you need more info let me know. That means you need to increase the maximum data size, .e.g. ulimit -d. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: QEMU 1.7.0
On Thu, Nov 28, 2013 at 09:30:08PM +0100, Robert Peichaer wrote:
The only thing I saw was a PLIST change:
--- PLIST.origThu Nov 28 00:39:19 2013
+++ PLIST Thu Nov 28 00:57:32 2013
@@ -64,6 +64,7 @@
share/locale/it/LC_MESSAGES/qemu.mo
share/locale/tr/LC_MESSAGES/qemu.mo
share/qemu/
+share/qemu/QEMU,tcx.bin
share/qemu/acpi-dsdt.aml
share/qemu/bamboo.dtb
share/qemu/bios.bin
Ah, lovely, nice last minute feature additions during release freeze.
Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.112
diff -u -p -r1.112 Makefile
--- Makefile25 Nov 2013 14:16:22 - 1.112
+++ Makefile28 Nov 2013 20:44:05 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc sparc
COMMENT= multi system emulator
-DISTNAME= qemu-1.6.1
+DISTNAME= qemu-1.7.0
CATEGORIES=emulators
MASTER_SITES= http://wiki.qemu.org/download/
EXTRACT_SUFX= .tar.bz2
@@ -57,6 +57,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--python=${MODPY_BIN} \
--smbd=${LOCALBASE}/libexec/smbd \
--cc=${CC} \
+ --cxx=${CXX} \
--host-cc=${CC} \
--extra-cflags=${EXTRA_CFLAGS} \
--extra-ldflags=${EXTRA_LDFLAGS} \
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo30 Oct 2013 19:53:29 - 1.32
+++ distinfo27 Nov 2013 23:06:37 -
@@ -1,2 +1,2 @@
-SHA256 (qemu-1.6.1.tar.bz2) = /HNvRKoQR4IjyIExCn5A/IOGVH6crffQHKRoWVFgUpQ=
-SIZE (qemu-1.6.1.tar.bz2) = 12041317
+SHA256 (qemu-1.7.0.tar.bz2) = MfMzqF8tFMYFp3Z5kEqWaOrrG23H2lOhZlIw9GvCExQ=
+SIZE (qemu-1.7.0.tar.bz2) = 12248954
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.37
diff -u -p -r1.37 patch-configure
--- patches/patch-configure 30 Oct 2013 19:53:29 - 1.37
+++ patches/patch-configure 27 Nov 2013 23:17:10 -
@@ -1,12 +1,32 @@
$OpenBSD: patch-configure,v 1.37 2013/10/30 19:53:29 brad Exp $
configure.orig Wed Oct 9 15:20:32 2013
-+++ configure Wed Oct 9 19:35:53 2013
-@@ -3397,8 +3397,6 @@ fi
+--- configure.orig Tue Nov 26 12:47:18 2013
configure Wed Nov 27 00:04:27 2013
+@@ -1345,6 +1345,10 @@ EOF
+ if compile_prog -fPIE -DPIE -pie; then
+ QEMU_CFLAGS=-fPIE -DPIE $QEMU_CFLAGS
+ LDFLAGS=-pie $LDFLAGS
++if test $targetos = OpenBSD; then
++ CC_NOPIE=-fno-pie
++ LD_NOPIE=-nopie
++fi
+ pie=yes
+ if compile_prog -Wl,-z,relro -Wl,-z,now ; then
+ LDFLAGS=-Wl,-z,relro -Wl,-z,now $LDFLAGS
+@@ -3549,8 +3553,6 @@ fi
if test $gcov = yes ; then
CFLAGS=-fprofile-arcs -ftest-coverage -g $CFLAGS
LDFLAGS=-fprofile-arcs -ftest-coverage $LDFLAGS
-elif test $debug = no ; then
-- CFLAGS=-O2 -D_FORTIFY_SOURCE=2 $CFLAGS
+- CFLAGS=-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS
fi
+@@ -4312,6 +4314,8 @@ if test $gcov = yes ; then
+ echo CONFIG_GCOV=y $config_host_mak
+ echo GCOV=$gcov_tool $config_host_mak
+ fi
++echo CC_NOPIE=$CC_NOPIE $config_host_mak
++echo LD_NOPIE=$LD_NOPIE $config_host_mak
+
+ # use included Linux headers
+ if test $linux = yes ; then
Index: patches/patch-pc-bios_optionrom_Makefile
===
RCS file:
/home/cvs/ports/emulators/qemu/patches/patch-pc-bios_optionrom_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-pc-bios_optionrom_Makefile
--- patches/patch-pc-bios_optionrom_Makefile30 Aug 2012 20:57:03 -
1.1
+++ patches/patch-pc-bios_optionrom_Makefile27 Nov 2013 05:05:51 -
@@ -1,21 +1,20 @@
$OpenBSD: patch-pc-bios_optionrom_Makefile,v 1.1 2012/08/30 20:57:03 pascal
Exp $
pc-bios/optionrom/Makefile.origThu Aug 30 17:41:17 2012
-+++ pc-bios/optionrom/Makefile Thu Aug 30 17:41:58 2012
-@@ -11,7 +11,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/optionrom)
-
+--- pc-bios/optionrom/Makefile.origTue Nov 26 12:47:18 2013
pc-bios/optionrom/Makefile Wed Nov 27 00:05:28 2013
+@@ -12,6 +12,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/optionrom)
CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
CFLAGS += -I$(SRC_PATH)
--CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
-+CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector, -fno-pie)
+ CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
++CFLAGS += $(CC_NOPIE)
QEMU_CFLAGS = $(CFLAGS)
build-all: multiboot.bin linuxboot.bin kvmvapic.bin
-@@ -20,7 +20,7 @@ build-all: multiboot.bin linuxboot.bin kvmvapic.bin
+@@ -20,7 +21,7 @@ build-all: multiboot.bin linuxboot.bin kvmvapic.bin
.SECONDARY:
%.img: %.o
-
Re: UPDATE: QEMU 1.7.0
On 27/11/13 6:16 PM, Brad Smith wrote: Here is an update to QEMU 1.7.0. OK? Not really related to this update but does anyone use QEMU on powerpc or sparc64 or could anyone do some quick tests to see how things fare as is? -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: QEMU 1.7.0
On Wed, Nov 27, 2013 at 06:16:43PM -0500, Brad Smith wrote:
Here is an update to QEMU 1.7.0.
OK?
Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.112
diff -u -p -r1.112 Makefile
--- Makefile 25 Nov 2013 14:16:22 - 1.112
+++ Makefile 27 Nov 2013 22:27:16 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc sparc
COMMENT= multi system emulator
-DISTNAME=qemu-1.6.1
+DISTNAME=qemu-1.7.0
CATEGORIES= emulators
MASTER_SITES=http://wiki.qemu.org/download/
EXTRACT_SUFX=.tar.bz2
@@ -57,6 +57,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--python=${MODPY_BIN} \
--smbd=${LOCALBASE}/libexec/smbd \
--cc=${CC} \
+ --cxx=${CXX} \
--host-cc=${CC} \
--extra-cflags=${EXTRA_CFLAGS} \
--extra-ldflags=${EXTRA_LDFLAGS} \
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo 30 Oct 2013 19:53:29 - 1.32
+++ distinfo 27 Nov 2013 23:06:37 -
@@ -1,2 +1,2 @@
-SHA256 (qemu-1.6.1.tar.bz2) = /HNvRKoQR4IjyIExCn5A/IOGVH6crffQHKRoWVFgUpQ=
-SIZE (qemu-1.6.1.tar.bz2) = 12041317
+SHA256 (qemu-1.7.0.tar.bz2) = MfMzqF8tFMYFp3Z5kEqWaOrrG23H2lOhZlIw9GvCExQ=
+SIZE (qemu-1.7.0.tar.bz2) = 12248954
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.37
diff -u -p -r1.37 patch-configure
--- patches/patch-configure 30 Oct 2013 19:53:29 - 1.37
+++ patches/patch-configure 27 Nov 2013 05:06:02 -
@@ -1,12 +1,32 @@
$OpenBSD: patch-configure,v 1.37 2013/10/30 19:53:29 brad Exp $
configure.orig Wed Oct 9 15:20:32 2013
-+++ configureWed Oct 9 19:35:53 2013
-@@ -3397,8 +3397,6 @@ fi
+--- configure.orig Tue Nov 26 12:47:18 2013
configureWed Nov 27 00:04:27 2013
+@@ -1345,6 +1345,10 @@ EOF
+ if compile_prog -fPIE -DPIE -pie; then
+ QEMU_CFLAGS=-fPIE -DPIE $QEMU_CFLAGS
+ LDFLAGS=-pie $LDFLAGS
++if test $targetos == OpenBSD; then
++ CC_NOPIE=-fno-pie
++ LD_NOPIE=-nopie
++fi
+ pie=yes
+ if compile_prog -Wl,-z,relro -Wl,-z,now ; then
+ LDFLAGS=-Wl,-z,relro -Wl,-z,now $LDFLAGS
+@@ -3549,8 +3553,6 @@ fi
if test $gcov = yes ; then
CFLAGS=-fprofile-arcs -ftest-coverage -g $CFLAGS
LDFLAGS=-fprofile-arcs -ftest-coverage $LDFLAGS
-elif test $debug = no ; then
-- CFLAGS=-O2 -D_FORTIFY_SOURCE=2 $CFLAGS
+- CFLAGS=-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS
fi
+@@ -4312,6 +4314,8 @@ if test $gcov = yes ; then
+ echo CONFIG_GCOV=y $config_host_mak
+ echo GCOV=$gcov_tool $config_host_mak
+ fi
++echo CC_NOPIE=$CC_NOPIE $config_host_mak
++echo LD_NOPIE=$LD_NOPIE $config_host_mak
+
+ # use included Linux headers
+ if test $linux = yes ; then
Index: patches/patch-pc-bios_optionrom_Makefile
===
RCS file:
/home/cvs/ports/emulators/qemu/patches/patch-pc-bios_optionrom_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-pc-bios_optionrom_Makefile
--- patches/patch-pc-bios_optionrom_Makefile 30 Aug 2012 20:57:03 -
1.1
+++ patches/patch-pc-bios_optionrom_Makefile 27 Nov 2013 05:05:51 -
@@ -1,21 +1,20 @@
$OpenBSD: patch-pc-bios_optionrom_Makefile,v 1.1 2012/08/30 20:57:03 pascal
Exp $
pc-bios/optionrom/Makefile.orig Thu Aug 30 17:41:17 2012
-+++ pc-bios/optionrom/Makefile Thu Aug 30 17:41:58 2012
-@@ -11,7 +11,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/optionrom)
-
+--- pc-bios/optionrom/Makefile.orig Tue Nov 26 12:47:18 2013
pc-bios/optionrom/Makefile Wed Nov 27 00:05:28 2013
+@@ -12,6 +12,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/optionrom)
CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer
-fno-builtin
CFLAGS += -I$(SRC_PATH)
--CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
-+CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector, -fno-pie)
+ CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
++CFLAGS += $(CC_NOPIE)
QEMU_CFLAGS = $(CFLAGS)
build-all: multiboot.bin linuxboot.bin kvmvapic.bin
-@@ -20,7 +20,7 @@ build-all: multiboot.bin linuxboot.bin kvmvapic.bin
+@@ -20,7 +21,7 @@ build-all: multiboot.bin linuxboot.bin kvmvapic.bin
.SECONDARY:
%.img: %.o
-$(call quiet-command,$(LD) -Ttext 0 -e _start -s -o $@ $, Building
$(TARGET_DIR)$@)
-+$(call quiet-command,$(LD) -nopie -Ttext 0 -e _start -s -o $@ $,
Building $(TARGET_DIR)$@)
++$(call quiet-command,$(LD) $(LD_NOPIE) -Ttext 0 -e _start -s -o $@
Re: UPDATE: QEMU 1.7.0
On 11/27/13 23:16, Brad Smith wrote: Here is an update to QEMU 1.7.0. OK? Hi Brad, Just deleted 1.7.0-rc2 and built 1.7.0 - it is running the xp image that I created with 1.7.0-rc2. port:fred ~ qemu-system-i386 --version QEMU emulator version 1.7.0, Copyright (c) 2003-2008 Fabrice Bellard port:fred ~ dmesg|head -2 OpenBSD 5.4-current (GENERIC.MP) #155: Wed Nov 20 12:24:39 MST 2013 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP Thanks Fred
