This commit was manufactured by cvs2svn to create branch

'kseitz_interps-20020528-branch'.

Sprout from cagney_regbuf-20020515-branch 2002-06-12 21:19:43 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2002-05-28 20:06:27 UTC Marek Michalkiewicz <marekm@amelek.gda.pl> '2002-05-28  Marek Michalkiewicz  <marekm@amelek.gda.pl>':
    ChangeLog
    Makefile.in
    config-ml.in
    config.guess
    config.sub
    config/ChangeLog
    config/acinclude.m4
    config/mh-apollo68
    config/mh-dgux
    config/mh-dgux386
    configure
    configure.in
    include/ChangeLog
    include/bfdlink.h
    include/dis-asm.h
    include/elf/ChangeLog
    include/elf/common.h
    include/elf/dlx.h
    include/elf/i386.h
    include/elf/ia64.h
    include/gdb/ChangeLog
    include/gdb/sim-d10v.h
    include/opcode/ChangeLog
    include/opcode/dlx.h
    include/opcode/h8300.h
    include/opcode/ia64.h
    include/opcode/mips.h
    include/opcode/sparc.h
Cherrypick from master 2002-06-18 21:15:57 UTC Dave Brolley <brolley@redhat.com> '2002-06-18  Dave Brolley  <brolley@redhat.com>':
    include/elf/frv.h
    include/gdb/sim-arm.h
Delete:
    include/sim-d10v.h

30 files changed, 559 insertions, 481 deletions

diff --git a/ChangeLog b/ChangeLog
index 1f914904c..0969e9c1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2002-05-28  Marek Michalkiewicz  <marekm@amelek.gda.pl>
+
+	* configure.in (noconfigdirs): Don't compile libiberty, libstdcxx
+	and libgcj for AVR.
+
+2002-05-28  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* config.sub: Add DLX target.
+
+2002-05-22  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.guess: Update to 2002-05-22 version.
+	* config.sub: Likewise.
+
+2002-05-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* Makefile.in: Allow for PWDCMD to override hardcoded pwd.
+	* config-ml.in: Likewise.
+	* configure: Likewise.
+	* configure.in: Likewise.
+
+	config:
+	* acinclude.m4: Allow for PWDCMD to override hardcoded pwd.
+
+2002-05-13  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* configure.in: Simplify makefile fragment collection.
+
+	* configure.in: Remove code to build emacs.
+
+	* configure.in : Remove --srcdir argument from targargs and buildargs
+	(it's always overridden in the Makefile anyway).  Rearrange a bit.
+
+	* configure: Move some logic to configure.in.
+	* configure.in: Move some logic from configure.
+
 2002-05-07  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* COPYING.LIBGLOSS: New file.
diff --git a/Makefile.in b/Makefile.in
index 12a69d3d3..72bd8b078 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001 Free Software Foundation
+#   1999, 2000, 2001, 2002 Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -65,6 +65,12 @@ GDB_NLM_DEPS =
 
 SHELL = /bin/sh
 
+# pwd command to use.  Allow user to override default by setting PWDCMD in
+# the environment to account for automounters.  The make variable must not
+# be called PWDCMD, otherwise the value set here is passed to make
+# subprocesses and overrides the setting from the user's environment.
+PWD = $${PWDCMD-pwd}
+
 # INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a
 # cygwin host.
 INSTALL_PROGRAM_ARGS =
@@ -984,8 +990,8 @@ DO_X = \
 .PHONY: $(DO_X)
 $(DO_X):
 	@target=`echo $@ | sed -e 's/^do-//'`; \
-	r=`pwd`; export r; \
-	s=`cd $(srcdir); pwd`; export s; \
+	r=`${PWD}`; export r; \
+	s=`cd $(srcdir); ${PWD}`; export s; \
 	$(SET_LIB_PATH) \
 	for i in $(SUBDIRS) -dummy-; do \
 	  if [ -f ./$$i/Makefile ]; then \
@@ -1011,8 +1017,8 @@ $(DO_X):
 	  else true; fi; \
 	done
 	@target=`echo $@ | sed -e 's/^do-//'`; \
-	r=`pwd`; export r; \
-	s=`cd $(srcdir); pwd`; export s; \
+	r=`${PWD}`; export r; \
+	s=`cd $(srcdir); ${PWD}`; export s; \
 	$(SET_LIB_PATH) \
 	for i in $(TARGET_CONFIGDIRS) -dummy-; do \
 	  if [ -f $(TARGET_SUBDIR)/$$i/Makefile ]; then \
@@ -1042,7 +1048,7 @@ dvi: do-dvi
 do-info: all-texinfo
 
 install-info: do-install-info dir.info
-	s=`cd $(srcdir); pwd`; export s; \
+	s=`cd $(srcdir); ${PWD}`; export s; \
 	if [ -f dir.info ] ; then \
 	  $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \
 	else true ; fi
@@ -1077,8 +1083,8 @@ realclean: maintainer-clean
 $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc:
 	@dir=`echo $@ | sed -e 's/clean-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) clean); \
 	else \
@@ -1090,8 +1096,8 @@ $(CLEAN_TARGET_MODULES):
 	@dir=`echo $@ | sed -e 's/clean-target-//'`; \
 	rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
 	if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \
 	else \
@@ -1164,7 +1170,7 @@ vault-install:
 .PHONY: install.all
 install.all: install-no-fixedincludes
 	@if [ -f ./gcc/Makefile ] ; then \
-		r=`pwd` ; export r ; \
+		r=`${PWD}` ; export r ; \
 		$(SET_LIB_PATH) \
 		(cd ./gcc; \
 		$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
@@ -1199,8 +1205,8 @@ gcc-no-fixedincludes:
 	  cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
 	  touch gcc/stmp-fixinc gcc/include/fixed; \
 	  rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd` ; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}` ; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd ./gcc; \
 	   $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
@@ -1214,8 +1220,8 @@ gcc-no-fixedincludes:
 $(ALL_BUILD_MODULES):
 	dir=`echo $@ | sed -e 's/all-build-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  (cd $(BUILD_SUBDIR)/$${dir} && $(MAKE) all); \
 	else \
 	  true; \
@@ -1233,8 +1239,8 @@ $(CONFIGURE_BUILD_MODULES):
 	elif echo " $(BUILD_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \
 	  if [ -d $(srcdir)/$${dir} ]; then \
 	    [ -d $(BUILD_SUBDIR)/$${dir} ] || mkdir $(BUILD_SUBDIR)/$${dir};\
-	    r=`pwd`; export r; \
-	    s=`cd $(srcdir); pwd`; export s; \
+	    r=`${PWD}`; export r; \
+	    s=`cd $(srcdir); ${PWD}`; export s; \
 	    AR="$(AR_FOR_BUILD)"; export AR; \
 	    AS="$(AS_FOR_BUILD)"; export AS; \
 	    CC="$(CC_FOR_BUILD)"; export CC; \
@@ -1318,8 +1324,8 @@ $(CONFIGURE_BUILD_MODULES):
 $(ALL_MODULES) all-gui all-libproc:
 	@dir=`echo $@ | sed -e 's/all-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) all); \
 	else \
@@ -1335,8 +1341,8 @@ $(NATIVE_CHECK_MODULES):
 	@if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
 	  dir=`echo $@ | sed -e 's/check-//'`; \
 	  if [ -f ./$${dir}/Makefile ] ; then \
-	    r=`pwd`; export r; \
-	    s=`cd $(srcdir); pwd`; export s; \
+	    r=`${PWD}`; export r; \
+	    s=`cd $(srcdir); ${PWD}`; export s; \
 	    $(SET_LIB_PATH) \
 	    (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
 	  else \
@@ -1347,8 +1353,8 @@ $(NATIVE_CHECK_MODULES):
 $(CROSS_CHECK_MODULES):
 	@dir=`echo $@ | sed -e 's/check-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
 	else \
@@ -1361,8 +1367,8 @@ $(CROSS_CHECK_MODULES):
 $(INSTALL_MODULES): installdirs
 	@dir=`echo $@ | sed -e 's/install-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
 	else \
@@ -1375,7 +1381,7 @@ $(INSTALL_MODULES): installdirs
 $(CONFIGURE_TARGET_MODULES):
 	@dir=`echo $@ | sed -e 's/configure-target-//'`; \
 	if [ -d $(TARGET_SUBDIR)/$${dir} ]; then \
-	  r=`pwd`; export r; \
+	  r=`${PWD}`; export r; \
 	  $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/$${dir}/tmpmulti.out 2> /dev/null; \
 	  if [ -s $(TARGET_SUBDIR)/$${dir}/tmpmulti.out ]; then \
 	    if [ -f $(TARGET_SUBDIR)/$${dir}/multilib.out ]; then \
@@ -1399,8 +1405,8 @@ $(CONFIGURE_TARGET_MODULES):
 	elif echo " $(TARGET_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \
 	  if [ -d $(srcdir)/$${dir} ]; then \
 	    [ -d $(TARGET_SUBDIR)/$${dir} ] || mkdir $(TARGET_SUBDIR)/$${dir};\
-	    r=`pwd`; export r; \
-	    s=`cd $(srcdir); pwd`; export s; \
+	    r=`${PWD}`; export r; \
+	    s=`cd $(srcdir); ${PWD}`; export s; \
 	    $(SET_LIB_PATH) \
 	    AR="$(AR_FOR_TARGET)"; export AR; \
 	    AS="$(AS_FOR_TARGET)"; export AS; \
@@ -1481,8 +1487,8 @@ $(CONFIGURE_TARGET_MODULES):
 $(ALL_TARGET_MODULES):
 	@dir=`echo $@ | sed -e 's/all-target-//'`; \
 	if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $(TARGET_SUBDIR)/$${dir}; \
 	    $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \
@@ -1496,8 +1502,8 @@ $(ALL_TARGET_MODULES):
 $(CHECK_TARGET_MODULES):
 	@dir=`echo $@ | sed -e 's/check-target-//'`; \
 	if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $(TARGET_SUBDIR)/$${dir}; \
 	    $(MAKE) $(TARGET_FLAGS_TO_PASS) check);\
@@ -1512,8 +1518,8 @@ $(CHECK_TARGET_MODULES):
 $(INSTALL_TARGET_MODULES): installdirs
 	@dir=`echo $@ | sed -e 's/install-target-//'`; \
 	if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $(TARGET_SUBDIR)/$${dir}; \
 	    $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \
@@ -1527,8 +1533,8 @@ $(INSTALL_TARGET_MODULES): installdirs
 $(ALL_X11_MODULES):
 	@dir=`echo $@ | sed -e 's/all-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $${dir}; \
 	   $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all); \
@@ -1542,8 +1548,8 @@ $(ALL_X11_MODULES):
 $(CHECK_X11_MODULES):
 	@dir=`echo $@ | sed -e 's/check-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $${dir}; \
 	   $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check); \
@@ -1557,8 +1563,8 @@ $(CHECK_X11_MODULES):
 $(INSTALL_X11_MODULES): installdirs
 	@dir=`echo $@ | sed -e 's/install-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $${dir}; \
 	   $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install); \
@@ -1570,8 +1576,8 @@ $(INSTALL_X11_MODULES): installdirs
 .PHONY: all-gcc
 all-gcc:
 	@if [ -f ./gcc/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
 	else \
@@ -1590,13 +1596,13 @@ all-gcc:
 #
 .PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean
 bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean: all-bootstrap
-	@r=`pwd`; export r; \
-	s=`cd $(srcdir); pwd`; export s; \
+	@r=`${PWD}`; export r; \
+	s=`cd $(srcdir); ${PWD}`; export s; \
 	$(SET_LIB_PATH) \
 	echo "Bootstrapping the compiler"; \
 	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
-	@r=`pwd`; export r; \
-	s=`cd $(srcdir); pwd`; export s; \
+	@r=`${PWD}`; export r; \
+	s=`cd $(srcdir); ${PWD}`; export s; \
 	case "$@" in \
 	  *bootstrap4-lean ) \
 			msg="Comparing stage3 and stage4 of the compiler"; \
@@ -1611,21 +1617,21 @@ bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean b
 	$(SET_LIB_PATH) \
 	echo "$$msg"; \
 	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
-	@r=`pwd`; export r; \
-	s=`cd $(srcdir); pwd` ; export s; \
+	@r=`${PWD}`; export r; \
+	s=`cd $(srcdir); ${PWD}` ; export s; \
 	$(SET_LIB_PATH) \
 	echo "Building runtime libraries"; \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
 
 .PHONY: cross
 cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
-	@r=`pwd`; export r; \
-	s=`cd $(srcdir); pwd`; export s; \
+	@r=`${PWD}`; export r; \
+	s=`cd $(srcdir); ${PWD}`; export s; \
 	$(SET_LIB_PATH) \
 	echo "Building the C and C++ compiler"; \
 	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
-	@r=`pwd`; export r; \
-	s=`cd $(srcdir); pwd` ; export s; \
+	@r=`${PWD}`; export r; \
+	s=`cd $(srcdir); ${PWD}` ; export s; \
 	$(SET_LIB_PATH) \
 	echo "Building runtime libraries"; \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \
