From 3260b2b2234d117894924674f6bfa7e5f60c92c3 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Fri, 17 Jan 2014 19:21:44 -0500 Subject: [PATCH] bug 961287 - don't lto files that are only compiled to assembly to get offsets r=glandium --- media/libvpx/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in index 0bbf9f377952..a97a421ea7a1 100644 --- a/media/libvpx/Makefile.in +++ b/media/libvpx/Makefile.in @@ -51,9 +51,10 @@ GARBAGE += vp8_asm_enc_offsets.$(OBJ_SUFFIX) vp8_asm_enc_offsets.asm else # We can extract the asm offsets directly from generated assembly using inline -# asm. This is the preferred method. +# asm. This is the preferred method. However we need to strip out CFLAGS that +# cause LTO because then the resulting .S file is useless. -vpx_scale_asm_offsets.s: CFLAGS += -DINLINE_ASM +vpx_scale_asm_offsets.s: CFLAGS := -DINLINE_ASM OFFSET_PATTERN := '^[a-zA-Z0-9_]* EQU' @@ -70,7 +71,7 @@ vpx_scale_asm_offsets.asm: vpx_scale_asm_offsets.s GARBAGE += vpx_scale_asm_offsets.s vpx_scale_asm_offsets.asm -vp8_asm_enc_offsets.s: CFLAGS += -DINLINE_ASM +vp8_asm_enc_offsets.s: CFLAGS := -DINLINE_ASM vp8_asm_enc_offsets.s: $(srcdir)/vp8/encoder/vp8_asm_enc_offsets.c $(REPORT_BUILD)