Date: Thu, 3 Oct 2013 13:10:13 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329179 - in head/emulators/qemu-devel: . files Message-ID: <201310031310.r93DADfr070255@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Thu Oct 3 13:10:13 2013 New Revision: 329179 URL: http://svnweb.freebsd.org/changeset/ports/329179 Log: - Add patch to fix mips-softmmu target crashes with clang. [1] - Remove USE_GCC. - Bump PORTREVISION. Submitted by: dim [1] Added: head/emulators/qemu-devel/files/patch-cpu-exec.c (contents, props changed) Modified: head/emulators/qemu-devel/Makefile Modified: head/emulators/qemu-devel/Makefile ============================================================================== --- head/emulators/qemu-devel/Makefile Thu Oct 3 13:08:43 2013 (r329178) +++ head/emulators/qemu-devel/Makefile Thu Oct 3 13:10:13 2013 (r329179) @@ -3,7 +3,7 @@ PORTNAME= qemu PORTVERSION= 1.6.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -63,10 +63,6 @@ CONFIGURE_ARGS+= --enable-nptl --target- CONFIGURE_ARGS+= --target-list=i386-softmmu,x86_64-softmmu .endif .else -# clang seems to build a broken mips-softmmu target (qemu segfaults -# at boot) Feel free to debug :) Some info is here: -# http://people.freebsd.org/~nox/tmp/qemu-1.6.0-mips-softmmu-crash.txt -USE_GCC= any .if empty(PORT_OPTIONS:MBSD_USER) CONFIGURE_ARGS+= --disable-bsd-user .else Added: head/emulators/qemu-devel/files/patch-cpu-exec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/qemu-devel/files/patch-cpu-exec.c Thu Oct 3 13:10:13 2013 (r329179) @@ -0,0 +1,13 @@ +--- a/cpu-exec.c ++++ b/cpu-exec.c +@@ -681,6 +681,10 @@ int cpu_exec(CPUArchState *env) + * local variables as longjmp is marked 'noreturn'. */ + cpu = current_cpu; + env = cpu->env_ptr; ++#if !(defined(CONFIG_USER_ONLY) && \ ++ (defined(TARGET_M68K) || defined(TARGET_PPC) || defined(TARGET_S390X))) ++ cc = CPU_GET_CLASS(cpu); ++#endif + } + } /* for(;;) */ +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310031310.r93DADfr070255>