@@ -1634,8 +1640,8 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
 .PHONY: check-gcc
 check-gcc:
 	@if [ -f ./gcc/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
 	else \
@@ -1645,8 +1651,8 @@ check-gcc:
 .PHONY: check-c++
 check-c++:
 	@if [ -f ./gcc/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
 	  $(MAKE) check-target-libstdc++-v3; \
@@ -1657,8 +1663,8 @@ check-c++:
 .PHONY: install-gcc
 install-gcc:
 	@if [ -f ./gcc/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
 	else \
@@ -1668,8 +1674,8 @@ install-gcc:
 .PHONY: install-gcc-cross
 install-gcc-cross:
 	@if [ -f ./gcc/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" install); \
 	else \
@@ -1682,8 +1688,8 @@ install-gcc-cross:
 install-dosrel: installdirs info
 	@dir=`echo $@ | sed -e 's/install-//'`; \
 	if [ -f ./$${dir}/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
+	  r=`${PWD}`; export r; \
+	  s=`cd $(srcdir); ${PWD}`; export s; \
 	  $(SET_LIB_PATH) \
 	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
 	else \
diff --git a/config-ml.in b/config-ml.in
index c968bf0d7..4b1be0f09 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -510,14 +510,16 @@ multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ]
 
 cat > Multi.tem <<\EOF
 
+PWD=$${PWDCMD-pwd}
+
 # FIXME: There should be an @-sign in front of the `if'.
 # Leave out until this is tested a bit more.
 multi-do:
 	if [ -z "$(MULTIDIRS)" ]; then \
 	  true; \
 	else \
-	  rootpre=`pwd`/; export rootpre; \
-	  srcrootpre=`cd $(srcdir); pwd`/; export srcrootpre; \
+	  rootpre=`${PWD}`/; export rootpre; \
+	  srcrootpre=`cd $(srcdir); ${PWD}`/; export srcrootpre; \
 	  lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
 	  compiler="$(CC)"; \
 	  for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
@@ -552,7 +554,7 @@ multi-clean:
 	if [ -z "$(MULTIDIRS)" ]; then \
 	  true; \
 	else \
-	  lib=`pwd | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
+	  lib=`${PWD} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
 	  for dir in Makefile $(MULTIDIRS); do \
 	    if [ -f ../$${dir}/$${lib}/Makefile ]; then \
 	      if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
@@ -659,10 +661,10 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
   if [ "${ml_verbose}" = --verbose ]; then
     echo "Running configure in multilib subdirs ${multidirs}"
-    echo "pwd: `pwd`"
+    echo "pwd: `${PWDCMD-pwd}`"
   fi
 
-  ml_origdir=`pwd`
+  ml_origdir=`${PWDCMD-pwd}`
   ml_libdir=`echo $ml_origdir | sed -e 's,^.*/,,'`
   # cd to top-level-build-dir/${with_target_subdir}
   cd ..
@@ -671,7 +673,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
     if [ "${ml_verbose}" = --verbose ]; then
       echo "Running configure in multilib subdir ${ml_dir}"
-      echo "pwd: `pwd`"
+      echo "pwd: `${PWDCMD-pwd}`"
     fi
 
     if [ -d ${ml_dir} ]; then true; else
@@ -699,7 +701,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
     case ${srcdir} in
     ".")
-      echo Building symlink tree in `pwd`/${ml_dir}/${ml_libdir}
+      echo Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}
       if [ "${with_target_subdir}" != "." ]; then
 	ml_unsubdir="../"
       else
diff --git a/config.guess b/config.guess
index ed2e03b7f..fbad77f14 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-03-20'
+timestamp='2002-05-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -142,6 +142,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
 	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
@@ -428,6 +429,9 @@ EOF
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
 	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS)
+	echo powerpc-harris-powermax
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -958,7 +962,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
diff --git a/config.sub b/config.sub
index 299f3f4c5..4693ac17f 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-04-26'
+timestamp='2002-05-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -230,7 +230,7 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
+	| d10v | d30v | dlx | dsp16xx \
 	| fr30 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
@@ -281,12 +281,12 @@ case $basic_machine in
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
 	| clipper-* | cydra-* \
-	| d10v-* | d30v-* \
+	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | fx80-* \
 	| h8300-* | h8500-* \
@@ -1090,7 +1090,7 @@ case $os in
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* )
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
diff --git a/config/ChangeLog b/config/ChangeLog
index 06f7605dc..129ce6168 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,13 @@
+2002-05-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* acinclude.m4: Allow for PWDCMD to override hardcoded pwd.
+
+2002-05-13  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* mh-apollo68: remove unused HDEFINES setting.
+	* mh-dgux: remove unused HDEFINES setting.
+	* mh-dgux386: remove unused HDEFINES setting, duplicate RANLIB=true.
+
 2002-04-29  Nathanael Nerode  <neroden@twcny.rr.com>
 
 	* config/mh-cxux: remove dead code
