diff --git a/libada/ChangeLog b/libada/ChangeLog
index d0afcea554a..607b7ba959a 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,10 @@
+2017-06-01  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR ada/80921
+	* configure.ac (default_gnatlib_target): Remove bogus condition.
+	(have_getipinfo): Tweak.
+	* configure: Regenerate.
+
 2017-05-02  Release Manager
 
 	* GCC 7.1.0 released.
@@ -8,7 +15,7 @@
 	* configure.ac: Add GCC_BASE_VER.
 	* Makefile.in (version): Use @get_gcc_base_ver@ instead of cat to get
 	version from BASE-VER file.
-	* configure: Regenerated.
+	* configure: Regenerate.
 
 2017-01-04  Alan Modra  <amodra@gmail.com>
 
diff --git a/libada/configure b/libada/configure
index 5ab0e211aa0..17a52c81db2 100755
--- a/libada/configure
+++ b/libada/configure
@@ -2960,9 +2960,7 @@ fi
 
 
 # Determine what to build for 'gnatlib'
-if test $build = $target \
-   && test ${enable_shared} = yes ; then
-  # Note that build=target is almost certainly the wrong test; FIXME
+if test ${enable_shared} = yes; then
   default_gnatlib_target="gnatlib-shared"
 else
   default_gnatlib_target="gnatlib-plain"
@@ -3006,9 +3004,10 @@ $as_echo "#define HAVE_GETIPINFO 1" >>confdefs.h
 
   fi
 
-have_getipinfo=
 if test x$have_unwind_getipinfo = xyes; then
   have_getipinfo=-DHAVE_GETIPINFO
+else
+  have_getipinfo=
 fi
 
 
diff --git a/libada/configure.ac b/libada/configure.ac
index 3e0f0a35210..0020df9d463 100644
--- a/libada/configure.ac
+++ b/libada/configure.ac
@@ -127,9 +127,7 @@ AC_PROG_AWK
 AC_PROG_LN_S
 
 # Determine what to build for 'gnatlib'
-if test $build = $target \
-   && test ${enable_shared} = yes ; then
-  # Note that build=target is almost certainly the wrong test; FIXME
+if test ${enable_shared} = yes; then
   default_gnatlib_target="gnatlib-shared"
 else
   default_gnatlib_target="gnatlib-plain"
@@ -138,11 +136,12 @@ AC_SUBST([default_gnatlib_target])
 
 # Check for _Unwind_GetIPInfo
 GCC_CHECK_UNWIND_GETIPINFO
-have_getipinfo=
 if test x$have_unwind_getipinfo = xyes; then
   have_getipinfo=-DHAVE_GETIPINFO
+else
+  have_getipinfo=
 fi
-AC_SUBST(have_getipinfo)
+AC_SUBST([have_getipinfo])
 
 # Determine what GCC version number to use in filesystem paths.
 GCC_BASE_VER