5 files changed, 6 insertions, 10 deletions
diff --git a/src/arch/arduino-nano-168/Makefile.inc b/src/arch/arduino-nano-168/Makefile.inc
index 4330d97..17b76e2 100644
--- a/src/arch/arduino-nano-168/Makefile.inc
+++ b/src/arch/arduino-nano-168/Makefile.inc
@@ -21,8 +21,7 @@ NM = avr-nm
 OBJCOPY = avr-objcopy
 OBJDUMP = avr-objdump
 
-# On each function call, the 2-Byte return address is pushed onto the stack
-ARCH_CALL_COST = 2
+ARCH_SHORTNAME = avr
 
 ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler avr-g++ -p . --Xcompiler
diff --git a/src/arch/arduino-nano/Makefile.inc b/src/arch/arduino-nano/Makefile.inc
index 28bbead..7933ef2 100644
--- a/src/arch/arduino-nano/Makefile.inc
+++ b/src/arch/arduino-nano/Makefile.inc
@@ -21,8 +21,7 @@ NM = avr-nm
 OBJCOPY = avr-objcopy
 OBJDUMP = avr-objdump
 
-# On each function call, the 2-Byte return address is pushed onto the stack
-ARCH_CALL_COST = 2
+ARCH_SHORTNAME = avr
 
 ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler avr-g++ -p . --Xcompiler
diff --git a/src/arch/blinkenrocket/Makefile.inc b/src/arch/blinkenrocket/Makefile.inc
index f2a4d68..b123e32 100644
--- a/src/arch/blinkenrocket/Makefile.inc
+++ b/src/arch/blinkenrocket/Makefile.inc
@@ -12,7 +12,8 @@ CXX = avr-g++
 NM = avr-nm
 OBJCOPY = avr-objcopy
 OBJDUMP = avr-objdump
-ARCH_CALL_COST = 4
+
+ARCH_SHORTNAME = avr
 
 ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler avr-g++ -p . --Xcompiler
diff --git a/src/arch/msp430fr5969lp/Makefile.inc b/src/arch/msp430fr5969lp/Makefile.inc
index b2c0231..1ea1c05 100644
--- a/src/arch/msp430fr5969lp/Makefile.inc
+++ b/src/arch/msp430fr5969lp/Makefile.inc
@@ -16,9 +16,7 @@ CXX = /opt/msp430/ti/gcc/bin/msp430-elf-g++
 OBJCOPY = /opt/msp430/ti/gcc/bin/msp430-elf-objcopy
 OBJDUMP = /opt/msp430/ti/gcc/bin/msp430-elf-objdump
 
-# For each function call, the 4-Byte (20 bits at 2-Byte alignment) return
-# address is pushed onto the stack.
-ARCH_CALL_COST = 4
+ARCH_SHORTNAME = msp430
 
 CXX_TARGETS += src/arch/msp430fr5969lp/arch.cc
 
diff --git a/src/arch/posix/Makefile.inc b/src/arch/posix/Makefile.inc
index e901aeb..ec34626 100644
--- a/src/arch/posix/Makefile.inc
+++ b/src/arch/posix/Makefile.inc
@@ -6,8 +6,7 @@ CC = gcc
 CXX = g++
 OBJDUMP = objdump
 
-# For each function call, the 8-Byte return address is pushed onto the stack.
-ARCH_CALL_COST = 8
+ARCH_SHORTNAME = x64
 
 ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 -p . --Xcompiler