From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HfemP-0004hD-8z for qemu-devel@nongnu.org; Sun, 22 Apr 2007 12:19:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HfemJ-0004h1-Tk for qemu-devel@nongnu.org; Sun, 22 Apr 2007 12:19:12 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HfemJ-0004gy-NZ for qemu-devel@nongnu.org; Sun, 22 Apr 2007 12:19:07 -0400 Received: from mail7.worldserver.net ([217.13.200.27]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1Hfegt-0008OI-EA for qemu-devel@nongnu.org; Sun, 22 Apr 2007 12:13:32 -0400 Mime-Version: 1.0 (Apple Message framework v752.2) Message-Id: <5643D4E8-2DE4-42FB-8FFE-52CD782BD341@users.sourceforge.net> Content-Type: multipart/mixed; boundary=Apple-Mail-5--764814249 From: Joachim Henke Date: Sun, 22 Apr 2007 18:12:44 +0200 Subject: [Qemu-devel] [PATCH] BSD linking fix Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --Apple-Mail-5--764814249 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Hello, it seems that this change: http://lists.gnu.org/archive/html/qemu-devel/2007-04/msg00023.html breaks linking in Mac OS X (PPC in my case): /usr/bin/ld: warning multiple definitions of symbol _ldexpl$LDBL128 libqemu.a(softfloat-native.o) definition of _ldexpl$LDBL128 in section (__TEXT,__text) /usr/lib/gcc/powerpc-apple-darwin8/4.0.1/../../../libmx.dylib(single module) definition of _ldexpl$LDBL128 /usr/bin/ld: warning multiple definitions of symbol _llrintl$LDBL128 libqemu.a(softfloat-native.o) definition of _llrintl$LDBL128 in section (__TEXT,__text) /usr/lib/gcc/powerpc-apple-darwin8/4.0.1/../../../libmx.dylib(single module) definition of _llrintl$LDBL128 /usr/bin/ld: warning multiple definitions of symbol _lrintl$LDBL128 libqemu.a(softfloat-native.o) definition of _lrintl$LDBL128 in section (__TEXT,__text) /usr/lib/gcc/powerpc-apple-darwin8/4.0.1/../../../libmx.dylib(single module) definition of _lrintl$LDBL128 The attached patch works for me. Kind regards, Jo -- Joachim Henke http://base91.sourceforge.net/j-o/ --Apple-Mail-5--764814249 Content-Transfer-Encoding: 7bit Content-Type: application/octet-stream; x-unix-mode=0600; name=softfloat.diff Content-Disposition: attachment; filename=softfloat.diff --- fpu/softfloat-native.c +++ fpu/softfloat-native.c @@ -31,5 +31,5 @@ #define remainderf(fa, fb) ((float)remainder(fa, fb)) #define rintf(f) ((float)rint(f)) -#if !defined(__sparc__) && HOST_SOLARIS < 10 +#if !defined(__sparc__) && defined(HOST_SOLARIS) && HOST_SOLARIS < 10 extern long double rintl(long double); extern long double scalbnl(long double, int); --Apple-Mail-5--764814249 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed --Apple-Mail-5--764814249--