Commit dd5b5d39 authored by Diego Biurrun's avatar Diego Biurrun Committed by Fiona Glaser

build: Set all ASFLAGS from within configure

This is how all other toolchain flags are handled.
parent c15f20bd
......@@ -88,17 +88,14 @@ X86SRC = $(X86SRC0:%=common/x86/%)
ifeq ($(ARCH),X86)
ARCH_X86 = yes
ASMSRC = $(X86SRC) common/x86/pixel-32.asm
ASFLAGS += -DARCH_X86_64=0
endif
ifeq ($(ARCH),X86_64)
ARCH_X86 = yes
ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm
ASFLAGS += -DARCH_X86_64=1
endif
ifdef ARCH_X86
ASFLAGS += -I$(SRCPATH)/common/x86/
SRCS += common/x86/mc-c.c common/x86/predict-c.c
OBJASM = $(ASMSRC:%.asm=%.o)
$(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm
......
......@@ -561,7 +561,7 @@ case $host_cpu in
i*86)
ARCH="X86"
AS="yasm"
ASFLAGS="$ASFLAGS -O2"
ASFLAGS="$ASFLAGS -O2 -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/"
if [ $compiler = GNU ]; then
if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
CFLAGS="$CFLAGS -march=i686"
......@@ -600,6 +600,7 @@ case $host_cpu in
x86_64)
ARCH="X86_64"
AS="yasm"
ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
[ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
if [ "$SYS" = MACOSX ]; then
ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment