diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/compile/internal/gc/main.go | 2 | ||||
| -rw-r--r-- | src/cmd/internal/objabi/util.go | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go index 5e30302970..2b61564ad8 100644 --- a/src/cmd/compile/internal/gc/main.go +++ b/src/cmd/compile/internal/gc/main.go @@ -104,7 +104,7 @@ func hidePanic() { func doversion() { p := objabi.Expstring() - if p == "X:none" { + if p == objabi.DefaultExpstring() { p = "" } sep := "" diff --git a/src/cmd/internal/objabi/util.go b/src/cmd/internal/objabi/util.go index 811fdd33d4..1da05021f5 100644 --- a/src/cmd/internal/objabi/util.go +++ b/src/cmd/internal/objabi/util.go @@ -46,7 +46,6 @@ func Getgoextlinkenabled() string { } func init() { - framepointer_enabled = 1 // default for _, f := range strings.Split(goexperiment, ",") { if f != "" { addexp(f) @@ -80,7 +79,7 @@ func addexp(s string) { } var ( - framepointer_enabled int + framepointer_enabled int = 1 Fieldtrack_enabled int Preemptibleloops_enabled int Clobberdead_enabled int @@ -100,6 +99,12 @@ var exper = []struct { {"clobberdead", &Clobberdead_enabled}, } +var defaultExpstring = Expstring() + +func DefaultExpstring() string { + return defaultExpstring +} + func Expstring() string { buf := "X" for i := range exper { |