--- Makefile.orig	2021-05-17 21:23:19 UTC
+++ Makefile
@@ -45,12 +45,8 @@ CC_AS    ?= ${CC_PREFIX}as
 
 MFLAGS   := 
 ASFLAGS  := 
-LDFLAGS  :=
 LDFLAGS_END :=
 INCFLAGS :=
-LIBS     :=
-CFLAGS   := 
-CXXFLAGS :=
 
 GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
 ifneq ($(GIT_VERSION)," unknown")
@@ -70,7 +66,7 @@ endif
 # Target Dynarec
 WITH_DYNAREC = $(ARCH)
 
-ifeq ($(ARCH), $(filter $(ARCH), i386 i686))
+ifeq ($(ARCH), $(filter $(ARCH), i386 i486 i686))
 	WITH_DYNAREC = x86
 endif
 
@@ -145,7 +141,7 @@ ifneq (,$(findstring unix,$(platform)))
 	HAVE_CDROM = 1
 	fpic = -fPIC
 
-	ifeq ($(WITH_DYNAREC), $(filter $(WITH_DYNAREC), x86_64 x64))
+	ifeq ($(WITH_DYNAREC), $(filter $(WITH_DYNAREC), x86_64 x64 amd64))
 		CFLAGS += -DTARGET_LINUX_x64
 		SINGLE_PREC_FLAGS=1
 		HAVE_GENERIC_JIT = 0
