diff options
| author | Jim Kingdon <jkingdon@engr.sgi.com> | 1993-11-03 21:33:13 +0000 |
|---|---|---|
| committer | Jim Kingdon <jkingdon@engr.sgi.com> | 1993-11-03 21:33:13 +0000 |
| commit | 021a5c6b014172a7261e8b080ebc049d6a60a200 (patch) | |
| tree | 64201975a0d0dce7530e4dfa57c3214cc941c081 | |
| parent | 3c292c5a46f52e118c78576bad7d972c3711fe54 (diff) | |
| download | gdb-021a5c6b014172a7261e8b080ebc049d6a60a200.zip gdb-021a5c6b014172a7261e8b080ebc049d6a60a200.tar.gz gdb-021a5c6b014172a7261e8b080ebc049d6a60a200.tar.bz2 | |
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.
| -rw-r--r-- | gdb/29k-share/udi/udip2soc.c | 4 | ||||
| -rw-r--r-- | gdb/29k-share/udi/udr.c | 4 | ||||
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/Makefile.in | 3 | ||||
| -rw-r--r-- | gdb/config/a29k/a29k-udi.mt | 3 |
5 files changed, 22 insertions, 1 deletions
diff --git a/gdb/29k-share/udi/udip2soc.c b/gdb/29k-share/udi/udip2soc.c index d0547da..96ae2e3 100644 --- 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 1e58eda..4722a4f 100644 --- 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 bd3f092..e501f0a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 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. * findvar.c (value_of_register): Rename val to reg_val to avoid diff --git a/gdb/Makefile.in b/gdb/Makefile.in index eb52de5..0079713 100644 --- 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 30d9449..5288920 100644 --- 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 |