diff options
| author | Robert de Bath <rdebath@poboxes.com> | 2002-12-04 22:38:14 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2013-10-23 23:48:48 +0200 |
| commit | b5790e52270b149e92531a8eb0cd521ff2854dff (patch) | |
| tree | 78902d047f44b04d9e0cfb10879a5b768090beaa /ld | |
| parent | 67ef77f9e0744e524188c01fe314b609edd53456 (diff) | |
| download | dev86-b5790e52270b149e92531a8eb0cd521ff2854dff.tar.gz | |
Import Dev86src-0.16.10.tar.gzv0.16.10
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/globvar.h | 2 | ||||
| -rw-r--r-- | ld/ld.c | 6 | ||||
| -rw-r--r-- | ld/writex86.c | 15 |
3 files changed, 22 insertions, 1 deletions
diff --git a/ld/globvar.h b/ld/globvar.h index 1554b98..84cf8ff 100644 --- a/ld/globvar.h +++ b/ld/globvar.h @@ -13,7 +13,9 @@ EXTERN struct redlist *redfirst; /* first on list of redefined symbols */ /* K&R _explicitly_ says extern followed by public is OK */ extern char hexdigit[]; /* constant */ extern int headerless; /* Don't output header on exe */ +#ifndef MSDOS extern int cpm86; /* Generate CP/M-86 CMD header */ +#endif extern bin_off_t text_base_value; /* Base address of text seg */ extern bin_off_t data_base_value; /* Base or alignment of data seg */ @@ -19,7 +19,9 @@ PUBLIC bin_off_t text_base_value = 0; /* XXX */ PUBLIC bin_off_t data_base_value = 0; /* XXX */ PUBLIC bin_off_t heap_top_value = 0; /* XXX */ PUBLIC int headerless = 0; +#ifndef MSDOS PUBLIC int cpm86 = 0; +#endif PUBLIC char hexdigit[] = "0123456789abcdef"; PRIVATE bool_t flag[128]; @@ -124,7 +126,9 @@ char **argv; case 'z': /* unmapped zero page */ case 'N': /* Native format a.out */ case 'd': /* Make a headerless outfile */ +#ifndef MSDOS case 'c': /* Write header in CP/M-86 format */ +#endif case 'y': /* Use a newer symbol table */ if (arg[2] == 0) flag[(int) arg[1]] = TRUE; @@ -239,9 +243,11 @@ char **argv; headerless = flag['d']; if( headerless ) flag['s'] = 1; +#ifndef MSDOS /* CP/M-86 executables can't use symbols. */ cpm86 = flag['c']; if ( cpm86 ) flag['s'] = 1; +#endif linksyms(flag['r']); if (outfilename == NUL_PTR) diff --git a/ld/writex86.c b/ld/writex86.c index d877edc..42158e4 100644 --- a/ld/writex86.c +++ b/ld/writex86.c @@ -4,7 +4,9 @@ #include "syshead.h" #include "x86_aout.h" +#ifndef MSDOS #include "x86_cpm86.h" +#endif #include "const.h" #include "obj.h" #include "type.h" @@ -18,7 +20,11 @@ #define ELF_SYMS 0 #endif +#ifdef MSDOS +# define FILEHEADERLENGTH (headerless?0:A_MINHDR) +#else # define FILEHEADERLENGTH (headerless?0:(cpm86?CPM86_HEADERLEN:A_MINHDR)) +#endif /* part of header not counted in offsets */ #define DPSEG 2 @@ -77,7 +83,9 @@ FORWARD void symres P((char *name)); FORWARD void setseg P((fastin_pt newseg)); FORWARD void skip P((unsigned countsize)); FORWARD void writeheader P((void)); +#ifndef MSDOS FORWARD void cpm86header P((void)); +#endif FORWARD void writenulls P((bin_off_t count)); EXTERN bool_t reloc_output; @@ -324,8 +332,11 @@ bool_pt argxsym; setsym("__heap_top", (bin_off_t)heap_top_value); openout(outfilename); +#ifndef MSDOS if (cpm86) cpm86header(); - else writeheader(); + else +#endif + writeheader(); for (modptr = modfirst; modptr != NUL_PTR; modptr = modptr->modnext) if (modptr->loadflag) { @@ -602,6 +613,7 @@ unsigned countsize; writenulls((bin_off_t) readsize(countsize)); } +#ifndef MSDOS PRIVATE void cpm86header() { struct cpm86_exec header; @@ -626,6 +638,7 @@ PRIVATE void cpm86header() if( FILEHEADERLENGTH ) writeout((char *) &header, FILEHEADERLENGTH); } +#endif PRIVATE void writeheader() { |