diff -Nur --exclude .cvsignore --exclude CVS --exclude mkinstalldirs -X rtems-cvs/.cvsignore -x nios2 -x nios2_eb2_1.cfg rtems-cvs.orig/c/TOOL_TARGETS rtems-cvs/c/TOOL_TARGETS
--- rtems-cvs.orig/c/TOOL_TARGETS	2004-09-29 22:41:55.000000000 +0200
+++ rtems-cvs/c/TOOL_TARGETS	2006-01-17 11:03:43.000000000 +0100
@@ -28,6 +28,12 @@
 	NOTE: Little endian configuration is not in all tools and 
 	      is untested for RTEMS itself.
 
+nios2: 
+    nios2-elf           ELF     Little endian
+
+    NOTE: Currently there is no native nios2-rtems toolchain;
+      Altera's nios2-elf-tools can be used with wrapper scripts.
+
 powerpc:
 	powerpc-rtems		ELF
 	powerpcle-rtems		ELF		Little endian
diff -Nur --exclude .cvsignore --exclude CVS --exclude mkinstalldirs -X rtems-cvs/.cvsignore -x nios2 -x nios2_eb2_1.cfg rtems-cvs.orig/c/src/aclocal/rtems-cpu-subdirs.m4 rtems-cvs/c/src/aclocal/rtems-cpu-subdirs.m4
--- rtems-cvs.orig/c/src/aclocal/rtems-cpu-subdirs.m4	2004-09-29 22:36:20.000000000 +0200
+++ rtems-cvs/c/src/aclocal/rtems-cpu-subdirs.m4	2005-12-04 15:42:20.000000000 +0100
@@ -18,6 +18,7 @@
 _RTEMS_CPU_SUBDIR([i386],[$1]);;
 _RTEMS_CPU_SUBDIR([m68k],[$1]);;
 _RTEMS_CPU_SUBDIR([mips],[$1]);;
+_RTEMS_CPU_SUBDIR([nios2],[$1]);;
 _RTEMS_CPU_SUBDIR([no_cpu],[$1]);;
 _RTEMS_CPU_SUBDIR([or32],[$1]);;
 _RTEMS_CPU_SUBDIR([powerpc],[$1]);;
diff -Nur --exclude .cvsignore --exclude CVS --exclude mkinstalldirs -X rtems-cvs/.cvsignore -x nios2 -x nios2_eb2_1.cfg rtems-cvs.orig/config-ml.in rtems-cvs/config-ml.in
--- rtems-cvs.orig/config-ml.in	2006-01-17 16:39:36.000000000 +0100
+++ rtems-cvs/config-ml.in	2006-01-13 18:05:23.000000000 +0100
@@ -226,6 +226,17 @@
 	  done
 	;;
 
+nios2-*-rtems*)
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *stack-check* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	;;
+
 sh-*-rtems*)
 	  old_multidirs=${multidirs}
 	  multidirs=""
diff -Nur --exclude .cvsignore --exclude CVS --exclude mkinstalldirs -X rtems-cvs/.cvsignore -x nios2 -x nios2_eb2_1.cfg rtems-cvs.orig/cpukit/configure.ac rtems-cvs/cpukit/configure.ac
--- rtems-cvs.orig/cpukit/configure.ac	2005-11-21 10:00:35.000000000 +0100
+++ rtems-cvs/cpukit/configure.ac	2005-12-25 19:50:41.000000000 +0100
@@ -295,6 +295,7 @@
 score/cpu/i386/Makefile
 score/cpu/m68k/Makefile
 score/cpu/mips/Makefile
+score/cpu/nios2/Makefile
 score/cpu/powerpc/Makefile
 score/cpu/sh/Makefile
 score/cpu/sparc/Makefile
diff -Nur --exclude .cvsignore --exclude CVS --exclude mkinstalldirs -X rtems-cvs/.cvsignore -x nios2 -x nios2_eb2_1.cfg rtems-cvs.orig/cpukit/librpc/src/xdr/xdr_float.c rtems-cvs/cpukit/librpc/src/xdr/xdr_float.c
--- rtems-cvs.orig/cpukit/librpc/src/xdr/xdr_float.c	2004-09-29 22:34:01.000000000 +0200
+++ rtems-cvs/cpukit/librpc/src/xdr/xdr_float.c	2005-12-04 11:33:43.000000000 +0100
@@ -62,6 +62,7 @@
     defined(__i386__) || \
     defined(__m68k__) || defined(__mc68000__) || \
     defined(__mips__) || \
+    defined(__nios2__) || \
     defined(__ns32k__) || \
     defined(__sparc__) || \
     defined(__ppc__) || defined(__PPC__) || \
diff -Nur --exclude .cvsignore --exclude CVS --exclude mkinstalldirs -X rtems-cvs/.cvsignore -x nios2 -x nios2_eb2_1.cfg rtems-cvs.orig/cpukit/score/cpu/Makefile.am rtems-cvs/cpukit/score/cpu/Makefile.am
--- rtems-cvs.orig/cpukit/score/cpu/Makefile.am	2005-04-23 06:59:26.000000000 +0200
+++ rtems-cvs/cpukit/score/cpu/Makefile.am	2005-12-04 11:35:00.000000000 +0100
@@ -4,7 +4,7 @@
 
 SUBDIRS = @RTEMS_CPU@
 
-DIST_SUBDIRS = arm c4x h8300 i386 m68k mips no_cpu powerpc sh sparc \
+DIST_SUBDIRS = arm c4x h8300 i386 m68k mips nios2 no_cpu powerpc sh sparc \
     unix
 DIST_SUBDIRS += avr