2006-07-14 Nathan Sidwell <nathan@codesourcery.com>

	bfd/
	* config.bfd (sh-*-uclinux, sh[12]-*-uclinux): New stanza.

	gas/
	* configure.tgt (sh-*-uclinux, sh[12]-*-uclinux): Specify as elf.

	ld/
	* Makefile.am (ALL_EMULATIONS): Add eshelf_uclinux.o
	(eshelf_uclinux.c): New target.
	* Makefile.in: Rebuilt.
	* configure.tgt (sh-*-uclinux* | sh[12]-*-uclinux*): New stanza.
	* emulparams/shelf_uclinux.sh: New.

6 files changed, 35 insertions, 1 deletions

diff --git a/ChangeLog.csl b/ChangeLog.csl
index ef84c8c85a6..3e67bf32efd 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,18 @@
+2006-07-14  Nathan Sidwell  <nathan@codesourcery.com>
+
+	bfd/
+	* config.bfd (sh-*-uclinux, sh[12]-*-uclinux): New stanza.
+
+	gas/
+	* configure.tgt (sh-*-uclinux, sh[12]-*-uclinux): Specify as elf.
+
+	ld/
+	* Makefile.am (ALL_EMULATIONS): Add eshelf_uclinux.o
+	(eshelf_uclinux.c): New target.
+	* Makefile.in: Rebuilt.
+	* configure.tgt (sh-*-uclinux* | sh[12]-*-uclinux*): New stanza.
+	* emulparams/shelf_uclinux.sh: New.
+
 2006-07-12  Richard Sandiford  <richard@codesourcery.com>
 
 	Backport from mainline:
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 37dd03cee69..b820a15c4d4 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -1131,6 +1131,14 @@ case "${targ}" in
     targ_selvecs=bfd_elf32_shblin_vec
     ;;
 
+  sh-*-uclinux* | sh[12]-*-uclinux*)
+    targ_defvec=bfd_elf32_sh_vec
+    targ_selvecs="bfd_elf32_shblin_vec bfd_elf32_shlin_vec"
+#ifdef BFD64
+    targ_selvecs="${targ_selvecs} bfd_elf32_sh64lin_vec bfd_elf32_sh64blin_vec bfd_elf64_sh64lin_vec bfd_elf64_sh64blin_vec"
+#endif
+    ;;
+
 #ifdef BFD64
   sh5le-*-netbsd*)
     targ_defvec=bfd_elf32_sh64lnbsd_vec
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 6463631c739..220b0137792 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -323,7 +323,7 @@ case ${generic_target} in
   sh64*-*-netbsd*)			fmt=elf em=nbsd ;;
   sh*-*-netbsdelf*)			fmt=elf em=nbsd ;;
   sh*-*-symbianelf*)			fmt=elf endian=little ;;
-  sh-*-elf*)				fmt=elf ;;
+  sh-*-elf* | sh-*-uclinux* | sh[12]-*-uclinux*)	fmt=elf ;;
   sh-*-coff*)				fmt=coff ;;
   sh-*-nto*)				fmt=elf ;;
   sh-*-pe*)				fmt=coff em=pe bfd_gas=yes endian=little ;;
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 329927209bc..be46773e7c6 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -351,6 +351,7 @@ ALL_EMULATIONS = \
 	eshlelf_nbsd.o \
 	eshelf_nto.o \
 	eshlelf_nto.o \
+	eshelf_uclinux.o \
 	eshl.o \
 	eshlelf.o \
 	eshlsymbian.o \
@@ -1465,6 +1466,9 @@ eshlelf_nbsd.c: $(srcdir)/emulparams/shlelf_nbsd.sh \
 eshlelf_nto.c: $(srcdir)/emulparams/shlelf_nto.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} shlelf_nto "$(tdir_shlelf_nto)"
+eshelf_uclinux.c: $(srcdir)/emulparams/shelf_uclinux.sh \
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} shelf_uclinux "$(tdir_shelf_uclinux)"
 eshlelf.c: $(srcdir)/emulparams/shlelf.sh \
   $(srcdir)/emulparams/shelf.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 245f221d184..2b920594e2d 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -577,6 +577,7 @@ ALL_EMULATIONS = \
 	eshlelf_nbsd.o \
 	eshelf_nto.o \
 	eshlelf_nto.o \
+	eshelf_uclinux.o \
 	eshl.o \
 	eshlelf.o \
 	eshlsymbian.o \
@@ -2275,6 +2276,9 @@ eshlelf_nbsd.c: $(srcdir)/emulparams/shlelf_nbsd.sh \
 eshlelf_nto.c: $(srcdir)/emulparams/shlelf_nto.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} shlelf_nto "$(tdir_shlelf_nto)"
+eshelf_uclinux.c: $(srcdir)/emulparams/shelf_uclinux.sh \
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} shelf_uclinux "$(tdir_shelf_uclinux)"
 eshlelf.c: $(srcdir)/emulparams/shlelf.sh \
   $(srcdir)/emulparams/shelf.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 56e1ae47559..ce7b198f2bd 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -472,6 +472,9 @@ sh-*-rtemscoff*)	targ_emul=sh; targ_extra_emuls=shl ;;
 sh-*-elf* | sh[1234]*-*-elf | sh-*-rtems* | sh-*-kaos* | sh-*-vxworks)
 			targ_emul=shelf
 			targ_extra_emuls="shlelf sh shl" ;;
+sh-*-uclinux* | sh[12]-*-uclinux*)
+			targ_emul=shelf_uclinux
+			targ_extra_emuls="shelf shlelf sh shl" ;;
 sh-*-nto*)		targ_emul=shelf_nto
 			targ_extra_emuls=shlelf_nto ;;
 sh-*-pe)		targ_emul=shpe ;