ref: e98e2bc1aaf4cb5f2648f852168b7a51a28e7cb5
parent: 35576bf067624e18397e3a72148b82c7cf3b849b
author: Werner Lemberg <[email protected]>
date: Sat Jul 12 12:37:39 EDT 2014
* builds/vms/ftconfig.h: Synchronize. Problem reported by Alexei.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-12 Werner Lemberg <[email protected]>
+
+ * builds/vms/ftconfig.h: Synchronize.
+ Problem reported by Alexei.
+
2014-07-11 Alexei Podtelezhnikov <[email protected]>
[base] Clean up bitmap conversion.
--- 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 @@
__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 */