[dev.regabi] all: merge master (dab3e5a) into dev.regabi

[gostls13.git] / src / cmd / link / internal / ld / main.go

diff --git a/src/cmd/link/internal/ld/main.go b/src/cmd/link/internal/ld/main.go
index 5a096f1b3b9fd2c27e564f4f0e60992d71f48e4f..cbd811846b6ffae60d9c3dbd528a549bc431cea0 100644 (file)
--- a/src/cmd/link/internal/ld/main.go
+++ b/src/cmd/link/internal/ld/main.go
@@ -92,11 +92,10 @@ var (
        FlagRound         = flag.Int("R", -1, "set address rounding `quantum`")
        FlagTextAddr      = flag.Int64("T", -1, "set text segment `address`")
        flagEntrySymbol   = flag.String("E", "", "set `entry` symbol name")
-
-       cpuprofile     = flag.String("cpuprofile", "", "write cpu profile to `file`")
-       memprofile     = flag.String("memprofile", "", "write memory profile to `file`")
-       memprofilerate = flag.Int64("memprofilerate", 0, "set runtime.MemProfileRate to `rate`")
-
+       cpuprofile        = flag.String("cpuprofile", "", "write cpu profile to `file`")
+       memprofile        = flag.String("memprofile", "", "write memory profile to `file`")
+       memprofilerate    = flag.Int64("memprofilerate", 0, "set runtime.MemProfileRate to `rate`")
+       flagAbiWrap       = flag.Bool("abiwrap", objabi.Regabi_enabled != 0, "support ABI wrapper functions")
        benchmarkFlag     = flag.String("benchmark", "", "set to 'mem' or 'cpu' to enable phase benchmarking")
        benchmarkFileFlag = flag.String("benchmarkprofile", "", "emit phase profiles to `base`_phase.{cpu,mem}prof")
 )