From db67d458959d211835f78d8f2aebb5ae84eb42e7 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
Date: Mon, 18 Jun 2018 09:37:12 -0400
Subject: [PATCH] configure.ac: Sync with GCC

Here's an extra one... I'll need to make some changes to the root
configure.ac.  This patch makes sure it is in sync with GCC first.

ChangeLog:

	* configure.ac: Sync with GCC, remove MPX-related things.
---
 ChangeLog    |  4 ++++
 configure.ac | 27 ---------------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 87e3dfc..93838be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-18  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* configure.ac: Sync with GCC, remove MPX-related things.
+
 2018-05-01  Nick Clifton  <nickc@redhat.com>
 
 	* config.guess: Synchronize with config project master sources.
diff --git a/configure.ac b/configure.ac
index a1edc36..28155a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,6 @@ target_libraries="target-libgcc \
 		target-libstdc++-v3 \
 		target-libsanitizer \
 		target-libvtv \
-		target-libmpx \
 		target-libssp \
 		target-libquadmath \
 		target-libgfortran \
@@ -601,22 +600,6 @@ if test -d ${srcdir}/libvtv; then
 fi
 
 
-# Enable libmpx on supported systems by request.
-if test -d ${srcdir}/libmpx; then
-    if test x$enable_libmpx = x; then
-       AC_MSG_CHECKING([for libmpx support])
-       if (srcdir=${srcdir}/libmpx; \
-               . ${srcdir}/configure.tgt; \
-               test "$LIBMPX_SUPPORTED" != "yes")
-       then
-           AC_MSG_RESULT([no])
-           noconfigdirs="$noconfigdirs target-libmpx"
-       else
-           AC_MSG_RESULT([yes])
-       fi
-    fi
-fi
-
 # Disable libhsail-rt on unsupported systems.
 if test -d ${srcdir}/libhsail-rt; then
     if test x$enable_libhsail_rt = x; then
@@ -2696,16 +2679,6 @@ if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 &&
   bootstrap_target_libs=${bootstrap_target_libs}target-libvtv,
 fi
 
-# If we are building libmpx and $BUILD_CONFIG contains bootstrap-mpx,
-# bootstrap it.
-if echo " ${target_configdirs} " | grep " libmpx " > /dev/null 2>&1; then
-  case "$BUILD_CONFIG" in
-    *bootstrap-mpx* )
-      bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
-      ;;
-  esac
-fi
-
 # Determine whether gdb needs tk/tcl or not.
 # Use 'maybe' since enable_gdbtk might be true even if tk isn't available
 # and in that case we want gdb to be built without tk.  Ugh!
-- 
2.7.4