diff --git a/config/acinclude.m4 b/config/acinclude.m4
index 9be62cb9a..00887e0dd 100755
--- a/config/acinclude.m4
+++ b/config/acinclude.m4
@@ -206,7 +206,7 @@ dnl Look for the header file
 AC_CACHE_VAL(ac_cv_c_bfdh,[
 for i in $dirlist; do
     if test -f "$i/bfd/bfd.h" ; then
-	ac_cv_c_bfdh=`(cd $i/bfd; pwd)`
+	ac_cv_c_bfdh=`(cd $i/bfd; ${PWDCMD-pwd})`
 	break
     fi
 done
@@ -224,7 +224,7 @@ AC_MSG_CHECKING(for the bfd library in the build tree)
 AC_CACHE_VAL(ac_cv_c_bfdlib,[
 for i in $dirlist; do
     if test -f "$i/bfd/Makefile" ; then
-	ac_cv_c_bfdlib=`(cd $i/bfd; pwd)`
+	ac_cv_c_bfdlib=`(cd $i/bfd; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -247,7 +247,7 @@ dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
 AC_CACHE_VAL(ac_cv_c_liberty,[
 for i in $dirlist; do
     if test -f "$i/libiberty/Makefile" ; then
-	ac_cv_c_liberty=`(cd $i/libiberty; pwd)`
+	ac_cv_c_liberty=`(cd $i/libiberty; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -268,7 +268,7 @@ dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
 AC_CACHE_VAL(ac_cv_c_opc,[
 for i in $dirlist; do
     if test -f "$i/opcodes/Makefile" ; then
-	ac_cv_c_opc=`(cd $i/opcodes; pwd)`
+	ac_cv_c_opc=`(cd $i/opcodes; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -290,7 +290,7 @@ dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
 AC_CACHE_VAL(ac_cv_c_dejagnu,[
 for i in $dirlist; do
     if test -f "$srcdir/$i/ecc/ecc/infra/testlib/current/include/dejagnu.h" ; then
-	ac_cv_c_dejagnu=`(cd $srcdir/$i/ecc/ecc/infra/testlib/current/include; pwd)`
+	ac_cv_c_dejagnu=`(cd $srcdir/$i/ecc/ecc/infra/testlib/current/include; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -303,7 +303,7 @@ fi
 AC_CACHE_VAL(ac_cv_c_dejagnulib,[
 for i in $dirlist; do
     if test -f "$srcdir/$i/infra/testlib/current/lib/hostutil.exp" ; then
-	ac_cv_c_dejagnulib=`(cd $srcdir/$i/infra/testlib/current/lib; pwd)`
+	ac_cv_c_dejagnulib=`(cd $srcdir/$i/infra/testlib/current/lib; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -316,7 +316,7 @@ AC_MSG_CHECKING(for runtest in the source tree)
 AC_CACHE_VAL(ac_cv_c_runtest,[
 for i in $dirlist; do
     if test -f "$srcdir/$i/dejagnu/runtest" ; then
-	ac_cv_c_runtest=`(cd $srcdir/$i/dejagnu; pwd)`
+	ac_cv_c_runtest=`(cd $srcdir/$i/dejagnu; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -342,7 +342,7 @@ dnl Look for the header file
 AC_CACHE_VAL(ac_cv_c_intlh,[
 for i in $dirlist; do
     if test -f "$i/intl/libintl.h" ; then
-	ac_cv_c_intlh=`(cd $i/intl; pwd)`
+	ac_cv_c_intlh=`(cd $i/intl; ${PWDCMD-pwd})`
 	break
     fi
 done
@@ -360,7 +360,7 @@ AC_MSG_CHECKING(for the libintl library in the build tree)
 AC_CACHE_VAL(ac_cv_c_intllib,[
 for i in $dirlist; do
     if test -f "$i/intl/Makefile" ; then
-	ac_cv_c_intllib=`(cd $i/intl; pwd)`
+	ac_cv_c_intllib=`(cd $i/intl; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -388,7 +388,7 @@ AC_MSG_CHECKING(for the simulator header file)
 AC_CACHE_VAL(ac_cv_c_simh,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/include/remote-sim.h" ; then
-	ac_cv_c_simh=`(cd ${srcdir}/$i/include; pwd)`
+	ac_cv_c_simh=`(cd ${srcdir}/$i/include; ${PWDCMD-pwd})`
 	break
     fi
 done
@@ -420,7 +420,7 @@ AC_MSG_CHECKING(for the simulator library)
 AC_CACHE_VAL(ac_cv_c_simlib,[
 for i in $dirlist; do
     if test -f "$i/sim/$target_dir/Makefile" ; then
-	ac_cv_c_simlib=`(cd $i/sim/$target_dir; pwd)`
+	ac_cv_c_simlib=`(cd $i/sim/$target_dir; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -463,7 +463,7 @@ dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
 AC_CACHE_VAL(ac_cv_c_libib,[
 for i in $dirlist; do
     if test -f "$i/libiberty/Makefile" ; then
-	ac_cv_c_libib=`(cd $i/libiberty/; pwd)`
+	ac_cv_c_libib=`(cd $i/libiberty/; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -483,7 +483,7 @@ dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
 AC_CACHE_VAL(ac_cv_c_devoh,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/include/remote-sim.h" ; then
-	ac_cv_c_devoh=`(cd ${srcdir}/$i/include; pwd)`
+	ac_cv_c_devoh=`(cd ${srcdir}/$i/include; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -506,7 +506,7 @@ IDELIB=
 AC_CACHE_VAL(ac_cv_c_ideh,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/libide/src/event.h" ; then
-	ac_cv_c_ideh=`(cd ${srcdir}/$i/libide/src; pwd)`;
+	ac_cv_c_ideh=`(cd ${srcdir}/$i/libide/src; ${PWDCMD-pwd})`;
     fi
 done
 ])
@@ -521,7 +521,7 @@ AC_MSG_CHECKING(for LIBIDE TCL headers in the source tree)
 AC_CACHE_VAL(ac_cv_c_idetclh,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/libidetcl/src/idetcl.h" ; then
-	ac_cv_c_idetclh=`(cd ${srcdir}/$i/libidetcl/src; pwd)`;
+	ac_cv_c_idetclh=`(cd ${srcdir}/$i/libidetcl/src; ${PWDCMD-pwd})`;
     fi
 done
 ])
@@ -536,7 +536,7 @@ AC_MSG_CHECKING(for IDE headers in the build tree)
 AC_CACHE_VAL(ac_cv_c_ideh2,[
 for i in $dirlist; do
     if test -f "$i/libide/src/Makefile" ; then
-	ac_cv_c_ideh2=`(cd $i/libide/src; pwd)`;
+	ac_cv_c_ideh2=`(cd $i/libide/src; ${PWDCMD-pwd})`;
     fi
 done
 ])
@@ -553,7 +553,7 @@ AC_CACHE_VAL(ac_cv_c_idelib,[
 if test x"${ac_cv_c_idelib}" = x ; then
     for i in $dirlist; do
       if test -f "$i/libide/src/Makefile" ; then
-        ac_cv_c_idelib=`(cd $i/libide/src; pwd)`
+        ac_cv_c_idelib=`(cd $i/libide/src; ${PWDCMD-pwd})`
         break
       fi
     done
@@ -571,7 +571,7 @@ AC_CACHE_VAL(ac_cv_c_idetcllib,[
 if test x"${ac_cv_c_idetcllib}" = x ; then
     for i in $dirlist; do
       if test -f "$i/libidetcl/src/Makefile" ; then
-        ac_cv_c_idetcllib=`(cd $i/libidetcl/src; pwd)`
+        ac_cv_c_idetcllib=`(cd $i/libidetcl/src; ${PWDCMD-pwd})`
         break
       fi
     done
@@ -597,7 +597,7 @@ dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
 AC_CACHE_VAL(ac_cv_c_iluh,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/ilu/runtime/kernel/method.h" ; then
-	ac_cv_c_iluh=`(cd ${srcdir}/$i/ilu/runtime/kernel; pwd)`
+	ac_cv_c_iluh=`(cd ${srcdir}/$i/ilu/runtime/kernel; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -613,7 +613,7 @@ dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
 AC_CACHE_VAL(ac_cv_c_iluh5,[
 for i in $dirlist; do
     if test -f "$i/ilu/runtime/kernel/iluconf.h" ; then
-	ac_cv_c_iluh5=`(cd $i/ilu/runtime/kernel; pwd)`
+	ac_cv_c_iluh5=`(cd $i/ilu/runtime/kernel; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -628,7 +628,7 @@ AC_MSG_CHECKING(for ILU C++ headers in the source tree)
 AC_CACHE_VAL(ac_cv_c_iluh2,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/ilu/stubbers/cpp/resource.h" ; then
-	ac_cv_c_iluh2=`(cd ${srcdir}/$i/ilu/stubbers/cpp; pwd)`
+	ac_cv_c_iluh2=`(cd ${srcdir}/$i/ilu/stubbers/cpp; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -643,7 +643,7 @@ AC_MSG_CHECKING(for ILU C headers)
 AC_CACHE_VAL(ac_cv_c_iluh3,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/ilu/stubbers/c/resource.h" ; then
-	ac_cv_c_iluh3=`(cd ${srcdir}/$i/ilu/stubbers/c  ; pwd)`
+	ac_cv_c_iluh3=`(cd ${srcdir}/$i/ilu/stubbers/c  ; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -658,7 +658,7 @@ AC_MSG_CHECKING(for ILU C runtime headers)
 AC_CACHE_VAL(ac_cv_c_iluh4,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/ilu/runtime/c/ilucstub.h" ; then
-	ac_cv_c_iluh4=`(cd ${srcdir}/$i/ilu/runtime/c  ; pwd)`
+	ac_cv_c_iluh4=`(cd ${srcdir}/$i/ilu/runtime/c  ; ${PWDCMD-pwd})`
     fi
 done
 ])
@@ -672,7 +672,7 @@ fi
 AC_CACHE_VAL(ac_cv_c_ilupath,[
 for i in $dirlist; do
     if test -f "$i/ilu/Makefile" ; then
-	ac_cv_c_ilupath=`(cd $i/ilu; pwd)`
+	ac_cv_c_ilupath=`(cd $i/ilu; ${PWDCMD-pwd})`
 	break
     fi
 done
@@ -682,7 +682,7 @@ ILUTOP=${ac_cv_c_ilupath}
 AC_MSG_CHECKING(for the ILU library in the build tree)
 AC_CACHE_VAL(ac_cv_c_ilulib,[
 if test -f "$ac_cv_c_ilupath/runtime/kernel/Makefile" ; then
-    ac_cv_c_ilulib=`(cd $ac_cv_c_ilupath/runtime/kernel; pwd)`
+    ac_cv_c_ilulib=`(cd $ac_cv_c_ilupath/runtime/kernel; ${PWDCMD-pwd})`
     AC_MSG_RESULT(found ${ac_cv_c_ilulib}/libilu.a)
 else
     AC_MSG_RESULT(no)
@@ -691,7 +691,7 @@ fi])
 AC_MSG_CHECKING(for the ILU C++ bindings library in the build tree)
 AC_CACHE_VAL(ac_cv_c_ilulib2,[
 if test -f "$ac_cv_c_ilupath/runtime/cpp/Makefile" ; then
-    ac_cv_c_ilulib2=`(cd $ac_cv_c_ilupath/runtime/cpp; pwd)`
+    ac_cv_c_ilulib2=`(cd $ac_cv_c_ilupath/runtime/cpp; ${PWDCMD-pwd})`
     AC_MSG_RESULT(found ${ac_cv_c_ilulib2}/libilu-c++.a)
 else
     AC_MSG_RESULT(no)
@@ -700,7 +700,7 @@ fi])
 AC_MSG_CHECKING(for the ILU C bindings library in the build tree)
 AC_CACHE_VAL(ac_cv_c_ilulib3,[
 if test -f "$ac_cv_c_ilupath/runtime/c/Makefile" ; then
-    ac_cv_c_ilulib3=`(cd $ac_cv_c_ilupath/runtime/c; pwd)`
+    ac_cv_c_ilulib3=`(cd $ac_cv_c_ilupath/runtime/c; ${PWDCMD-pwd})`
     AC_MSG_RESULT(found ${ac_cv_c_ilulib3}/libilu-c.a)
 else
     AC_MSG_RESULT(no)
@@ -709,7 +709,7 @@ fi])
 AC_MSG_CHECKING(for the ILU Tk bindings library in the build tree)
 AC_CACHE_VAL(ac_cv_c_ilulib4,[
 if test -f "$ac_cv_c_ilupath/runtime/mainloop/Makefile" ; then
-    ac_cv_c_ilulib4=`(cd $ac_cv_c_ilupath/runtime/mainloop; pwd)`
+    ac_cv_c_ilulib4=`(cd $ac_cv_c_ilupath/runtime/mainloop; ${PWDCMD-pwd})`
     AC_MSG_RESULT(found ${ac_cv_c_ilulib4}/libilu-tk.a)
 else
     AC_MSG_RESULT(no)
@@ -858,9 +858,9 @@ AC_CACHE_VAL(ac_cv_c_tclh,[
 dnl first check to see if --with-tclinclude was specified
 if test x"${with_tclinclude}" != x ; then
   if test -f ${with_tclinclude}/tcl.h ; then
-    ac_cv_c_tclh=`(cd ${with_tclinclude}; pwd)`
+    ac_cv_c_tclh=`(cd ${with_tclinclude}; ${PWDCMD-pwd})`
   elif test -f ${with_tclinclude}/generic/tcl.h ; then
-    ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; pwd)`
+    ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; ${PWDCMD-pwd})`
   else
     AC_MSG_ERROR([${with_tclinclude} directory doesn't contain headers])
   fi
@@ -870,7 +870,7 @@ dnl next check if it came with Tcl configuration file
 if test x"${ac_cv_c_tclconfig}" != x ; then
   for i in $dirlist; do
     if test -f $ac_cv_c_tclconfig/$i/generic/tcl.h ; then
-      ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/$i/generic; pwd)`
+      ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/$i/generic; ${PWDCMD-pwd})`
       break
     fi
   done
@@ -891,7 +891,7 @@ if test x"${ac_cv_c_tclh}" = x ; then
     dnl might be multiple version of Tcl, and we want the most recent one.
     for i in `ls -dr $tclpath/tcl* 2>/dev/null ` ; do
         if test -f $i/generic/tcl.h ; then
-          ac_cv_c_tclh=`(cd $i/generic; pwd)`
+          ac_cv_c_tclh=`(cd $i/generic; ${PWDCMD-pwd})`
           break
         fi
     done
@@ -950,7 +950,7 @@ if test x"${no_tcl}" = x ; then
     dnl First check to see if --with-tclconfig was specified.
     if test x"${with_tclconfig}" != x ; then
         if test -f "${with_tclconfig}/tclConfig.sh" ; then
-            ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
+            ac_cv_c_tclconfig=`(cd ${with_tclconfig}; ${PWDCMD-pwd})`
         else
             AC_MSG_ERROR([${with_tclconfig} directory doesn't contain tclConfig.sh])
         fi
@@ -963,11 +963,11 @@ if test x"${no_tcl}" = x ; then
             dnl cygwin's tkConfig.sh could be in either directory depending
             dnl on the cygwin port of tcl.
             if test -f $srcdir/$i/unix/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; pwd)`
+                ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})`
 	        break
             fi
             if test -f $srcdir/$i/win/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $srcdir/$i/win; pwd)`
+                ac_cv_c_tclconfig=`(cd $srcdir/$i/win; ${PWDCMD-pwd})`
 	        break
             fi
         done
@@ -989,11 +989,11 @@ if test x"${no_tcl}" = x ; then
             dnl cygwin's tclConfig.sh could be in either directory depending
             dnl on the cygwin port of tcl.
             if test -f $i/unix/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
+                ac_cv_c_tclconfig=`(cd $i/unix; ${PWDCMD-pwd})`
                 break
             fi
             if test -f $i/win/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $i/win; pwd)`
+                ac_cv_c_tclconfig=`(cd $i/win; ${PWDCMD-pwd})`
                 break
             fi
         done
@@ -1097,9 +1097,9 @@ AC_CACHE_VAL(ac_cv_c_tkh,[
 dnl first check to see if --with-tkinclude was specified
 if test x"${with_tkinclude}" != x ; then
   if test -f ${with_tkinclude}/tk.h ; then
-    ac_cv_c_tkh=`(cd ${with_tkinclude}; pwd)`
+    ac_cv_c_tkh=`(cd ${with_tkinclude}; ${PWDCMD-pwd})`
   elif test -f ${with_tkinclude}/generic/tk.h ; then
-    ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; pwd)`
+    ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; ${PWDCMD-pwd})`
   else
     AC_MSG_ERROR([${with_tkinclude} directory doesn't contain headers])
   fi
@@ -1109,7 +1109,7 @@ dnl next check if it came with Tk configuration file
 if test x"${ac_cv_c_tkconfig}" != x ; then
   for i in $dirlist; do
     if test -f $ac_cv_c_tkconfig/$i/generic/tk.h ; then
-      ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/$i/generic; pwd)`
+      ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/$i/generic; ${PWDCMD-pwd})`
       break
     fi
   done
@@ -1130,7 +1130,7 @@ if test x"${ac_cv_c_tkh}" = x ; then
     dnl might be multiple version of Tk, and we want the most recent one.
     for i in `ls -dr $tkpath/tk* 2>/dev/null ` ; do
         if test -f $i/generic/tk.h ; then
-          ac_cv_c_tkh=`(cd $i/generic; pwd)`
+          ac_cv_c_tkh=`(cd $i/generic; ${PWDCMD-pwd})`
           break
         fi
     done
@@ -1183,7 +1183,7 @@ if test x"${no_tk}" = x ; then
     dnl First check to see if --with-tkconfig was specified.
     if test x"${with_tkconfig}" != x ; then
         if test -f "${with_tkconfig}/tkConfig.sh" ; then
-            ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)`
+            ac_cv_c_tkconfig=`(cd ${with_tkconfig}; ${PWDCMD-pwd})`
         else
             AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh])
         fi
@@ -1196,11 +1196,11 @@ if test x"${no_tk}" = x ; then
             dnl cygwin's tkConfig.sh could be in either directory depending
             dnl on the cygwin port of tk.
             if test -f $srcdir/$i/unix/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; pwd)`
+                ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})`
 	        break
             fi
             if test -f $srcdir/$i/win/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; pwd)`
+                ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})`
 	        break
             fi
         done
@@ -1222,11 +1222,11 @@ if test x"${no_tk}" = x ; then
             dnl cygwin's tkConfig.sh could be in either directory depending
             dnl on the cygwin port of tk.
             if test -f $i/unix/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
+                ac_cv_c_tkconfig=`(cd $i/unix; ${PWDCMD-pwd})`
                 break
             fi
             if test -f $i/win/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $i/win; pwd)`
+                ac_cv_c_tkconfig=`(cd $i/win; ${PWDCMD-pwd})`
                 break
             fi
         done
@@ -1302,9 +1302,9 @@ AC_CACHE_VAL(ac_cv_c_itclh,[
 dnl first check to see if --with-itclinclude was specified
 if test x"${with_itclinclude}" != x ; then
   if test -f ${with_itclinclude}/itcl.h ; then
-    ac_cv_c_itclh=`(cd ${with_itclinclude}; pwd)`
+    ac_cv_c_itclh=`(cd ${with_itclinclude}; ${PWDCMD-pwd})`
   elif test -f ${with_itclinclude}/src/itcl.h ; then
-    ac_cv_c_itclh=`(cd ${with_itclinclude}/src; pwd)`
+    ac_cv_c_itclh=`(cd ${with_itclinclude}/src; ${PWDCMD-pwd})`
   else
     AC_MSG_ERROR([${with_itclinclude} directory doesn't contain headers])
   fi
@@ -1314,7 +1314,7 @@ dnl next check if it came with Itcl configuration file
 if test x"${ac_cv_c_itclconfig}" != x ; then
   for i in $dirlist; do
     if test -f $ac_cv_c_itclconfig/$i/src/itcl.h ; then
-      ac_cv_c_itclh=`(cd $ac_cv_c_itclconfig/$i/src; pwd)`
+      ac_cv_c_itclh=`(cd $ac_cv_c_itclconfig/$i/src; ${PWDCMD-pwd})`
       break
     fi
   done
@@ -1335,7 +1335,7 @@ if test x"${ac_cv_c_itclh}" = x ; then
     dnl might be multiple version of Itcl, and we want the most recent one.
     for i in `ls -dr $itclpath/itcl* 2>/dev/null ` ; do
         if test -f $i/src/itcl.h ; then
-          ac_cv_c_itclh=`(cd $i/src; pwd)`
+          ac_cv_c_itclh=`(cd $i/src; ${PWDCMD-pwd})`
           break
         fi
     done
@@ -1380,10 +1380,10 @@ if test x"${no_itcl}" = x ; then
     dnl First check to see if --with-itcllib was specified.
     if test x"${with_itcllib}" != x ; then
         if test -f "${with_itcllib}/libitcl$TCL_SHARED_LIB_SUFFIX" ; then
-            ac_cv_c_itcllib=`(cd ${with_itcllib}; pwd)`/libitcl$TCL_SHARED_LIB_SUFFIX
+            ac_cv_c_itcllib=`(cd ${with_itcllib}; ${PWDCMD-pwd})`/libitcl$TCL_SHARED_LIB_SUFFIX
 	else
 	    if test -f "${with_itcllib}/libitcl$TCL_UNSHARED_LIB_SUFFIX"; then
-	 	ac_cv_c_itcllib=`(cd ${with_itcllib}; pwd)`/libitcl$TCL_UNSHARED_LIB_SUFFIX
+	 	ac_cv_c_itcllib=`(cd ${with_itcllib}; ${PWDCMD-pwd})`/libitcl$TCL_UNSHARED_LIB_SUFFIX
 	    fi
 	fi
     fi
@@ -1399,9 +1399,9 @@ if test x"${no_itcl}" = x ; then
         done
         dnl Itcl 7.5 and greater puts library in subdir.  Look there first.
         if test -f "$itclpath/src/libitcl.$TCL_SHLIB_SUFFIX" ; then
-	     ac_cv_c_itcllib=`(cd $itclpath/src; pwd)`
+	     ac_cv_c_itcllib=`(cd $itclpath/src; ${PWDCMD-pwd})`
         elif test -f "$itclpath/src/libitcl.a"; then
-	     ac_cv_c_itcllib=`(cd $itclpath/src; pwd)`
+	     ac_cv_c_itcllib=`(cd $itclpath/src; ${PWDCMD-pwd})`
 	fi
     fi
     dnl check in a few other private locations
@@ -1415,10 +1415,10 @@ if test x"${no_itcl}" = x ; then
         for i in `ls -dr ${itclpath}/itcl* 2>/dev/null` ; do
             dnl Itcl 7.5 and greater puts library in subdir.  Look there first.
             if test -f "$i/src/libitcl$TCL_SHLIB_SUFFIX" ; then
-	        ac_cv_c_itcllib=`(cd $i/src; pwd)`
+	        ac_cv_c_itcllib=`(cd $i/src; ${PWDCMD-pwd})`
 	        break
             elif test -f "$i/src/libitcl.a"; then
-	        ac_cv_c_itcllib=`(cd $i/src; pwd)`
+	        ac_cv_c_itcllib=`(cd $i/src; ${PWDCMD-pwd})`
 	        break
 	    fi	
         done
@@ -1430,9 +1430,9 @@ if test x"${no_itcl}" = x ; then
 	ccpath=`which ${CC}  | sed -e 's:/bin/.*::'`/lib
         dnl Itcl 7.5 and greater puts library in subdir.  Look there first.
         if test -f "${ccpath}/libitcl$TCL_SHLIB_SUFFIX" ; then
-	    ac_cv_c_itcllib=`(cd ${ccpath}; pwd)`
+	    ac_cv_c_itcllib=`(cd ${ccpath}; ${PWDCMD-pwd})`
         elif test -f "${ccpath}/libitcl.a"; then
-	    ac_cv_c_itcllib=`(cd ${ccpath}; pwd)`
+	    ac_cv_c_itcllib=`(cd ${ccpath}; ${PWDCMD-pwd})`
         fi
     fi
     ])
@@ -1463,9 +1463,9 @@ AC_CACHE_VAL(ac_cv_c_itclsh,[
 dnl first check to see if --with-itclinclude was specified
 if test x"${with_itclinclude}" != x ; then
   if test -f ${with_itclinclude}/itcl_sh ; then
-    ac_cv_c_itclsh=`(cd ${with_itclinclude}; pwd)`
+    ac_cv_c_itclsh=`(cd ${with_itclinclude}; ${PWDCMD-pwd})`
   elif test -f ${with_itclinclude}/src/itcl_sh ; then
-    ac_cv_c_itclsh=`(cd ${with_itclinclude}/src; pwd)`
+    ac_cv_c_itclsh=`(cd ${with_itclinclude}/src; ${PWDCMD-pwd})`
   else
     AC_MSG_ERROR([${with_itclinclude} directory doesn't contain itcl_sh])
   fi
@@ -1486,7 +1486,7 @@ if test x"${ac_cv_c_itclsh}" = x ; then
     dnl might be multiple version of Itcl, and we want the most recent one.
     for i in `ls -dr $itclpath/itcl* 2>/dev/null ` ; do
         if test -f $i/src/itcl_sh ; then
-          ac_cv_c_itclsh=`(cd $i/src; pwd)`/itcl_sh
+          ac_cv_c_itclsh=`(cd $i/src; ${PWDCMD-pwd})`/itcl_sh
           break
         fi
     done
@@ -1525,9 +1525,9 @@ AC_CACHE_VAL(ac_cv_c_itclmkidx,[
 dnl first check to see if --with-itclinclude was specified
 if test x"${with_itclinclude}" != x ; then
   if test -f ${with_itclinclude}/itcl_sh ; then
-    ac_cv_c_itclmkidx=`(cd ${with_itclinclude}; pwd)`
+    ac_cv_c_itclmkidx=`(cd ${with_itclinclude}; ${PWDCMD-pwd})`
   elif test -f ${with_itclinclude}/src/itcl_sh ; then
-    ac_cv_c_itclmkidx=`(cd ${with_itclinclude}/src; pwd)`
+    ac_cv_c_itclmkidx=`(cd ${with_itclinclude}/src; ${PWDCMD-pwd})`
   else
     AC_MSG_ERROR([${with_itclinclude} directory doesn't contain itcl_sh])
   fi
@@ -1548,7 +1548,7 @@ if test x"${ac_cv_c_itclmkidx}" = x ; then
     dnl might be multiple version of Itcl, and we want the most recent one.
     for i in `ls -dr $itclpath/itcl* 2>/dev/null ` ; do
         if test -f $i/library/itcl_mkindex.tcl ; then
-          ac_cv_c_itclmkidx=`(cd $i/library; pwd)`/itcl_mkindex.tcl
+          ac_cv_c_itclmkidx=`(cd $i/library; ${PWDCMD-pwd})`/itcl_mkindex.tcl
           break
         fi
     done
@@ -1559,7 +1559,7 @@ if test x"${ac_cv_c_itclmkidx}" = x ; then
     dnl Itcl 7.5 and greater puts library in subdir.  Look there first.
     for i in `ls -dr $ccpath/itcl* 2>/dev/null ` ; do
         if test -f $i/itcl_mkindex.tcl ; then
-            ac_cv_c_itclmkidx=`(cd $i; pwd)`/itcl_mkindex.tcl
+            ac_cv_c_itclmkidx=`(cd $i; ${PWDCMD-pwd})`/itcl_mkindex.tcl
             break
         fi
     done
@@ -1595,9 +1595,9 @@ AC_CACHE_VAL(ac_cv_c_tixh,[
 dnl first check to see if --with-tixinclude was specified
 if test x"${with_tixinclude}" != x ; then
   if test -f ${with_tixinclude}/tix.h ; then
-    ac_cv_c_tixh=`(cd ${with_tixinclude}; pwd)`
+    ac_cv_c_tixh=`(cd ${with_tixinclude}; ${PWDCMD-pwd})`
   elif test -f ${with_tixinclude}/generic/tix.h ; then
-    ac_cv_c_tixh=`(cd ${with_tixinclude}/generic; pwd)`
+    ac_cv_c_tixh=`(cd ${with_tixinclude}/generic; ${PWDCMD-pwd})`
   else
     AC_MSG_ERROR([${with_tixinclude} directory doesn't contain headers])
   fi
@@ -1607,7 +1607,7 @@ dnl next check if it came with Tix configuration file
 if test x"${ac_cv_c_tixconfig}" != x ; then
   for i in $dirlist; do
     if test -f $ac_cv_c_tixconfig/$i/generic/tix.h ; then
-      ac_cv_c_tixh=`(cd $ac_cv_c_tixconfig/$i/generic; pwd)`
+      ac_cv_c_tixh=`(cd $ac_cv_c_tixconfig/$i/generic; ${PWDCMD-pwd})`
       break
     fi
   done
@@ -1628,7 +1628,7 @@ if test x"${ac_cv_c_tixh}" = x ; then
     dnl might be multiple version of Tix, and we want the most recent one.
     for i in `ls -dr $tixpath/tix* 2>/dev/null ` ; do
         if test -f $i/generic/tix.h ; then
-          ac_cv_c_tixh=`(cd $i/generic; pwd)`
+          ac_cv_c_tixh=`(cd $i/generic; ${PWDCMD-pwd})`
           break
         fi
     done
@@ -1681,7 +1681,7 @@ if test x"${no_tix}" = x ; then
   # First check to see if --with-tixconfig was specified.
   if test x"${with_tixconfig}" != x ; then
     if test -f "${with_tixconfig}/tixConfig.sh" ; then
-      ac_cv_c_tixconfig=`(cd ${with_tixconfig}; pwd)`
+      ac_cv_c_tixconfig=`(cd ${with_tixconfig}; ${PWDCMD-pwd})`
     else
       AC_MSG_ERROR([${with_tixconfig} directory doesn't contain tixConfig.sh])
     fi
@@ -1697,7 +1697,7 @@ if test x"${no_tix}" = x ; then
 		../../../tix \
 		`ls -dr ../../../tix[[4]]* 2>/dev/null` ; do
       if test -f "$i/tixConfig.sh" ; then
-        ac_cv_c_tixconfig=`(cd $i; pwd)`
+        ac_cv_c_tixconfig=`(cd $i; ${PWDCMD-pwd})`
 	break
       fi
     done
@@ -1706,7 +1706,7 @@ if test x"${no_tix}" = x ; then
   if test x"${ac_cv_c_tixconfig}" = x ; then
     for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
       if test -f "$i/tixConfig.sh" ; then
-        ac_cv_c_tkconfig=`(cd $i; pwd)`
+        ac_cv_c_tkconfig=`(cd $i; ${PWDCMD-pwd})`
 	break
       fi
     done
@@ -1717,7 +1717,7 @@ if test x"${no_tix}" = x ; then
 		${srcdir}/../tix \
 		`ls -dr ${srcdir}/../tix[[4-9]]* 2>/dev/null` ; do
       if test -f "$i/tixConfig.sh" ; then
-        ac_cv_c_tixconfig=`(cd $i; pwd)`
+        ac_cv_c_tixconfig=`(cd $i; ${PWDCMD-pwd})`
 	break
       fi
     done
@@ -1764,7 +1764,7 @@ if test x"${no_itcl}" = x ; then
   # First check to see if --with-itclconfig was specified.
   if test x"${with_itclconfig}" != x ; then
     if test -f "${with_itclconfig}/itclConfig.sh" ; then
-      ac_cv_c_itclconfig=`(cd ${with_itclconfig}; pwd)`
+      ac_cv_c_itclconfig=`(cd ${with_itclconfig}; ${PWDCMD-pwd})`
     else
       AC_MSG_ERROR([${with_itclconfig} directory doesn't contain itclConfig.sh])
     fi
@@ -1780,7 +1780,7 @@ if test x"${no_itcl}" = x ; then
 		../../../itcl/itcl \
 		`ls -dr ../../../itcl/itcl[[3]]* 2>/dev/null` ; do
       if test -f "$i/itclConfig.sh" ; then
-        ac_cv_c_itclconfig=`(cd $i; pwd)`
+        ac_cv_c_itclconfig=`(cd $i; ${PWDCMD-pwd})`
 	break
       fi
     done
@@ -1789,7 +1789,7 @@ if test x"${no_itcl}" = x ; then
   if test x"${ac_cv_c_itclconfig}" = x ; then
     for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
       if test -f "$i/itclConfig.sh" ; then
-        ac_cv_c_itclconfig=`(cd $i; pwd)`
+        ac_cv_c_itclconfig=`(cd $i; ${PWDCMD-pwd})`
 	break
       fi
     done
@@ -1800,7 +1800,7 @@ if test x"${no_itcl}" = x ; then
 		${srcdir}/../itcl/itcl \
 		`ls -dr ${srcdir}/../itcl/itcl[[3]]* 2>/dev/null` ; do
       if test -f "$i/itcl/itclConfig.sh" ; then
-        ac_cv_c_itclconfig=`(cd $i; pwd)`
+        ac_cv_c_itclconfig=`(cd $i; ${PWDCMD-pwd})`
 	break
       fi
     done
@@ -1851,7 +1851,7 @@ if test x"${no_itk}" = x ; then
   # First check to see if --with-itkconfig was specified.
   if test x"${with_itkconfig}" != x ; then
     if test -f "${with_itkconfig}/itkConfig.sh" ; then
-      ac_cv_c_itkconfig=`(cd ${with_itkconfig}; pwd)`
+      ac_cv_c_itkconfig=`(cd ${with_itkconfig}; ${PWDCMD-pwd})`
     else
       AC_MSG_ERROR([${with_itkconfig} directory doesn't contain itkConfig.sh])
     fi
@@ -1867,7 +1867,7 @@ if test x"${no_itk}" = x ; then
 		../../../itcl/itk \
 		`ls -dr ../../../itcl/itk[[3]]* 2>/dev/null` ; do
       if test -f "$i/itkConfig.sh" ; then
-        ac_cv_c_itkconfig=`(cd $i; pwd)`
+        ac_cv_c_itkconfig=`(cd $i; ${PWDCMD-pwd})`
 	break
       fi
     done
@@ -1876,7 +1876,7 @@ if test x"${no_itk}" = x ; then
   if test x"${ac_cv_c_itkconfig}" = x ; then
     for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
       if test -f "$i/itcl/itkConfig.sh" ; then
-        ac_cv_c_itkconfig=`(cd $i; pwd)`
+        ac_cv_c_itkconfig=`(cd $i; ${PWDCMD-pwd})`
 	break
       fi
     done
@@ -1887,7 +1887,7 @@ if test x"${no_itk}" = x ; then
 		${srcdir}/../itcl/itk \
 		`ls -dr ${srcdir}/../itcl/itk[[3]]* 2>/dev/null` ; do
       if test -f "$i/itkConfig.sh" ; then
-        ac_cv_c_itkconfig=`(cd $i; pwd)`
+        ac_cv_c_itkconfig=`(cd $i; ${PWDCMD-pwd})`
 	break
       fi
     done
@@ -1934,9 +1934,9 @@ AC_CACHE_VAL(ac_cv_c_libguih,[
 dnl first check to see if --with-libguiinclude was specified
 if test x"${with_libguiinclude}" != x ; then
   if test -f ${with_libguiinclude}/guitcl.h ; then
-    ac_cv_c_libguih=`(cd ${with_libguiinclude}; pwd)`
+    ac_cv_c_libguih=`(cd ${with_libguiinclude}; ${PWDCMD-pwd})`
   elif test -f ${with_libguiinclude}/src/guitcl.h ; then
-    ac_cv_c_libguih=`(cd ${with_libguiinclude}/src; pwd)`
+    ac_cv_c_libguih=`(cd ${with_libguiinclude}/src; ${PWDCMD-pwd})`
   else
     AC_MSG_ERROR([${with_libguiinclude} directory doesn't contain headers])
   fi
@@ -1946,7 +1946,7 @@ dnl next check if it came with Libgui configuration file
 if test x"${ac_cv_c_libguiconfig}" != x ; then
   for i in $dirlist; do
     if test -f $ac_cv_c_libguiconfig/$i/src/guitcl.h ; then
-      ac_cv_c_libguih=`(cd $ac_cv_c_libguiconfig/$i/src; pwd)`
+      ac_cv_c_libguih=`(cd $ac_cv_c_libguiconfig/$i/src; ${PWDCMD-pwd})`
       break
     fi
   done
@@ -1967,7 +1967,7 @@ if test x"${ac_cv_c_libguih}" = x ; then
     dnl might be multiple version of Libgui, and we want the most recent one.
     for i in `ls -dr $libguipath/libgui* 2>/dev/null ` ; do
         if test -f $i/src/guitcl.h ; then
-          ac_cv_c_libguih=`(cd $i/src; pwd)`
+          ac_cv_c_libguih=`(cd $i/src; ${PWDCMD-pwd})`
           break
         fi
     done
@@ -2004,7 +2004,7 @@ AC_CACHE_VAL(ac_cv_c_libguilib,[
 if test x"${ac_cv_c_libguilib}" = x ; then
     for i in $dirlist; do
       if test -f "$i/libgui/src/Makefile" ; then
-        ac_cv_c_libguilib=`(cd $i/libgui/src; pwd)`
+        ac_cv_c_libguilib=`(cd $i/libgui/src; ${PWDCMD-pwd})`
         break
       fi
     done
diff --git a/config/mh-apollo68 b/config/mh-apollo68
index 4b4ffa54b..eb102d550 100644
--- a/config/mh-apollo68
+++ b/config/mh-apollo68
@@ -1,2 +1 @@
-HDEFINES = -DUSG
 RANLIB=true
diff --git a/config/mh-dgux b/config/mh-dgux
index 746ffdb2d..b55fb2fe0 100644
--- a/config/mh-dgux
+++ b/config/mh-dgux
@@ -1,3 +1,2 @@
-HDEFINES=-DHOST_SYS=DGUX_SYS
 RANLIB=true
 
diff --git a/config/mh-dgux386 b/config/mh-dgux386
index f1e533a2e..2fcd4bf09 100644
--- a/config/mh-dgux386
+++ b/config/mh-dgux386
@@ -1,7 +1,3 @@
-# from mh-dgux
-HDEFINES=-DHOST_SYS=DGUX_SYS
-RANLIB = true
-
 # from mh-sysv4
 RANLIB = true
 
diff --git a/configure b/configure
index 30446a209..2cb059f6b 100755
--- a/configure
+++ b/configure
@@ -3,8 +3,8 @@
 ### WARNING: this file contains embedded tabs.  Do not run untabify on this file.
 
 # Configuration script
-# Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001,
+# 2002 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -152,13 +152,13 @@ NO_EDIT="This file was generated automatically by configure.  Do not edit."
 
 progname=$0
 # if PWD already has a value, it is probably wrong.
-if [ -n "$PWD" ]; then PWD=`pwd`; fi
+if [ -n "$PWD" ]; then PWD=`${PWDCMD-pwd}`; fi
 
 case "${progname}" in
 /* | [A-Za-z]:[\\/]* ) ;;
 */*) ;;
 *)
-        PATH=$PATH:${PWD=`pwd`} ; export PATH
+        PATH=$PATH:${PWD=`${PWDCMD-pwd}`} ; export PATH
         ;;
 esac
 
@@ -526,7 +526,7 @@ fi
 configsub=`echo ${progname} | sed 's/configure$/config.sub/'`
 moveifchange=`echo ${progname} | sed 's/configure$/move-if-change/'`
 ## the sed command below emulates the dirname command
-topsrcdir=`cd \`echo ${progname} | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'\`; pwd`
+topsrcdir=`cd \`echo ${progname} | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'\`; ${PWDCMD-pwd}`
 
 
 # this is a hack.  sun4 must always be a valid host alias or this will fail.
@@ -566,8 +566,8 @@ case "${srcdir}" in
 		echo "Invalid source directory ${srcdir}" >&2
 		exit 1
 	fi
-	pwd=`pwd`
-	srcpwd=`cd ${srcdir} ; pwd`
+	pwd=`${PWDCMD-pwd}`
+	srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}`
 	if [ "${pwd}" = "${srcpwd}" ] ; then
 		srcdir=.
 	fi
@@ -579,7 +579,7 @@ case "${srcdir}" in
 ".") ;;
 *)
         if [ -f ${srcdir}/config.status ] ; then
-                echo '***' Cannot configure here in \"${PWD=`pwd`}\" when \"${srcdir}\" is currently configured. 1>&2
+                echo '***' Cannot configure here in \"${PWD=`${PWDCMD-pwd}`}\" when \"${srcdir}\" is currently configured. 1>&2
                 exit 1
         fi
 esac
@@ -708,7 +708,7 @@ fi
 # some sanity checks on configure.in
 case "${srctrigger}" in
 "")
-        echo '***' srctrigger not set in ${PWD=`pwd`}/configure.in.  1>&2
+        echo '***' srctrigger not set in ${PWD=`${PWDCMD-pwd}`}/configure.in.  1>&2
         exit 1
         ;;
 *) ;;
@@ -778,8 +778,8 @@ esac
 
 if [ ! -r ${srcdir}/${srctrigger} ] ; then
         case "${srcdirdefaulted}" in
-        "") echo '***' "${progname}: Can't find ${srcname} sources in ${PWD=`pwd`}/${srcdir}" 1>&2 ;;
-        *)  echo '***' "${progname}: Can't find ${srcname} sources in ${PWD=`pwd`}/. or ${PWD=`pwd`}/.." 1>&2 ;;
+        "") echo '***' "${progname}: Can't find ${srcname} sources in ${PWD=`${PWDCMD-pwd}`}/${srcdir}" 1>&2 ;;
+        *)  echo '***' "${progname}: Can't find ${srcname} sources in ${PWD=`${PWDCMD-pwd}`}/. or ${PWD=`${PWDCMD-pwd}`}/.." 1>&2 ;;
         esac
 
         echo '***' \(At least ${srctrigger} is missing.\) 1>&2
@@ -1072,22 +1072,6 @@ export CXX
 export CFLAGS
 export CXXFLAGS
 
-# FIXME: This should be in configure.in, not configure
-case "$host" in
-	*go32*)
-	    enable_gdbtk=no ;;
-	*msdosdjgpp*)
-	    enable_gdbtk=no ;;
-esac
-
-# FIXME: This should be in configure.in, not configure
-# Determine whether gdb needs tk/tcl or not.
-if [ "$enable_gdbtk" != "no" ]; then
-	GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui"
-else
-	GDB_TK=""
-fi
-
 all_build_modules=
 if test x"${build_alias}" != x"${host_alias}"
 then
@@ -1124,7 +1108,7 @@ for subdir in . ${subdirs} ; do
         if mkdir ${subdir} ; then
                 true
         else
-                echo '***' "${progname}: could not make ${PWD=`pwd`}/${subdir}" 1>&2
+                echo '***' "${progname}: could not make ${PWD=`${PWDCMD-pwd}`}/${subdir}" 1>&2
                 exit 1
         fi
     fi
@@ -1223,7 +1207,7 @@ EOF
                               sed -e "/^####/  r ${package_makefile_rules_frag}" ${srcdir}/${subdir}/${Makefile_in} > ${Makefile}.tem
                       else
                               echo '***' Expected package makefile rules fragment \"${package_makefile_rules_frag}\" 1>&2
-                              echo '***' is missing in ${PWD=`pwd`}. 1>&2
+                              echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2
                               cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem
                       fi
             esac
@@ -1259,7 +1243,7 @@ EOF
                               sed -e "/^####/  r ${host_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem
                       else
                               echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2
-                              echo '***' is missing in ${PWD=`pwd`}. 1>&2
+                              echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2
                               mv ${Makefile} ${subdir}/Makefile.tem
                       fi
             esac
@@ -1295,7 +1279,7 @@ EOF
                               sed -e "/^####/  r ${package_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem
                       else
                               echo '***' Expected package makefile fragment \"${package_makefile_rules_frag}\" 1>&2
-                              echo '***' is missing in ${PWD=`pwd`}. 1>&2
+                              echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2
                               mv ${Makefile} ${subdir}/Makefile.tem
                       fi
             esac
@@ -1481,7 +1465,7 @@ EOF
 
         newusing=`echo "${using}" | sed 's/and/using/'`
         using=${newusing}
-        echo "Created \"${Makefile}\" in" ${PWD=`pwd`} ${using}
+        echo "Created \"${Makefile}\" in" ${PWD=`${PWDCMD-pwd}`} ${using}
 
         . ${tmpfile}.pos
 
@@ -1547,14 +1531,14 @@ if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then
                                         if mkdir ./${bld_dir} ; then
                                                 true
                                         else
-                                                echo '***' "${progname}: could not make ${PWD=`pwd`}/${bld_dir}" 1>&2
+                                                echo '***' "${progname}: could not make ${PWD=`${PWDCMD-pwd}`}/${bld_dir}" 1>&2
                                                 exit 1
                                         fi
                                 fi
                                 ;;
                         esac
 
-                        POPDIR=${PWD=`pwd`}
+                        POPDIR=${PWD=`${PWDCMD-pwd}`}
                         cd ${bld_dir} 
 
 ### figure out what to do with srcdir
@@ -1602,7 +1586,7 @@ if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then
                 	                ${srcdiroption} ${diroptions} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then
 	                                true
         	                else
-					echo Configure in `pwd` failed, exiting. 1>&2
+					echo Configure in `${PWDCMD-pwd}` failed, exiting. 1>&2
                 	                exit 1
                         	fi
 			fi
diff --git a/configure.in b/configure.in
index 2569cc2ec..b21918e07 100644
--- a/configure.in
+++ b/configure.in
@@ -51,7 +51,7 @@ libstdcxx_flags='`case $$dir in libstdc++-v3 | libjava) ;; *) test ! -f $$r/$(TA
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
 # know that we are building the simulator.
-host_tools="texinfo byacc flex bison binutils ld gas gcc cgen sid sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find emacs emacs19 uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext zip fastjar"
+host_tools="texinfo byacc flex bison binutils ld gas gcc cgen sid sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext zip fastjar"
 
 # libgcj represents the runtime libraries only used by gcj.
 libgcj="target-libffi \
@@ -93,7 +93,7 @@ target_tools="target-examples target-groff target-gperf"
 #
 # This must be a single line because of the way it is searched by grep in
 # the code below.
-native_only="autoconf automake libtool cvssrc emacs emacs19 fileutils find gawk gettext grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl apache inet time ash bash bzip2 prms snavigator gnuserv target-gperf"
+native_only="autoconf automake libtool cvssrc fileutils find gawk gettext grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl apache inet time ash bash bzip2 prms snavigator gnuserv target-gperf"
 
 # directories to be built in a cross environment only
 #
@@ -125,11 +125,11 @@ case "${host}" in
   m68k-hp-hpux*)
     # Avoid "too much defining" errors from HPUX compiler.
     tentative_cc="cc -Wp,-H256000"
-    host_makefile_frag="${host_makefile_frag} config/mh-hp300"
+    host_makefile_frag="config/mh-hp300"
     ;;
   m68k-apollo-sysv*)
     tentative_cc="cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DUSG"
-    host_makefile_frag="${host_makefile_frag} config/mh-apollo68"
+    host_makefile_frag="config/mh-apollo68"
     ;;
   m68k-apollo-bsd*)
     #None of the Apollo compilers can compile gas or binutils.  The preprocessor
@@ -139,34 +139,34 @@ case "${host}" in
     # or whatever), but I'm not sure leaving CC as cc is any better...
     #CC=cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DNO_STDARG
     tentative_cc=gcc
-    host_makefile_frag="${host_makefile_frag} config/mh-a68bsd"
+    host_makefile_frag="config/mh-a68bsd"
     ;;
   m88k-dg-dgux*)
     tentative_cc="gcc -Wall -ansi -D__using_DGUX"
-    host_makefile_frag="${host_makefile_frag} config/mh-dgux"
+    host_makefile_frag="config/mh-dgux"
     ;;
   m88k-harris-cxux*)
     # Under CX/UX, we want to tell the compiler to use ANSI mode.
     tentative_cc="cc -Xa"
-    host_makefile_frag="${host_makefile_frag} config/mh-cxux"
+    host_makefile_frag="config/mh-cxux"
     ;;
   m88k-motorola-sysv*)
-    host_makefile_frag="${host_makefile_frag} config/mh-delta88"
+    host_makefile_frag="config/mh-delta88"
     ;;
   mips*-dec-ultrix*)
     tentative_cc="cc -Wf,-XNg1000"
-    host_makefile_frag="${host_makefile_frag} config/mh-decstation"
+    host_makefile_frag="config/mh-decstation"
     ;;
   mips*-nec-sysv4*)
     # The C compiler on NEC MIPS SVR4 needs bigger tables.
     tentative_cc="cc -ZXNd=5000 -ZXNg=1000"
-    host_makefile_frag="${host_makefile_frag} config/mh-necv4"
+    host_makefile_frag="config/mh-necv4"
     ;;
   mips*-sgi-irix6*)
-    host_makefile_frag="${host_makefile_frag} config/mh-irix6"
+    host_makefile_frag="config/mh-irix6"
     ;;
   mips*-sgi-irix5*)
-    host_makefile_frag="${host_makefile_frag} config/mh-irix5"
+    host_makefile_frag="config/mh-irix5"
     ;;
   mips*-sgi-irix4*)
     # Tell compiler to use K&R C.  We can't compile under the SGI Ansi
@@ -175,10 +175,10 @@ case "${host}" in
     tentative_cc="cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh2000 -Wf,-XNl8192"
     ;;
   mips*-sgi-irix3*)
-    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    host_makefile_frag="config/mh-sysv"
     ;;
   mips*-*-sysv4*)
-    host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
+    host_makefile_frag="config/mh-sysv4"
     ;;
   mips*-*-sysv*)
     # This is for a MIPS running RISC/os 4.52C.
@@ -194,24 +194,24 @@ case "${host}" in
     # This is not part of CFLAGS because perhaps not all C compilers have this
     # option.
     tentative_cc="cc -systype sysv"
-    host_makefile_frag="${host_makefile_frag} config/mh-riscos"
+    host_makefile_frag="config/mh-riscos"
     ;;
   i370-ibm-opened*)
     tentative_cc="c89"
-    host_makefile_frag="${host_makefile_frag} config/mh-openedition"
+    host_makefile_frag="config/mh-openedition"
     ;;
   i[3456]86-*-sysv5*)
-    host_makefile_frag="${host_makefile_frag} config/mh-sysv5"
+    host_makefile_frag="config/mh-sysv5"
     ;;
   i[3456]86-*-dgux*)
     tentative_cc="gcc -Wall -ansi -D__using_DGUX"
-    host_makefile_frag="${host_makefile_frag} config/mh-dgux386"
+    host_makefile_frag="config/mh-dgux386"
     ;;
   i[3456]86-ncr-sysv4.3*)
     # The MetaWare compiler will generate a copyright message unless you
     # turn it off by adding the -Hnocopyr flag.
     tentative_cc="cc -Hnocopyr"
-    host_makefile_frag="${host_makefile_frag} config/mh-ncrsvr43"
+    host_makefile_frag="config/mh-ncrsvr43"
     ;;
   i[3456]86-ncr-sysv4*)
     # for an NCR 3000 (i486/SVR4) system.
@@ -220,47 +220,47 @@ case "${host}" in
     # you run it, but it chokes and dies on a whole bunch of GNU source
     # files.  Default to using the AT&T compiler installed in /usr/ccs/ATT/cc.
     tentative_cc="/usr/ccs/ATT/cc"
-    host_makefile_frag="${host_makefile_frag} config/mh-ncr3000"
+    host_makefile_frag="config/mh-ncr3000"
     ;;
   i[3456]86-*-sco3.2v5*)
-    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    host_makefile_frag="config/mh-sysv"
     ;;
   i[3456]86-*-sco*)
     # The native C compiler botches some simple uses of const.  Unfortunately,
     # it doesn't defined anything like "__sco__" for us to test for in ansidecl.h.
     tentative_cc="cc -Dconst="
-    host_makefile_frag="${host_makefile_frag} config/mh-sco"
+    host_makefile_frag="config/mh-sco"
     ;;
   i[3456]86-*-udk*)
-    host_makefile_frag="${host_makefile_frag} config/mh-sysv5"
+    host_makefile_frag="config/mh-sysv5"
     ;;
   i[3456]86-*-isc*)
-    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    host_makefile_frag="config/mh-sysv"
     ;;
   i[3456]86-*-solaris2*)
-    host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
+    host_makefile_frag="config/mh-sysv4"
     ;;
   i[3456]86-*-aix*)
-    host_makefile_frag="${host_makefile_frag} config/mh-aix386"
+    host_makefile_frag="config/mh-aix386"
     ;;
   i[3456]86-*-msdosdjgpp*)
-    host_makefile_frag="${host_makefile_frag} config/mh-djgpp"
+    host_makefile_frag="config/mh-djgpp"
     ;;
   *-cygwin*)
-    host_makefile_frag="${host_makefile_frag} config/mh-cygwin"
+    host_makefile_frag="config/mh-cygwin"
     ;;
   *-mingw32*)
-    host_makefile_frag="${host_makefile_frag} config/mh-mingw32"
+    host_makefile_frag="config/mh-mingw32"
     ;;
   *-interix*)
-    host_makefile_frag="${host_makefile_frag} config/mh-interix"
+    host_makefile_frag="config/mh-interix"
     ;;
   vax-*-ultrix2*)
     # The old BSD pcc isn't up to compiling parts of gdb so use gcc
     tentative_cc=gcc
     ;;
   *-*-solaris2*)
-    host_makefile_frag="${host_makefile_frag} config/mh-solaris"
+    host_makefile_frag="config/mh-solaris"
     ;;
   m68k-sun-sunos*)
     # Sun's C compiler needs the -J flag to be able to compile cp-parse.c
@@ -269,30 +269,30 @@ case "${host}" in
     ;;
   *-hp-hpux[78]*)
     tentative_cc="cc -Wp,-H256000"
-    host_makefile_frag="${host_makefile_frag} config/mh-hpux8"
+    host_makefile_frag="config/mh-hpux8"
     ;;
   *-hp-hpux*)
     tentative_cc="cc -Wp,-H256000"
-    host_makefile_frag="${host_makefile_frag} config/mh-hpux"
+    host_makefile_frag="config/mh-hpux"
     ;;
   *-*-hiux*)
     tentative_cc="cc -Wp,-H256000"
-    host_makefile_frag="${host_makefile_frag} config/mh-hpux"
+    host_makefile_frag="config/mh-hpux"
     ;;
   rs6000-*-lynxos*)
     # /bin/cc is less than useful for our purposes.  Always use GCC
     tentative_cc="/usr/cygnus/progressive/bin/gcc"
-    host_makefile_frag="${host_makefile_frag} config/mh-lynxrs6k"
+    host_makefile_frag="config/mh-lynxrs6k"
     ;;
   *-*-lynxos*)
     # /bin/cc is less than useful for our purposes.  Always use GCC
     tentative_cc="/bin/gcc"
     ;;
   *-*-sysv4*)
-    host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
+    host_makefile_frag="config/mh-sysv4"
     ;;
   *-*-sysv*)
-    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    host_makefile_frag="config/mh-sysv"
     ;;
 esac
 fi
@@ -446,7 +446,7 @@ target_subdir=${target_alias}
 if test ! -d ${target_subdir} ; then
   if mkdir ${target_subdir} ; then true
   else
-    echo "'*** could not make ${PWD=`pwd`}/${target_subdir}" 1>&2
+    echo "'*** could not make ${PWD=`${PWDCMD-pwd}`}/${target_subdir}" 1>&2
     exit 1
   fi
 fi
@@ -457,7 +457,7 @@ if test x"${build_alias}" != x"${host}" ; then
   if test ! -d ${build_subdir} ; then
     if mkdir ${build_subdir} ; then true
     else
-      echo "'*** could not make ${PWD=`pwd`}/${build_subdir}" 1>&2
+      echo "'*** could not make ${PWD=`${PWDCMD-pwd}`}/${build_subdir}" 1>&2
       exit 1
     fi
   fi
@@ -654,10 +654,10 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
     ;;
   alpha*-dec-osf*)
-    # ld works, but does not support shared libraries.  emacs doesn't
-    # work.  newlib is not 64 bit ready.  I'm not sure about fileutils.
+    # ld works, but does not support shared libraries.
+    # newlib is not 64 bit ready.  I'm not sure about fileutils.
     # gas doesn't generate exception information.
-    noconfigdirs="$noconfigdirs gas ld emacs fileutils target-newlib target-libgloss"
+    noconfigdirs="$noconfigdirs gas ld fileutils target-newlib target-libgloss"
     ;;
   alpha*-*-*vms*)
     noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss ${libgcj}"
@@ -731,6 +731,9 @@ case "${target}" in
   arm-*-riscix*)
     noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
     ;;
+  avr-*-*)
+    noconfigdirs="$noconfigdirs target-libiberty ${libstdcxx_version} ${libgcj}"
+    ;;
   c4x-*-*)
     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-librx target-libgloss ${libgcj}"
     ;;
@@ -772,13 +775,6 @@ case "${target}" in
     # Do configure ld/binutils/gas for this case.
     ;;
   hppa*-*-*)
-    # HP's C compiler doesn't handle Emacs correctly (but on BSD and Mach
-    # cc is gcc, and on any system a user should be able to link cc to
-    # whatever they want.  FIXME, emacs emacs19).
-    case "${CC}" in
-	"" | cc*) noconfigdirs="$noconfigdirs emacs emacs19" ;;
-        *) ;;
-    esac
     # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
     # build on HP-UX 10.20.
     noconfigdirs="$noconfigdirs ld shellutils ${libgcj}"
@@ -864,13 +860,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
   i[3456]86-*-sysv4*)
-    # The SYSV4 C compiler doesn't handle Emacs correctly
-    case "${CC}" in
-	"" | cc*) noconfigdirs="$noconfigdirs emacs emacs19" ;;
-        *) ;;
-    esac
-    # but that's okay since emacs doesn't work anyway
-    noconfigdirs="$noconfigdirs emacs emacs19 target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
     ;;
   i[3456]86-*-beos*)
      noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
