Attachment 186295 Details for Bug 222247 – Simple proposed patch

[patch] Simple proposed patch

ieeefp.h-macros_redefinition_fix.patch (text/plain), 1.06 KB, created by Bertrand Petit on 2017-09-12 12:10:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bertrand Petit

Created: 2017-09-12 12:10:46 UTC

Size: 1.06 KB

patch

obsolete

>diff -r 077d55401303 sys/i386/include/ieeefp.h
>--- a/sys/i386/include/ieeefp.h	Mon Sep 11 06:14:50 2017 +0200
>+++ b/sys/i386/include/ieeefp.h	Tue Sep 12 14:04:36 2017 +0200
>@@ -108,12 +108,7 @@
> 
> #ifdef __GNUCLIKE_ASM
> 
>-#define	__fldcw(addr)	__asm __volatile("fldcw %0" : : "m" (*(addr)))
>-#define	__fldenv(addr)	__asm __volatile("fldenv %0" : : "m" (*(addr)))
>-#define	__fnclex()	__asm __volatile("fnclex")
>-#define	__fnstcw(addr)	__asm __volatile("fnstcw %0" : "=m" (*(addr)))
>-#define	__fnstenv(addr)	__asm __volatile("fnstenv %0" : "=m" (*(addr)))
>-#define	__fnstsw(addr)	__asm __volatile("fnstsw %0" : "=m" (*(addr)))
>+#include <fenv.h>
> 
> /*
>  * Load the control word.  Be careful not to trap if there is a currently
>@@ -136,11 +131,11 @@
> 		if (((_sw & ~_cw) & FP_STKY_FLD) != 0) {
> 			__fnstenv(&_env);
> 			_env._cw = _newcw;
>-			__fldenv(&_env);
>+			__fldenv(_env);
> 			return;
> 		}
> 	}
>-	__fldcw(&_newcw);
>+	__fldcw(_newcw);
> }
> 
> static __inline fp_rnd_t
>@@ -249,7 +244,7 @@
> 	}
> 	__fnstenv(&_env);
> 	_env._sw &= ~_m;
>-	__fldenv(&_env);
>+	__fldenv(_env);
> 	return (_p);
> }
>

Actions: View | Diff

Attachments on bug 222247: 186295 | 186320