From 8b9cfd766d1de5e8b0409e4a475730c9a79da5ea Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Mon, 27 May 2019 00:14:02 +0000
Subject: [PATCH] re PR go/90635 (typo in libgo/configure.ac)

	PR go/90635
    libgo: correct typo in USE_LIBFFI AM_CONDITIONAL

    Only affects the case of passing --without-libffi to configure.

    Fixes https://gcc.gnu.org/PR90635

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/178998

From-SVN: r271640
---
 gcc/go/gofrontend/MERGE | 2 +-
 libgo/configure         | 2 +-
 libgo/configure.ac      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 7f668945952..ba9550787af 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-578c4fb6132801db8e9d11d741d2394e07c5a398
+3995d545f1e112c682753f342eaef0877551a649
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/configure b/libgo/configure
index 888b6d96bc2..1e33a5769e0 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -13712,7 +13712,7 @@ $as_echo "#define USE_LIBFFI 1" >>confdefs.h
 fi
 
 
- if test "$with_liffi" != "no"; then
+ if test "$with_libffi" != "no"; then
   USE_LIBFFI_TRUE=
   USE_LIBFFI_FALSE='#'
 else
diff --git a/libgo/configure.ac b/libgo/configure.ac
index c47253b28f3..0bd328c618b 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -128,7 +128,7 @@ if test "$with_libffi" != no; then
 fi
 AC_SUBST(LIBFFI)
 AC_SUBST(LIBFFIINCS)
-AM_CONDITIONAL(USE_LIBFFI, test "$with_liffi" != "no")
+AM_CONDITIONAL(USE_LIBFFI, test "$with_libffi" != "no")
 
 # See if the user wants to configure without libatomic. This is useful if we are
 # on an architecture for which libgo does not need an atomic support library and
-- 
2.30.2