@@ -950,17 +940,15 @@ case "${target}" in
     ;;
   mips*-*-irix5*)
     # The GNU linker does not support shared libraries.
-    # emacs is emacs 18, which does not work on Irix 5 (emacs19 does work)
-    noconfigdirs="$noconfigdirs ld gprof emacs target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs ld gprof target-libgloss ${libgcj}"
     ;;
   mips*-*-irix6*)
     # The GNU assembler does not support IRIX 6.
-    # emacs is emacs 18, which does not work on Irix 5 (emacs19 does work)
     # Linking libjava exceeds command-line length limits on at least
     # IRIX 6.2, but not on IRIX 6.5.
     # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham
     # <oldham@codesourcery.com>
-    noconfigdirs="$noconfigdirs gas gprof emacs target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs gas gprof target-libgloss ${libgcj}"
     ;;
   mips*-dec-bsd*)
     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
@@ -1319,6 +1307,18 @@ if test -n "${target_makefile_frag}" ; then
   target_makefile_frag=mt-frag
 fi
 
+case "$host" in
+  *msdosdjgpp*)
+    enable_gdbtk=no ;;
+esac
+# Determine whether gdb needs tk/tcl or not.
+case "$enable_gdbtk" in
+  no)
+    GDB_TK="" ;;
+  *)
+    GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui" ;;
+esac
+
 # post-target:
 
 # Make sure that the compiler is able to generate an executable.  If it
