FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libgo: better error messages for unknown GOARCH/GOOS

Browse source 
PR go/113530

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/557655
This commit is contained in:
Ian Lance Taylor 2024-01-22 17:26:23 -08:00
parent e52d31804a
commit cfc6d9ae81
5 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View file

@ -1,4 +1,4 @@
7ab229670f7dad1d79f33929f9a4f8e6e4a71526 8c056e335cecec67d1d223a329b7ba4dac778a65
The first line of this file holds the git revision number of the last The first line of this file holds the git revision number of the last
merge done from the gofrontend repository. merge done from the gofrontend repository.

4
libgo/Makefile.am
View file

@ -497,6 +497,10 @@ s-version: Makefile
zgoarch.go: s-zgoarch; @true zgoarch.go: s-zgoarch; @true
s-zgoarch: Makefile goarch.sh s-zgoarch: Makefile goarch.sh
rm -f zgoarch.go.tmp rm -f zgoarch.go.tmp
if ! $(SHELL) $(srcdir)/goarch.sh $(GOARCH) family >/dev/null 2>/dev/null; then \
$(SHELL) $(srcdir)/goarch.sh $(GOARCH) family; \
exit 1; \
fi
echo "package goarch" > zgoarch.go.tmp echo "package goarch" > zgoarch.go.tmp
echo >> zgoarch.go.tmp echo >> zgoarch.go.tmp
echo 'const GOARCH = "'$(GOARCH)'"' >> zgoarch.go.tmp echo 'const GOARCH = "'$(GOARCH)'"' >> zgoarch.go.tmp

4
libgo/Makefile.in
View file

@ -2716,6 +2716,10 @@ s-version: Makefile
zgoarch.go: s-zgoarch; @true zgoarch.go: s-zgoarch; @true
s-zgoarch: Makefile goarch.sh s-zgoarch: Makefile goarch.sh
rm -f zgoarch.go.tmp rm -f zgoarch.go.tmp
if ! $(SHELL) $(srcdir)/goarch.sh $(GOARCH) family >/dev/null 2>/dev/null; then \
$(SHELL) $(srcdir)/goarch.sh $(GOARCH) family; \
exit 1; \
fi
echo "package goarch" > zgoarch.go.tmp echo "package goarch" > zgoarch.go.tmp
echo >> zgoarch.go.tmp echo >> zgoarch.go.tmp
echo 'const GOARCH = "'$(GOARCH)'"' >> zgoarch.go.tmp echo 'const GOARCH = "'$(GOARCH)'"' >> zgoarch.go.tmp

8
libgo/configure vendored
View file

@ -14107,6 +14107,10 @@ fi
if test "${GOOS}" = "unknown"; then
as_fn_error $? "\"could not determine GOOS from ${host}\"" "$LINENO" 5
fi
USE_DEJAGNU=no USE_DEJAGNU=no
case ${host} in case ${host} in
*-*-rtems*) USE_DEJAGNU=yes ;; *-*-rtems*) USE_DEJAGNU=yes ;;
@ -14339,6 +14343,10 @@ esac
if test "${GOARCH}" = "unknown"; then
as_fn_error $? "\"could not determine GOARCH from ${host}\"" "$LINENO" 5
fi
if test "$GOARCH" = "386" -o "$GOARCH" = "amd64" -o "$GOARCH" = "amd64p32"; then if test "$GOARCH" = "386" -o "$GOARCH" = "amd64" -o "$GOARCH" = "amd64p32"; then
LIBGO_IS_X86_TRUE= LIBGO_IS_X86_TRUE=
LIBGO_IS_X86_FALSE='#' LIBGO_IS_X86_FALSE='#'

8
libgo/configure.ac
View file

@ -209,6 +209,10 @@ AM_CONDITIONAL(LIBGO_IS_BSD, test $is_darwin = yes -o $is_dragonfly = yes -o $is
AC_SUBST(GOOS) AC_SUBST(GOOS)
AC_SUBST(ALLGOOS) AC_SUBST(ALLGOOS)
if test "${GOOS}" = "unknown"; then
AC_MSG_ERROR("could not determine GOOS from ${host}")
fi
dnl Test whether we need to use DejaGNU or whether we can use the dnl Test whether we need to use DejaGNU or whether we can use the
dnl simpler gotest approach. We can only use gotest for a native dnl simpler gotest approach. We can only use gotest for a native
dnl build. dnl build.
@ -376,6 +380,10 @@ AC_SUBST(GOARCH)
AC_SUBST(ALLGOARCH) AC_SUBST(ALLGOARCH)
AC_SUBST(ALLGOARCHFAMILY) AC_SUBST(ALLGOARCHFAMILY)
if test "${GOARCH}" = "unknown"; then
AC_MSG_ERROR("could not determine GOARCH from ${host}")
fi
AM_CONDITIONAL(LIBGO_IS_X86, test "$GOARCH" = "386" -o "$GOARCH" = "amd64" -o "$GOARCH" = "amd64p32") AM_CONDITIONAL(LIBGO_IS_X86, test "$GOARCH" = "386" -o "$GOARCH" = "amd64" -o "$GOARCH" = "amd64p32")
FUNCTION_DESCRIPTORS=false FUNCTION_DESCRIPTORS=false