From f98ce8b87cbbab00afa021fbe77ce1b9bed6ea69 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 1 Oct 2009 12:57:30 +0000
Subject: [PATCH] 2009-10-01	Joel Sherrill <joel.sherrill@oarcorp.com>

	* rtems/score/arm.h: Recognize ARMv6J as needed by arm1136 variants.
---
 cpukit/score/cpu/arm/ChangeLog         | 4 ++++
 cpukit/score/cpu/arm/rtems/score/arm.h | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog
index 481089a0d5..ba717ae081 100644
--- a/cpukit/score/cpu/arm/ChangeLog
+++ b/cpukit/score/cpu/arm/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-01	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* rtems/score/arm.h: Recognize ARMv6J as needed by arm1136 variants.
+
 2009-09-15	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Fix for inline asm in _CPU_Fatal_halt().
diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/rtems/score/arm.h
index e9a21baf7c..243630d182 100644
--- a/cpukit/score/cpu/arm/rtems/score/arm.h
+++ b/cpukit/score/cpu/arm/rtems/score/arm.h
@@ -50,6 +50,9 @@ extern "C" {
 #elif defined(__ARM_ARCH_5TE__)
 #  define CPU_MODEL_NAME  "ARMv5TE"
 
+#elif defined(__ARM_ARCH_6J__)
+#  define CPU_MODEL_NAME  "ARMv6J"
+
 #else
 #  error "Unsupported CPU Model"