shithub: scc

Download patch

ref: d69a87fbbe610e26cc16b25ef694a3d4ec985edd
parent: 6ee2fb85da693eb56401f7b87b551d26577410aa
author: Roberto E. Vargas Caballero <k0ga@shike2.com>
date: Mon Feb 11 04:24:37 EST 2019

[ld] Move ld out of a directory

diff: cannot open a/src/cmd/ld//null: file does not exist: 'a/src/cmd/ld//null'
--- a/src/cmd/Makefile
+++ b/src/cmd/Makefile
@@ -12,7 +12,7 @@
          $(BINDIR)/objcopy \
          $(BINDIR)/addr2line \
 
-DIRS   = as ld scc
+DIRS   = as scc
 
 LIBMACH = $(LIBDIR)/libmach.a
 LIBSCC  = $(LIBDIR)/libscc.a
@@ -33,6 +33,9 @@
 
 $(BINDIR)/ranlib: ranlib.o $(DRIVER).o $(LIBMACH) $(LIBSCC)
 	$(CC) $(SCC_LDFLAGS) ranlib.o $(DRIVER).o -lmach -lscc -o $@
+
+$(BINDIR)/ld: ld.o $(LIBMACH) $(LIBSCC)
+	$(CC) $(SCC_LDFLAGS) ld.o -lmach -lscc -o $@
 
 $(BINDIR)/objdump: objdump.o $(LIBMACH)
 	$(CC) $(SCC_LDFLAGS) objdump.o -lmach -o $@
--- a/src/cmd/deps.mk
+++ b/src/cmd/deps.mk
@@ -45,10 +45,10 @@
 ./as/target/x86/ins.o: $(INCDIR)/scc/scc/scc.h
 ./as/target/x86/ins.o: ./as/target/x86/../../as.h
 ./as/target/x86/ins.o: ./as/target/x86/proc.h
-./ld/main.o: $(INCDIR)/scc/scc/ar.h
-./ld/main.o: $(INCDIR)/scc/scc/mach.h
-./ld/main.o: $(INCDIR)/scc/scc/scc.h
-./ld/main.o: $(INCDIR)/scc/scc/syslibs.h
+./ld.o: $(INCDIR)/scc/scc/ar.h
+./ld.o: $(INCDIR)/scc/scc/mach.h
+./ld.o: $(INCDIR)/scc/scc/scc.h
+./ld.o: $(INCDIR)/scc/scc/syslibs.h
 ./nm.o: $(INCDIR)/scc/scc/arg.h
 ./nm.o: $(INCDIR)/scc/scc/mach.h
 ./objdump.o: $(INCDIR)/scc/scc/arg.h
