[PATCH] m68k: math-emu updates [13/20]

Compile fixes

diff --git a/arch/m68k/math-emu/fp_emu.h b/arch/m68k/math-emu/fp_emu.h
index bf2d88b298847ea3bed33521c4a5a217cf17115a..55ecb417e3d08df48514a250e64647a910ac9812 100644 (file)
--- a/arch/m68k/math-emu/fp_emu.h
+++ b/arch/m68k/math-emu/fp_emu.h
@@ -38,7 +38,9 @@
 #ifndef _FP_EMU_H
 #define _FP_EMU_H
 
+#ifdef __ASSEMBLY__
 #include "../kernel/m68k_defs.h"
+#endif
 #include <asm/math-emu.h>
 
 #ifndef __ASSEMBLY__

diff --git a/arch/m68k/math-emu/multi_arith.h b/arch/m68k/math-emu/multi_arith.h
index a2db72008737d50d10e989b1ff2029139ea0a2f3..2f11436e361a58c457b36387dcfa48d81f6ba46d 100644 (file)
--- a/arch/m68k/math-emu/multi_arith.h
+++ b/arch/m68k/math-emu/multi_arith.h
@@ -376,7 +376,7 @@ extern inline void fp_submant(struct fp_ext *dest, struct fp_ext *src1, struct f
        asm ("divu.l %2,%1:%0" : "=d" (quot), "=d" (rem)                \
                : "dm" (div), "1" (srch), "0" (srcl))
 #define fp_add64(dest1, dest2, src1, src2) ({                          \
-       asm ("add.l %1,%0" : "=d,=dm" (dest2)                           \
+       asm ("add.l %1,%0" : "=d,dm" (dest2)                            \
                : "dm,d" (src2), "0,0" (dest2));                        \
        asm ("addx.l %1,%0" : "=d" (dest1)                              \
                : "d" (src1), "0" (dest1));                             \
@@ -391,14 +391,14 @@ extern inline void fp_submant(struct fp_ext *dest, struct fp_ext *src1, struct f
                : "d" (0), "0" (dest->m32[0]));                         \
 })
 #define fp_sub64(dest, src) ({                                         \
-       asm ("sub.l %1,%0" : "=d,=dm" (dest.m32[1])                     \
+       asm ("sub.l %1,%0" : "=d,dm" (dest.m32[1])                      \
                : "dm,d" (src.m32[1]), "0,0" (dest.m32[1]));            \
        asm ("subx.l %1,%0" : "=d" (dest.m32[0])                        \
                : "d" (src.m32[0]), "0" (dest.m32[0]));                 \
 })
 #define fp_sub96c(dest, srch, srcm, srcl) ({                           \
        char carry;                                                     \
-       asm ("sub.l %1,%0" : "=d,=dm" (dest.m32[2])                     \
+       asm ("sub.l %1,%0" : "=d,dm" (dest.m32[2])                      \
                : "dm,d" (srcl), "0,0" (dest.m32[2]));                  \
        asm ("subx.l %1,%0" : "=d" (dest.m32[1])                        \
                : "d" (srcm), "0" (dest.m32[1]));                       \