diff --git a/src/stub/Makefile b/src/stub/Makefile
index 0ad59a3d..203d4667 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -713,10 +713,10 @@ endif
 
 ifndef EXTRA_MAKEFILES
 EXTRA_MAKEFILES :=
-ifneq ($(filter extra-%,$(MAKECMDGOALS)),)
+##ifneq ($(filter extra-%,$(MAKECMDGOALS)),)
 EXTRA_MAKEFILES += $(wildcard src/arch/*/Makefile.extra src/arch/*/*/Makefile.extra src/arch/*/*/*/Makefile.extra)
-##EXTRA_MAKEFILES += $(shell find src/arch -name Makefile.extra 2>/dev/null)
-endif
+####EXTRA_MAKEFILES += $(shell find src/arch -name Makefile.extra 2>/dev/null)
+##endif
 endif
 
 ifneq ($(strip $(EXTRA_MAKEFILES)),)
diff --git a/src/stub/src/arch/amd64/Makefile.extra b/src/stub/src/arch/amd64/Makefile.extra
index 23b036cb..b03f4258 100644
--- a/src/stub/src/arch/amd64/Makefile.extra
+++ b/src/stub/src/arch/amd64/Makefile.extra
@@ -24,17 +24,20 @@ include $(top_srcdir)/src/stub/Makefile
 
 
 # /***********************************************************************
-# // amd64-lzma
+# // method-lzma
 # ************************************************************************/
 
-lzma_d_c%.S : tc_list = amd64-lzma amd64-linux.elf default
+lzma_d_c%.S : tc_list = method-lzma amd64-linux.elf default
 lzma_d_c%.S : tc_bfdname = elf64-x86-64
 
-tc.amd64-lzma.gcc      = $(tc.amd64-linux.elf.gcc)
-tc.amd64-lzma.gcc     += -Os
-tc.amd64-lzma.gcc     += -ffunction-sections
-tc.amd64-lzma.gcc     += -I$(UPX_LZMADIR)
-tc.amd64-lzma.gcc     += -I$(top_srcdir)/src
+c := tc.method-lzma.gcc
+$c  = $(tc.amd64-linux.elf.gcc)
+$c += -Os -fomit-frame-pointer
+$c += -fno-unit-at-a-time
+$c += -ffunction-sections
+$c += -fwrapv
+$c += -I$(UPX_LZMADIR)
+$c += -I$(top_srcdir)/src
 
 lzma_d_c%.S : lzma_d_c.c
 	$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o
diff --git a/src/stub/src/arch/arm/v4a/Makefile.extra b/src/stub/src/arch/arm/v4a/Makefile.extra
index 051294b5..b8636d90 100644
--- a/src/stub/src/arch/arm/v4a/Makefile.extra
+++ b/src/stub/src/arch/arm/v4a/Makefile.extra
@@ -24,20 +24,23 @@ include $(top_srcdir)/src/stub/Makefile
 
 
 # /***********************************************************************
-# // arm-lzma
+# // method-lzma
 # ************************************************************************/
 
-lzma_d_c%.S : tc_list = arm-lzma arm-linux.elf default
+lzma_d_c%.S : tc_list = method-lzma arm-linux.elf default
 lzma_d_c%.S : tc_bfdname = elf32-littlearm
 
-tc.arm-lzma.gcc      = $(tc.arm-linux.elf.gcc)
+c := tc.method-lzma.gcc
+$c  = $(tc.arm-linux.elf.gcc)
 # -fPIC not needed: no globals, no string constants, no &func.
 # Omitting -fPIC enables general use of r10.
-tc.arm-lzma.gcc     += -march=armv4
-tc.arm-lzma.gcc     += -Os
-tc.arm-lzma.gcc     += -ffunction-sections
-tc.arm-lzma.gcc     += -I$(UPX_LZMADIR)
-tc.arm-lzma.gcc     += -I$(top_srcdir)/src
+$c += -march=armv4
+$c += -Os -fomit-frame-pointer
+$c += -fno-unit-at-a-time
+$c += -ffunction-sections
+$c += -fwrapv
+$c += -I$(UPX_LZMADIR)
+$c += -I$(top_srcdir)/src
 
 lzma_d_c%.S : lzma_d_c.c
 	$(call tc,gcc) $(PP_FLAGS) -S $< -o tmp/$T.s