@@ -1389,12 +1389,12 @@ if test "${shared}" = "yes" ; then
   esac
 fi
 
-# Record target_configdirs and the configure arguments for target and
-# build configuration in Makefile.
-target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
-targargs=`echo "${arguments}" | \
+# Base args.  Strip norecursion, cache-file, srcdir, host, build, target.
+# These are the ones we might not want to pass down to subconfigures.
+baseargs=`echo "${arguments}" | \
 	sed -e 's/--no[^ 	]*//' \
 	    -e 's/--cache[a-z-]*=[^ 	]*//' \
+	    -e 's/--sr[a-z-]*=[^ 	]*//' \
 	    -e 's/--ho[a-z-]*=[^ 	]*//' \
 	    -e 's/--bu[a-z-]*=[^ 	]*//' \
 	    -e 's/--ta[a-z-]*=[^ 	]*//'`
@@ -1402,7 +1402,12 @@ targargs=`echo "${arguments}" | \
 # For the build-side libraries, we just need to pretend we're native,
 # and not use the same cache file.  Multilibs are neither needed nor
 # desired.
-buildargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} ${targargs}"
+buildargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} ${baseargs}"
+
+# Record target_configdirs and the configure arguments for target and
+# build configuration in Makefile.
+target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
+targargs=${baseargs}
 
 # Passing a --with-cross-host argument lets the target libraries know
 # whether they are being built with a cross-compiler or being built
