* configure.tgt (gdb_osabi, build_gdbserver): Comment variables.

	(arm*-*-*): Do not set obsolete build_rdi_share variable.

	(*-*-freebsd* | *-*-kfreebsd*-gnu): Remove generic case, replace by ...
	(alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
	(i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
	(sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu): ... specific cases.
	(x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu): Re-sort.

	(xscale-*-*): Merge into arm*-*-* case.
	(fido-*-elf*): Merge into m68*-*-elf* case.
	(m68*-*-aout*, m68*-*-coff*, m68*-*-elf*, m68*-*-rtems*,
	m68*-*-uclinux*): Merge cases.
	(powerpc-*-linux*, powerpc64-*-linux*): Merge cases.
	(sh-*-coff*, sh-*-elf*): Merge into sh* case.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0e9acd032d4f0f24e05c6172209c2e1f82ced241..4264c230ea0e694dbaa97ef069c812e323969bbb 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,21 @@
+2007-11-16  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * configure.tgt (gdb_osabi, build_gdbserver): Comment variables.
+       (arm*-*-*): Do not set obsolete build_rdi_share variable.
+
+       (*-*-freebsd* | *-*-kfreebsd*-gnu): Remove generic case, replace by ...
+       (alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
+       (i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
+       (sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu): ... specific cases.
+       (x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu): Re-sort.
+
+       (xscale-*-*): Merge into arm*-*-* case.
+       (fido-*-elf*): Merge into m68*-*-elf* case.
+       (m68*-*-aout*, m68*-*-coff*, m68*-*-elf*, m68*-*-rtems*,
+       m68*-*-uclinux*): Merge cases.
+       (powerpc-*-linux*, powerpc64-*-linux*): Merge cases.
+       (sh-*-coff*, sh-*-elf*): Merge into sh* case. 
+
 2007-11-16  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * configure.tgt: Reformat main case statement.

diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 487672a1a0ca202da096cc245adfe3c21ba32a77..9c77fb1fb8bd72d31b83bfec5f7a3b12961fb5c7 100644 (file)
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -4,6 +4,8 @@
 # This file sets the following shell variables:
 #  gdb_target_cpu      generic name of CPU
 #  gdb_target          name of GDB target definition to use
+#  gdb_osabi           default OS ABI to use with target
+#  build_gdbserver     set to "yes" if gdbserver supports target
 
 case $target in
  d10v-*-* | \
@@ -58,19 +60,15 @@ esac
 
 case "${target}" in
 
-x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
-       gdb_target=fbsd64
-       ;;
-*-*-freebsd* | *-*-kfreebsd*-gnu)
-       gdb_target=fbsd
-       ;;
-
 alpha*-*-osf*)
        gdb_target=alpha-osf1
        ;;
 alpha*-*-linux*)
        gdb_target=alpha-linux
        ;;
+alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
+       gdb_target=fbsd
+       ;;
 alpha*-*-netbsd* | alpha*-*-knetbsd*-gnu)
        gdb_target=nbsd
        ;;
@@ -100,13 +98,8 @@ arm*-*-netbsd* | arm*-*-knetbsd*-gnu)
 arm*-*-openbsd*)
        gdb_target=obsd
        ;;
-arm*-*-* | thumb*-*-* | strongarm*-*-*)
-       gdb_target=embed
-       build_rdi_share=yes
-       ;;
-xscale-*-*)
+arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
        gdb_target=embed
-       build_rdi_share=yes
        ;;
 
 avr-*-*)
@@ -117,10 +110,6 @@ cris*)
        gdb_target=cris
        ;;
 
-fido-*-elf*)
-       gdb_target=monitor
-       ;;
-
 frv-*-*)
        gdb_target=frv
        ;;
@@ -142,6 +131,9 @@ hppa*-*-*)
        gdb_target=hppa
        ;;
 
+i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
+       gdb_target=fbsd
+       ;;
 i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
        gdb_target=nbsd
        ;;
@@ -204,16 +196,8 @@ m68hc11*-*-*|m6811*-*-*)
        gdb_target=m68hc11
        ;;
 
-m68*-*-aout*)
-       gdb_target=monitor
-       ;;
-m68*-*-coff*)
-       gdb_target=monitor
-       ;;
-m68*-*-elf*)
-       gdb_target=monitor
-       ;;
-m68*-*-rtems*)
+m68*-*-aout* | m68*-*-coff* | m68*-*-elf* | m68*-*-rtems* | m68*-*-uclinux* | \
+fido-*-elf*)
        gdb_target=monitor
        ;;
 m68*-*-linux*)
@@ -226,9 +210,6 @@ m68*-*-netbsd* | m68*-*-knetbsd*-gnu)
 m68*-*-openbsd*)
        gdb_target=obsd
        ;;
-m68*-*-uclinux*)
-       gdb_target=monitor
-       ;;
 
 m88*-*-openbsd*)
        gdb_target=obsd
@@ -275,11 +256,7 @@ powerpc-*-openbsd*)
 powerpc-*-aix* | rs6000-*-*)
        gdb_target=aix
        ;;
-powerpc-*-linux*)
-       gdb_target=linux
-       build_gdbserver=yes
-       ;;
-powerpc64-*-linux*)
+powerpc-*-linux* | powerpc64-*-linux*)
        gdb_target=linux
        build_gdbserver=yes
        ;;
@@ -300,12 +277,6 @@ score-*-*)
        gdb_target=embed
        ;;
 
-sh-*-coff*)
-       gdb_target=embed
-       ;;
-sh-*-elf*)
-       gdb_target=embed
-       ;;
 # FIXME should that be sh*-*-linux*, perhaps?
 sh-*-linux*)
        gdb_target=linux
@@ -330,6 +301,9 @@ sparc-*-linux*)
 sparc64-*-linux*)
        gdb_target=linux64
        ;;
+sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu)
+       gdb_target=fbsd
+       ;;
 sparc-*-netbsd* | sparc-*-knetbsd*-gnu)
        gdb_target=nbsd
        ;;
@@ -385,6 +359,9 @@ x86_64-*-linux*)
        gdb_target=linux64
        build_gdbserver=yes
        ;;
+x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
+       gdb_target=fbsd64
+       ;;
 x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu)
        gdb_target=nbsd64
        ;;