diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
--- dav1d-0.4.0.orig/Makefile 1969-12-31 17:00:00.000000000 -0700
-+++ dav1d-0.4.0/Makefile 2019-08-30 10:30:39.846512952 -0600
-@@ -0,0 +1,342 @@
++++ dav1d-0.4.0/Makefile 2019-09-05 16:38:01.820636946 -0600
+@@ -0,0 +1,358 @@
++
++_ARCH := $(shell uname -m)
++ARCH_I32 := $(shell expr "x$(_ARCH)" : 'xi[346]86.*')
++ARCH_X64 := $(shell expr "x$(_ARCH)" : 'x..._64*')
++
++ifneq ($(ARCH_I32),0)
++ASM_ARCH := elf32
++ARCH_X86_32 := 1
++ARCH_X86_64 := 0
++endif
++ifneq ($(ARCH_X64),0)
++ASM_ARCH := elf64
++ARCH_X86_32 := 0
++ARCH_X86_64 := 1
++endif
++
+BUILD=build
+DESTDIR=/
+PREFIX=usr/local
+ mc_ssse3.obj \
+ msac.obj)
+$(NASM_BLD)/%.obj: src/x86/%.asm
-+ $(NASM) -f elf64 \
++ $(NASM) -f $(ASM_ARCH) \
+ -I src/ -I $(BUILD)/ -MQ $@ -MF $@.ndep \
+ $< -o $@
+
+ echo >> $@ "#define ARCH_ARM 0"
+ echo >> $@ "#define ARCH_PPC64LE 0"
+ echo >> $@ "#define ARCH_X86 1"
-+ echo >> $@ "#define ARCH_X86_32 0"
-+ echo >> $@ "#define ARCH_X86_64 1"
++ echo >> $@ "#define ARCH_X86_32 $(ARCH_X86_32)"
++ echo >> $@ "#define ARCH_X86_64 $(ARCH_X86_64)"
+ echo >> $@ "#define CONFIG_16BPC 1"
+ echo >> $@ "#define CONFIG_8BPC 1"
+ echo >> $@ "#define CONFIG_LOG 1"
+ echo >> $@ "#define STACK_ALIGNMENT 32"
+
+$(BUILD)/config.asm:
-+ echo > $@ "%define ARCH_X86_32 0"
-+ echo >> $@ "%define ARCH_X86_64 1"
++ echo > $@ "%define ARCH_X86_32 $(ARCH_X86_32)"
++ echo >> $@ "%define ARCH_X86_64 $(ARCH_X86_64)"
+ echo >> $@ "%define PIC 1"
+ echo >> $@ "%define STACK_ALIGNMENT 32"
+
+$(CHKASM_BIT16)/%.o: $(TESTS_CHKASM)/%.c
+ $(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $<
+$(TESTS_CHKASM_BLD)/x86/%.obj: $(TESTS_CHKASM)/x86/%.asm
-+ @$(NASM) -f elf64 \
++ @$(NASM) -f $(ASM_ARCH) \
+ -I src/ -I $(BUILD)/ -MQ $@ -MF $@.ndep \
+ $< -o $@
+