summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-06-15 22:45:17 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-06-15 22:45:17 +0000
commitecbbd9689b9dd1c804792c3e163ca5cbb68d9cb3 (patch)
tree7ea31ded3784e1d4e7597fbdad22b1f0c0b29c7c /cpukit
parent2010-06-15 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-ecbbd9689b9dd1c804792c3e163ca5cbb68d9cb3.tar.bz2
2010-06-15 Joel Sherrill <joel.sherrill@oarcorp.com>
PR 1561/cpukit * configure.ac, score/cpu/Makefile.am: Merge SPARC64 port.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/configure.ac1
-rw-r--r--cpukit/score/cpu/Makefile.am1
3 files changed, 7 insertions, 0 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index ca0e5bb27f..36488beed1 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,10 @@
2010-06-15 Joel Sherrill <joel.sherrill@oarcorp.com>
+ PR 1561/cpukit
+ * configure.ac, score/cpu/Makefile.am: Merge SPARC64 port.
+
+2010-06-15 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* posix/src/psignal.c: Formatting.
2010-06-15 Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index f7b59ecd2e..fc2964c6be 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -313,6 +313,7 @@ score/cpu/nios2/Makefile
score/cpu/powerpc/Makefile
score/cpu/sh/Makefile
score/cpu/sparc/Makefile
+score/cpu/sparc64/Makefile
score/cpu/no_cpu/Makefile
posix/Makefile
itron/Makefile
diff --git a/cpukit/score/cpu/Makefile.am b/cpukit/score/cpu/Makefile.am
index 973f2e8b4e..569afb8cd5 100644
--- a/cpukit/score/cpu/Makefile.am
+++ b/cpukit/score/cpu/Makefile.am
@@ -20,6 +20,7 @@ DIST_SUBDIRS += no_cpu
DIST_SUBDIRS += powerpc
DIST_SUBDIRS += sh
DIST_SUBDIRS += sparc
+DIST_SUBDIRS += sparc64
include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/local.am