diff options
| author | Ian Lance Taylor <iant@golang.org> | 2022-02-11 14:53:56 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2022-02-11 15:01:19 -0800 |
| commit | 8dc2499aa62f768c6395c9754b8cabc1ce25c494 (patch) | |
| tree | 43d7fd2bbfd7ad8c9625a718a5e8718889351994 /libgo/go/plugin/plugin_dlopen.go | |
| parent | 9a56779dbc4e2d9c15be8d31e36f2f59be7331a8 (diff) | |
| download | gcc-8dc2499aa62f768c6395c9754b8cabc1ce25c494.tar.gz | |
libgo: update to Go1.18beta2
gotools/
* Makefile.am (go_cmd_cgo_files): Add ast_go118.go
(check-go-tool): Copy golang.org/x/tools directories.
* Makefile.in: Regenerate.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/384695
Diffstat (limited to 'libgo/go/plugin/plugin_dlopen.go')
| -rw-r--r-- | libgo/go/plugin/plugin_dlopen.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libgo/go/plugin/plugin_dlopen.go b/libgo/go/plugin/plugin_dlopen.go index 23adc4f15ea..cdd6bb56919 100644 --- a/libgo/go/plugin/plugin_dlopen.go +++ b/libgo/go/plugin/plugin_dlopen.go @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build (linux && cgo) || (darwin && cgo) || (freebsd && cgo) || (hurd && cgo) -// +build linux,cgo darwin,cgo freebsd,cgo hurd,cgo +//go:build (linux && cgo) || (darwin && cgo) || (freebsd && cgo) || (hurd & cgo) package plugin @@ -103,7 +102,7 @@ func open(name string) (*Plugin, error) { } // Fill out the value of each plugin symbol. - updatedSyms := map[string]interface{}{} + updatedSyms := map[string]any{} for symName, sym := range syms { isFunc := symName[0] == '.' if isFunc { @@ -148,7 +147,7 @@ var ( ) // lastmoduleinit is defined in package runtime -func lastmoduleinit() (pluginpath string, syms map[string]interface{}, errstr string) +func lastmoduleinit() (pluginpath string, syms map[string]any, errstr string) // doInit is defined in package runtime //go:linkname doInit runtime.doInit |