Commit e98e2bc1aaf4cb5f2648f852168b7a51a28e7cb5
2014-07-12T16:37:39
* builds/vms/ftconfig.h: Synchronize. Problem reported by Alexei.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
diff --git a/ChangeLog b/ChangeLog
index d1c241a..c832cff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-12 Werner Lemberg <wl@gnu.org>
+
+ * builds/vms/ftconfig.h: Synchronize.
+ Problem reported by Alexei.
+
2014-07-11 Alexei Podtelezhnikov <apodtele@gmail.com>
[base] Clean up bitmap conversion.
diff --git a/builds/vms/ftconfig.h b/builds/vms/ftconfig.h
index 3fb8f84..b1f5f75 100644
--- a/builds/vms/ftconfig.h
+++ b/builds/vms/ftconfig.h
@@ -4,7 +4,7 @@
/* */
/* VMS-specific configuration file (specification only). */
/* */
-/* Copyright 1996-2004, 2006-2008, 2011, 2013 by */
+/* Copyright 1996-2004, 2006-2008, 2011, 2013, 2014 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -359,7 +359,11 @@ FT_BEGIN_HEADER
__asm__ __volatile__ (
"smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */
"mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */
+#if defined( __clang__ ) && defined( __thumb2__ )
+ "add.w %0, %0, #0x8000\n\t" /* %0 += 0x8000 */
+#else
"add %0, %0, #0x8000\n\t" /* %0 += 0x8000 */
+#endif
"adds %1, %1, %0\n\t" /* %1 += %0 */
"adc %2, %2, #0\n\t" /* %2 += carry */
"mov %0, %1, lsr #16\n\t" /* %0 = %1 >> 16 */