From 2cd5dce83187ba167fca700f2e588ee52c6f3e6e Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sun, 15 Mar 2009 00:58:25 -0700 Subject: [PATCH] Use __asm__ for declaring assembly instead of asm. * builds/unix/ftconfig.in (FT_MulFix_arm): 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 deletion(-) diff --git a/ChangeLog b/ChangeLog index 515bf16f3..f484840ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-03-15 Steve Langasek + + Use __asm__ for declaring assembly instead of asm. + + * builds/unix/ftconfig.in (FT_MulFix_arm): Use __asm__ instead of + asm on arm, fixing a build failure on armel with -pedantic. + 2009-03-14 Werner Lemberg Fix valgrind warning. diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index 0adfdcf64..c5e4e46b4 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 */