summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/score/cpu/arm/ChangeLog7
-rw-r--r--cpukit/score/cpu/arm/rtems/score/arm.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog
index 4166c21c66..6a6eeb5249 100644
--- a/cpukit/score/cpu/arm/ChangeLog
+++ b/cpukit/score/cpu/arm/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-07 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ PR 1949/cpukit
+ PR 1950/cpukit
+ * rtems/score/arm.h: Select ARMv4 multilib implementation for
+ __ARM_ARCH_6J__.
+
2011-09-27 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1914/cpukit
diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/rtems/score/arm.h
index c0a7c8bb54..70b9618478 100644
--- a/cpukit/score/cpu/arm/rtems/score/arm.h
+++ b/cpukit/score/cpu/arm/rtems/score/arm.h
@@ -72,6 +72,7 @@ extern "C" {
#elif defined(__ARM_ARCH_6J__)
# define CPU_MODEL_NAME "ARMv6J"
+# define ARM_MULTILIB_ARCH_V4
#elif defined(__ARM_ARCH_6M__)
# define CPU_MODEL_NAME "ARMv6M"