diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index 8436fbbf7996..9b4873ede42b 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -163,3 +163,7 @@ pixman-arm-neon.$(OBJ_SUFFIX): COMPILE_CFLAGS += $(ARM_NEON_CFLAGS) pixman-vmx.$(OBJ_SUFFIX): COMPILE_CFLAGS += $(VMX_CFLAGS) +# The ARM asm functions here don't appreciate being called by functions +# compiled with -mapcs-frame. See bug 832752. +CXXFLAGS := $(filter-out -mapcs-frame,$(CXXFLAGS)) +CFLAGS := $(filter-out -mapcs-frame,$(CFLAGS))