summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--include/freetype/config/ftconfig.h6
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 911d48bbf..33236b3dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-19 Michael Lotz <mmlr@mlotz.ch>
+
+ Fix Savannah bug #25355.
+
+ * include/freetype/config/ftconfig.h (FT_MulFix_i386): Make
+ assembler code work with gcc 2.95.3 (as used by the Haiku project).
+ Add `cc' register to the clobber list.
+
2009-01-18 Werner Lemberg <wl@gnu.org>
Protect FT_Get_Next_Char.
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h
index 169da3cf3..3c0b8b164 100644
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -357,9 +357,9 @@ FT_BEGIN_HEADER
"shrl $16, %%eax\n"
"shll $16, %%edx\n"
"addl %%edx, %%eax\n"
- : "=a"(result), "+d"(b)
- : "a"(a)
- : "%ecx" );
+ : "=a"(result), "=d"(b)
+ : "a"(a), "d"(b)
+ : "%ecx", "cc" );
return result;
}