diff options
author | Ian Lance Taylor <iant@golang.org> | 2019-09-06 18:12:46 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-09-06 18:12:46 +0000 |
commit | aa8901e9bb0399d2c16f988ba2fe46eb0c0c5d13 (patch) | |
tree | 7e63b06d1eec92beec6997c9d3ab47a5d6a835be /libgo/Makefile.in | |
parent | 920ea3b8ba3164b61ac9490dfdfceb6936eda6dd (diff) | |
download | gcc-aa8901e9bb0399d2c16f988ba2fe46eb0c0c5d13.tar.gz |
libgo: update to Go 1.13beta1 release
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/193497
From-SVN: r275473
Diffstat (limited to 'libgo/Makefile.in')
-rw-r--r-- | libgo/Makefile.in | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/libgo/Makefile.in b/libgo/Makefile.in index f415ca60116..751683887a3 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -218,10 +218,10 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES) am__DEPENDENCIES_2 = $(addsuffix .lo,$(PACKAGES)) \ internal/bytealg/bytealg.lo reflect/makefunc_ffi_c.lo \ $(am__DEPENDENCIES_1) syscall/errno.lo syscall/signame.lo \ - syscall/wait.lo $(internal_x_net_lif_lo) \ - $(internal_x_net_route_lo) log/syslog/syslog_c.lo \ + syscall/wait.lo $(golangorg_x_net_lif_lo) \ + $(golangorg_x_net_route_lo) log/syslog/syslog_c.lo \ runtime/internal/atomic_c.lo sync/atomic_c.lo \ - internal/cpu/cpu_gccgo.lo + internal/cpu/cpu_gccgo.lo golang.org/x/sys/cpu_gccgo.lo am__DEPENDENCIES_3 = am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2) \ ../libbacktrace/libbacktrace.la $(am__DEPENDENCIES_3) \ @@ -670,6 +670,7 @@ toolexeclibgocrypto_DATA = \ crypto/des.gox \ crypto/dsa.gox \ crypto/ecdsa.gox \ + crypto/ed25519.gox \ crypto/elliptic.gox \ crypto/hmac.gox \ crypto/md5.gox \ @@ -854,8 +855,7 @@ toolexeclibgounicode_DATA = \ # Some packages are only needed for tests, so unlike the other # internal packages nothing will explicitly depend on them. # Force them to be built. -noinst_DATA = internal/x/net/internal/nettest.gox \ - internal/x/net/nettest.gox internal/testenv.gox \ +noinst_DATA = golang.org/x/net/nettest.gox internal/testenv.gox \ internal/trace.gox net/internal/socktest.gox \ os/signal/internal/pty.gox runtime/pprof/internal/profile.gox \ zdefaultcc.go @@ -915,13 +915,14 @@ libgo_go_objs = \ syscall/errno.lo \ syscall/signame.lo \ syscall/wait.lo \ - $(internal_x_net_lif_lo) \ - $(internal_x_net_route_lo) \ + $(golangorg_x_net_lif_lo) \ + $(golangorg_x_net_route_lo) \ log/syslog/syslog_c.lo \ $(os_lib_inotify_lo) \ runtime/internal/atomic_c.lo \ sync/atomic_c.lo \ - internal/cpu/cpu_gccgo.lo + internal/cpu/cpu_gccgo.lo \ + golang.org/x/sys/cpu_gccgo.lo libgo_ldflags = \ -version-info $(libtool_VERSION) $(PTHREAD_CFLAGS) $(AM_LDFLAGS) @@ -1114,22 +1115,22 @@ extra_check_libs_cmd_vet_internal_cfg = $(abs_builddir)/libgotool.a # Use a build tag, based on a configure check, to cope. @HAVE_STAT_TIMESPEC_TRUE@@LIBGO_IS_SOLARIS_TRUE@matchargs_os = --tag=solaristag @LIBGO_IS_SOLARIS_FALSE@matchargs_os = -@LIBGO_IS_BSD_TRUE@internal_x_net_route_lo = \ -@LIBGO_IS_BSD_TRUE@ internal/x/net/route.lo +@LIBGO_IS_BSD_TRUE@golangorg_x_net_route_lo = \ +@LIBGO_IS_BSD_TRUE@ golang.org/net/route.lo -@LIBGO_IS_BSD_TRUE@internal_x_net_route_check = \ -@LIBGO_IS_BSD_TRUE@ internal/x/net/route/check +@LIBGO_IS_BSD_TRUE@golangorg_x_net_route_check = \ +@LIBGO_IS_BSD_TRUE@ golang.org/x/net/route/check -@LIBGO_IS_SOLARIS_TRUE@internal_x_net_lif_lo = \ -@LIBGO_IS_SOLARIS_TRUE@ internal/x/net/lif.lo +@LIBGO_IS_SOLARIS_TRUE@golangorg_x_net_lif_lo = \ +@LIBGO_IS_SOLARIS_TRUE@ golang.org/x/net/lif.lo -@LIBGO_IS_SOLARIS_TRUE@internal_x_net_lif_check = \ -@LIBGO_IS_SOLARIS_TRUE@ internal/x/net/lif/check +@LIBGO_IS_SOLARIS_TRUE@golangorg_x_net_lif_check = \ +@LIBGO_IS_SOLARIS_TRUE@ golang.org/x/net/lif/check TPACKAGES = $(shell cat $(srcdir)/check-packages.txt) TEST_PACKAGES = $(addsuffix /check,$(TPACKAGES)) \ - $(internal_x_net_lif_check) \ - $(internal_x_net_route_check) + $(golangorg_x_net_lif_check) \ + $(golangorg_x_net_route_check) MOSTLYCLEANFILES = \ s-runtime_sysinfo s-sigtab s-runtime-inc s-zstdpkglist \ @@ -2597,7 +2598,6 @@ s-version: Makefile echo " BigEndian = `$(SHELL) $(srcdir)/goarch.sh $(GOARCH) bigendian`" >> version.go.tmp echo " CacheLineSize = `$(SHELL) $(srcdir)/goarch.sh $(GOARCH) cachelinesize`" >> version.go.tmp echo " DefaultPhysPageSize = `$(SHELL) $(srcdir)/goarch.sh $(GOARCH) defaultphyspagesize`" >> version.go.tmp - echo " HugePageSize = `$(SHELL) $(srcdir)/goarch.sh $(GOARCH) hugepagesize`" >> version.go.tmp echo " Int64Align = `$(SHELL) $(srcdir)/goarch.sh $(GOARCH) int64align`" >> version.go.tmp echo " MinFrameSize = `$(SHELL) $(srcdir)/goarch.sh $(GOARCH) minframesize`" >> version.go.tmp echo " PCQuantum = `$(SHELL) $(srcdir)/goarch.sh $(GOARCH) pcquantum`" >> version.go.tmp @@ -2631,14 +2631,16 @@ s-objabi: Makefile rm -f objabi.go.tmp echo "package objabi" > objabi.go.tmp echo "import \"runtime\"" >> objabi.go.tmp - echo 'func init() { defaultGOROOT = `$(prefix)` }' >> objabi.go.tmp + echo 'func defaultGOROOTValue() string { return `$(prefix)` }' >> objabi.go.tmp echo 'const defaultGO386 = `sse2`' >> objabi.go.tmp echo 'const defaultGOARM = `5`' >> objabi.go.tmp echo 'const defaultGOMIPS = `hardfloat`' >> objabi.go.tmp echo 'const defaultGOMIPS64 = `hardfloat`' >> objabi.go.tmp + echo 'const defaultGOPPC64 = `power8`' >> objabi.go.tmp echo 'const defaultGOOS = runtime.GOOS' >> objabi.go.tmp echo 'const defaultGOARCH = runtime.GOARCH' >> objabi.go.tmp echo 'const defaultGO_EXTLINK_ENABLED = ``' >> objabi.go.tmp + echo 'const defaultGO_LDSO = ``' >> objabi.go.tmp echo 'const version = `'`cat $(srcdir)/VERSION | sed 1q`' '`$(GOC) --version | sed 1q`'`' >> objabi.go.tmp echo 'const stackGuardMultiplierDefault = 1' >> objabi.go.tmp echo 'const goexperiment = ``' >> objabi.go.tmp @@ -2700,7 +2702,7 @@ s-zstdpkglist: Makefile echo 'package goroot' > zstdpkglist.go.tmp echo "" >> zstdpkglist.go.tmp echo 'var stdpkg = map[string]bool{' >> zstdpkglist.go.tmp - echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's|[a-z0-9_/]*_c\.lo||g' | sed 's|\([a-z0-9_/]*\)\.lo|"\1": true,|g' >> zstdpkglist.go.tmp + echo $(libgo_go_objs) 'unsafe.lo' 'runtime/cgo.lo' | sed 's|[a-z0-9_./]*_c\.lo||g' | sed 's|\([a-z0-9_./]*\)\.lo|"\1": true,|g' >> zstdpkglist.go.tmp echo '}' >> zstdpkglist.go.tmp $(SHELL) $(srcdir)/mvifdiff.sh zstdpkglist.go.tmp zstdpkglist.go $(STAMP) $@ @@ -2876,6 +2878,11 @@ internal/cpu/cpu_gccgo.lo: go/internal/cpu/cpu_gccgo.c runtime.inc @$(MKDIR_P) internal/cpu $(LTCOMPILE) -c -o $@ $(srcdir)/go/internal/cpu/cpu_gccgo.c +# Similarly, golang.org/x/sys/cpu needs some C code. +golang.org/x/sys/cpu_gccgo.lo: go/golang.org/x/sys/cpu/cpu_gccgo.c runtime.inc + @$(MKDIR_P) golang.org/x/sys + $(LTCOMPILE) -c -o $@ $(srcdir)/go/golang.org/x/sys/cpu/cpu_gccgo.c + # Build internal/x/net/route only on BSD systems. @LIBGO_IS_BSD_TRUE@$(eval $(call PACKAGE_template,internal/x/net/route)) |