diff --git a/src/stub/src/arm.v4a-linux.elf-entry.S b/src/stub/src/arm.v4a-linux.elf-entry.S
index 59405e8d..596a8e2f 100644
--- a/src/stub/src/arm.v4a-linux.elf-entry.S
+++ b/src/stub/src/arm.v4a-linux.elf-entry.S
@@ -29,8 +29,8 @@
 *  <jreiser@users.sourceforge.net>
 */
 
-#define ARM_OLDABI 1
 NBPW= 4
+#define ARMEL_EABI4 1
 #include "arch/arm/v4a/macros.S"
 #define call bl
 
@@ -41,7 +41,6 @@ arg4 .req r3
 arg5 .req r4
 arg6 .req r5
 
-#define bkpt .long 0xe7f001f0  /* reserved instr; Linux GNU eabi breakpoint */
 sz_Elf32_Phdr =  8*NBPW
   p_vaddr = 2*NBPW
 sz_Elf32_Ehdr = 13*NBPW
diff --git a/src/stub/src/arm64-linux.elf-fold.S b/src/stub/src/arm64-linux.elf-fold.S
index da77d2ba..25b6d85b 100644
--- a/src/stub/src/arm64-linux.elf-fold.S
+++ b/src/stub/src/arm64-linux.elf-fold.S
@@ -30,7 +30,7 @@
 NBPW= 8
 #define call bl
 
-#define ARM_OLDABI 1
+#define ARMEL_EABI4 1
 #include "arch/arm64/v8/macros.S"
 
 sz_Ehdr= 8*NBPW
diff --git a/src/stub/src/armeb.v4a-linux.elf-entry.S b/src/stub/src/armeb.v4a-linux.elf-entry.S
index 7852f3e0..e07b7ff6 100644
--- a/src/stub/src/armeb.v4a-linux.elf-entry.S
+++ b/src/stub/src/armeb.v4a-linux.elf-entry.S
@@ -1,4 +1,3 @@
-#define ARM_OLDABI 1
 #include "arm.v4a-linux.elf-entry.S"
 
 /* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/armeb.v4a-linux.elf-fold.S b/src/stub/src/armeb.v4a-linux.elf-fold.S
index 164c357d..62fdee9c 100644
--- a/src/stub/src/armeb.v4a-linux.elf-fold.S
+++ b/src/stub/src/armeb.v4a-linux.elf-fold.S
@@ -27,7 +27,6 @@
 @  <jreiser@users.sourceforge.net>
 @
 
-#define ARM_OLDABI 1
 #define FILTER_ID 0x51  /* big-endian */
 #include "arm.v4a-linux.elf-fold.S"
 #undef FILTER_ID