From 8db677b0a7fb35ba475aa9e9787fd5a107101ef6 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Wed, 12 Aug 2009 14:41:02 -0700
Subject: [PATCH] delete heuristic left over from incremental compilation

R=r
DELTA=31  (2 added, 28 deleted, 1 changed)
OCL=33064
CL=33112
---
 src/cmd/6l/obj.c | 15 +--------------
 src/cmd/8l/obj.c | 17 ++---------------
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/src/cmd/6l/obj.c b/src/cmd/6l/obj.c
index 75fe3ca031..b6e1a96605 100644
--- a/src/cmd/6l/obj.c
+++ b/src/cmd/6l/obj.c
@@ -692,23 +692,10 @@ addlib(char *src, char *obj)
 			snprint(pname, sizeof pname, "%s/pkg/%s_%s/%s", goroot, goos, goarch, name);
 		strcpy(name, pname);
 	}
+	cleanname(name);
 	if(debug['v'])
 		Bprint(&bso, "%5.2f addlib: %s %s pulls in %s\n", cputime(), obj, src, name);
 
-	p = strrchr(src, '/');
-	q = strrchr(name, '/');
-	if(p != nil && q != nil && p - src == q - name && memcmp(src, name, p - src) == 0) {
-		// leading paths are the same.
-		// if the source file refers to an object in its own directory
-		// and we are inside an archive, ignore the reference, in the hope
-		// that the archive contains that object too.
-		if(strchr(obj, '(')) {
-			if(debug['v'])
-				Bprint(&bso, "%5.2f ignored srcdir object %s\n", cputime(), name);
-			return;
-		}
-	}
-
 	for(i=0; i<libraryp; i++)
 		if(strcmp(name, library[i]) == 0)
 			return;
diff --git a/src/cmd/8l/obj.c b/src/cmd/8l/obj.c
index ce57521b7e..4aca76736a 100644
--- a/src/cmd/8l/obj.c
+++ b/src/cmd/8l/obj.c
@@ -600,7 +600,7 @@ zaddr(Biobuf *f, Adr *a, Sym *h[])
 void
 addlib(char *src, char *obj)
 {
-	char name[1024], pname[1024], comp[256], *p, *q;
+	char name[1024], pname[1024], comp[256], *p;
 	int i, search;
 
 	if(histfrogp <= 0)
@@ -657,23 +657,10 @@ addlib(char *src, char *obj)
 			snprint(pname, sizeof pname, "%s/pkg/%s_%s/%s", goroot, goos, goarch, name);
 		strcpy(name, pname);
 	}
+	cleanname(name);
 	if(debug['v'])
 		Bprint(&bso, "%5.2f addlib: %s %s pulls in %s\n", cputime(), obj, src, name);
 
-	p = strrchr(src, '/');
-	q = strrchr(name, '/');
-	if(p != nil && q != nil && p - src == q - name && memcmp(src, name, p - src) == 0) {
-		// leading paths are the same.
-		// if the source file refers to an object in its own directory
-		// and we are inside an archive, ignore the reference, in the hope
-		// that the archive contains that object too.
-		if(strchr(obj, '(')) {
-			if(debug['v'])
-				Bprint(&bso, "%5.2f ignored srcdir object %s\n", cputime(), name);
-			return;
-		}
-	}
-
 	for(i=0; i<libraryp; i++)
 		if(strcmp(name, library[i]) == 0)
 			return;
-- 
2.48.1