Merge changes for dos x udi:

	* Makefile.in (udi2go32.o): add rule to build this file
	* 29k-share/udi/udi2go32.c: new file
	* config/a29k/a29k-udi.mt: add udi2go32.o
	* 29k-share/udi/{udr.c, udip2soc.c}: #ifdef out the entire file
	  if __GO32__ is defined.  What a hack.

diff --git a/gdb/29k-share/udi/udip2soc.c b/gdb/29k-share/udi/udip2soc.c
index d0547da9a8b6847566b6e976d7a9496824ace835..96ae2e37dc950bd0fd3f41f7783de4f9e1d1859d 100644 (file)
--- a/gdb/29k-share/udi/udip2soc.c
+++ b/gdb/29k-share/udi/udip2soc.c
@@ -24,6 +24,9 @@ static  char udip2soc_c_AMD[]="@(#)udip2soc.c 2.8, AMD";
 *      It is used by DFE client processes
 ********************************************************************** HISTORY
 */
+/* This is all unneeded on DOS machines.  */
+#ifndef __GO32__
+
 #include <stdio.h>
 #include <string.h>
 
@@ -1245,3 +1248,4 @@ UDIUInt32 UDIGetDFEIPCId()
 {
     return ((company_c << 16) + (product_c << 12) + version_c);
 }
+#endif /* __GO32__ */

diff --git a/gdb/29k-share/udi/udr.c b/gdb/29k-share/udi/udr.c
index 1e58eda90500befc54f355d846fe4f5dafb7451a..4722a4f8ba99693379bc2485f3b6e369b5c06974 100644 (file)
--- a/gdb/29k-share/udi/udr.c
+++ b/gdb/29k-share/udi/udr.c
@@ -26,6 +26,9 @@ static char udr_c_AMD[]="@(#)udr.c    2.3, AMD";
 *      and de-serialised back into the approproiate objects.
 ********************************************************************** HISTORY
 */
+/* This is all unneeded on DOS machines.  */
+#ifndef __GO32__
+
 #include <stdio.h>
 #include <sys/types.h>
 
@@ -421,3 +424,4 @@ int size;
     offset = offset & (size -1);
     if(offset) udr_setpos(udrs, align + offset);
 }
+#endif /* __GO32__ */

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bd3f092b5367a6d212efe9364eebf5733a8133bd..e501f0a6c19361d70f9fbf27e0945da2c2f695dd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Wed Nov  3 09:20:18 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+       Merge changes for dos x udi:
+       * Makefile.in (udi2go32.o): add rule to build this file
+       * 29k-share/udi/udi2go32.c: new file
+       * config/a29k/a29k-udi.mt: add udi2go32.o
+       * 29k-share/udi/{udr.c, udip2soc.c}: #ifdef out the entire file 
+         if __GO32__ is defined.  What a hack.
+
 Wed Nov  3 09:20:18 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
        * remote.c (putpkt, getpkt): Don't call interrupt_query.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index eb52de5e1d3ced781ce1d0553307e006d3661f1b..0079713fc8d651fb1468a5dc97c0c31c2e5bb9dc 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1011,6 +1011,9 @@ ALLCONFIG = config/a29k/a29k-kern.mt config/a29k/a29k-udi.mt \
 udip2soc.o: $(srcdir)/29k-share/udi/udip2soc.c $(udiheaders)
        $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/29k-share/udi/udip2soc.c
 
+udi2go32.o: $(srcdir)/29k-share/udi/udi2go32.c $(udiheaders)
+       $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/29k-share/udi/udi2go32.c
+
 udr.o: $(srcdir)/29k-share/udi/udr.c $(udiheaders) 
        $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/29k-share/udi/udr.c
 

diff --git a/gdb/config/a29k/a29k-udi.mt b/gdb/config/a29k/a29k-udi.mt
index 30d94490b06428bb8052d605b1727cac2c5d84e3..5288920a085ff2968beafca4ebebaa6852bc04f5 100644 (file)
--- a/gdb/config/a29k/a29k-udi.mt
+++ b/gdb/config/a29k/a29k-udi.mt
@@ -1,5 +1,6 @@
 # Target: AMD 29000 on EB29K board over a serial line.
-TDEPFILES= exec.o a29k-pinsn.o remote-udi.o a29k-tdep.o udip2soc.o udr.o
+TDEPFILES= exec.o a29k-pinsn.o remote-udi.o a29k-tdep.o udip2soc.o udr.o \
+  udi2go32.o
 REMOTE_O=
 TM_FILE= tm-a29k.h
 # The following is for ../include/a.out.encap.h