diff --git a/include/ChangeLog b/include/ChangeLog
index dd0a2302a..d64d48cae 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,25 @@
+2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
+
+	* dis-asm.h: Prototype print_insn_dlx.
+
+2002-05-23  Andrew Cagney  <ac131313@redhat.com>
+
+	* sim-d10v.h: Delete file.  Moved to include/gdb/.
+
+2002-05-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf/common.h (PT_TLS, SHF_TLS, STT_TLS, DF_STATIC_TLS): Define.
+	* elf/ia64.h (R_IA64_LTOFF_TPREL22): Renamed from R_IA64_LTOFF_TP22.
+	* elf/i386.h: Add TLS relocs.
+
+2002-05-21  H.J. Lu  (hjl@gnu.org)
+
+	* bfdlink.h (bfd_link_info): Add allow_multiple_definition.
+
+2002-05-17  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* dis-asm.h (print_insn_shl, print_insn_sh64l): Remove prototype.
+
 2002-04-16  David S. Miller  <davem@redhat.com>
 
 	* xregex2.h (__restrict_arr): Define to __restrict on GCC
diff --git a/include/bfdlink.h b/include/bfdlink.h
index a03454721..b1411c381 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -231,6 +231,8 @@ struct bfd_link_info
      select an appropriate memset function.  Apparently it is also
      normal for HPPA shared libraries to have undefined symbols.  */
   boolean allow_shlib_undefined;
+  /* True if ok to have multiple definition.  */
+  boolean allow_multiple_definition;
   /* Which symbols to strip.  */
   enum bfd_link_strip strip;
   /* Which local symbols to discard.  */
diff --git a/include/dis-asm.h b/include/dis-asm.h
index decc863c6..8d38f7e8d 100644
--- a/include/dis-asm.h
+++ b/include/dis-asm.h
@@ -205,6 +205,7 @@ extern int print_insn_little_a29k	PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_avr		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_d10v		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_d30v		PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_dlx 		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_fr30		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_hppa		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_i860		PARAMS ((bfd_vma, disassemble_info*));
@@ -226,7 +227,6 @@ extern int print_insn_little_powerpc	PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_rs6000		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_s390              PARAMS ((bfd_vma, disassemble_info*)); 
 extern int print_insn_sh		PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_shl		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_tic30		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_tic54x		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_tic80		PARAMS ((bfd_vma, disassemble_info*));
@@ -235,7 +235,6 @@ extern int print_insn_vax		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_w65		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_xstormy16		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_sh64		PARAMS ((bfd_vma, disassemble_info *));
-extern int print_insn_sh64l		PARAMS ((bfd_vma, disassemble_info *));
 extern int print_insn_sh64x_media	PARAMS ((bfd_vma, disassemble_info *));
 
 extern disassembler_ftype arc_get_disassembler PARAMS ((void *));
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index fe3823b1b..1deec0daa 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
+
+	* common.h (EM_DLX): Define.
+	* dlx.h: New file.
+
 2002-05-08  Jason Thorpe  <thorpej@wasabisystems.com>
 
 	* common.h (NT_GNU_ABI_TAG): Define.
diff --git a/include/elf/common.h b/include/elf/common.h
index f8b0832e8..48e2f4ae5 100644
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -236,6 +236,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    Written in the absense of an ABI.  */
 #define EM_OPENRISC_OLD		0x3426
 
+/* DLX magic number
+   Written in the absense of an ABI.  */
+#define EM_DLX			0x5aa5
+
 #define EM_XSTORMY16	        0xad45
 
 /* See the above comment before you add a new EM_* value here.  */
@@ -254,6 +258,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define PT_NOTE		4		/* Auxiliary information */
 #define PT_SHLIB	5		/* Reserved, unspecified semantics */
 #define PT_PHDR		6		/* Entry for header table itself */
+#define PT_TLS		7		/* Thread local storage segment */
 #define PT_LOOS         0x60000000	/* OS-specific */
 #define PT_HIOS         0x6fffffff	/* OS-specific */
 #define PT_LOPROC	0x70000000	/* Processor-specific */
@@ -322,6 +327,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define SHF_LINK_ORDER  (1 << 7)	/* Preserve section ordering when linking */
 #define SHF_OS_NONCONFORMING (1 << 8)	/* OS specific processing required */
 #define SHF_GROUP	(1 << 9)	/* Member of a section group */
+#define SHF_TLS		(1 << 10)	/* Thread local storage section */
 
 /* #define SHF_MASKOS	0x0F000000    *//* OS-specific semantics */
 #define SHF_MASKOS	0x0FF00000	/* New value, Oct 4, 1999 Draft */
@@ -417,6 +423,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define STT_SECTION	3		/* Symbol associated with a section */
 #define STT_FILE	4		/* Symbol gives a file name */
 #define STT_COMMON	5		/* An uninitialised common block */
+#define STT_TLS		6		/* Thread local data object */
 #define STT_LOOS        10		/* OS-specific semantics */
 #define STT_HIOS        12		/* OS-specific semantics */
 #define STT_LOPROC	13		/* Application-specific semantics */
@@ -585,6 +592,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define DF_SYMBOLIC	(1 << 1)
 #define DF_TEXTREL	(1 << 2)
 #define DF_BIND_NOW	(1 << 3)
+#define DF_STATIC_TLS	(1 << 4)
 
 /* These constants are used for the version number of a Elf32_Verdef
    structure.  */
diff --git a/include/elf/frv.h b/include/elf/frv.h
new file mode 100644
index 000000000..65ce97d1e
--- /dev/null
+++ b/include/elf/frv.h
@@ -0,0 +1,95 @@
+/* FRV ELF support for BFD.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of BFD, the Binary File Descriptor library.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _ELF_FRV_H
+#define _ELF_FRV_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_frv_reloc_type)
+  RELOC_NUMBER (R_FRV_NONE, 0)
+  RELOC_NUMBER (R_FRV_32, 1)
+  RELOC_NUMBER (R_FRV_LABEL16, 2)
+  RELOC_NUMBER (R_FRV_LABEL24, 3)
+  RELOC_NUMBER (R_FRV_LO16, 4)
+  RELOC_NUMBER (R_FRV_HI16, 5)
+  RELOC_NUMBER (R_FRV_GPREL12, 6)
+  RELOC_NUMBER (R_FRV_GPRELU12, 7)
+  RELOC_NUMBER (R_FRV_GPREL32, 8)
+  RELOC_NUMBER (R_FRV_GPRELHI, 9)
+  RELOC_NUMBER (R_FRV_GPRELLO, 10)
+  RELOC_NUMBER (R_FRV_GNU_VTINHERIT, 200)
+  RELOC_NUMBER (R_FRV_GNU_VTENTRY, 201)
+END_RELOC_NUMBERS(R_FRV_max)
+
+/* Processor specific flags for the ELF header e_flags field.  */
+						/* gpr support */
+#define EF_FRV_GPR_MASK		0x00000003	/* mask for # of gprs */
+#define EF_FRV_GPR_32		0x00000001	/* -mgpr-32 */
+#define EF_FRV_GPR_64		0x00000002	/* -mgpr-64 */
+
+						/* fpr support */
+#define EF_FRV_FPR_MASK		0x0000000c	/* mask for # of fprs */
+#define EF_FRV_FPR_32		0x00000004	/* -mfpr-32 */
+#define EF_FRV_FPR_64		0x00000008	/* -mfpr-64 */
+#define EF_FRV_FPR_NONE		0x0000000c	/* -msoft-float */
+
+						/* double word support */
+#define EF_FRV_DWORD_MASK	0x00000030	/* mask for dword support */
+#define EF_FRV_DWORD_YES	0x00000010	/* use double word insns */
+#define EF_FRV_DWORD_NO		0x00000020	/* don't use double word insn*/
+
+#define EF_FRV_DOUBLE		0x00000040	/* -mdouble */
+#define EF_FRV_MEDIA		0x00000080	/* -mmedia */
+
+#define EF_FRV_PIC		0x00000100	/* -fpic */
+#define EF_FRV_NON_PIC_RELOCS	0x00000200	/* used non pic safe relocs */
+
+#define EF_FRV_MULADD		0x00000400	/* -mmuladd */
+#define EF_FRV_BIGPIC		0x00000800	/* -fPIC */
+#define	EF_FRV_LIBPIC		0x00001000	/* -mlibrary-pic */
+#define EF_FRV_G0		0x00002000	/* -G 0, no small data ptr */
+#define EF_FRV_NOPACK		0x00004000	/* -mnopack */
+
+#define	EF_FRV_CPU_MASK		0xff000000	/* specific cpu bits */
+#define EF_FRV_CPU_GENERIC	0x00000000	/* generic FRV */
+#define EF_FRV_CPU_FR500	0x01000000	/* FRV500 */
+#define EF_FRV_CPU_FR300	0x02000000	/* FRV300 */
+#define EF_FRV_CPU_SIMPLE	0x03000000	/* SIMPLE */
+#define EF_FRV_CPU_TOMCAT	0x04000000	/* Tomcat, FR500 prototype */
+#define EF_FRV_CPU_FR400	0x05000000	/* FRV400 */
+
+						/* Mask of PIC related bits */
+#define	EF_FRV_PIC_FLAGS	(EF_FRV_PIC | EF_FRV_LIBPIC | EF_FRV_BIGPIC)
+
+						/* Mask of all flags */
+#define EF_FRV_ALL_FLAGS	(EF_FRV_GPR_MASK | \
+				 EF_FRV_FPR_MASK | \
+				 EF_FRV_DWORD_MASK | \
+				 EF_FRV_DOUBLE | \
+				 EF_FRV_MEDIA | \
+				 EF_FRV_PIC_FLAGS | \
+				 EF_FRV_NON_PIC_RELOCS | \
+				 EF_FRV_MULADD | \
+				 EF_FRV_G0 | \
+				 EF_FRV_NOPACK | \
+				 EF_FRV_CPU_MASK)
+
+#endif /* _ELF_FRV_H */
diff --git a/include/elf/i386.h b/include/elf/i386.h
index 4a15efc49..c6e9709a1 100644
--- a/include/elf/i386.h
+++ b/include/elf/i386.h
@@ -34,12 +34,31 @@ START_RELOC_NUMBERS (elf_i386_reloc_type)
      RELOC_NUMBER (R_386_RELATIVE,  8)	/* Adjust by program base */
      RELOC_NUMBER (R_386_GOTOFF,    9)	/* 32 bit offset to GOT */
      RELOC_NUMBER (R_386_GOTPC,    10)	/* 32 bit PC relative offset to GOT */
-     FAKE_RELOC   (FIRST_INVALID_RELOC, 11)
-     FAKE_RELOC   (LAST_INVALID_RELOC,  19)
+     RELOC_NUMBER (R_386_32PLT,    11)	/* Used by Sun */
+     FAKE_RELOC   (FIRST_INVALID_RELOC, 12)
+     FAKE_RELOC   (LAST_INVALID_RELOC,  16)
+     RELOC_NUMBER (R_386_TLS_LE,   17)
+     RELOC_NUMBER (R_386_TLS_GD,   18)
+     RELOC_NUMBER (R_386_TLS_LDM,  19)
      RELOC_NUMBER (R_386_16,       20)
      RELOC_NUMBER (R_386_PC16,     21)
      RELOC_NUMBER (R_386_8,	   22)
      RELOC_NUMBER (R_386_PC8,      23)
+     RELOC_NUMBER (R_386_TLS_GD_32,    24)
+     RELOC_NUMBER (R_386_TLS_GD_PUSH,  25)
+     RELOC_NUMBER (R_386_TLS_GD_CALL,  26)
+     RELOC_NUMBER (R_386_TLS_GD_POP,   27)
+     RELOC_NUMBER (R_386_TLS_LDM_32,   28)
+     RELOC_NUMBER (R_386_TLS_LDM_PUSH, 29)
+     RELOC_NUMBER (R_386_TLS_LDM_CALL, 30)
+     RELOC_NUMBER (R_386_TLS_LDM_POP,  31)
+     RELOC_NUMBER (R_386_TLS_LDO_32,   32)
+     RELOC_NUMBER (R_386_TLS_IE_32,    33)
+     RELOC_NUMBER (R_386_TLS_LE_32,    34)
+     RELOC_NUMBER (R_386_TLS_DTPMOD32, 35)
+     RELOC_NUMBER (R_386_TLS_DTPOFF32, 36)
+     RELOC_NUMBER (R_386_TLS_TPOFF32,  37)
+
      /* These are GNU extensions to enable C++ vtable garbage collection.  */
      RELOC_NUMBER (R_386_GNU_VTINHERIT, 250)
      RELOC_NUMBER (R_386_GNU_VTENTRY, 251)
diff --git a/include/elf/ia64.h b/include/elf/ia64.h
index 5e632ed01..310a7f74a 100644
--- a/include/elf/ia64.h
+++ b/include/elf/ia64.h
@@ -192,7 +192,7 @@ START_RELOC_NUMBERS (elf_ia64_reloc_type)
   RELOC_NUMBER (R_IA64_TPREL64MSB, 0x96) /* @tprel(sym+add), data8 MSB */
   RELOC_NUMBER (R_IA64_TPREL64LSB, 0x97) /* @tprel(sym+add), data8 LSB */
 
