diff --git a/ChangeLog b/ChangeLog
index d36033a..2ff7c3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-24  Joe Seymour  <jseymour@codesourcery.com>
+
+	* config.sub (hexagon): Set default operating system to elf.
+	* testsuite/config-sub.data: Change "hexagon" mapping to
+	hexagon-unknown-elf.
+
 2012-04-18  Joel Brobecker  <brobecker@adacore.com>
 
 	* config.sub (*-lynx*178, *-lynx*5): New.
diff --git a/config.sub b/config.sub
index 59bb593..6205f84 100755
--- a/config.sub
+++ b/config.sub
@@ -1543,6 +1543,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index ee0890c..4311df9 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -53,7 +53,7 @@ fido-elf			fido-unknown-elf
 fido				fido-unknown-none
 frv-linux			frv-unknown-linux-gnu
 hexagon-linux			hexagon-unknown-linux-gnu
-hexagon				hexagon-unknown-none
+hexagon				hexagon-unknown-elf
 i386-aros			i386-pc-aros
 i386-drops1.0			i386-pc-drops1.0
 i386-elf			i386-pc-elf