diff --git a/src/stub/src/arch/arm/v4t/Makefile.extra b/src/stub/src/arch/arm/v4t/Makefile.extra
index f530a851..1ac036b7 100644
--- a/src/stub/src/arch/arm/v4t/Makefile.extra
+++ b/src/stub/src/arch/arm/v4t/Makefile.extra
@@ -24,18 +24,21 @@ include $(top_srcdir)/src/stub/Makefile
 
 
 # /***********************************************************************
-# // arm-lzma
+# // method-lzma
 # ************************************************************************/
 
-lzma_d_c%.S : tc_list = arm-lzma arm-linux.elf default
+lzma_d_c%.S : tc_list = method-lzma arm-linux.elf default
 lzma_d_c%.S : tc_bfdname = elf32-littlearm
 
-tc.arm-lzma.gcc      = $(tc.arm-linux.elf.gcc)
-tc.arm-lzma.gcc     += -march=armv4t -mthumb
-tc.arm-lzma.gcc     += -Os
-tc.arm-lzma.gcc     += -ffunction-sections
-tc.arm-lzma.gcc     += -I$(UPX_LZMADIR)
-tc.arm-lzma.gcc     += -I$(top_srcdir)/src
+c := tc.method-lzma.gcc
+$c  = $(tc.arm-linux.elf.gcc)
+$c += -march=armv4t -mthumb
+$c += -Os -fomit-frame-pointer
+$c += -fno-unit-at-a-time
+$c += -ffunction-sections
+$c += -fwrapv
+$c += -I$(UPX_LZMADIR)
+$c += -I$(top_srcdir)/src
 
 lzma_d_c%.S : lzma_d_c.c
 	$(call tc,gcc) $(PP_FLAGS) -S $< -o tmp/$T.s
