Index: bfd/config.bfd
===================================================================
RCS file: /cvs/src/src/bfd/config.bfd,v
retrieving revision 1.74
diff -c -r1.74 config.bfd
*** config.bfd	2001/12/08 03:45:49	1.74
--- config.bfd	2001/12/13 17:54:10
***************
*** 113,119 ****
      targ_selvecs=bfd_elf32_bigarc_vec
      ;;
  
!   arm-*-netbsd* | arm-*-openbsd*)
      targ_defvec=armnetbsd_vec
      targ_underscore=yes
      ;;
--- 113,123 ----
      targ_selvecs=bfd_elf32_bigarc_vec
      ;;
  
!   arm-*-netbsdelf*)
!     targ_defvec=bfd_elf32_littlearm_vec
!     targ_selvecs="bfd_elf32_bigarm_vec armnetbsd_vec"
!     ;;
!   arm-*-netbsdaout* | arm-*-netbsd* | arm-*-openbsd*)
      targ_defvec=armnetbsd_vec
      targ_underscore=yes
      ;;
Index: bfd/configure.in
===================================================================
RCS file: /cvs/src/src/bfd/configure.in,v
retrieving revision 1.72
diff -c -r1.72 configure.in
*** configure.in	2001/12/13 11:09:33	1.72
--- configure.in	2001/12/13 17:54:18
***************
*** 165,170 ****
--- 165,171 ----
    alpha*-*-netbsd*)	COREFILE=netbsd-core.lo ;;
    alpha*-*-*)		COREFILE=osf-core.lo ;;
    arm-*-freebsd*)	COREFILE='' ;;
+   arm-*-netbsd*)	COREFILE=netbsd-core.lo ;;
    arm-*-riscix)		COREFILE=trad-core.lo ;;
    hppa*-*-hpux*)	COREFILE=hpux-core.lo ;;
    hppa*-*-hiux*)	COREFILE=hpux-core.lo ;;
Index: gas/configure.in
===================================================================
RCS file: /cvs/src/src/gas/configure.in,v
retrieving revision 1.85
diff -c -r1.85 configure.in
*** configure.in	2001/12/08 03:45:55	1.85
--- configure.in	2001/12/13 17:54:29
***************
*** 193,199 ****
        arm-*-linux*aout*)	        fmt=aout em=linux ;;
        arm*-*-linux-gnu* | arm*-*-uclinux*)	
  					fmt=elf  em=linux ;;
!       arm-*-netbsd* | arm-*-openbsd*)   fmt=aout em=nbsd ;;
        arm-*-oabi | thumb-*-oabi)        fmt=elf ;;
        arm-epoc-pe | thumb-epoc-pe)      fmt=coff em=epoc-pe ;;
        arm-*-wince)			fmt=coff em=wince-pe ;;
--- 193,201 ----
        arm-*-linux*aout*)	        fmt=aout em=linux ;;
        arm*-*-linux-gnu* | arm*-*-uclinux*)	
  					fmt=elf  em=linux ;;
!       arm-*-netbsdelf*)                 fmt=elf  em=nbsd ;;
!       arm-*-netbsdaout* | arm-*-netbsd* | arm-*-openbsd*)
!                                         fmt=aout em=nbsd ;;
        arm-*-oabi | thumb-*-oabi)        fmt=elf ;;
        arm-epoc-pe | thumb-epoc-pe)      fmt=coff em=epoc-pe ;;
        arm-*-wince)			fmt=coff em=wince-pe ;;
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.78
diff -c -r1.78 Makefile.am
*** Makefile.am	2001/12/08 03:45:58	1.78
--- Makefile.am	2001/12/13 17:54:32
***************
*** 118,123 ****
--- 118,124 ----
  	earmcoff.o \
  	earmelf.o \
  	earmelf_linux.o \
+ 	earmelf_nbsd.o \
  	earmelf_oabi.o \
  	earmnbsd.o \
  	earmpe.o \
***************
*** 357,362 ****
--- 358,367 ----
    $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/armelf.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} armelf_linux "$(tdir_armelf_linux)"
+ earmelf_nbsd.c: $(srcdir)/emulparams/armelf_nbsd.sh \
+   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/armelf.em \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 	${GENSCRIPTS} armelf_nbsd "$(tdir_armelf_nbsd)"
  earmaoutb.c:	$(srcdir)/emulparams/armaoutb.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} armaoutb "$(tdir_armaoutb)"
Index: ld/configure.tgt
===================================================================
RCS file: /cvs/src/src/ld/configure.tgt,v
retrieving revision 1.70
diff -c -r1.70 configure.tgt
*** configure.tgt	2001/12/08 03:45:58	1.70
--- configure.tgt	2001/12/13 17:54:35
***************
*** 196,202 ****
  arm-*-coff)		targ_emul=armcoff ;;
  arm-*-vxworks)		targ_emul=armcoff ;;
  arm-*-freebsd*)		targ_emul=armelf ;;
! arm-*-netbsd*)		targ_emul=armnbsd ;;
  arm-*-openbsd*)		targ_emul=armnbsd ;;
  arm-*-rtems*)		targ_emul=armelf ;;
  arm-*-elf)		targ_emul=armelf ;;
--- 196,205 ----
  arm-*-coff)		targ_emul=armcoff ;;
  arm-*-vxworks)		targ_emul=armcoff ;;
  arm-*-freebsd*)		targ_emul=armelf ;;
! arm-*-netbsdelf*)	targ_emul=armelf_nbsd;
! 			targ_extra_emuls="armelf armnbsd" ;;
! arm-*-netbsd*)		targ_emul=armnbsd;
! 			targ_extra_emuls="armelf armelf_nbsd"  ;;
  arm-*-openbsd*)		targ_emul=armnbsd ;;
  arm-*-rtems*)		targ_emul=armelf ;;
  arm-*-elf)		targ_emul=armelf ;;
Index: ld/emulparams/armelf_nbsd.sh
===================================================================
*** /dev/null	Tue Aug 21 17:33:51 2001
--- armelf_nbsd.sh	Tue Dec 11 09:41:34 2001
***************
*** 0 ****
--- 1,16 ----
+ ARCH=arm
+ SCRIPT_NAME=elf
+ OUTPUT_FORMAT="elf32-littlearm"
+ BIG_OUTPUT_FORMAT="elf32-bigarm"
+ LITTLE_OUTPUT_FORMAT="elf32-littlearm"
+ MAXPAGESIZE=0x8000
+ TEMPLATE_NAME=elf32
+ EXTRA_EM_FILE=armelf
+ GENERATE_SHLIB_SCRIPT=yes
+ 
+ DATA_START_SYMBOLS='__data_start = . ;';
+ OTHER_TEXT_SECTIONS='*(.glue_7t) *(.glue_7)'
+ OTHER_BSS_SYMBOLS='__bss_start__ = .;'
+ OTHER_BSS_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;'
+ 
+ TEXT_START_ADDR=0x00008000