Module Name: xsrc
Committed By: nonaka
Date: Fri May 29 22:25:07 UTC 2009
Modified Files:
xsrc/external/mit/freetype/dist/include/freetype/config: ftconfig.h
Log Message:
Use correct syntax for orr instruction.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h
diff -u xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.1.1.2 xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.2
--- xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h:1.1.1.2 Mon Apr 13 18:51:14 2009
+++ xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h Fri May 29 22:25:07 2009
@@ -327,7 +327,7 @@
"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 */
- "orr %0, %2, lsl #16\n\t" /* %0 |= %2 << 16 */
+ "orr %0, %0, %2, lsl #16\n\t" /* %0 |= %2 << 16 */
: "=r"(a), "=&r"(t2), "=&r"(t)
: "r"(a), "r"(b) );
return a;