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 cff01a11f8ab0eae0cfc1d5ef462ce9fb77b3cf5..7d6ac08433d2c9b8220268321667bf55112dfc0c 100644 (file)
--- 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 1dc00d70d3532679ebfce570f69779bab726f33f..86492a53bcac90f7250ba02c8050fd8d6919747d 100644 (file)
--- 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 1d5c1aad2515977deb284600cd34ecac70ae9def..dc1d3146381790790a813196e1f745093dfb43cc 100644 (file)
--- 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;
 }