PR libstdc++/81797 Add .NOTPARALLEL to include/Makefile for darwin

PR libstdc++/81797
	* configure.ac (INCLUDE_DIR_NOTPARALLEL): Define.
	* configure: Regenerate.
	* include/Makefile.am (INCLUDE_DIR_NOTPARALLEL): Add .NOTPARALLEL when
	defined.
	* include/Makefile.in: Regenerate.

From-SVN: r257710
This commit is contained in:
Jonathan Wakely 2018-02-15 20:56:41 +00:00 committed by Jonathan Wakely
parent 117ad0be08
commit 51f174c0ef
5 changed files with 50 additions and 9 deletions

View file

@ -1,3 +1,12 @@
2018-02-15 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/81797
* configure.ac (INCLUDE_DIR_NOTPARALLEL): Define.
* configure: Regenerate.
* include/Makefile.am (INCLUDE_DIR_NOTPARALLEL): Add .NOTPARALLEL when
defined.
* include/Makefile.in: Regenerate.
2018-01-29 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/83833

View file

@ -621,6 +621,8 @@ CPU_DEFINES_SRCDIR
ATOMIC_FLAGS
ATOMIC_WORD_SRCDIR
ATOMICITY_SRCDIR
INCLUDE_DIR_NOTPARALLEL_FALSE
INCLUDE_DIR_NOTPARALLEL_TRUE
BUILD_PDF_FALSE
BUILD_PDF_TRUE
PDFLATEX
@ -11605,7 +11607,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11608 "configure"
#line 11610 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11711,7 +11713,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11714 "configure"
#line 11716 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -15397,7 +15399,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
# Fake what AC_TRY_COMPILE does.
cat > conftest.$ac_ext << EOF
#line 15400 "configure"
#line 15402 "configure"
int main()
{
typedef bool atomic_type;
@ -15432,7 +15434,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; }
rm -f conftest*
cat > conftest.$ac_ext << EOF
#line 15435 "configure"
#line 15437 "configure"
int main()
{
typedef short atomic_type;
@ -15467,7 +15469,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; }
rm -f conftest*
cat > conftest.$ac_ext << EOF
#line 15470 "configure"
#line 15472 "configure"
int main()
{
// NB: _Atomic_word not necessarily int.
@ -15503,7 +15505,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }
rm -f conftest*
cat > conftest.$ac_ext << EOF
#line 15506 "configure"
#line 15508 "configure"
int main()
{
typedef long long atomic_type;
@ -15584,7 +15586,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu
# unnecessary for this test.
cat > conftest.$ac_ext << EOF
#line 15587 "configure"
#line 15589 "configure"
int main()
{
_Decimal32 d1;
@ -15626,7 +15628,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
# unnecessary for this test.
cat > conftest.$ac_ext << EOF
#line 15629 "configure"
#line 15631 "configure"
template<typename T1, typename T2>
struct same
{ typedef T2 type; };
@ -15660,7 +15662,7 @@ $as_echo "$enable_int128" >&6; }
rm -f conftest*
cat > conftest.$ac_ext << EOF
#line 15663 "configure"
#line 15665 "configure"
template<typename T1, typename T2>
struct same
{ typedef T2 type; };
@ -81079,6 +81081,18 @@ else
fi
case "$build" in
*-*-darwin* ) glibcxx_include_dir_notparallel=yes ;;
* ) glibcxx_include_dir_notparallel=no ;;
esac
if test $glibcxx_include_dir_notparallel = "yes"; then
INCLUDE_DIR_NOTPARALLEL_TRUE=
INCLUDE_DIR_NOTPARALLEL_FALSE='#'
else
INCLUDE_DIR_NOTPARALLEL_TRUE='#'
INCLUDE_DIR_NOTPARALLEL_FALSE=
fi
# Propagate the target-specific source directories through the build chain.
ATOMICITY_SRCDIR=config/${atomicity_dir}
@ -81845,6 +81859,10 @@ if test -z "${BUILD_PDF_TRUE}" && test -z "${BUILD_PDF_FALSE}"; then
as_fn_error "conditional \"BUILD_PDF\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${INCLUDE_DIR_NOTPARALLEL_TRUE}" && test -z "${INCLUDE_DIR_NOTPARALLEL_FALSE}"; then
as_fn_error "conditional \"INCLUDE_DIR_NOTPARALLEL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0

View file

@ -473,6 +473,12 @@ AM_CONDITIONAL(BUILD_PDF,
test $ac_cv_prog_DBLATEX = "yes" &&
test $ac_cv_prog_PDFLATEX = "yes")
case "$build" in
*-*-darwin* ) glibcxx_include_dir_notparallel=yes ;;
* ) glibcxx_include_dir_notparallel=no ;;
esac
AM_CONDITIONAL(INCLUDE_DIR_NOTPARALLEL,
test $glibcxx_include_dir_notparallel = "yes")
# Propagate the target-specific source directories through the build chain.
ATOMICITY_SRCDIR=config/${atomicity_dir}

View file

@ -1479,3 +1479,8 @@ $(decimal_headers): ; @:
$(ext_headers): ; @:
$(experimental_headers): ; @:
$(experimental_bits_headers): ; @:
if INCLUDE_DIR_NOTPARALLEL
# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81797
.NOTPARALLEL:
endif

View file

@ -1903,6 +1903,9 @@ $(ext_headers): ; @:
$(experimental_headers): ; @:
$(experimental_bits_headers): ; @:
# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81797
@INCLUDE_DIR_NOTPARALLEL_TRUE@.NOTPARALLEL:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: