続 in-tree X.Org

駄目だ、他の場所でも同じエラーで止った…。
ちゃんと直さないと駄目ですな。これでいける筈。

Index: ftconfig.h
===================================================================
RCS file: /cvsroot/xsrc/external/mit/freetype/dist/include/freetype/config/ftconfig.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 ftconfig.h
--- ftconfig.h	13 Apr 2009 18:51:14 -0000	1.1.1.2
+++ ftconfig.h	29 May 2009 22:22:13 -0000
@@ -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;