mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-02 01:48:05 +00:00
Bug 544697. pixman: Reenable NEON support. r=vlad,bsmedberg
3f91dcac71c4 turned off NEON because of build breakage. This turns it back on. We also need to add a SSRCS target so that .S files get built with gcc.
This commit is contained in:
parent
6c65d9c0c9
commit
1ba8851c67
@ -380,6 +380,7 @@ _OBJS = \
|
||||
$(JRI_STUB_CFILES) \
|
||||
$(addsuffix .$(OBJ_SUFFIX), $(JMC_GEN)) \
|
||||
$(CSRCS:.c=.$(OBJ_SUFFIX)) \
|
||||
$(SSRCS:.S=.$(OBJ_SUFFIX)) \
|
||||
$(patsubst %.cc,%.$(OBJ_SUFFIX),$(CPPSRCS:.cpp=.$(OBJ_SUFFIX))) \
|
||||
$(CMSRCS:.m=.$(OBJ_SUFFIX)) \
|
||||
$(CMMSRCS:.mm=.$(OBJ_SUFFIX)) \
|
||||
|
@ -92,8 +92,7 @@ ifdef HAVE_ARM_SIMD
|
||||
USE_ARM_SIMD_GCC=1
|
||||
endif
|
||||
ifdef HAVE_ARM_NEON
|
||||
# temporarily disabled to see if it fixes odd mobile build breakage
|
||||
#USE_ARM_NEON_GCC=1
|
||||
USE_ARM_NEON_GCC=1
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -148,6 +147,7 @@ endif
|
||||
|
||||
ifdef USE_ARM_NEON_GCC
|
||||
CSRCS += pixman-arm-neon.c
|
||||
SSRCS += pixman-arm-neon-asm.S
|
||||
DEFINES += -DUSE_ARM_NEON
|
||||
ARM_NEON_CFLAGS = -mfloat-abi=softfp -mfpu=neon
|
||||
endif
|
||||
|
@ -817,8 +817,8 @@ generate_composite_function \
|
||||
vsli.u64 d0, d0, #8
|
||||
vsli.u64 d0, d0, #16
|
||||
vsli.u64 d0, d0, #32
|
||||
vmov d1, d0
|
||||
vmov q1, q0
|
||||
vorr d1, d0, d0
|
||||
vorr q1, q0, q0
|
||||
.endm
|
||||
|
||||
.macro pixman_composite_src_n_8_cleanup
|
||||
@ -856,8 +856,8 @@ generate_composite_function \
|
||||
vld1.32 {d0[0]}, [DUMMY]
|
||||
vsli.u64 d0, d0, #16
|
||||
vsli.u64 d0, d0, #32
|
||||
vmov d1, d0
|
||||
vmov q1, q0
|
||||
vorr d1, d0, d0
|
||||
vorr q1, q0, q0
|
||||
.endm
|
||||
|
||||
.macro pixman_composite_src_n_0565_cleanup
|
||||
@ -894,8 +894,8 @@ generate_composite_function \
|
||||
add DUMMY, sp, #ARGS_STACK_OFFSET
|
||||
vld1.32 {d0[0]}, [DUMMY]
|
||||
vsli.u64 d0, d0, #32
|
||||
vmov d1, d0
|
||||
vmov q1, q0
|
||||
vorr d1, d0, d0
|
||||
vorr q1, q0, q0
|
||||
.endm
|
||||
|
||||
.macro pixman_composite_src_n_8888_cleanup
|
||||
|
@ -380,6 +380,7 @@ _OBJS = \
|
||||
$(JRI_STUB_CFILES) \
|
||||
$(addsuffix .$(OBJ_SUFFIX), $(JMC_GEN)) \
|
||||
$(CSRCS:.c=.$(OBJ_SUFFIX)) \
|
||||
$(SSRCS:.S=.$(OBJ_SUFFIX)) \
|
||||
$(patsubst %.cc,%.$(OBJ_SUFFIX),$(CPPSRCS:.cpp=.$(OBJ_SUFFIX))) \
|
||||
$(CMSRCS:.m=.$(OBJ_SUFFIX)) \
|
||||
$(CMMSRCS:.mm=.$(OBJ_SUFFIX)) \
|
||||
|
Loading…
Reference in New Issue
Block a user