-  RELOC_NUMBER (R_IA64_LTOFF_TP22, 0x9a) /* @ltoff(@tprel(s+a)), add imm22 */
+  RELOC_NUMBER (R_IA64_LTOFF_TPREL22, 0x9a) /* @ltoff(@tprel(s+a)), add imm22 */
 
   RELOC_NUMBER (R_IA64_DTPMOD64MSB, 0xa6) /* @dtpmod(sym+add), data8 MSB */
   RELOC_NUMBER (R_IA64_DTPMOD64LSB, 0xa7) /* @dtpmod(sym+add), data8 LSB */
diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog
index 96a4a058a..e0992c95a 100644
--- a/include/gdb/ChangeLog
+++ b/include/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-23  Andrew Cagney  <ac131313@redhat.com>
+
+	* sim-d10v.h: New file.  Moved from include/sim-d10v.h.
+
 2002-05-10  Elena Zannoni  <ezannoni@redhat.com>
 
         * sim-sh.h: New file, for sh gdb<->sim interface.
diff --git a/include/gdb/sim-arm.h b/include/gdb/sim-arm.h
index 1e49781e8..6d80700ad 100644
--- a/include/gdb/sim-arm.h
+++ b/include/gdb/sim-arm.h
@@ -28,7 +28,7 @@
 extern "C" { // }
 #endif
 
-enum sim_arm_regnum
+enum sim_arm_regs
 {
   SIM_ARM_R0_REGNUM,
   SIM_ARM_R1_REGNUM,
diff --git a/include/gdb/sim-d10v.h b/include/gdb/sim-d10v.h
index f153a4194..9d29e0584 100644
--- a/include/gdb/sim-d10v.h
+++ b/include/gdb/sim-d10v.h
@@ -1,6 +1,5 @@
 /* This file defines the interface between the d10v simulator and gdb.
-
-   Copyright 1999, 2002 Free Software Foundation, Inc.
+   Copyright 1999 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -76,61 +75,26 @@ extern unsigned long sim_d10v_translate_addr
 
 /* The simulator makes use of the following register information. */
 
-enum sim_d10v_regs
-{
-  SIM_D10V_R0_REGNUM,
-  SIM_D10V_R1_REGNUM,
-  SIM_D10V_R2_REGNUM,
-  SIM_D10V_R3_REGNUM,
-  SIM_D10V_R4_REGNUM,
-  SIM_D10V_R5_REGNUM,
-  SIM_D10V_R6_REGNUM,
-  SIM_D10V_R7_REGNUM,
-  SIM_D10V_R8_REGNUM,
-  SIM_D10V_R9_REGNUM,
-  SIM_D10V_R10_REGNUM,
-  SIM_D10V_R11_REGNUM,
-  SIM_D10V_R12_REGNUM,
-  SIM_D10V_R13_REGNUM,
-  SIM_D10V_R14_REGNUM,
-  SIM_D10V_R15_REGNUM,
-  SIM_D10V_CR0_REGNUM,
-  SIM_D10V_CR1_REGNUM,
-  SIM_D10V_CR2_REGNUM,
-  SIM_D10V_CR3_REGNUM,
-  SIM_D10V_CR4_REGNUM,
-  SIM_D10V_CR5_REGNUM,
-  SIM_D10V_CR6_REGNUM,
-  SIM_D10V_CR7_REGNUM,
-  SIM_D10V_CR8_REGNUM,
-  SIM_D10V_CR9_REGNUM,
-  SIM_D10V_CR10_REGNUM,
-  SIM_D10V_CR11_REGNUM,
-  SIM_D10V_CR12_REGNUM,
-  SIM_D10V_CR13_REGNUM,
-  SIM_D10V_CR14_REGNUM,
-  SIM_D10V_CR15_REGNUM,
-  SIM_D10V_A0_REGNUM,
-  SIM_D10V_A1_REGNUM,
-  SIM_D10V_SPI_REGNUM,
-  SIM_D10V_SPU_REGNUM,
-  SIM_D10V_IMAP0_REGNUM,
-  SIM_D10V_IMAP1_REGNUM,
-  SIM_D10V_DMAP0_REGNUM,
-  SIM_D10V_DMAP1_REGNUM,
-  SIM_D10V_DMAP2_REGNUM,
-  SIM_D10V_DMAP3_REGNUM,
-  SIM_D10V_TS2_DMAP_REGNUM
-};
-  
 enum
-{
-  SIM_D10V_NR_R_REGS = 16,
-  SIM_D10V_NR_A_REGS = 2,
-  SIM_D10V_NR_IMAP_REGS = 2,
-  SIM_D10V_NR_DMAP_REGS = 4,
-  SIM_D10V_NR_CR_REGS = 16
-};
+  {
+    SIM_D10V_R0_REGNUM = 0,
+    SIM_D10V_CR0_REGNUM = 16,
+    SIM_D10V_A0_REGNUM = 32,
+    SIM_D10V_SPI_REGNUM = 34,
+    SIM_D10V_SPU_REGNUM = 35,
+    SIM_D10V_IMAP0_REGNUM = 36,
+    SIM_D10V_DMAP0_REGNUM = 38,
+    SIM_D10V_TS2_DMAP_REGNUM = 40
+  };
+
+enum
+  {
+    SIM_D10V_NR_R_REGS = 16,
+    SIM_D10V_NR_A_REGS = 2,
+    SIM_D10V_NR_IMAP_REGS = 2,
+    SIM_D10V_NR_DMAP_REGS = 4,
+    SIM_D10V_NR_CR_REGS = 16
+  };
 
 #ifdef __cplusplus
 }
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 2882ce568..100c886a7 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,21 @@
+2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
+
+	* dlx.h: New file.
+
+2002-05-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* ia64.h: Use #include "" instead of <> for local header files.
+	* sparc.h: Likewise.
+
+2002-05-22  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* mips.h: Add M_DROL, M_DROL_I, M_DROR, M_DROR_I macro cases.
+
+2002-05-17  Andrey Volkov  <avolkov@sources.redhat.com>
+
+        * h8300.h: Corrected defs of all control regs 
+	and eepmov instr.
+		      
 2002-04-11  Alan Modra  <amodra@bigpond.net.au>
 
 	* i386.h: Add intel mode cmpsd and movsd.
diff --git a/include/opcode/dlx.h b/include/opcode/dlx.h
index e1b249f85..23e3b00bc 100644
--- a/include/opcode/dlx.h
+++ b/include/opcode/dlx.h
@@ -163,7 +163,7 @@ struct dlx_opcode
   char *args;
 };
 
-static const struct dlx_opcode dlx_opcodes[] =
+static CONST struct dlx_opcode dlx_opcodes[] =
   {
   /* Arithmetic and Logic R-TYPE instructions.  */
     { "nop",      (ALUOP|NOPF),   "N"     },  /* NOP                          */
diff --git a/include/opcode/h8300.h b/include/opcode/h8300.h
index 9cd40a6cb..18d17c537 100644
--- a/include/opcode/h8300.h
+++ b/include/opcode/h8300.h
@@ -333,8 +333,8 @@ struct h8_opcode h8_opcodes[] =
   NEW_SOP(O(O_AND,SL),0,6,"and.l"),{{IMM32,RD32,E }},{{0x7,0xA,0x6,B30|RD32,IMM32LIST,E}} EOP,
   NEW_SOP(O(O_AND,SL),0,2,"and.l") ,{{RS32,RD32,E }},{{0x0,0x1,0xF,0x0,0x6,0x6,B30|RS32,B30|RD32,E}} EOP,
 
-  NEW_SOP(O(O_ANDC,SB),1,2,"andc"), {{IMM8,CCR,E}},{{ 0x0,0x6,IMM8,IGNORE,E,0,0,0,0}} EOP,
-  NEW_SOP(O(O_ANDC,SB),1,2,"andc"), {{IMM8,EXR,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x6,IMM8,IGNORE,E,0,0,0,0}} EOP,
+  NEW_SOP(O(O_ANDC,SB),1,2,"andc"), {{IMM8,CCR|DST,E}},{{ 0x0,0x6,IMM8,IGNORE,E,0,0,0,0}} EOP,
+  NEW_SOP(O(O_ANDC,SB),1,2,"andc"), {{IMM8,EXR|DST,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x6,IMM8,IGNORE,E,0,0,0,0}} EOP,
 
   BITOP(O(O_BAND,SB), IMM3|B30,"band",0x7,0x6,0x7,0xC,0x7,0xE,0x0),
   BRANCH(O(O_BRA,SB),"bra",0x0),
@@ -391,14 +391,14 @@ struct h8_opcode h8_opcodes[] =
   NEW_SOP(O(O_DEC, SW),0,2,"dec.w") ,{{DBIT,RD16,E }},{{0x1,0xB,0x5|DBIT,RD16,E}} EOP,
   NEW_SOP(O(O_DEC, SL),0,2,"dec.l") ,{{DBIT,RD32,E }},{{0x1,0xB,0x7|DBIT,RD32|B30,E}} EOP,
 
-  NEW_SOP(O(O_DIVU,SB),1,6,"divxu.b"), {{RS8,RD16,E}}, {{0x5,0x1,RS8,RD16,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_DIVU,SW),0,20,"divxu.w"),{{RS16,RD32,E}},{{0x5,0x3,RS16,B30|RD32,E}}EOP,
+  NEW_SOP(O(O_DIVU,SB),1,13,"divxu.b"), {{RS8,RD16,E}}, {{0x5,0x1,RS8,RD16,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_DIVU,SW),0,21,"divxu.w"),{{RS16,RD32,E}},{{0x5,0x3,RS16,B30|RD32,E}}EOP,
     
-  NEW_SOP(O(O_DIVS,SB),0,20,"divxs.b") ,{{RS8,RD16,E }},{{0x0,0x1,0xD,0x0,0x5,0x1,RS8,RD16,E}} EOP,
-  NEW_SOP(O(O_DIVS,SW),0,02,"divxs.w") ,{{RS16,RD32,E }},{{0x0,0x1,0xD,0x0,0x5,0x3,RS16,B30|RD32,E}} EOP,
+  NEW_SOP(O(O_DIVS,SB),0,13,"divxs.b") ,{{RS8,RD16,E }},{{0x0,0x1,0xD,0x0,0x5,0x1,RS8,RD16,E}} EOP,
+  NEW_SOP(O(O_DIVS,SW),0,21,"divxs.w") ,{{RS16,RD32,E }},{{0x0,0x1,0xD,0x0,0x5,0x3,RS16,B30|RD32,E}} EOP,
 
-  NEW_SOP(O(O_EEPMOV,SB),1,50,"eepmov.b"),{{E,0,0}},{{0x7,0xB,0x5,0xC,0x5,0x9,0x8,0xF,E}}EOP,
-  NEW_SOP(O(O_EEPMOV,SW),0,50,"eepmov.w"),{{E,0,0}},{{0x7,0xB,0xD,0x4,0x5,0x9,0x8,0xF,E}} EOP,
+  NEW_SOP(O(O_EEPMOV,SB),1,4,"eepmov.b"),{{E,0,0}},{{0x7,0xB,0x5,0xC,0x5,0x9,0x8,0xF,E}}EOP,
+  NEW_SOP(O(O_EEPMOV,SW),0,4,"eepmov.w"),{{E,0,0}},{{0x7,0xB,0xD,0x4,0x5,0x9,0x8,0xF,E}} EOP,
     
   NEW_SOP(O(O_EXTS,SW),0,2,"exts.w"),{{OR16,E,0}},{{0x1,0x7,0xD,OR16,E   }}EOP,
   NEW_SOP(O(O_EXTS,SL),0,2,"exts.l"),{{OR32,E,0}},{{0x1,0x7,0xF,OR32|B30,E   }}EOP,
@@ -419,23 +419,23 @@ struct h8_opcode h8_opcodes[] =
   SOP(O(O_JSR,SB),8,"jsr"),{{SRC|ABSJMP,E,0}},{{0x5,0xE,SRC|ABSJMP,IGNORE,IGNORE,IGNORE,IGNORE,IGNORE,E}}EOP,
   SOP(O(O_JSR,SB),8,"jsr"),{{SRC|MEMIND,E,0}},{{0x5,0xF,SRC|MEMIND,IGNORE,E,0,0,0,0}}EOP,
 
-  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{IMM8,CCR,E}},         {{ 0x0,0x7,IMM8,IGNORE,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{OR8,CCR,E}},          {{ 0x0,0x3,0x0,OR8,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS16SRC,CCR,E}},     {{PREFIXLDC,0x6,0xB,0x0,0x0,ABS16SRC,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS32SRC,CCR,E}},     {{PREFIXLDC,0x6,0xB,0x2,0x0,SRC|ABS32LIST,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_16,CCR,E}},{{PREFIXLDC,0x6,0xF,B30|DISPREG,0,DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_32,CCR,E}},{{PREFIXLDC,0x7,0x8,B30|DISPREG,0,0x6,0xB,0x2,0x0,SRC|DISP32LIST,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSINC,CCR,E}},        {{PREFIXLDC,0x6,0xD,B30|RSINC,0x0,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSIND,CCR,E}},        {{PREFIXLDC,0x6,0x9,B30|RDIND,0x0,E}} EOP,
-
-  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{IMM8,EXR,E}},         {{ 0x0,0x1,0x4,0x1,0x0,0x7,IMM8,IGNORE,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{OR8,EXR,E}},          {{ 0x0,0x3,0x1,OR8,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS16SRC,EXR,E}},     {{ 0x0,0x1,0x4,0x1,0x6,0xb,0x0,0x0,ABS16SRC,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS32SRC,EXR,E}},     {{ 0x0,0x1,0x4,0x1,0x6,0xb,0x2,0x0,SRC|ABS32LIST,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_16,EXR,E}},{{ 0x0,0x1,0x4,0x1,0x6,0xf,B30|DISPREG,0,DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_32,EXR,E}},{{ 0x0,0x1,0x4,0x1,0x7,0x8,B30|DISPREG,0,0x6,0xB,0x2,0x0,SRC|DISP32LIST,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSINC,EXR,E}},        {{ 0x0,0x1,0x4,0x1,0x6,0xd,B30|RSINC,0x0,E}}EOP,
-  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSIND,EXR,E}},        {{ 0x0,0x1,0x4,0x1,0x6,0x9,B30|RDIND,0x0,E}} EOP,
+  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{IMM8,CCR|DST,E}},         {{ 0x0,0x7,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{OR8,CCR|DST,E}},          {{ 0x0,0x3,0x0,OR8,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS16SRC,CCR|DST,E}},     {{PREFIXLDC,0x6,0xB,0x0,0x0,ABS16SRC,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS32SRC,CCR|DST,E}},     {{PREFIXLDC,0x6,0xB,0x2,0x0,SRC|ABS32LIST,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_16,CCR|DST,E}},{{PREFIXLDC,0x6,0xF,B30|DISPREG,0,DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_32,CCR|DST,E}},{{PREFIXLDC,0x7,0x8,B30|DISPREG,0,0x6,0xB,0x2,0x0,SRC|DISP32LIST,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSINC,CCR|DST,E}},        {{PREFIXLDC,0x6,0xD,B30|RSINC,0x0,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSIND,CCR|DST,E}},        {{PREFIXLDC,0x6,0x9,B30|RDIND,0x0,E}} EOP,
+
+  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{IMM8,EXR|DST,E}},         {{ 0x0,0x1,0x4,0x1,0x0,0x7,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_LDC,SB),1,2,"ldc"),{{OR8,EXR|DST,E}},          {{ 0x0,0x3,0x1,OR8,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS16SRC,EXR|DST,E}},     {{ 0x0,0x1,0x4,0x1,0x6,0xb,0x0,0x0,ABS16SRC,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{ABS32SRC,EXR|DST,E}},     {{ 0x0,0x1,0x4,0x1,0x6,0xb,0x2,0x0,SRC|ABS32LIST,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_16,EXR|DST,E}},{{ 0x0,0x1,0x4,0x1,0x6,0xf,B30|DISPREG,0,DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{DISP|SRC|L_32,EXR|DST,E}},{{ 0x0,0x1,0x4,0x1,0x7,0x8,B30|DISPREG,0,0x6,0xB,0x2,0x0,SRC|DISP32LIST,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSINC,EXR|DST,E}},        {{ 0x0,0x1,0x4,0x1,0x6,0xd,B30|RSINC,0x0,E}}EOP,
+  NEW_SOP(O(O_LDC,SB),0,2,"ldc"),{{RSIND,EXR|DST,E}},        {{ 0x0,0x1,0x4,0x1,0x6,0x9,B30|RDIND,0x0,E}} EOP,
 
   SOP(O(O_MOV_TO_REG,SB),4,"mov.b"),{{ABS|SRC|L_16|MEMRELAX,RD8,E}},  {{ 0x6,0xA,0x0,RD8,SRC|ABS|MEMRELAX|A16LIST,E}}EOP,
   SOP(O(O_MOV_TO_REG,SB),6,"mov.b"),{{ABS|SRC|L_32|MEMRELAX,RD8,E }}, {{ 0x6,0xA,0x2,RD8,SRC|ABS|MEMRELAX|A32LIST,E }}EOP,
@@ -520,8 +520,8 @@ struct h8_opcode h8_opcodes[] =
   NEW_SOP(O(O_OR,SL),0,6,"or.l"),{{IMM32,RD32,E }},{{0x7,0xA,0x4,B30|RD32,IMM32LIST,E}} EOP,
   NEW_SOP(O(O_OR,SL),0,2,"or.l"),{{RS32,RD32,E }},{{0x0,0x1,0xF,0x0,0x6,0x4,B30|RS32,B30|RD32,E}} EOP,
 
-  NEW_SOP(O(O_ORC,SB),1,2,"orc"),{{IMM8,CCR,E}},{{ 0x0,0x4,IMM8,IGNORE,E,0,0,0,0}}EOP,
-  NEW_SOP(O(O_ORC,SB),1,2,"orc"),{{IMM8,EXR,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x4,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_ORC,SB),1,2,"orc"),{{IMM8,CCR|DST,E}},{{ 0x0,0x4,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  NEW_SOP(O(O_ORC,SB),1,2,"orc"),{{IMM8,EXR|DST,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x4,IMM8,IGNORE,E,0,0,0,0}}EOP,
 
   NEW_SOP(O(O_MOV_TO_REG,SW),1,6,"pop.w"),{{OR16,E,0}},{{ 0x6,0xD,0x7,OR16,E,0,0,0,0}}EOP,
   NEW_SOP(O(O_MOV_TO_REG,SL),0,6,"pop.l"),{{OR32,E,0}},{{ PREFIX32,0x6,0xD,0x7,OR32|B30,E,0,0,0,0}}EOP,
@@ -544,25 +544,25 @@ struct h8_opcode h8_opcodes[] =
 
   SOP(O(O_SLEEP,SN),2,"sleep"),{{E,0,0}},{{ 0x0,0x1,0x8,0x0,E,0,0,0,0}} EOP,
 
-  NEW_SOP(O(O_STC,SB), 1,2,"stc"),{{CCR,RD8,E}},{{ 0x0,0x2,0x0,RD8,E,0,0,0,0}} EOP,
+  NEW_SOP(O(O_STC,SB), 1,2,"stc"),{{CCR|SRC,RD8,E}},{{ 0x0,0x2,0x0,RD8,E,0,0,0,0}} EOP,
 
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,RSIND,E}},        {{PREFIXLDC,0x6,0x9,B31|RDIND,0x0,E}} EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,DISP|DST|L_16,E}},{{PREFIXLDC,0x6,0xF,B31|DISPREG,0,DST|DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,DISP|DST|L_32,E}},{{PREFIXLDC,0x7,0x8,B30|DISPREG,0,0x6,0xB,0xA,0x0,DST|DISP32LIST,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,RDDEC,E}},        {{PREFIXLDC,0x6,0xD,B31|RDDEC,0x0,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,RSIND,E}},        {{PREFIXLDC,0x6,0x9,B31|RDIND,0x0,E}} EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,DISP|DST|L_16,E}},{{PREFIXLDC,0x6,0xF,B31|DISPREG,0,DST|DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,DISP|DST|L_32,E}},{{PREFIXLDC,0x7,0x8,B30|DISPREG,0,0x6,0xB,0xA,0x0,DST|DISP32LIST,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,RDDEC,E}},        {{PREFIXLDC,0x6,0xD,B31|RDDEC,0x0,E}}EOP,
 
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,ABS16SRC,E}},     {{PREFIXLDC,0x6,0xB,0x8,0x0,ABS16DST,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR,ABS32SRC,E}},     {{PREFIXLDC,0x6,0xB,0xA,0x0,DST|ABS32LIST,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,ABS16DST,E}},     {{PREFIXLDC,0x6,0xB,0x8,0x0,ABS16DST,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{CCR|SRC,ABS32DST,E}},     {{PREFIXLDC,0x6,0xB,0xA,0x0,DST|ABS32LIST,E}}EOP,
 
-  NEW_SOP(O(O_STC,SB), 1,2,"stc"),{{EXR,RD8,E}},{{ 0x0,0x2,0x1,RD8,E,0,0,0,0}} EOP,
+  NEW_SOP(O(O_STC,SB), 1,2,"stc"),{{EXR|SRC,RD8,E}},{{ 0x0,0x2,0x1,RD8,E,0,0,0,0}} EOP,
 
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,RSIND,E}},        {{0x0,0x1,0x4,0x1,0x6,0x9,B31|RDIND,0x0,E}} EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,DISP|DST|L_16,E}},{{0x0,0x1,0x4,0x1,0x6,0xF,B31|DISPREG,0,DST|DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,DISP|DST|L_32,E}},{{0x0,0x1,0x4,0x1,0x7,0x8,B30|DISPREG,0,0x6,0xB,0xA,0x0,DST|DISP32LIST,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,RDDEC,E}},        {{0x0,0x1,0x4,0x1,0x6,0xD,B31|RDDEC,0x0,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,RSIND,E}},        {{0x0,0x1,0x4,0x1,0x6,0x9,B31|RDIND,0x0,E}} EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,DISP|DST|L_16,E}},{{0x0,0x1,0x4,0x1,0x6,0xF,B31|DISPREG,0,DST|DISP|L_16,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,DISP|DST|L_32,E}},{{0x0,0x1,0x4,0x1,0x7,0x8,B30|DISPREG,0,0x6,0xB,0xA,0x0,DST|DISP32LIST,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,RDDEC,E}},        {{0x0,0x1,0x4,0x1,0x6,0xD,B31|RDDEC,0x0,E}}EOP,
 
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,ABS16SRC,E}},     {{0x0,0x1,0x4,0x1,0x6,0xB,0x8,0x0,ABS16DST,IGNORE,IGNORE,IGNORE,E}}EOP,
-  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR,ABS32SRC,E}},     {{0x0,0x1,0x4,0x1,0x6,0xB,0xA,0x0,DST|ABS32LIST,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,ABS16DST,E}},     {{0x0,0x1,0x4,0x1,0x6,0xB,0x8,0x0,ABS16DST,IGNORE,IGNORE,IGNORE,E}}EOP,
+  NEW_SOP(O(O_STC,SB),0,2,"stc"),{{EXR|SRC,ABS32DST,E}},     {{0x0,0x1,0x4,0x1,0x6,0xB,0xA,0x0,DST|ABS32LIST,E}}EOP,
 
   SOP(O(O_SUB,SB),2,"sub.b"),{{RS8,RD8,E}},{{ 0x1,0x8,RS8,RD8,E,0,0,0,0}}EOP,
 
