From: Russ Cox <rsc@golang.org>
Date: Thu, 18 Sep 2008 22:06:14 +0000 (-0700)
Subject: make acid build on linux.
X-Git-Tag: weekly.2009-11-06~3183
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=899c5281da89e584e6793cf4ee39cb5c697929c1;p=gostls13.git

make acid build on linux.
recognize symbol table info again on 64-only linux.

R=r
DELTA=11  (9 added, 0 deleted, 2 changed)
OCL=15486
CL=15486
---

diff --git a/src/libmach_amd64/executable.c b/src/libmach_amd64/executable.c
index 6c05102ab0..deca13cd87 100644
--- a/src/libmach_amd64/executable.c
+++ b/src/libmach_amd64/executable.c
@@ -796,11 +796,11 @@ error:
 		read(fd, buf, sh[ep->shstrndx].size);
 
 		for(i = 0; i < ep->shnum; i++) {
-			if (sh[i].type == 2 && strcmp(&buf[sh[i].name], ".gosymtab") == 0) {
+			if (strcmp(&buf[sh[i].name], ".gosymtab") == 0) {
 				symsize = sh[i].size;
 				symoff = sh[i].offset;
 			}
-			if (sh[i].type == 2 && strcmp(&buf[sh[i].name], ".gopclntab") == 0) {
+			if (strcmp(&buf[sh[i].name], ".gopclntab") == 0) {
 				if (sh[i].offset != symoff+symsize) {
 					werrstr("pc line table not contiguous with symbol table");
 					free(buf);
diff --git a/src/libmach_amd64/linux.c b/src/libmach_amd64/linux.c
index ee4c8a2177..ff4012081b 100644
--- a/src/libmach_amd64/linux.c
+++ b/src/libmach_amd64/linux.c
@@ -523,3 +523,12 @@ ptraceerr:
 	werrstr("ptrace %s register laddr=%d pid=%d: %r", isr ? "read" : "write", laddr, map->pid);
 	return -1;	
 }
+
+char*
+procstatus(int pid)
+{
+	if(isstopped(pid))
+		return "Stopped";
+
+	return "Running";
+}