freetype-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[ft-devel] [PATCH] Use __asm__ for declaring assembly instead of asm.


From: Steve Langasek
Subject: [ft-devel] [PATCH] Use __asm__ for declaring assembly instead of asm.
Date: Sun, 15 Mar 2009 00:58:25 -0700
User-agent: Mutt/1.5.18 (2008-05-17)

use __asm__ instead of asm on arm, fixing a build failure on armel with
-pedantic.
---
 ChangeLog               |    7 +++++++
 builds/unix/ftconfig.in |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 515bf16..21e7f06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-15  Steve Langasek  <address@hidden>
+
+       Use __asm__ for declaring assembly instead of asm.
+
+       * builds/unix/ftconfig.in: use __asm__ instead of asm on arm,
+       fixing a build failure on armel with -pedantic.
+
 2009-03-14  Werner Lemberg  <address@hidden>
 
        Fix valgrind warning.
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in
index 0adfdcf..c5e4e46 100644
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -298,7 +298,7 @@ FT_BEGIN_HEADER
     register FT_Int32  t, t2;
 
 
-    asm __volatile__ (
+    __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) */
       "add    %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
-- 
1.6.1.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]