From: Russ Cox <rsc@golang.org>
Date: Wed, 2 Nov 2011 03:26:10 +0000 (-0400)
Subject: undo CL 5330066 / 6a5647d82728
X-Git-Tag: weekly.2011-11-08~88
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4c3ea0008c81e18688fc77f73dd0a8bb0c8ad323;p=gostls13.git

undo CL 5330066 / 6a5647d82728

I promised it wouldn't last very long.
People who really need this can sync to 6a5647d82728.

««« original CL description
gc: add GOEXPERIMENT=os.Error

This won't last long, I promise.

R=ken2
CC=golang-dev
https://golang.org/cl/5330066
»»»

R=ken2
CC=golang-dev
https://golang.org/cl/5333053
---

diff --git a/src/cmd/gc/go.h b/src/cmd/gc/go.h
index cff01a11f8..7d6ac08433 100644
--- a/src/cmd/gc/go.h
+++ b/src/cmd/gc/go.h
@@ -852,7 +852,6 @@ EXTERN	int	typecheckok;
 EXTERN	int	compiling_runtime;
 
 EXTERN	int	rune32;
-EXTERN	int	oserror;
 
 /*
  *	y.tab.c
diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c
index 1dc00d70d3..86492a53bc 100644
--- a/src/cmd/gc/lex.c
+++ b/src/cmd/gc/lex.c
@@ -38,7 +38,6 @@ static struct {
 	int *val;
 } exper[] = {
 	{"rune32", &rune32},
-	{"os.Error", &oserror},
 };
 
 static void
diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index 1d5c1aad25..dc1d314638 100644
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -2967,17 +2967,6 @@ mkpkg(Strlit *path)
 	p->prefix = pathtoprefix(path->s);
 	p->link = phash[h];
 	phash[h] = p;
-	
-	// If the compiler was built with
-	//	GOEXPERIMENT=os.Error
-	// define os.Error as an alias for error.
-	// Terrible and won't last long, but useful for transitions.
-	if(oserror && strcmp(path->s, "os") == 0) {
-		Sym *s;
-		s = pkglookup("Error", p);
-		s->def = typenod(errortype);
-	}
-
 	return p;
 }