diff --git a/src/stub/src/arch/arm/v4t/lzma_d_cf.S b/src/stub/src/arch/arm/v4t/lzma_d_cf.S
index 640dd5fa..8d63d31d 100644
--- a/src/stub/src/arch/arm/v4t/lzma_d_cf.S
+++ b/src/stub/src/arch/arm/v4t/lzma_d_cf.S
@@ -1004,9 +1004,9 @@
 	ldr	r0, [sp, #28]
 	ldr	r2, [sp, #148]
 	cmp	r0, r2
-	bcs	.LfCB1171
+	bcs	.LfCB1173
 	b	.Lf22	@long jump
-.LfCB1171:
+.LfCB1173:
 .Lf141:
 	ldr	r3, .Lf175
 	cmp	r1, r3
diff --git a/src/stub/src/arch/arm/v4t/lzma_d_cs.S b/src/stub/src/arch/arm/v4t/lzma_d_cs.S
index 71ff4f0e..1ad9d3dc 100644
--- a/src/stub/src/arch/arm/v4t/lzma_d_cs.S
+++ b/src/stub/src/arch/arm/v4t/lzma_d_cs.S
@@ -1004,9 +1004,9 @@
 	ldr	r0, [sp, #28]
 	ldr	r2, [sp, #148]
 	cmp	r0, r2
-	bcs	.LsCB1171
+	bcs	.LsCB1173
 	b	.Ls22	@long jump
-.LsCB1171:
+.LsCB1173:
 .Ls141:
 	ldr	r3, .Ls175
 	cmp	r1, r3
diff --git a/src/stub/src/arch/i386/Makefile.extra b/src/stub/src/arch/i386/Makefile.extra
index e6f3376d..5784e9f4 100644
--- a/src/stub/src/arch/i386/Makefile.extra
+++ b/src/stub/src/arch/i386/Makefile.extra
@@ -24,16 +24,19 @@ include $(top_srcdir)/src/stub/Makefile
 
 
 # /***********************************************************************
-# // i386-lzma
+# // method-lzma
 # ************************************************************************/
 
-lzma_d_c%.S : tc_list = i386-lzma i386-linux.elf arch-i386 default
+lzma_d_c%.S : tc_list = method-lzma i386-linux.elf arch-i386 default
 lzma_d_c%.S : tc_bfdname = elf32-i386
 
-tc.i386-lzma.gcc      = $(tc.i386-linux.elf.gcc)
-tc.i386-lzma.gcc     += -ffunction-sections
-tc.i386-lzma.gcc     += -I$(UPX_LZMADIR)
-tc.i386-lzma.gcc     += -I$(top_srcdir)/src
+c := tc.method-lzma.gcc
+$c  = $(tc.i386-linux.elf.gcc)
+$c += -fno-unit-at-a-time
+$c += -ffunction-sections
+$c += -fwrapv
+$c += -I$(UPX_LZMADIR)
+$c += -I$(top_srcdir)/src
 
 lzma_d_c%.S : lzma_d_c.c
 	$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o
diff --git a/src/stub/src/arch/m68k/m68000/Makefile.extra b/src/stub/src/arch/m68k/m68000/Makefile.extra
index b4e6ec6d..16ddba2b 100644
--- a/src/stub/src/arch/m68k/m68000/Makefile.extra
+++ b/src/stub/src/arch/m68k/m68000/Makefile.extra
@@ -24,21 +24,23 @@ include $(top_srcdir)/src/stub/Makefile
 
 
 # /***********************************************************************
-# // m68k-lzma
+# // method-lzma
 # ************************************************************************/
 
-lzma_d_c%.S : tc_list = m68k-lzma default
+lzma_d_c%.S : tc_list = method-lzma default
 lzma_d_c%.S : tc_bfdname = elf32-m68k
 
-tc.m68k-lzma.gcc      = $(tc.m68k-atari.tos.gcc)
+c := tc.method-lzma.gcc
+$c  = $(tc.m68k-atari.tos.gcc)
 # FIXME / TODO: we still generate references to __mulsi3
-##tc.m68k-lzma.gcc     += -m68020
-##tc.m68k-lzma.gcc     += -mshort -D_LZMA_UINT32_IS_ULONG
-tc.m68k-lzma.gcc     += -Os -fomit-frame-pointer
-tc.m68k-lzma.gcc     += -fwrapv
-tc.m68k-lzma.gcc     += -ffunction-sections
-tc.m68k-lzma.gcc     += -I$(UPX_LZMADIR)
-tc.m68k-lzma.gcc     += -I$(top_srcdir)/src
+##$c += -m68020
+##$c += -mshort -D_LZMA_UINT32_IS_ULONG
+$c += -Os -fomit-frame-pointer
+$c += -fno-unit-at-a-time
+$c += -ffunction-sections
+$c += -fwrapv
+$c += -I$(UPX_LZMADIR)
+$c += -I$(top_srcdir)/src
 
 lzma_d_c%.S : lzma_d_c.c
 	$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o
diff --git a/src/stub/src/arch/m68k/m68020/Makefile.extra b/src/stub/src/arch/m68k/m68020/Makefile.extra
index 63bb4226..eef0fb3c 100644
--- a/src/stub/src/arch/m68k/m68020/Makefile.extra
+++ b/src/stub/src/arch/m68k/m68020/Makefile.extra
@@ -24,19 +24,21 @@ include $(top_srcdir)/src/stub/Makefile
 
 
 # /***********************************************************************
-# // m68k-lzma
+# // method-lzma
 # ************************************************************************/
 
-lzma_d_c%.S : tc_list = m68k-lzma default
+lzma_d_c%.S : tc_list = method-lzma default
 lzma_d_c%.S : tc_bfdname = elf32-m68k
 
-tc.m68k-lzma.gcc      = $(tc.m68k-atari.tos.gcc)
-tc.m68k-lzma.gcc     += -m68020-60
-tc.m68k-lzma.gcc     += -Os -fomit-frame-pointer
-tc.m68k-lzma.gcc     += -fwrapv
-tc.m68k-lzma.gcc     += -ffunction-sections
-tc.m68k-lzma.gcc     += -I$(UPX_LZMADIR)
-tc.m68k-lzma.gcc     += -I$(top_srcdir)/src
+c := tc.method-lzma.gcc
+$c  = $(tc.m68k-atari.tos.gcc)
+$c += -m68020-60
+$c += -Os -fomit-frame-pointer
+$c += -fno-unit-at-a-time
+$c += -ffunction-sections
+$c += -fwrapv
+$c += -I$(UPX_LZMADIR)
+$c += -I$(top_srcdir)/src
 
 lzma_d_c%.S : lzma_d_c.c
 	$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o
diff --git a/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra b/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
index dd0115eb..7d7d2dfb 100644
--- a/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
+++ b/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
@@ -24,18 +24,21 @@ include $(top_srcdir)/src/stub/Makefile
 
 
 # /***********************************************************************
-# // mipsel.r3000-lzma
+# // method-lzma
 # ************************************************************************/
 
-lzma_d_c%.S : tc_list = mipsel-lzma mipsel.r3000-ps1 default
+lzma_d_c%.S : tc_list = method-lzma mipsel.r3000-ps1 default
 lzma_d_c%.S : tc_bfdname = elf32-littlemips
 
-tc.mipsel-lzma.gcc      = $(tc.mipsel.r3000-ps1.gcc)
-tc.mipsel-lzma.gcc     += -pie -fPIC -mabi=eabi
-tc.mipsel-lzma.gcc     += -Os -fomit-frame-pointer
-tc.mipsel-lzma.gcc     += -ffunction-sections
-tc.mipsel-lzma.gcc     += -I$(UPX_LZMADIR)
-tc.mipsel-lzma.gcc     += -I$(top_srcdir)/src
+c := tc.method-lzma.gcc
+$c  = $(tc.mipsel.r3000-ps1.gcc)
+$c += -pie -fPIC
+$c += -Os -fomit-frame-pointer
+$c += -fno-unit-at-a-time
+$c += -ffunction-sections
+##$c += -fwrapv
+$c += -I$(UPX_LZMADIR)
+$c += -I$(top_srcdir)/src
 
 lzma_d_c%.S : lzma_d_c.c
 	$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o
diff --git a/src/stub/src/arch/powerpc/32/Makefile.extra b/src/stub/src/arch/powerpc/32/Makefile.extra
index 4fe6f48e..cc0efda8 100644
--- a/src/stub/src/arch/powerpc/32/Makefile.extra
+++ b/src/stub/src/arch/powerpc/32/Makefile.extra
@@ -24,18 +24,21 @@ include $(top_srcdir)/src/stub/Makefile
 
 
 # /***********************************************************************
-# // powerpc-lzma
+# // method-lzma
 # ************************************************************************/
 
-lzma_d_c%.S : tc_list = powerpc-lzma powerpc-linux.elf default
+lzma_d_c%.S : tc_list = method-lzma powerpc-linux.elf default
 lzma_d_c%.S : tc_bfdname = elf32-powerpc
 
-tc.powerpc-lzma.gcc      = $(tc.powerpc-linux.elf.gcc)
-tc.powerpc-lzma.gcc     += -mcpu=405 -fPIC
-tc.powerpc-lzma.gcc     += -Os
-tc.powerpc-lzma.gcc     += -ffunction-sections
-tc.powerpc-lzma.gcc     += -I$(UPX_LZMADIR)
-tc.powerpc-lzma.gcc     += -I$(top_srcdir)/src
+c := tc.method-lzma.gcc
+$c  = $(tc.powerpc-linux.elf.gcc)
+$c += -mcpu=405 -fPIC
+$c += -Os -fomit-frame-pointer
+$c += -fno-unit-at-a-time
+$c += -ffunction-sections
+$c += -fwrapv
+$c += -I$(UPX_LZMADIR)
+$c += -I$(top_srcdir)/src
 
 lzma_d_c%.S : lzma_d_c.c
 	$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o