[dev.garbage] all: merge default (f38460037b72) into dev.garbage

This is the revision that dev.cc is branched from.

LGTM=austin
R=austin
CC=golang-codereviews
https://codereview.appspot.com/169590043

1 files changed, 25 insertions, 0 deletions

diff --git a/src/cmd/cc/lexbody b/src/cmd/cc/lexbody
index e24db1bc0..f586aaa20 100644
--- a/src/cmd/cc/lexbody
+++ b/src/cmd/cc/lexbody
@@ -220,6 +220,31 @@ slookup(char *s)
 	return lookup();
 }
 
+LSym *thetext;
+
+void
+settext(LSym *s)
+{
+	thetext = s;
+}
+
+Sym*
+labellookup(Sym *s)
+{
+	char *p;
+	Sym *lab;
+	
+	if(thetext == nil) {
+		s->labelname = s->name;
+		return s;
+	}
+	p = smprint("%s.%s", thetext->name, s->name);
+	lab = slookup(p);
+	free(p);
+	lab->labelname = s->name;
+	return lab;
+}
+
 Sym*
 lookup(void)
 {