diff --git a/ChangeLog b/ChangeLog
index dbe4966..0eb46cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-26  Olivier Hainque  <hainque@adacore.com>
+
+	* config.sub (leon, leon[3-9]): New CPUs.
+	* testsuite/config-sub.data: New tests for leon and leon3.
+
 2014-09-11  Palmer Dabbelt  <palmer.dabbelt@eecs.berkeley.edu>
 
 	* config.sub (riscv32, riscv64): New.
diff --git a/config.sub b/config.sub
index bba4efb..d4c8338 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2014-09-11'
+timestamp='2014-09-26'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -327,6 +327,9 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -774,6 +777,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 7249dc0..944382d 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -99,6 +99,10 @@ k1om				k1om-unknown-none
 k1om-linux			k1om-unknown-linux-gnu
 le32-nacl			le32-unknown-nacl
 le64-none			le64-unknown-none
+leon-elf			sparc-leon-elf
+leon3-elf			sparc-leon3-elf
+leon-wrs-vxworks		sparc-leon-vxworks
+leon3-vxworks			sparc-leon3-vxworks
 lm32-elf			lm32-unknown-elf
 lm32				lm32-unknown-none
 m32c-elf			m32c-unknown-elf