diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 039274ea61..aaa0d007f7 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -10,6 +10,7 @@ CXX        = $(CROSS_COMPILE)g++
 LD_LTO     = $(CROSS_COMPILE)ld
 endif
 CPP        = $(CC) -E
+ADDR2LINE  = $(CROSS_COMPILE)addr2line
 AR         = $(CROSS_COMPILE)ar
 RANLIB     = $(CROSS_COMPILE)ranlib
 NM         = $(CROSS_COMPILE)nm
diff --git a/config/SunOS.mk b/config/SunOS.mk
index 0fe5f45590..f1088e3833 100644
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -3,6 +3,7 @@ LD         = $(CROSS_COMPILE)gld
 CC         = $(CROSS_COMPILE)gcc
 CPP        = $(CROSS_COMPILE)gcc -E
 CXX        = $(CROSS_COMPILE)g++
+ADDR2LINE  = $(CROSS_COMPILE)gaddr2line
 AR         = $(CROSS_COMPILE)gar
 RANLIB     = $(CROSS_COMPILE)granlib
 NM         = $(CROSS_COMPILE)gnm
diff --git a/xen/Makefile b/xen/Makefile
index 18a4f7e101..ad9bfc2506 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -55,7 +55,7 @@ export TARGET_ARCH     := $(shell echo $(XEN_TARGET_ARCH) | \
 # Allow someone to change their config file
 export KCONFIG_CONFIG ?= .config
 
-export CC CXX LD NM OBJCOPY OBJDUMP
+export CC CXX LD NM OBJCOPY OBJDUMP ADDR2LINE
 
 export TARGET := xen