diff options
| author | Rob Pike <r@golang.org> | 2009-04-15 21:57:55 -0700 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2009-04-15 21:57:55 -0700 |
| commit | 57bff962d97b712fbbd2c81af46b770684114fbd (patch) | |
| tree | 4eeeec3fc7613746ad39445dd7401067dcc40dba /src | |
| parent | 55faa5f10eb887dfdd4eb6f525e059fc0047f6a1 (diff) | |
| download | go-57bff962d97b712fbbd2c81af46b770684114fbd.tar.xz | |
fix gotest by fixing nm -s to print in file order by storing a sequence number
as the .6 file is read. now tests will be run in file order.
R=rsc
DELTA=9 (6 added, 1 deleted, 2 changed)
OCL=27542
CL=27544
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/nm/nm.c | 7 | ||||
| -rw-r--r-- | src/libmach_amd64/obj.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/cmd/nm/nm.c b/src/cmd/nm/nm.c index 63c77bd921..66748eef7c 100644 --- a/src/cmd/nm/nm.c +++ b/src/cmd/nm/nm.c @@ -185,11 +185,13 @@ cmp(void *vs, void *vt) s = vs; t = vt; - if(nflag) + if(nflag) // sort on address (numeric) order if((*s)->value < (*t)->value) return -1; else return (*s)->value > (*t)->value; + if(sflag) // sort on file order (sequence) + return (*s)->sequence - (*t)->sequence; return strcmp((*s)->name, (*t)->name); } /* @@ -298,8 +300,7 @@ printsyms(Sym **symptr, long nsym) char *cp; char path[512]; - if(!sflag) - qsort(symptr, nsym, sizeof(*symptr), (void*)cmp); + qsort(symptr, nsym, sizeof(*symptr), (void*)cmp); wid = 0; for (i=0; i<nsym; i++) { diff --git a/src/libmach_amd64/obj.c b/src/libmach_amd64/obj.c index 7a6e204510..8bd138421b 100644 --- a/src/libmach_amd64/obj.c +++ b/src/libmach_amd64/obj.c @@ -108,6 +108,8 @@ static void objreset(void); static void objlookup(int, char *, int, uint); static void objupdate(int, int); +static int sequence; + int objtype(Biobuf *bp, char **name) { @@ -295,6 +297,7 @@ objlookup(int id, char *name, int type, uint sig) sp->s.type = type; sp->s.sig = sig; sp->s.value = islocal(type) ? MAXOFF : 0; + sp->s.sequence = sequence++; names[id] = &sp->s; sp->next = hash[h]; hash[h] = sp; |