From owner-svn-ports-head@FreeBSD.ORG Thu Oct 3 13:10:14 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 65CE7CFE; Thu, 3 Oct 2013 13:10:14 +0000 (UTC) (envelope-from nox@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 38802236A; Thu, 3 Oct 2013 13:10:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r93DAEcs070257; Thu, 3 Oct 2013 13:10:14 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r93DADfr070255; Thu, 3 Oct 2013 13:10:13 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201310031310.r93DADfr070255@svn.freebsd.org> From: Juergen Lock Date: Thu, 3 Oct 2013 13:10:13 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Oct 2013 13:10:14 -0000 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(;;) */ +