diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog
index 34f5ef7c0acb..7375dbea33b3 100644
--- a/gnattools/ChangeLog
+++ b/gnattools/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-13  Arnaud Charlet  <charlet@adacore.com>
+
+	PR ada/31808
+	* Makefile.in (gnattools-cross): Do not build vxaddr2line
+
 2008-04-05  Arnaud Charlet  <charlet@adacore.com>
 
 	* Makefile.in: Remove handling of gnatbl.
diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in
index eb90a9fd09f2..4c50d6e1cce2 100644
--- a/gnattools/Makefile.in
+++ b/gnattools/Makefile.in
@@ -232,11 +232,6 @@ gnattools-cross: $(GCC_DIR)/stamp-tools
 	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
 	  $(TOOLS_FLAGS_TO_PASS_CROSS) \
 	  $(GNATTOOLS2_FILES)
-	# gnattools4 (cross only)
-	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
-	  $(TOOLS_FLAGS_TO_PASS_CROSS) \
-	  top_buildir=../../.. \
-           ../../vxaddr2line$(exeext)
 	# Rename cross tools to where the GCC makefile wants them when
 	# installing.  FIXME: installation should be done elsewhere.
 	if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \