Notice: We have migrated to GitLab launching 2024-05-01 see here: https://gitlab.rtems.org/

Ticket #3171: darwin-apfs-gcc-libstdc++-bug-81797-redi-2.diff

File darwin-apfs-gcc-libstdc++-bug-81797-redi-2.diff, 4.5 KB (added by Chris Johns, on 10/27/17 at 03:04:12)

Generated version of Jonathan Wakely's patch from the GCC ticket comment 42 tracking this issue.

  • gcc-7.2.0/libstdc++-v3/configure.ac

    old new  
    467467               test $ac_cv_prog_DBLATEX = "yes" &&
    468468               test $ac_cv_prog_PDFLATEX = "yes")
    469469
     470case "$build" in
     471 *-*-darwin* ) glibcxx_include_dir_notparallel=yes ;;
     472 * ) glibcxx_include_dir_notparallel=no ;;
     473esac
     474AM_CONDITIONAL(INCLUDE_DIR_NOTPARALLEL,
     475               test $glibcxx_include_dir_notparallel = "yes")
    470476
    471477# Propagate the target-specific source directories through the build chain.
    472478ATOMICITY_SRCDIR=config/${atomicity_dir}
  • gcc-7.2.0/libstdc++-v3/configure

    old new  
    620620ATOMIC_FLAGS
    621621ATOMIC_WORD_SRCDIR
    622622ATOMICITY_SRCDIR
     623INCLUDE_DIR_NOTPARALLEL_FALSE
     624INCLUDE_DIR_NOTPARALLEL_TRUE
    623625BUILD_PDF_FALSE
    624626BUILD_PDF_TRUE
    625627PDFLATEX
     
    1160111603  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    1160211604  lt_status=$lt_dlunknown
    1160311605  cat > conftest.$ac_ext <<_LT_EOF
    11604 #line 11604 "configure"
     11606#line 11606 "configure"
    1160511607#include "confdefs.h"
    1160611608
    1160711609#if HAVE_DLFCN_H
     
    1170711709  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    1170811710  lt_status=$lt_dlunknown
    1170911711  cat > conftest.$ac_ext <<_LT_EOF
    11710 #line 11710 "configure"
     11712#line 11712 "configure"
    1171111713#include "confdefs.h"
    1171211714
    1171311715#if HAVE_DLFCN_H
     
    1539315395  # Fake what AC_TRY_COMPILE does.
    1539415396
    1539515397    cat > conftest.$ac_ext << EOF
    15396 #line 15396 "configure"
     15398#line 15398 "configure"
    1539715399int main()
    1539815400{
    1539915401  typedef bool atomic_type;
     
    1542815430    rm -f conftest*
    1542915431
    1543015432    cat > conftest.$ac_ext << EOF
    15431 #line 15431 "configure"
     15433#line 15433 "configure"
    1543215434int main()
    1543315435{
    1543415436  typedef short atomic_type;
     
    1546315465    rm -f conftest*
    1546415466
    1546515467    cat > conftest.$ac_ext << EOF
    15466 #line 15466 "configure"
     15468#line 15468 "configure"
    1546715469int main()
    1546815470{
    1546915471  // NB: _Atomic_word not necessarily int.
     
    1549915501    rm -f conftest*
    1550015502
    1550115503    cat > conftest.$ac_ext << EOF
    15502 #line 15502 "configure"
     15504#line 15504 "configure"
    1550315505int main()
    1550415506{
    1550515507  typedef long long atomic_type;
     
    1558015582  # unnecessary for this test.
    1558115583
    1558215584    cat > conftest.$ac_ext << EOF
    15583 #line 15583 "configure"
     15585#line 15585 "configure"
    1558415586int main()
    1558515587{
    1558615588  _Decimal32 d1;
     
    1562215624  # unnecessary for this test.
    1562315625
    1562415626    cat > conftest.$ac_ext << EOF
    15625 #line 15625 "configure"
     15627#line 15627 "configure"
    1562615628template<typename T1, typename T2>
    1562715629  struct same
    1562815630  { typedef T2 type; };
     
    1565615658    rm -f conftest*
    1565715659
    1565815660    cat > conftest.$ac_ext << EOF
    15659 #line 15659 "configure"
     15661#line 15661 "configure"
    1566015662template<typename T1, typename T2>
    1566115663  struct same
    1566215664  { typedef T2 type; };
     
    8121981221fi
    8122081222
    8122181223
     81224case "$build" in
     81225 *-*-darwin* ) glibcxx_include_dir_notparallel=yes ;;
     81226 * ) glibcxx_include_dir_notparallel=no ;;
     81227esac
     81228 if test $glibcxx_include_dir_notparallel = "yes"; then
     81229  INCLUDE_DIR_NOTPARALLEL_TRUE=
     81230  INCLUDE_DIR_NOTPARALLEL_FALSE='#'
     81231else
     81232  INCLUDE_DIR_NOTPARALLEL_TRUE='#'
     81233  INCLUDE_DIR_NOTPARALLEL_FALSE=
     81234fi
     81235
    8122281236
    8122381237# Propagate the target-specific source directories through the build chain.
    8122481238ATOMICITY_SRCDIR=config/${atomicity_dir}
     
    8191381927  as_fn_error "conditional \"BUILD_PDF\" was never defined.
    8191481928Usually this means the macro was only invoked conditionally." "$LINENO" 5
    8191581929fi
     81930if test -z "${INCLUDE_DIR_NOTPARALLEL_TRUE}" && test -z "${INCLUDE_DIR_NOTPARALLEL_FALSE}"; then
     81931  as_fn_error "conditional \"INCLUDE_DIR_NOTPARALLEL\" was never defined.
     81932Usually this means the macro was only invoked conditionally." "$LINENO" 5
     81933fi
    8191681934
    8191781935: ${CONFIG_STATUS=./config.status}
    8191881936ac_write_fail=0
  • gcc-7.2.0/libstdc++-v3/include/Makefile.am

    old new  
    14751475$(ext_headers): ; @:
    14761476$(experimental_headers): ; @:
    14771477$(experimental_bits_headers): ; @:
     1478if INCLUDE_DIR_NOTPARALLEL
     1479# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81797
     1480.NOTPARALLEL:
     1481endif
  • gcc-7.2.0/libstdc++-v3/include/Makefile.in

    old new  
    18971897$(ext_headers): ; @:
    18981898$(experimental_headers): ; @:
    18991899$(experimental_bits_headers): ; @:
     1900# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81797
     1901@INCLUDE_DIR_NOTPARALLEL_TRUE@.NOTPARALLEL:
    19001902
    19011903# Tell versions [3.59,3.63) of GNU make to not export all variables.
    19021904# Otherwise a system limit (for SysV at least) may be exceeded.