--- /dev/null
+++ b/src/cmd/ld.c
@@ -1,0 +1,529 @@
+static char sccsid[] = "@(#) ./ld/main.c";
+
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <scc/mach.h>
+#include <scc/scc.h>
+#include <scc/ar.h>
+#include <scc/syslibs.h>
+
+#define NR_SYMBOL 128
+
+typedef struct objlst Objlst;
+typedef struct symbol Symbol;
+
+enum {
+	NOINSTALL,
+	INSTALL,
+};
+
+enum {
+	OUTLIB,
+	INLIB,
+};
+
+struct objlst {
+	Obj *obj;
+	struct objlst *next;
+};
+
+struct symbol {
+	char *name;
+	Obj *obj;
+	Objsym *def;
+	unsigned long long size, value;
+	struct symbol *next, *prev;
+	struct symbol *hash;
+};
+
+char *output = "a.out", *entry = "start", *datasiz;
+
+static int bintype = -1;
+static char *filename, *membname;
+static Objlst *objhead, *objlast;
+static Symbol *symtab[NR_SYMBOL];
+static Symbol refhead = {
+	.next = &refhead,
+	.prev = &refhead,
+};
+
+int sflag;		/* discard all the symbols */
+int xflag;		/* discard local symbols */
+int Xflag;		/* discard locals starting with 'L' */
+int rflag;		/* preserve relocation bits */
+int dflag;		/* define common even with rflag */
+int gflag;              /* preserve debug symbols */
+
+static int status;
+
+static char *
+errstr(void)
+{
+	return strerror(errno);
+}
+
+static void
+error(char *fmt, ...)
+{
+	va_list va;
+
+	va_start(va, fmt);
+	fprintf(stderr, "ld: %s: ", filename);
+	if (membname)
+		fprintf(stderr, "%s: ", membname);
+	vfprintf(stderr, fmt, va);
+	putc('\n', stderr);
+	va_end(va);
+
+	status = EXIT_FAILURE;
+}
+
+static void
+cleanup(void)
+{
+	if (status != EXIT_FAILURE)
+		remove(output);
+}
+
+static int
+moreundef(void)
+{
+
+	return refhead.next != &refhead;
+}
+
+static Symbol *
+lookup(char *name, int install)
+{
+	size_t len;
+	char *s;
+	unsigned h;
+	Symbol *sym;
+
+	h = genhash(name) % NR_SYMBOL;
+
+	for (sym = symtab[h]; sym; sym = sym->hash) {
+		if (!strcmp(name, sym->name))
+			return sym;
+	}
+
+	if (!install)
+		return NULL;
+
+	len = strlen(name) + 1;
+	sym = malloc(sizeof(*sym));
+	s = malloc(len);
+	if (!len || !s) {
+		error("out of memory");
+		exit(EXIT_FAILURE);
+	}
+
+	sym->obj = NULL;
+	sym->name = memcpy(s, name, len);
+	sym->hash = symtab[h];
+	symtab[h] = sym;
+	sym->value = 0;
+	sym->size = 0;
+
+	refhead.next->prev = sym;
+	sym->next = refhead.next;
+	refhead.next = sym;
+	sym->prev = &refhead;
+
+	return sym;
+}
+
+static Symbol *
+define(Objsym *osym, Obj *obj)
+{
+	Symbol *sym = lookup(osym->name, INSTALL);
+
+	if (sym->def && sym->def->type != 'C') {
+		error("%s: symbol redefined", osym->name);
+		return NULL;
+	}
+
+	sym->obj = obj;
+	sym->def = osym;
+	sym->size = osym->size;
+	sym->value = osym->value;
+
+	sym->next->prev = sym->prev;
+	sym->prev->next = sym->next;
+	sym->next = sym->prev = NULL;
+
+	return sym;
+}
+
+static int
+newsym(Objsym *osym, void *obj)
+{
+	Symbol *sym;
+
+	switch (osym->type) {
+	case 'U':
+		lookup(osym->name, INSTALL);
+	case '?':
+	case 'N':
+		break;
+	case 'C':
+		sym = lookup(osym->name, NOINSTALL);
+		if (!sym || !sym->def) {
+			define(osym, obj);
+			break;
+		}
+		if (sym->def->type != 'C')
+			break;
+		if (sym->size < osym->size)
+			sym->size = osym->size;
+		break;
+	default:
+		if (isupper(osym->type))
+			define(osym, obj);
+		break;
+	}
+
+	return 1;
+}
+
+static void
+loadobj(Obj *obj)
+{
+	Objlst *lst;
+
+	if ((lst = malloc(sizeof(*lst))) == NULL) {
+		error("out of memory");
+		return;
+	}
+
+	lst->obj = obj;
+	lst->next = NULL;
+
+	if (!objlast)
+		objlast = objhead = lst;
+	else
+		objlast = objlast->next = lst;
+
+	forsym(obj, newsym, obj);
+}
+
+static void
+newobject(FILE *fp, int type, int inlib)
+{
+	Obj *obj;
+	Symbol *sym, *p;
+
+	if ((obj = objnew(type)) == NULL) {
+		error("out of memory");
+		return;
+	}
+
+	if (bintype == -1) {
+		bintype = type;
+	} else if (bintype != type) {
+		error("not compatible object file");
+		return;
+	}
+	bintype = type;
+
+	if (objread(obj, fp) < 0) {
+		error("object file corrupted");
+		goto delete;
+	}
+
+	if (inlib) {
+		p = &refhead;
+		for (sym = p->next; sym != p; sym = sym->next) {
+			if (objlookup(obj, sym->name, 0))
+				break;
+		}
+		if (sym == p)
+			goto  delete;
+	}
+	loadobj(obj);
+
+	return;
+
+delete:
+	objdel(obj);
+	return;
+}
+
+static void
+loadlib(FILE *fp)
+{
+	int t, loaded;
+	long n;
+	Objsymdef *def, *dp;
+	Symbol *sym;
+
+	if (getindex(bintype, &n, &def, fp) < 0) {
+		error("corrupted index");
+		return;
+	}
+
+	for (loaded = 0; moreundef(); loaded = 0) {
+		for (dp = def; dp; dp = dp->next) {
+			sym = lookup(dp->name, NOINSTALL);
+			if (!sym || !sym->def)
+				continue;
+
+			if (fseek(fp, dp->offset, SEEK_SET) == EOF) {
+				error(errstr());
+				break;
+			}
+
+			if ((t = objtype(fp, NULL)) == -1) {
+				error("library file corrupted");
+				break;
+			}
+
+			if (t != bintype) {
+				error("incompatible library");
+				break;
+			}
+
+			newobject(fp, t, OUTLIB);
+			loaded = 1;
+		}
+		if (!loaded)
+			break;
+	}
+clean:
+	free(def);
+}
+
+static int
+newmember(FILE *fp, char *name, void *data)
+{
+	int t;
+	int *nmemb = data;
+
+	membname = data;
+
+	if (bintype == -1) {
+		error("an object file is needed before any library");
+		return 0;
+	}
+
+	if (*nmemb++ == 0) {
+		if(!strncmp(name, namindex(bintype), SARNAM)) {
+			loadlib(fp);
+			return 0;
+		}
+	}
+
+	if ((t = objtype(fp, NULL)) == -1)
+		return 1;
+
+	if (bintype != t) {
+		error("wrong object file format");
+		return 1;
+	}
+
+	newobject(fp, t, INLIB);
+
+	return 1;
+}
+
+static int
+newlibrary(FILE *fp)
+{
+	int nmemb = 0;
+
+	return formember(fp, newmember, &nmemb);
+}
+
+static FILE *
+openfile(char *name, char *buffer)
+{
+	size_t pathlen, len;
+	FILE *fp;
+	char **bp, **base, **end;
+	char libname[FILENAME_MAX];
+
+	filename = name;
+	membname = NULL;
+	if (name[0] != '-' || name[1] != 'l') {
+		if ((fp = fopen(name, "rb")) == NULL)
+			error(errstr());
+		return fp;
+	}
+
+	len = strlen(name+2) + 3;
+	if (len > FILENAME_MAX-1) {
+		error("library name too long");
+		return NULL;
+	}
+	strcat(strcpy(buffer, "lib"), name+2);
+
+	filename = buffer;
+	if ((fp = fopen(libname, "rb")) != NULL)
+		return fp;
+
+	base = syslibs;
+	end = &syslibs[MAX_LIB_PATHS];
+	for (bp = base; bp < end && *bp; ++bp) {
+		pathlen = strlen(*bp);
+		if (pathlen + len > FILENAME_MAX-1)
+			continue;
+		memcpy(libname, *bp, pathlen);
+		memcpy(libname+pathlen+1, buffer, len);
+		buffer[pathlen] = '/';
+
+		if ((fp = fopen(buffer, "rb")) != NULL)
+			return fp;
+	}
+
+	error("not found");
+	return NULL;
+}
+
+static void
+pass1(int argc, char *argv[])
+{
+	int t;
+	FILE *fp;
+	char buff[FILENAME_MAX];
+
+	for ( ; *argv; ++argv) {
+		if ((fp = openfile(*argv, buff)) == NULL)
+			continue;
+
+		if ((t = objtype(fp, NULL)) != -1)
+			newobject(fp, t, OUTLIB);
+		else if (archive(fp))
+			newlibrary(fp);
+		else
+			error("bad format");
+
+		fclose(fp);
+	}
+
+	if (moreundef()) {
+		Symbol *sym, *p;
+
+		p = &refhead;
+		for (sym = p->next; sym != p; sym = sym->next) {
+			fprintf(stderr,
+			        "ld: symbol '%s' not defined\n",
+			        sym->name);
+		}
+		exit(EXIT_FAILURE);
+	}
+}
+
+static void
+pass2(int argc, char *argv[])
+{
+}
+
+static void
+usage(void)
+{
+	fputs("usage: ld [options] file ...\n", stderr);
+	exit(EXIT_FAILURE);
+}
+
+static void
+Lpath(char *path)
+{
+	char **bp, **base, **end;
+
+	base = syslibs;
+	end = &syslibs[MAX_LIB_PATHS];
+	for (bp = base; bp < end && *bp; ++bp)
+		;
+	if (bp == end) {
+		fputs("ld: too many -L options\n", stderr);
+		exit(1);
+	}
+	*bp = path;
+}
+
+int
+main(int argc, char *argv[])
+{
+	char *cp, **p;
+
+	for (--argc; *++argv; --argc) {
+		if (argv[0][0] != '-' || argv[0][1] == 'l')
+			break;
+		if (argv[0][1] == '-') {
+			--argc, ++argv;
+			break;
+		}
+		for (cp = &argv[0][1]; *cp; ++cp) {
+			switch (*cp) {
+			case 's':
+				sflag = 1;
+				break;
+			case 'x':
+				xflag = 1;
+				break;
+			case 'X':
+				Xflag = 1;
+				break;
+			case 'r':
+				rflag = 1;
+				break;
+			case 'd':
+				dflag = 1;
+				break;
+			case 'i':
+			case 'n':
+				/* TODO */
+				break;
+			case 'L':
+				if (argc == 0)
+					goto usage;
+				++argv, --argc;
+				Lpath(*argv);
+				break;
+			case 'u':
+				if (argc == 0)
+					goto usage;
+				++argv, --argc;
+				lookup(*argv, INSTALL);
+				break;
+			case 'o':
+				if (argc == 0)
+					goto usage;
+				++argv, --argc;
+				output = *argv;
+				break;
+			case 'e':
+				if (argc == 0)
+					goto usage;
+				++argv, --argc;
+				entry = *argv;
+				break;
+			case 'D':
+				if (argc == 0)
+					goto usage;
+				++argv, --argc;
+				datasiz = *argv;
+				break;
+			default:
+			usage:
+				usage();
+			}
+		}
+	}
+
+	if (argc == 0)
+		usage();
+
+	atexit(cleanup);
+
+	pass1(argc, argv);
+	pass2(argc, argv);
+
+	return status;
+}
--- a/src/cmd/ld/Makefile
+++ /dev/null
@@ -1,19 +1,0 @@
-.POSIX:
-
-PROJECTDIR = ../../..
-include $(PROJECTDIR)/scripts/rules.mk
-
-OBJS = main.o \
-
-TARGET = $(BINDIR)/ld
-
-all: $(TARGET)
-
-$(TARGET): $(LIBDIR)/libscc.a $(LIBDIR)/libscc.a
-
-$(TARGET): $(OBJS)
-	$(CC) $(SCC_LDFLAGS) $(OBJS) -lmach -lscc -o $@
-
-dep: inc-dep
-
-include deps.mk
--- a/src/cmd/ld/deps.mk
+++ /dev/null
@@ -1,5 +1,0 @@
-#deps
-./main.o: $(INCDIR)/scc/scc/ar.h
-./main.o: $(INCDIR)/scc/scc/mach.h
-./main.o: $(INCDIR)/scc/scc/scc.h
-./main.o: $(INCDIR)/scc/scc/syslibs.h
--- a/src/cmd/ld/main.c
+++ /dev/null
@@ -1,529 +1,0 @@
-static char sccsid[] = "@(#) ./ld/main.c";
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <scc/mach.h>
-#include <scc/scc.h>
-#include <scc/ar.h>
-#include <scc/syslibs.h>
-
-#define NR_SYMBOL 128
-
-typedef struct objlst Objlst;
-typedef struct symbol Symbol;
-
-enum {
-	NOINSTALL,
-	INSTALL,
-};
-
-enum {
-	OUTLIB,
-	INLIB,
-};
-
-struct objlst {
-	Obj *obj;
-	struct objlst *next;
-};
-
-struct symbol {
-	char *name;
-	Obj *obj;
-	Objsym *def;
-	unsigned long long size, value;
-	struct symbol *next, *prev;
-	struct symbol *hash;
-};
-
-char *output = "a.out", *entry = "start", *datasiz;
-
-static int bintype = -1;
-static char *filename, *membname;
-static Objlst *objhead, *objlast;
-static Symbol *symtab[NR_SYMBOL];
-static Symbol refhead = {
-	.next = &refhead,
-	.prev = &refhead,
-};
-
-int sflag;		/* discard all the symbols */
-int xflag;		/* discard local symbols */
-int Xflag;		/* discard locals starting with 'L' */
-int rflag;		/* preserve relocation bits */
-int dflag;		/* define common even with rflag */
-int gflag;              /* preserve debug symbols */
-
-static int status;
-
-static char *
-errstr(void)
-{
-	return strerror(errno);
-}
-
-static void
-error(char *fmt, ...)
-{
-	va_list va;
-
-	va_start(va, fmt);
-	fprintf(stderr, "ld: %s: ", filename);
-	if (membname)
-		fprintf(stderr, "%s: ", membname);
-	vfprintf(stderr, fmt, va);
-	putc('\n', stderr);
-	va_end(va);
-
-	status = EXIT_FAILURE;
-}
-
-static void
-cleanup(void)
-{
-	if (status != EXIT_FAILURE)
-		remove(output);
-}
-
-static int
-moreundef(void)
-{
-
-	return refhead.next != &refhead;
-}
-
-static Symbol *
-lookup(char *name, int install)
-{
-	size_t len;
-	char *s;
-	unsigned h;
-	Symbol *sym;
-
-	h = genhash(name) % NR_SYMBOL;
-
-	for (sym = symtab[h]; sym; sym = sym->hash) {
-		if (!strcmp(name, sym->name))
-			return sym;
-	}
-
-	if (!install)
-		return NULL;
-
-	len = strlen(name) + 1;
-	sym = malloc(sizeof(*sym));
-	s = malloc(len);
-	if (!len || !s) {
-		error("out of memory");
-		exit(EXIT_FAILURE);
-	}
-
-	sym->obj = NULL;
-	sym->name = memcpy(s, name, len);
-	sym->hash = symtab[h];
-	symtab[h] = sym;
-	sym->value = 0;
-	sym->size = 0;
-
-	refhead.next->prev = sym;
-	sym->next = refhead.next;
-	refhead.next = sym;
-	sym->prev = &refhead;
-
-	return sym;
-}
-
-static Symbol *
-define(Objsym *osym, Obj *obj)
-{
-	Symbol *sym = lookup(osym->name, INSTALL);
-
-	if (sym->def && sym->def->type != 'C') {
-		error("%s: symbol redefined", osym->name);
-		return NULL;
-	}
-
-	sym->obj = obj;
-	sym->def = osym;
-	sym->size = osym->size;
-	sym->value = osym->value;
-
-	sym->next->prev = sym->prev;
-	sym->prev->next = sym->next;
-	sym->next = sym->prev = NULL;
-
-	return sym;
-}
-
-static int
-newsym(Objsym *osym, void *obj)
-{
-	Symbol *sym;
-
-	switch (osym->type) {
-	case 'U':
-		lookup(osym->name, INSTALL);
-	case '?':
-	case 'N':
-		break;
-	case 'C':
-		sym = lookup(osym->name, NOINSTALL);
-		if (!sym || !sym->def) {
-			define(osym, obj);
-			break;
-		}
-		if (sym->def->type != 'C')
-			break;
-		if (sym->size < osym->size)
-			sym->size = osym->size;
-		break;
-	default:
-		if (isupper(osym->type))
-			define(osym, obj);
-		break;
-	}
-
-	return 1;
-}
-
-static void
-loadobj(Obj *obj)
-{
-	Objlst *lst;
-
-	if ((lst = malloc(sizeof(*lst))) == NULL) {
-		error("out of memory");
-		return;
-	}
-
-	lst->obj = obj;
-	lst->next = NULL;
-
-	if (!objlast)
-		objlast = objhead = lst;
-	else
-		objlast = objlast->next = lst;
-
-	forsym(obj, newsym, obj);
-}
-
-static void
-newobject(FILE *fp, int type, int inlib)
-{
-	Obj *obj;
-	Symbol *sym, *p;
-
-	if ((obj = objnew(type)) == NULL) {
-		error("out of memory");
-		return;
-	}
-
-	if (bintype == -1) {
-		bintype = type;
-	} else if (bintype != type) {
-		error("not compatible object file");
-		return;
-	}
-	bintype = type;
-
-	if (objread(obj, fp) < 0) {
-		error("object file corrupted");
-		goto delete;
-	}
-
-	if (inlib) {
-		p = &refhead;
-		for (sym = p->next; sym != p; sym = sym->next) {
-			if (objlookup(obj, sym->name, 0))
-				break;
-		}
-		if (sym == p)
-			goto  delete;
-	}
-	loadobj(obj);
-
-	return;
-
-delete:
-	objdel(obj);
-	return;
-}
-
-static void
-loadlib(FILE *fp)
-{
-	int t, loaded;
-	long n;
-	Objsymdef *def, *dp;
-	Symbol *sym;
-
-	if (getindex(bintype, &n, &def, fp) < 0) {
-		error("corrupted index");
-		return;
-	}
-
-	for (loaded = 0; moreundef(); loaded = 0) {
-		for (dp = def; dp; dp = dp->next) {
-			sym = lookup(dp->name, NOINSTALL);
-			if (!sym || !sym->def)
-				continue;
-
-			if (fseek(fp, dp->offset, SEEK_SET) == EOF) {
-				error(errstr());
-				break;
-			}
-
-			if ((t = objtype(fp, NULL)) == -1) {
-				error("library file corrupted");
-				break;
-			}
-
-			if (t != bintype) {
-				error("incompatible library");
-				break;
-			}
-
-			newobject(fp, t, OUTLIB);
-			loaded = 1;
-		}
-		if (!loaded)
-			break;
-	}
-clean:
-	free(def);
-}
-
-static int
-newmember(FILE *fp, char *name, void *data)
-{
-	int t;
-	int *nmemb = data;
-
-	membname = data;
-
-	if (bintype == -1) {
-		error("an object file is needed before any library");
-		return 0;
-	}
-
-	if (*nmemb++ == 0) {
-		if(!strncmp(name, namindex(bintype), SARNAM)) {
-			loadlib(fp);
-			return 0;
-		}
-	}
-
-	if ((t = objtype(fp, NULL)) == -1)
-		return 1;
-
-	if (bintype != t) {
-		error("wrong object file format");
-		return 1;
-	}
-
-	newobject(fp, t, INLIB);
-
-	return 1;
-}
-
-static int
-newlibrary(FILE *fp)
-{
-	int nmemb = 0;
-
-	return formember(fp, newmember, &nmemb);
-}
-
-static FILE *
-openfile(char *name, char *buffer)
-{
-	size_t pathlen, len;
-	FILE *fp;
-	char **bp, **base, **end;
-	char libname[FILENAME_MAX];
-
-	filename = name;
-	membname = NULL;
-	if (name[0] != '-' || name[1] != 'l') {
-		if ((fp = fopen(name, "rb")) == NULL)
-			error(errstr());
-		return fp;
-	}
-
-	len = strlen(name+2) + 3;
-	if (len > FILENAME_MAX-1) {
-		error("library name too long");
-		return NULL;
-	}
-	strcat(strcpy(buffer, "lib"), name+2);
-
-	filename = buffer;
-	if ((fp = fopen(libname, "rb")) != NULL)
-		return fp;
-
-	base = syslibs;
-	end = &syslibs[MAX_LIB_PATHS];
-	for (bp = base; bp < end && *bp; ++bp) {
-		pathlen = strlen(*bp);
-		if (pathlen + len > FILENAME_MAX-1)
-			continue;
-		memcpy(libname, *bp, pathlen);
-		memcpy(libname+pathlen+1, buffer, len);
-		buffer[pathlen] = '/';
-
-		if ((fp = fopen(buffer, "rb")) != NULL)
-			return fp;
-	}
-
-	error("not found");
-	return NULL;
-}
-
-static void
-pass1(int argc, char *argv[])
-{
-	int t;
-	FILE *fp;
-	char buff[FILENAME_MAX];
-
-	for ( ; *argv; ++argv) {
-		if ((fp = openfile(*argv, buff)) == NULL)
-			continue;
-
-		if ((t = objtype(fp, NULL)) != -1)
-			newobject(fp, t, OUTLIB);
-		else if (archive(fp))
-			newlibrary(fp);
-		else
-			error("bad format");
-
-		fclose(fp);
-	}
-
-	if (moreundef()) {
-		Symbol *sym, *p;
-
-		p = &refhead;
-		for (sym = p->next; sym != p; sym = sym->next) {
-			fprintf(stderr,
-			        "ld: symbol '%s' not defined\n",
-			        sym->name);
-		}
-		exit(EXIT_FAILURE);
-	}
-}
-
-static void
-pass2(int argc, char *argv[])
-{
-}
-
-static void
-usage(void)
-{
-	fputs("usage: ld [options] file ...\n", stderr);
-	exit(EXIT_FAILURE);
-}
-
-static void
-Lpath(char *path)
-{
-	char **bp, **base, **end;
-
-	base = syslibs;
-	end = &syslibs[MAX_LIB_PATHS];
-	for (bp = base; bp < end && *bp; ++bp)
-		;
-	if (bp == end) {
-		fputs("ld: too many -L options\n", stderr);
-		exit(1);
-	}
-	*bp = path;
-}
-
-int
-main(int argc, char *argv[])
-{
-	char *cp, **p;
-
-	for (--argc; *++argv; --argc) {
-		if (argv[0][0] != '-' || argv[0][1] == 'l')
-			break;
-		if (argv[0][1] == '-') {
-			--argc, ++argv;
-			break;
-		}
-		for (cp = &argv[0][1]; *cp; ++cp) {
-			switch (*cp) {
-			case 's':
-				sflag = 1;
-				break;
-			case 'x':
-				xflag = 1;
-				break;
-			case 'X':
-				Xflag = 1;
-				break;
-			case 'r':
-				rflag = 1;
-				break;
-			case 'd':
-				dflag = 1;
-				break;
-			case 'i':
-			case 'n':
-				/* TODO */
-				break;
-			case 'L':
-				if (argc == 0)
-					goto usage;
-				++argv, --argc;
-				Lpath(*argv);
-				break;
-			case 'u':
-				if (argc == 0)
-					goto usage;
-				++argv, --argc;
-				lookup(*argv, INSTALL);
-				break;
-			case 'o':
-				if (argc == 0)
-					goto usage;
-				++argv, --argc;
-				output = *argv;
-				break;
-			case 'e':
-				if (argc == 0)
-					goto usage;
-				++argv, --argc;
-				entry = *argv;
-				break;
-			case 'D':
-				if (argc == 0)
-					goto usage;
-				++argv, --argc;
-				datasiz = *argv;
-				break;
-			default:
-			usage:
-				usage();
-			}
-		}
-	}
-
-	if (argc == 0)
-		usage();
-
-	atexit(cleanup);
-
-	pass1(argc, argv);
-	pass2(argc, argv);
-
-	return status;
-}