From b8a5bdd1fca66051ad975485ba7b8ea7939e6253 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 15 Jul 2011 10:15:28 +0200 Subject: [PATCH] Bug 670329 - Avoid bumping ARM target because of NEON code in gfx. r=jmuizelaar --- gfx/ycbcr/yuv_convert_arm.cpp | 4 ++++ gfx/ycbcr/yuv_row_arm.s | 3 +++ 2 files changed, 7 insertions(+) diff --git a/gfx/ycbcr/yuv_convert_arm.cpp b/gfx/ycbcr/yuv_convert_arm.cpp index 3c7495ef1ea..0334e348dea 100644 --- a/gfx/ycbcr/yuv_convert_arm.cpp +++ b/gfx/ycbcr/yuv_convert_arm.cpp @@ -50,6 +50,10 @@ void __attribute((noinline,optimize("-fomit-frame-pointer"))) */ asm volatile ( ".fpu neon\n" +/* Allow to build on targets not supporting neon, and force the object file + * target to avoid bumping the final binary target */ +".arch armv7-a\n" +".object_arch armv4t\n" ".macro convert_macroblock size\n" /* load up to 16 source pixels */ ".if \\size == 16\n" diff --git a/gfx/ycbcr/yuv_row_arm.s b/gfx/ycbcr/yuv_row_arm.s index e72c5c83d5e..a7fafede211 100644 --- a/gfx/ycbcr/yuv_row_arm.s +++ b/gfx/ycbcr/yuv_row_arm.s @@ -36,6 +36,9 @@ .arch armv7-a .fpu neon +/* Allow to build on targets not supporting neon, and force the object file + * target to avoid bumping the final binary target */ + .object_arch armv4t .text .align