diff options
| author | Robert de Bath <rdebath@poboxes.com> | 2003-09-20 19:44:36 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2013-10-23 23:48:49 +0200 |
| commit | 22950ba3df3a0b739786243679d69cd4094e8b20 (patch) | |
| tree | 942907e918e556d340dcbcb8ffdc0f7d020a275e /ld | |
| parent | 5613ba3c0749fa494d35c4dc36b57c5b4e6edb55 (diff) | |
| download | dev86-22950ba3df3a0b739786243679d69cd4094e8b20.tar.gz | |
Import Dev86src-0.16.13.tar.gzv0.16.13
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/Makefile | 12 | ||||
| -rw-r--r-- | ld/bindef.h | 2 | ||||
| -rw-r--r-- | ld/io.c | 1 | ||||
| -rw-r--r-- | ld/writebin.c | 6 |
4 files changed, 12 insertions, 9 deletions
diff --git a/ld/Makefile b/ld/Makefile index 104a740..69170bd 100644 --- a/ld/Makefile +++ b/ld/Makefile @@ -1,8 +1,4 @@ -ifeq ($(VERSION),) -include Version -endif - LIBDIR =/usr/bin CFLAGS =-O LDFLAGS = @@ -13,7 +9,7 @@ LDFLAGS = # -DSTANDARD_GNU_A_OUT # a.out.h is like GNU normal. # -DNO_AOUT # a.out.h is like nothing known! # -DEFS =-DREL_OUTPUT -DBUGCOMPAT -DVERSION='"$(VERSION)"' +DEFS =-DREL_OUTPUT -DBUGCOMPAT # An alternative file for a non-standard a.out.h (eg i386 linux on an Alpha) # @@ -25,11 +21,11 @@ OBJS= dumps.o io.o ld.o readobj.o table.o typeconv.o linksyms.o \ all: ld86 objchop catimage objdump86 ld86: $(OBJS) - $(CC) $(LDFLAGS) $^ -o $@ + $(CC) $(LDFLAGS) $(OBJS) -o $@ install: ld86 install -d $(LIBDIR) - install -m 755 $^ $(LIBDIR) + install -m 755 ld86 $(LIBDIR) clean realclean clobber: rm -f *.o ld86 ld86r objchop catimage objdump86 @@ -38,7 +34,7 @@ $(OBJS): align.h ar.h bindef.h byteord.h config.h const.h globvar.h obj.h \ syshead.h type.h x86_aout.h ar.h: - [ -f ar.h ] || \ + test -f ar.h || \ { rm -f ar.h ; ln -s ../libc/include/ar.h . ; } || \ ln ../libc/include/ar.h . diff --git a/ld/bindef.h b/ld/bindef.h index 0ccbdf9..1c8dc49 100644 --- a/ld/bindef.h +++ b/ld/bindef.h @@ -1,4 +1,5 @@ +#if defined(__i386__) || defined(__8086__) || defined(__i386) #ifndef MSDOS #ifndef NO_AOUT /* Ok, I'm just gonna make it simple ... override this if you like. */ @@ -76,3 +77,4 @@ #endif /* NO_AOUT */ #endif /* MSDOS */ +#endif /* CPU type */ @@ -6,6 +6,7 @@ #include "const.h" #include "type.h" #include "globvar.h" +#include "version.h" #define DRELBUFSIZE 3072 #define ERR (-1) diff --git a/ld/writebin.c b/ld/writebin.c index 1b36ce7..e833f6c 100644 --- a/ld/writebin.c +++ b/ld/writebin.c @@ -1053,7 +1053,11 @@ bin_off_t count; } #else -PUBLIC void writebin(outfilename, argsepid, argbits32, argstripflag, arguzp) +#ifndef FUNCNAME +#define FUNCNAME writebin +#endif + +PUBLIC void FUNCNAME(outfilename, argsepid, argbits32, argstripflag, arguzp) char *outfilename; bool_pt argsepid; bool_pt argbits32; |