* i386b-nat.c: Revert part of Mar 5 change. FreeBSD collapsed the

s* and t* symbols too.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2a9649a0b01f4a60213578b71b2b639fdd2b955f..003e8412095234af9906ac9a3bf34c01ad2d08d9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar  7 12:09:51 1996  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+       * i386b-nat.c: Revert part of Mar 5 change.  FreeBSD collapsed the
+       s* and t* symbols too.
+
 Thu Mar  7 15:18:51 1996  James G. Smith  <jsmith@cygnus.co.uk>
 
        * symfile.c (generic_load): Avoid division by zero.

diff --git a/gdb/i386b-nat.c b/gdb/i386b-nat.c
index bb78d7288dd18a42a7a2ac71561c70334b95b181..d273cabeeb3b4fe62558eb217574f84c385a0de0 100644 (file)
--- a/gdb/i386b-nat.c
+++ b/gdb/i386b-nat.c
@@ -81,12 +81,25 @@ static int tregmap[] =
   tEIP, tEFLAGS, tCS, tSS
 };
 
+#ifdef sEAX
 static int sregmap[] = 
 {
   sEAX, sECX, sEDX, sEBX,
   sESP, sEBP, sESI, sEDI,
   sEIP, sEFLAGS, sCS, sSS
 };
+#else /* No sEAX */
+
+/* FreeBSD has decided to collapse the s* and t* symbols.  So if the s*
+   ones aren't around, use the t* ones for sregmap too.  */
+
+static int sregmap[] = 
+{
+  tEAX, tECX, tEDX, tEBX,
+  tESP, tEBP, tESI, tEDI,
+  tEIP, tEFLAGS, tCS, tSS
+};
+#endif /* No sEAX */
 
 /* blockend is the value of u.u_ar0, and points to the
    place where ES is stored.  */