2004-03-23 Eric Christopher <echristo@redhat.com>

* mips/configure.in: Add mipsisa64-*-* to target support.
	* mips/configure: Regenerate.
	* frv/crt0.S: Fix comment.

libgloss/ChangeLog

@@ -1,3 +1,8 @@
+2004-03-23  Eric Christopher  <echristo@redhat.com>
+
+	* mips/configure.in: Add mipsisa64-*-* to target support.
+	* mips/configure: Regenerate.
+
 2004-03-03  Stephane Carrez  <stcarrez@nerim.fr>
 
 	* m68hc11/sci-inout.S: Supports -mlong-calls.

libgloss/frv/crt0.S

@@ -105,7 +105,7 @@ _start:
 	call	 EXT(__frv_fixptrs)
 #endif /* ! __FRV_FDPIC__ */
 
-					/* fixup the .dtors list */
+					/* fixup the user .rofixup list */
 	P(sethi) #gprelhi(EXT(__ROFIXUP_LIST__)), gr9
 	sethi	 #gprelhi(EXT(__ROFIXUP_END__)), gr10
 	P(setlo) #gprello(EXT(__ROFIXUP_LIST__)), gr9

libgloss/mips/configure

@@ -918,7 +918,8 @@ case "${target}" in
         bsp_list="libdve.a libidt.a libjmr3904.a"
         ;;
   mipsisa32-*-* | mipsisa32el-*-* | \
-  mipsisa32r2-*-* | mipsisa32r2el-*-*)
+  mipsisa32r2-*-* | mipsisa32r2el-*-* | \
+  mipsisa64-*-*)
 	crt0="crt0_cfe.o crt0_cygmon.o crt0.o"
 	pcrt0="pcrt0.o"
 	part_specific_obj=
@@ -1034,15 +1035,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\_ACEOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
 
 # Without the "./", some shells look in PATH for config.status.

libgloss/mips/configure.in

@@ -93,7 +93,8 @@ case "${target}" in
         bsp_list="libdve.a libidt.a libjmr3904.a"
         ;;
   mipsisa32-*-* | mipsisa32el-*-* | \
-  mipsisa32r2-*-* | mipsisa32r2el-*-*)
+  mipsisa32r2-*-* | mipsisa32r2el-*-* | \
+  mipsisa64-*-*)
 	crt0="crt0_cfe.o crt0_cygmon.o crt0.o"
 	pcrt0="pcrt0.o"
 	part_specific_obj=