[Qemu-devel] [PATCH] BSD linking fix

[Joachim Henke <j-o@users.sourceforge.net>]

[-- Attachment #1: Type: text/plain, Size: 1061 bytes --]

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/

[-- Attachment #2: softfloat.diff --]
[-- Type: application/octet-stream, Size: 367 bytes --]

--- 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);

[-- Attachment #3: Type: text/plain, Size: 2 bytes --]