From b0a12a28805dcdf20836c9170a29e91290d8a530 Mon Sep 17 00:00:00 2001 From: Johann Date: Fri, 17 Feb 2012 12:24:44 -0800 Subject: [PATCH] Refine offset pattern When compiling with -ggdb3 the output includes an extraneous EQU from vpx_ports/asm_offsets.h https://trac.macports.org/ticket/33285 Change-Id: Iba93ddafec414c152b87001a7542e7a894781231 --- libs.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs.mk b/libs.mk index 96eff5b..da92001 100644 --- a/libs.mk +++ b/libs.mk @@ -280,19 +280,21 @@ $(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)vpx_config.asm # Calculate platform- and compiler-specific offsets for hand coded assembly # +OFFSET_PATTERN:='^[a-zA-Z0-9_]* EQU' + ifeq ($(filter icc gcc,$(TGT_CC)), $(TGT_CC)) $(BUILD_PFX)asm_com_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S - grep -w EQU $< | tr -d '$$\#' $(ADS2GAS) > $@ + grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@ $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S: $(VP8_PREFIX)common/asm_com_offsets.c CLEAN-OBJS += $(BUILD_PFX)asm_com_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S $(BUILD_PFX)asm_enc_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S - grep -w EQU $< | tr -d '$$\#' $(ADS2GAS) > $@ + grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@ $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S: $(VP8_PREFIX)encoder/asm_enc_offsets.c CLEAN-OBJS += $(BUILD_PFX)asm_enc_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S $(BUILD_PFX)asm_dec_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S - grep -w EQU $< | tr -d '$$\#' $(ADS2GAS) > $@ + grep $(OFFSET_PATTERN) $< | tr -d '$$\#' $(ADS2GAS) > $@ $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S: $(VP8_PREFIX)decoder/asm_dec_offsets.c CLEAN-OBJS += $(BUILD_PFX)asm_dec_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S else -- 2.7.4