@@ -585,8 +585,8 @@ struct h8_opcode h8_opcodes[] =
   NEW_SOP(O(O_XOR,SL),0,6,"xor.l"),{{IMM32,RD32,E }},{{0x7,0xA,0x5,B30|RD32,IMM32LIST,E}} EOP,
   NEW_SOP(O(O_XOR,SL),0,2,"xor.l") ,{{RS32,RD32,E }},{{0x0,0x1,0xF,0x0,0x6,0x5,B30|RS32,B30|RD32,E}} EOP,
 
-  SOP(O(O_XORC,SB),2,"xorc"),{{IMM8,CCR,E}},{{ 0x0,0x5,IMM8,IGNORE,E,0,0,0,0}}EOP,
-  SOP(O(O_XORC,SB),2,"xorc"),{{IMM8,EXR,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x5,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  SOP(O(O_XORC,SB),2,"xorc"),{{IMM8,CCR|DST,E}},{{ 0x0,0x5,IMM8,IGNORE,E,0,0,0,0}}EOP,
+  SOP(O(O_XORC,SB),2,"xorc"),{{IMM8,EXR|DST,E}},{{ 0x0,0x1,0x4,0x1,0x0,0x5,IMM8,IGNORE,E,0,0,0,0}}EOP,
 
   NEW_SOP(O(O_CLRMAC,SN),1,2,"clrmac"),{{E, 0, 0}},{{0x0,0x1,0xa,0x0,E}} EOP,
   NEW_SOP(O(O_MAC,SL),1,2,"mac"),{{RSINC,RDINC,E}},{{0x0,0x1,0x6,0x0,0x6,0xd,B30|RSINC,B30|RDINC,E}} EOP,
diff --git a/include/opcode/ia64.h b/include/opcode/ia64.h
index 642330cc1..d4e6d1081 100644
--- a/include/opcode/ia64.h
+++ b/include/opcode/ia64.h
@@ -1,5 +1,5 @@
 /* ia64.h -- Header file for ia64 opcode table
-   Copyright (C) 1998, 1999 David Mosberger-Tang <davidm@hpl.hp.com>
+   Copyright (C) 1998, 1999, 2002 David Mosberger-Tang <davidm@hpl.hp.com>
 
    See the file HP-COPYRIGHT for additional information.  */
 
@@ -8,7 +8,7 @@
 
 #include <sys/types.h>
 
-#include <bfd.h>
+#include "bfd.h"
 
 
 typedef BFD_HOST_U_64_BIT ia64_insn;
diff --git a/include/opcode/mips.h b/include/opcode/mips.h
index 96c7a576e..06f5625c3 100644
--- a/include/opcode/mips.h
+++ b/include/opcode/mips.h
@@ -526,9 +526,13 @@ enum
   M_REM_3I,
   M_REMU_3,
   M_REMU_3I,
+  M_DROL,
   M_ROL,
+  M_DROL_I,
   M_ROL_I,
+  M_DROR,
   M_ROR,
+  M_DROR_I,
   M_ROR_I,
   M_S_DA,
   M_S_DOB,
diff --git a/include/opcode/sparc.h b/include/opcode/sparc.h
index 5b6b5d149..c41292364 100644
--- a/include/opcode/sparc.h
+++ b/include/opcode/sparc.h
@@ -1,5 +1,5 @@
 /* Definitions for opcode table for the sparc.
-   Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
+   Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2002
    Free Software Foundation, Inc.
 
 This file is part of GAS, the GNU Assembler, GDB, the GNU debugger, and
@@ -20,7 +20,7 @@ along with GAS or GDB; see the file COPYING.	If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include <ansidecl.h>
+#include "ansidecl.h"
 
 /* The SPARC opcode table (and other related data) is defined in
    the opcodes library in sparc-opc.c.  If you change anything here, make
diff --git a/include/sim-d10v.h b/include/sim-d10v.h
deleted file mode 100644
index 9d29e0584..000000000
--- a/include/sim-d10v.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* This file defines the interface between the d10v simulator and gdb.
-   Copyright 1999 Free Software Foundation, Inc.
-
-This file is part of GDB.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#if !defined (SIM_D10V_H)
-#define SIM_D10V_H
-
-#ifdef __cplusplus
-extern "C" { // }
-#endif
-
-/* GDB interprets addresses as:
-
-   0x00xxxxxx: Physical unified memory segment     (Unified memory)
-   0x01xxxxxx: Physical instruction memory segment (On-chip insn memory)
-   0x02xxxxxx: Physical data memory segment        (On-chip data memory)
-   0x10xxxxxx: Logical data address segment        (DMAP translated memory)
-   0x11xxxxxx: Logical instruction address segment (IMAP translated memory)
-
-   The remote d10v board interprets addresses as:
-
-   0x00xxxxxx: Physical unified memory segment     (Unified memory)
-   0x01xxxxxx: Physical instruction memory segment (On-chip insn memory)
-   0x02xxxxxx: Physical data memory segment        (On-chip data memory)
-
-   The following translate a virtual DMAP/IMAP offset into a physical
-   memory segment assigning the translated address to PHYS.  Since a
-   memory access may cross a page boundrary the number of bytes for
-   which the translation is applicable (or 0 for an invalid virtual
-   offset) is returned. */
-
-enum
-  {
-    SIM_D10V_MEMORY_UNIFIED = 0x00000000,
-    SIM_D10V_MEMORY_INSN = 0x01000000,
-    SIM_D10V_MEMORY_DATA = 0x02000000,
-    SIM_D10V_MEMORY_DMAP = 0x10000000,
-    SIM_D10V_MEMORY_IMAP = 0x11000000
-  };
-
-extern unsigned long sim_d10v_translate_dmap_addr
-  (unsigned long offset,
-   int nr_bytes,
-   unsigned long *phys,
-   unsigned long (*dmap_register) (int reg_nr));
-
-extern unsigned long sim_d10v_translate_imap_addr
-  (unsigned long offset,
-   int nr_bytes,
-   unsigned long *phys,
-   unsigned long (*imap_register) (int reg_nr));
-
-extern unsigned long sim_d10v_translate_addr
-  (unsigned long vaddr,
-   int nr_bytes,
-   unsigned long *phys,
-   unsigned long (*dmap_register) (int reg_nr),
-   unsigned long (*imap_register) (int reg_nr));
-
-
-/* The simulator makes use of the following register information. */
-
-enum
-  {
-    SIM_D10V_R0_REGNUM = 0,
-    SIM_D10V_CR0_REGNUM = 16,
-    SIM_D10V_A0_REGNUM = 32,
-    SIM_D10V_SPI_REGNUM = 34,
-    SIM_D10V_SPU_REGNUM = 35,
-    SIM_D10V_IMAP0_REGNUM = 36,
-    SIM_D10V_DMAP0_REGNUM = 38,
-    SIM_D10V_TS2_DMAP_REGNUM = 40
-  };
-
-enum
-  {
-    SIM_D10V_NR_R_REGS = 16,
-    SIM_D10V_NR_A_REGS = 2,
-    SIM_D10V_NR_IMAP_REGS = 2,
-    SIM_D10V_NR_DMAP_REGS = 4,
-    SIM_D10V_NR_CR_REGS = 16
-  };
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif