summaryrefslogtreecommitdiff
path: root/lang/gcc-aux
diff options
context:
space:
mode:
authormarino <marino>2014-04-30 16:24:39 +0000
committermarino <marino>2014-04-30 16:24:39 +0000
commita891bfc8cdb0147404de54fc5495d9b93cac0c9b (patch)
tree28938e46abdcdf0f9cab967ff8fe25e3c2e133bf /lang/gcc-aux
parentf60843104a3268b8a9835c39439fea6ace4dc0f0 (diff)
downloadpkgsrc-a891bfc8cdb0147404de54fc5495d9b93cac0c9b.tar.gz
lang/gcc-aux: Change base of gcc 4.7.3 to gcc 4.9.0
It appears that gcc-aux is the first gcc 4.9.0 in pkgsrc. It's purpose is to build the Ada packages in pkgsrc, but it also supports C, C++, Objective-C, and Fortran languages by default. GCC 4.9 was released on 22 April 2014. Of note, GCC 4.9 fully supports the new Ada-2012 standard. The rest of the changes since GCC 4.8.2 are too numerous to mention, but a decent summary can be found here: http://gcc.gnu.org/gcc-4.9/changes.html FreeBSD support was added, but SunOS support was temporarily disabled. This is due to all new bootstraps being provided, but the SunOS bootstrap is not yet ready. Currently supported platforms are * NetBSD i386 and x86-64 * DragonFly i386 and x86-64 * FreeBSD i386 and x86-64 All platform fully pass the Ada testsuite: * http://www.dragonlace.net/gnataux/netbsd32/ * http://www.dragonlace.net/gnataux/netbsd64/ * http://www.dragonlace.net/gnataux/dragonfly32/ * http://www.dragonlace.net/gnataux/dragonfly64/ * http://www.dragonlace.net/gnataux/freebsd32/ * http://www.dragonlace.net/gnataux/freebsd64/
Diffstat (limited to 'lang/gcc-aux')
-rw-r--r--lang/gcc-aux/DESCR9
-rw-r--r--lang/gcc-aux/Makefile294
-rw-r--r--lang/gcc-aux/Makefile.testsuite302
-rw-r--r--lang/gcc-aux/Makefile.version7
-rw-r--r--lang/gcc-aux/buildlink3.mk4
-rw-r--r--lang/gcc-aux/distinfo47
-rw-r--r--lang/gcc-aux/files/diff-ada1911
-rw-r--r--lang/gcc-aux/files/diff-ada-testsuite421
-rw-r--r--lang/gcc-aux/files/diff-core613
-rw-r--r--lang/gcc-aux/files/diff-cxx264
-rw-r--r--lang/gcc-aux/files/diff-cxx-testsuite4614
-rw-r--r--lang/gcc-aux/files/diff-fortran44
-rw-r--r--lang/gcc-aux/files/diff-fortran-testsuite20
-rw-r--r--lang/gcc-aux/files/diff-gcc-testsuite22
-rw-r--r--lang/gcc-aux/files/diff-static-version16
-rw-r--r--lang/gcc-aux/options.mk66
16 files changed, 1864 insertions, 6790 deletions
diff --git a/lang/gcc-aux/DESCR b/lang/gcc-aux/DESCR
index 5a43a5b46ce..0af924c68d1 100644
--- a/lang/gcc-aux/DESCR
+++ b/lang/gcc-aux/DESCR
@@ -1,7 +1,6 @@
The AUX compiler supports several languages: Ada, C, C++, Fortran and
Objective-C. Since Ada support must be built by an Ada-capable compiler,
-only platforms for which a bootstrap compiler is available can build the
-AUX compiler.
+only platforms for which a bootstrap compiler is available can build it.
The AUX compiler is based on release versions of the Free Software
Foundation's GNU Compiler Collection. It carries with it the GMGPL license,
@@ -11,7 +10,5 @@ Library Exception, so the resulting binaries have no licensing requirements.
Binaries produced by the AUX compiler should be legally handled the same as
binaries produced by any FSF compiler.
-The AUX GNAT compiler the full Ada-83, Ada-95, Ada-2005 standard and
-provides a partial implementation of Ada-2012. The Ada-2012 reference manual
-was submitted to the International Organization for Standardization (ISO)
-in June 2012.
+This compiler implements the full Ada-83, Ada-95, Ada-2005 and Ada-2012
+standards.
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index 363cc2a5ed6..5dc33bdcbfe 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2014/01/07 02:30:11 marino Exp $
+# $NetBSD: Makefile,v 1.16 2014/04/30 16:24:39 marino Exp $
#
PKGNAME= gcc-aux-${SNAPSHOT}
DISTNAME= gcc-${GCC_VERSION}
-PKGREVISION= 4
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
DISTFILES= ${DISTNAME}.tar.bz2
@@ -13,56 +12,45 @@ HOMEPAGE= http://www.dragonlace.net/
COMMENT= GNAT Ada compiler based on GCC ${GCC_BRANCH}
LICENSE= gnu-gpl-v3 AND gnu-lgpl-v3
-SNAPSHOT= 20130411
-GCC_BRANCH= 4.7
-GCC_POINT= 3
-GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT}
-LANGS= c
-
-USE_TOOLS+= gmake sed:run perl makeinfo bzip2 patch pod2man
-USE_BUILTIN.iconv= no
-APPLY_DIFFS= core
-
+.include "Makefile.version"
+.include "Makefile.testsuite"
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-# Requires bootstrap compiler, which is only available for NetBSD i386/AMD64
-# DragonFly i386/AMD64 and SunOS i386 Bootstrap compilers for OpenBSD and
-# FreeBSD also exist, but are currently reserved for the native package systems
-# of those platforms.
+LANGS= c ada c++
+USE_TOOLS+= gmake sed:run perl makeinfo bzip2 patch pod2man tar
+APPLY_DIFFS= core ada cxx
+
+# Requires bootstrap compiler, which is only available for on selected systems
+# Disable SunOS for now until multilib version can be built and tested.
ONLY_FOR_PLATFORM= DragonFly-*-* \
+ FreeBSD-*-i386 \
+ FreeBSD-*-x86_64 \
NetBSD-[5-9]*-i386 \
- NetBSD-[5-9]*-x86_64 \
- SunOS-5.1[1-9]*-i386
+ NetBSD-[5-9]*-x86_64
+
+# SunOS-5.1[1-9]*-i386
+# gnat-bootstrap.i386.solaris.tar.bz2
BLD_TARGET= ${MACHINE_ARCH}-aux-${LOWER_OPSYS}${OS_VERSION}
-THREAD_MODEL= posix
-OS_LABEL4VERS= [pkgsrc]
-BOOTSTRAP_COMPILER= NOT_REQUIRED
-INTENDED_COMPILER= NATIVE
-BOOTSTRAP_TRIPLET= NOT SET
+GARCH= ${MACHINE_ARCH:S/amd64/x86_64/}
+OS_LABEL4VERS= [${OPSYS}${GARCH:M*64:S/amd_//:S/x86_//}]
FULL_GNATGCC= NOT SET
FULL_PATH= /sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/gcc-aux/bin:${PREFIX}/sbin:${PREFIX}/bin
-OLD_EH= register_frame
-REBUILD_LIB= Rebuild the following library first:
-STICONV= ${PREFIX}/lib/libiconv.a
-STINTL= \$${top_builddir}/../intl/libintl.a
-
-.if ${OPSYS} == "DragonFly"
-.if ${MACHINE_ARCH} == "i386"
- OS_LABEL4VERS= [DragonFly]
- BOOTSTRAP_TRIPLET= i386-bootstrap-dragonfly2.8/4.6.0
-.endif
-.if ${MACHINE_ARCH} == "x86_64"
- OS_LABEL4VERS= [DragonFly64]
- BOOTSTRAP_TRIPLET= x86_64-bootstrap-dragonfly2.8/4.6.0
-.endif
-BOOTSTRAP_COMPILER= gnat-bootstrap.${MACHINE_ARCH}.dragonfly.tar.bz2
-LINK_HEADER= /usr/include/sys/link_elf.h
+.if ${OPSYS} == DragonFly
+BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.dragonfly.36A.tar.bz2
.endif
+.if ${OPSYS} == FreeBSD
+MODERN_BINUTILS= yes
+. if !empty(OS_VERSION:M[678].*)
+BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.84.tar.bz2
+. else
+BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2
+. endif
+.endif
.if ${OPSYS} == "NetBSD"
.if !empty(OS_VERSION:M6.99.*)
@@ -70,58 +58,46 @@ LINK_HEADER= /usr/include/sys/link_elf.h
.else
NSUFF= ${OS_VERSION}
.endif
-# Special handling of clang may be required for all platforms
-# but currently this is confirmed only for NetBSD
-.if ${PKGSRC_COMPILER} == clang
-MY_CONFIGURE_ENV+= LDFLAGS=-lm
-.endif
-.if ${MACHINE_ARCH} == "i386"
- OS_LABEL4VERS= [NetBSD]
- BOOTSTRAP_TRIPLET= i386-bootstrap-netbsdelf5.1/4.6.0
- BLD_TARGET= ${MACHINE_ARCH}-aux-netbsdelf${NSUFF}
- BOOTSTRAP_COMPILER= gnat-bootstrap.${MACHINE_ARCH}.netbsd.tar.bz2
+.if ${GARCH} == i386
+ NELF= elf
.endif
-.if ${MACHINE_ARCH} == "x86_64"
- OS_LABEL4VERS= [NetBSD64]
- BOOTSTRAP_TRIPLET= x86_64-aux-netbsd6.1/4.7.3
- BLD_TARGET= ${MACHINE_ARCH}-aux-netbsd${NSUFF}
- BOOTSTRAP_COMPILER= gnat-bootstrap2.${MACHINE_ARCH}.netbsd.tar.bz2
+BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.netbsd.614.tar.bz2
+BLD_TARGET= ${MACHINE_ARCH}-aux-netbsd${NELF}${NSUFF}
.endif
-LINK_HEADER= /usr/include/link_elf.h
-.endif
-
.if ${OPSYS} == "SunOS"
-.if ${MACHINE_ARCH} == "i386"
- OS_LABEL4VERS= [Solaris]
- BOOTSTRAP_TRIPLET= i386-bootstrap-solaris5.11/4.6.1
-.endif
+BOOTSTRAP_TRIPLET= i386-bootstrap-solaris5.11/4.6.1
SOL_OSV= `expr substr ${OS_VERSION} 3 2`
BLD_TARGET= ${MACHINE_ARCH}-aux-${LOWER_OPSYS}2.${SOL_OSV}
BOOTSTRAP_COMPILER= gnat-bootstrap.${MACHINE_ARCH}.solaris.tar.bz2
-MY_CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
-. if exists(/usr/sfw/bin/gld)
-EXTRA_CONFARGS+= --with-gnu-ld --with-ld=/usr/sfw/bin/gld
-. else
-EXTRA_CONFARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
-. endif
-. if exists(/usr/sfw/bin/gas)
-EXTRA_CONFARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
-. else
-EXTRA_CONFARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
-. endif
+MODERN_BINUTILS= yes
+.endif
+
+.if defined(MODERN_BINUTILS)
+BUILDLINK_DEPMETHOD.binutils= full
+.include "../../devel/binutils/buildlink3.mk"
+EXTRA_CONFARGS+= --with-gnu-ld --with-ld=${PREFIX}/bin/gld
+EXTRA_CONFARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
+MY_CONFIGURE_ENV+= AR=${PREFIX}/bin/gar
+MY_CONFIGURE_ENV+= AS=${PREFIX}/bin/gas
+MY_CONFIGURE_ENV+= LD=${PREFIX}/bin/gld
+MY_CONFIGURE_ENV+= NM=${PREFIX}/bin/gnm
+MY_CONFIGURE_ENV+= RANLIB=${PREFIX}/bin/granlib
+.else
+EXTRA_CONFARGS+= --with-gnu-ld --with-ld=/usr/bin/ld
+EXTRA_CONFARGS+= --with-gnu-as --with-as=/usr/bin/as
.endif
# define some important directories and files
-BUILDDIR= ${WRKDIR}/build
WRKSRC= ${WRKDIR}/gcc-${GCC_VERSION}
-PKG_PREFIX= ${PREFIX}/gcc-aux
+BUILDDIR= ${WRKDIR}/build
+NEWBSDIR= ${WRKDIR}/newbs/bootstrap
CFG_SCRIPT= ${WRKSRC}/configure
-BOOTSTRAP_PREFIX= ${WRKDIR}/bootstrap
REVFILE= ${WRKSRC}/gcc/REVISION
-BASELIB= ${PREFIX}/lib
-
+BOOTSTRAP_PREFIX= ${WRKDIR}/bootstrap
+PKG_PREFIX= ${PREFIX}/gcc-aux
+BSFILENAME= ada-bootstrap.${GARCH}.${LOWER_OPSYS}.${OS_VERSION:C/[A-Z_.-]//g}.tar
# testing if gcc-aux is already installed - if so, use this compiler along with
@@ -133,33 +109,41 @@ FULL_GNATGCC=${LOCALBASE}/gcc-aux/bin/ada
.if ${FULL_GNATGCC} == "NOT SET"
# here we know we need to install the bootstrap compiler
-INTENDED_COMPILER=BOOTSTRAP
+. if defined(BOOTSTRAP_TRIPLET)
FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gnatgcc
+. else
+FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gcc
+FULL_GNATGXX=${BOOTSTRAP_PREFIX}/bin/g++
+. endif
DISTFILES+= ${BOOTSTRAP_COMPILER}
SITES.${BOOTSTRAP_COMPILER}= http://downloads.dragonlace.net/src/
FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin
-. if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == "x86_64"
-MY_CONFIGURE_ENV+= LD_LIBRARY_PATH=${BOOTSTRAP_PREFIX}/lib
-EXTRA_LLP=:${BOOTSTRAP_PREFIX}/lib
-. endif
.endif
-# For pkg maintenance, uncomment to invoke "bmake mdi"
-#DISTFILES+= \
-# gnat-bootstrap.i386.dragonfly.tar.bz2 \
-# gnat-bootstrap.x86_64.dragonfly.tar.bz2 \
-# gnat-bootstrap.i386.netbsd.tar.bz2 \
-# gnat-bootstrap2.x86_64.netbsd.tar.bz2 \
-# gnat-bootstrap.i386.solaris.tar.bz2
+# for port maintenance, invoke "make mdi PLUS_BOOTSTRAPS=1"
+.if defined(PLUS_BOOTSTRAPS)
+MASTER_SITES= http://downloads.dragonlace.net/src/ \
+ ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
+DISTFILES= \
+ ${DISTNAME}.tar.bz2 \
+ ada-bootstrap.i386.dragonfly.36A.tar.bz2 \
+ ada-bootstrap.i386.freebsd.84.tar.bz2 \
+ ada-bootstrap.i386.freebsd.100B.tar.bz2 \
+ ada-bootstrap.i386.netbsd.614.tar.bz2 \
+ ada-bootstrap.x86_64.dragonfly.36A.tar.bz2 \
+ ada-bootstrap.x86_64.freebsd.84.tar.bz2 \
+ ada-bootstrap.x86_64.freebsd.100B.tar.bz2 \
+ ada-bootstrap.x86_64.netbsd.614.tar.bz2
+.endif
# establish ada-aware compiler for use
MY_CONFIGURE_ENV+= CC=${FULL_GNATGCC}
+MY_CONFIGURE_ENV+= CXX=${FULL_GNATGXX}
MY_CONFIGURE_ENV+= PATH=${FULL_PATH}
-MY_CONFIGURE_ENV+= LDFLAGS=${COMPILER_RPATH_FLAG:Q}${PKG_PREFIX:Q}/lib
-MY_MAKE_ENV= PATH=${FULL_PATH}
-MY_MAKE_ENV+= ICONVPREFIX=${PREFIX}
+MY_CONFIGURE_ENV+= LDFLAGS="-lm ${COMPILER_RPATH_FLAG}${PREFIX}/lib"
+MY_MAKE_ENV+= PATH=${FULL_PATH}
MY_MAKE_ENV+= LD_LIBRARY_PATH=${BUILDDIR}/gcc${EXTRA_LLP}
# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
# a binary so we need to make sure we give it the installed sed and not
@@ -176,10 +160,7 @@ CONFIGURE_ARGS+= --with-system-zlib
CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}
CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr}
CONFIGURE_ARGS+= --with-mpc=${BUILDLINK_PREFIX.mpcomplex}
-CONFIGURE_ARGS+= --with-libiconv-prefix=${PREFIX}
-CONFIGURE_ARGS+= --enable-shared
-CONFIGURE_ARGS+= --enable-threads=${THREAD_MODEL}
-CONFIGURE_ARGS+= --disable-bootstrap
+CONFIGURE_ARGS+= --enable-threads=posix
CONFIGURE_ARGS+= --disable-libmudflap
CONFIGURE_ARGS+= --disable-libgomp
CONFIGURE_ARGS+= --disable-libssp
@@ -193,109 +174,66 @@ GENERATE_PLIST+= ${FIND} * \( -type f -or -type l \) | ${SORT} -dr;
post-extract:
# Personalize GNAT for each different machine
@${ECHO} "-=> GCC AUX ${OS_LABEL4VERS}" > ${REVFILE}
-
# Create new directories in preparation of applying diff files
-.if !empty(PKG_OPTIONS:Mcxx)
${MKDIR} ${WRKSRC}/libstdc++-v3/config/locale/dragonfly
${MKDIR} ${WRKSRC}/libstdc++-v3/config/os/bsd/dragonfly
-.endif
-
# Apply required composite diff files
.for suffix in ${APPLY_DIFFS}
@${ECHO} "Applying composite patch diff-${suffix}"
- @${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-${suffix}
+ ${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-${suffix}
.endfor
-
+ (cd ${WRKSRC}/libstdc++-v3/testsuite && ${PERL5} -i \
+ -pe 's|\*-\*-freebsd\*|*-*-dragonfly* *-*-freebsd*|' ${CXXTS4DF})
+ (cd ${WRKSRC}/libstdc++-v3/testsuite/22_locale && ${PERL5} -i \
+ -pe 's|ISO-8859|ISO8859|g;' \
+ -pe 's|ja_JP.eucjp|ja_JP.eucJP|g;' \
+ -pe 's|en_HK|zh_HK|g;' \
+ -pe 's|en_PH|en_NZ|g;' \
+ -pe 's|se_NO|no_NO|g;' \
+ -pe 's|es_MX|es_ES|g;' \
+ -pe 's|ru_RU.UTF8|ru_RU.UTF-8|g' ${LOCALE22FIX})
+.if !empty(PKG_OPTIONS:Mstatic) || !empty(PKG_OPTIONS:Mbootstrap)
+ # Ensure GNAT tools are built statically
+ ${PERL5} -pi -e 's/^GCC_LINK_FLAGS=.*/GCC_LINK_FLAGS=-static/' \
+ ${WRKSRC}/gcc/ada/gcc-interface/Makefile.in
+.endif
# Update LINK_SPEC to add gcc-aux lib runpath in every binary
@${ECHO} "Configuring LINK_SPEC runpath"
- @perl -pi -e 's;\@PREFIX\@;${PREFIX};' \
+ ${PERL5} -pi -e 's;\@PREFIX\@;${PREFIX};' \
${WRKSRC}/gcc/config/dragonfly.h \
${WRKSRC}/gcc/config/i386/freebsd.h \
${WRKSRC}/gcc/config/i386/netbsd-elf.h
- # Handle static option
-.if !empty(PKG_OPTIONS:Mstatic) || ${OPSYS} == "NetBSD"
- @${ECHO} "Reconfiguring GCC Makefile to build compiler statically"
- @${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-static-version
-.if empty(PKG_OPTIONS:Mnls)
- @perl -pi -e 's;\@LIBICONV\@;${STICONV};' \
- ${WRKSRC}/gcc/Makefile.in \
- ${WRKSRC}/libcpp/Makefile.in \
- ${WRKSRC}/gcc/ada/gcc-interface/Makefile.in
-.else
- @perl -pi -e 's;\@LIBINTL\@;${STINTL} ${STICONV};' ${WRKSRC}/intl/config.intl.in
- @perl -pi -e 's;\@LIBICONV\@;;' \
- ${WRKSRC}/gcc/Makefile.in \
- ${WRKSRC}/libcpp/Makefile.in \
- ${WRKSRC}/gcc/ada/gcc-interface/Makefile.in
-.endif
-.endif
-
-.if ${INTENDED_COMPILER} == "BOOTSTRAP"
+.if defined(BOOTSTRAP_TRIPLET)
# Bootstrap compiler has statically linked z, gmp, mpc, mpfr and iconv
# The only shared lib is libc.so.7, so it should work for a long time.
- # It is at least 28MB and doesn't come with shared libraries.
+ # No longer used, only here to support future SunOS bootstrap generation
${MKDIR} ${BOOTSTRAP_PREFIX}
- mv ${BOOTSTRAP_PREFIX}/../bin ${BOOTSTRAP_PREFIX}
- mv ${BOOTSTRAP_PREFIX}/../lib ${BOOTSTRAP_PREFIX}
- mv ${BOOTSTRAP_PREFIX}/../libexec ${BOOTSTRAP_PREFIX}
-
- # Bootstrap compiler malfunctions in NetBSD 6 unless include-fixed
- # directory is removed first. It will eventually cause problems
- # for DragonFly and Solaris as well, so just unconditionally kill it.
+ ${MV} ${BOOTSTRAP_PREFIX}/../bin ${BOOTSTRAP_PREFIX}
+ ${MV} ${BOOTSTRAP_PREFIX}/../lib ${BOOTSTRAP_PREFIX}
+ ${MV} ${BOOTSTRAP_PREFIX}/../libexec ${BOOTSTRAP_PREFIX}
${RM} -rf ${BOOTSTRAP_PREFIX}/lib/gcc/${BOOTSTRAP_TRIPLET}/include-fixed
.endif
-pre-configure:
-# NetBSD's system compiler is not configured to use dl_iterate_phdr which is
-# required to build shared libraries if gnat-aux handles exceptions via
-# dl_iterate_phdr. Therefore the feature requires statically built
-# gmp, mpc, mpfr, and iconv libraries in order to build on NetBSD.
-# DragonFly introduced this functionality with 2.11, but it's possible the
-# shared libraries were built with an earlier compiler in the case of an
-# upgrade. We need to detect this situation on shared library builds and
-# stop the build if the libraries need to be rebuilt.
-.if ${OPSYS} == "DragonFly" && empty(PKG_OPTIONS:Mstatic)
- @if ${GREP} dl_iterate_phdr ${LINK_HEADER} > /dev/null; then \
- if ${GREP} ${OLD_EH} ${BASELIB}/libmpc.so > /dev/null; then \
- ${ERROR_MSG} "${REBUILD_LIB} math/mpcomplex"; \
- exit 101; \
- fi; \
- if ${GREP} ${OLD_EH} ${BASELIB}/libmpfr.so > /dev/null; then \
- ${ERROR_MSG} "${REBUILD_LIB} math/mpfr"; \
- exit 102; \
- fi; \
- if ${GREP} ${OLD_EH} ${BASELIB}/libgmp.so > /dev/null; then \
- ${ERROR_MSG} "${REBUILD_LIB} devel/gmp"; \
- exit 103; \
- fi; \
- if ${GREP} ${OLD_EH} ${BASELIB}/libiconv.so > /dev/null; then \
- ${ERROR_MSG} "${REBUILD_LIB} converters/libiconv"; \
- exit 104; \
- fi; \
- fi
-.endif
-
-
do-configure:
${MKDIR} ${BUILDDIR}
cd ${BUILDDIR} && ${SETENV} ${MY_CONFIGURE_ENV} \
- ${CFG_SCRIPT} ${CONFIGURE_ARGS}
+ ${CFG_SCRIPT} ${CONFIGURE_ARGS}
do-build:
# The unlimited stacksize is for NetBSD64
cd ${BUILDDIR} && \
- ${ULIMIT_CMD_stacksize} && \
- ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1:Q} all
+ ${ULIMIT_CMD_stacksize} && \
+ ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1:Q} all
+.if !empty(PKG_OPTIONS:Mtestsuite) && empty(PKG_OPTIONS:Mbootstrap)
do-test: build test-ada test-fortran test-objc test-cxx test-c
test-ada:
-.if !empty(PKG_OPTIONS:Mtestsuite) && !empty(PKG_OPTIONS:Mada)
.if (${OPSYS} == "NetBSD") && (${MACHINE_ARCH} == "x86_64")
# NetBSD has an extremely small default stacksize of 2MB, which is
# insufficient for the gnat.dg testsuite.
@@ -308,38 +246,42 @@ test-ada:
.else
cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-ada
.endif
-.endif
test-fortran:
-.if !empty(PKG_OPTIONS:Mtestsuite) && !empty(PKG_OPTIONS:Mfortran)
+.if !empty(PKG_OPTIONS:Mfortran)
cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-fortran
.endif
test-objc:
-.if !empty(PKG_OPTIONS:Mtestsuite) && !empty(PKG_OPTIONS:Mobjc)
+.if !empty(PKG_OPTIONS:Mobjc)
cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-objc
.endif
test-cxx:
-.if !empty(PKG_OPTIONS:Mtestsuite) && !empty(PKG_OPTIONS:Mcxx)
# libstdc++ always ends with error status, so ignore it
cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk \
check-c++ || ${TRUE}
-.endif
test-c:
-.if !empty(PKG_OPTIONS:Mtestsuite)
cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-c
.endif
-
do-install:
cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} install-strip \
- DESTDIR=${DESTDIR}
-
-
+ DESTDIR=${DESTDIR}
+ ${MV} ${DESTDIR}${PKG_PREFIX}/share ${WRKDIR}/moved_share
+.if !empty(PKG_OPTIONS:Mbootstrap)
+ ${MKDIR} ${NEWBSDIR}
+ ${CP} -a ${DESTDIR}${PKG_PREFIX}/bin ${NEWBSDIR}/
+ ${CP} -a ${DESTDIR}${PKG_PREFIX}/lib ${NEWBSDIR}/
+ ${CP} -a ${DESTDIR}${PKG_PREFIX}/include ${NEWBSDIR}/
+ ${CP} -a ${DESTDIR}${PKG_PREFIX}/libexec ${NEWBSDIR}/
+ ${RM} ${NEWBSDIR}/bin/${GARCH}*
+ ${RM} -rf ${NEWBSDIR}/lib/gcc/${BLD_TARGET}/${GCC_VERSION}/include-fixed
+ (cd ${NEWBSDIR}/.. ; \
+ ${TAR} -cf ${BSFILENAME} bootstrap; ${BZIP2} ${BSFILENAME})
+.endif
-.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
.include "../../math/mpfr/buildlink3.mk"
.include "../../math/mpcomplex/buildlink3.mk"
diff --git a/lang/gcc-aux/Makefile.testsuite b/lang/gcc-aux/Makefile.testsuite
new file mode 100644
index 00000000000..a3234e5607d
--- /dev/null
+++ b/lang/gcc-aux/Makefile.testsuite
@@ -0,0 +1,302 @@
+# $NetBSD: Makefile.testsuite,v 1.1 2014/04/30 16:24:39 marino Exp $
+
+CXXTS4DF= \
+ 17_intro/headers/c++1998/stdc++.cc \
+ 17_intro/headers/c++1998/stdc++_multiple_inclusion.cc \
+ 17_intro/headers/c++200x/stdc++.cc \
+ 17_intro/headers/c++200x/stdc++_multiple_inclusion.cc \
+ 18_support/pthread_guard.cc \
+ 20_util/shared_ptr/thread/default_weaktoshared.cc \
+ 21_strings/basic_string/pthread18185.cc \
+ 21_strings/basic_string/pthread4.cc \
+ 22_locale/locale/cons/12658_thread-1.cc \
+ 22_locale/locale/cons/12658_thread-2.cc \
+ 23_containers/list/pthread1.cc \
+ 23_containers/list/pthread5.cc \
+ 23_containers/map/pthread6.cc \
+ 23_containers/vector/debug/multithreaded_swap.cc \
+ 26_numerics/headers/cmath/c_math_dynamic.cc \
+ 27_io/basic_ofstream/pthread2.cc \
+ 27_io/basic_ostringstream/pthread3.cc \
+ 30_threads/async/42819.cc \
+ 30_threads/async/49668.cc \
+ 30_threads/async/any.cc \
+ 30_threads/async/async.cc \
+ 30_threads/async/launch.cc \
+ 30_threads/async/sync.cc \
+ 30_threads/call_once/39909.cc \
+ 30_threads/call_once/49668.cc \
+ 30_threads/call_once/call_once1.cc \
+ 30_threads/condition_variable/cons/1.cc \
+ 30_threads/condition_variable/members/1.cc \
+ 30_threads/condition_variable/members/2.cc \
+ 30_threads/condition_variable/members/53841.cc \
+ 30_threads/condition_variable/native_handle/typesizes.cc \
+ 30_threads/condition_variable_any/50862.cc \
+ 30_threads/condition_variable_any/cons/1.cc \
+ 30_threads/condition_variable_any/members/1.cc \
+ 30_threads/condition_variable_any/members/2.cc \
+ 30_threads/future/cons/move.cc \
+ 30_threads/future/members/45133.cc \
+ 30_threads/future/members/get.cc \
+ 30_threads/future/members/get2.cc \
+ 30_threads/future/members/share.cc \
+ 30_threads/future/members/valid.cc \
+ 30_threads/future/members/wait.cc \
+ 30_threads/future/members/wait_for.cc \
+ 30_threads/future/members/wait_until.cc \
+ 30_threads/lock/1.cc \
+ 30_threads/lock/2.cc \
+ 30_threads/lock/3.cc \
+ 30_threads/lock/4.cc \
+ 30_threads/mutex/cons/1.cc \
+ 30_threads/mutex/dest/destructor_locked.cc \
+ 30_threads/mutex/lock/1.cc \
+ 30_threads/mutex/native_handle/1.cc \
+ 30_threads/mutex/native_handle/typesizes.cc \
+ 30_threads/mutex/try_lock/1.cc \
+ 30_threads/mutex/try_lock/2.cc \
+ 30_threads/mutex/unlock/1.cc \
+ 30_threads/packaged_task/49668.cc \
+ 30_threads/packaged_task/cons/1.cc \
+ 30_threads/packaged_task/cons/2.cc \
+ 30_threads/packaged_task/cons/3.cc \
+ 30_threads/packaged_task/cons/alloc.cc \
+ 30_threads/packaged_task/cons/move.cc \
+ 30_threads/packaged_task/cons/move_assign.cc \
+ 30_threads/packaged_task/members/get_future.cc \
+ 30_threads/packaged_task/members/get_future2.cc \
+ 30_threads/packaged_task/members/invoke.cc \
+ 30_threads/packaged_task/members/invoke2.cc \
+ 30_threads/packaged_task/members/invoke3.cc \
+ 30_threads/packaged_task/members/invoke4.cc \
+ 30_threads/packaged_task/members/invoke5.cc \
+ 30_threads/packaged_task/members/reset.cc \
+ 30_threads/packaged_task/members/reset2.cc \
+ 30_threads/packaged_task/members/swap.cc \
+ 30_threads/packaged_task/members/valid.cc \
+ 30_threads/promise/cons/1.cc \
+ 30_threads/promise/cons/alloc.cc \
+ 30_threads/promise/cons/move.cc \
+ 30_threads/promise/cons/move_assign.cc \
+ 30_threads/promise/members/get_future.cc \
+ 30_threads/promise/members/get_future2.cc \
+ 30_threads/promise/members/set_exception.cc \
+ 30_threads/promise/members/set_exception2.cc \
+ 30_threads/promise/members/set_value.cc \
+ 30_threads/promise/members/set_value2.cc \
+ 30_threads/promise/members/set_value3.cc \
+ 30_threads/promise/members/swap.cc \
+ 30_threads/recursive_mutex/cons/1.cc \
+ 30_threads/recursive_mutex/dest/destructor_locked.cc \
+ 30_threads/recursive_mutex/lock/1.cc \
+ 30_threads/recursive_mutex/native_handle/1.cc \
+ 30_threads/recursive_mutex/native_handle/typesizes.cc \
+ 30_threads/recursive_mutex/try_lock/1.cc \
+ 30_threads/recursive_mutex/try_lock/2.cc \
+ 30_threads/recursive_mutex/unlock/1.cc \
+ 30_threads/recursive_timed_mutex/cons/1.cc \
+ 30_threads/recursive_timed_mutex/dest/destructor_locked.cc \
+ 30_threads/recursive_timed_mutex/lock/1.cc \
+ 30_threads/recursive_timed_mutex/lock/2.cc \
+ 30_threads/recursive_timed_mutex/native_handle/1.cc \
+ 30_threads/recursive_timed_mutex/native_handle/typesizes.cc \
+ 30_threads/recursive_timed_mutex/try_lock/1.cc \
+ 30_threads/recursive_timed_mutex/try_lock/2.cc \
+ 30_threads/recursive_timed_mutex/try_lock_for/1.cc \
+ 30_threads/recursive_timed_mutex/try_lock_for/2.cc \
+ 30_threads/recursive_timed_mutex/try_lock_for/3.cc \
+ 30_threads/recursive_timed_mutex/try_lock_until/1.cc \
+ 30_threads/recursive_timed_mutex/try_lock_until/2.cc \
+ 30_threads/recursive_timed_mutex/unlock/1.cc \
+ 30_threads/shared_future/cons/move.cc \
+ 30_threads/shared_future/members/45133.cc \
+ 30_threads/shared_future/members/get.cc \
+ 30_threads/shared_future/members/get2.cc \
+ 30_threads/shared_future/members/valid.cc \
+ 30_threads/shared_future/members/wait.cc \
+ 30_threads/shared_future/members/wait_for.cc \
+ 30_threads/shared_future/members/wait_until.cc \
+ 30_threads/this_thread/1.cc \
+ 30_threads/this_thread/2.cc \
+ 30_threads/this_thread/3.cc \
+ 30_threads/this_thread/4.cc \
+ 30_threads/thread/cons/1.cc \
+ 30_threads/thread/cons/2.cc \
+ 30_threads/thread/cons/3.cc \
+ 30_threads/thread/cons/4.cc \
+ 30_threads/thread/cons/49668.cc \
+ 30_threads/thread/cons/5.cc \
+ 30_threads/thread/cons/6.cc \
+ 30_threads/thread/cons/7.cc \
+ 30_threads/thread/cons/8.cc \
+ 30_threads/thread/cons/9.cc \
+ 30_threads/thread/cons/moveable.cc \
+ 30_threads/thread/members/1.cc \
+ 30_threads/thread/members/2.cc \
+ 30_threads/thread/members/3.cc \
+ 30_threads/thread/members/4.cc \
+ 30_threads/thread/members/5.cc \
+ 30_threads/thread/members/hardware_concurrency.cc \
+ 30_threads/thread/swap/1.cc \
+ 30_threads/timed_mutex/cons/1.cc \
+ 30_threads/timed_mutex/dest/destructor_locked.cc \
+ 30_threads/timed_mutex/lock/1.cc \
+ 30_threads/timed_mutex/native_handle/1.cc \
+ 30_threads/timed_mutex/native_handle/typesizes.cc \
+ 30_threads/timed_mutex/try_lock/1.cc \
+ 30_threads/timed_mutex/try_lock/2.cc \
+ 30_threads/timed_mutex/try_lock_for/1.cc \
+ 30_threads/timed_mutex/try_lock_for/2.cc \
+ 30_threads/timed_mutex/try_lock_for/3.cc \
+ 30_threads/timed_mutex/try_lock_until/1.cc \
+ 30_threads/timed_mutex/try_lock_until/2.cc \
+ 30_threads/timed_mutex/unlock/1.cc \
+ 30_threads/try_lock/1.cc \
+ 30_threads/try_lock/2.cc \
+ 30_threads/try_lock/3.cc \
+ 30_threads/try_lock/4.cc \
+ 30_threads/unique_lock/cons/1.cc \
+ 30_threads/unique_lock/cons/2.cc \
+ 30_threads/unique_lock/cons/3.cc \
+ 30_threads/unique_lock/cons/4.cc \
+ 30_threads/unique_lock/cons/5.cc \
+ 30_threads/unique_lock/cons/6.cc \
+ 30_threads/unique_lock/locking/1.cc \
+ 30_threads/unique_lock/locking/2.cc \
+ 30_threads/unique_lock/locking/3.cc \
+ 30_threads/unique_lock/locking/4.cc \
+ 30_threads/unique_lock/modifiers/1.cc \
+ 30_threads/unique_lock/modifiers/2.cc \
+ ext/rope/pthread7-rope.cc \
+ tr1/2_general_utilities/shared_ptr/thread/default_weaktoshared.cc \
+ tr1/2_general_utilities/shared_ptr/thread/mutex_weaktoshared.cc
+
+LOCALE22FIX= \
+ codecvt/always_noconv/char/wrapped_locale.cc \
+ codecvt/always_noconv/wchar_t/2.cc \
+ codecvt/always_noconv/wchar_t/3.cc \
+ codecvt/always_noconv/wchar_t/wrapped_locale.cc \
+ codecvt/encoding/char/wrapped_locale.cc \
+ codecvt/encoding/wchar_t/2.cc \
+ codecvt/encoding/wchar_t/3.cc \
+ codecvt/encoding/wchar_t/wrapped_locale.cc \
+ codecvt/in/char/wrapped_locale.cc \
+ codecvt/in/wchar_t/2.cc \
+ codecvt/in/wchar_t/3.cc \
+ codecvt/in/wchar_t/wrapped_locale.cc \
+ codecvt/length/char/wrapped_locale.cc \
+ codecvt/length/wchar_t/2.cc \
+ codecvt/length/wchar_t/3.cc \
+ codecvt/length/wchar_t/wrapped_locale.cc \
+ codecvt/max_length/char/wrapped_locale.cc \
+ codecvt/max_length/wchar_t/2.cc \
+ codecvt/max_length/wchar_t/3.cc \
+ codecvt/max_length/wchar_t/wrapped_locale.cc \
+ codecvt/out/char/wrapped_locale.cc \
+ codecvt/out/wchar_t/2.cc \
+ codecvt/out/wchar_t/3.cc \
+ codecvt/out/wchar_t/7.cc \
+ codecvt/out/wchar_t/wrapped_locale.cc \
+ codecvt/unshift/char/wrapped_locale.cc \
+ codecvt/unshift/wchar_t/2.cc \
+ codecvt/unshift/wchar_t/3.cc \
+ codecvt/unshift/wchar_t/wrapped_locale.cc \
+ collate/compare/char/wrapped_locale.cc \
+ collate/compare/wchar_t/wrapped_locale.cc \
+ collate/hash/char/wrapped_locale.cc \
+ collate/hash/wchar_t/wrapped_locale.cc \
+ collate/transform/char/wrapped_locale.cc \
+ collate/transform/wchar_t/wrapped_locale.cc \
+ ctype/cons/char/wrapped_locale.cc \
+ ctype/is/char/wrapped_locale.cc \
+ ctype/is/wchar_t/wrapped_locale.cc \
+ ctype/narrow/char/wrapped_locale.cc \
+ ctype/narrow/wchar_t/3.cc \
+ ctype/narrow/wchar_t/wrapped_locale.cc \
+ ctype/scan/char/wrapped_locale.cc \
+ ctype/scan/wchar_t/wrapped_locale.cc \
+ ctype/to/char/wrapped_locale.cc \
+ ctype/to/wchar_t/wrapped_locale.cc \
+ ctype/widen/char/wrapped_locale.cc \
+ ctype/widen/wchar_t/2.cc \
+ ctype/widen/wchar_t/3.cc \
+ ctype/widen/wchar_t/wrapped_locale.cc \
+ facet/2.cc \
+ locale/cons/40184.cc \
+ locale/cons/5.cc \
+ locale/cons/unicode.cc \
+ locale/global_locale_objects/2.cc \
+ messages/members/char/wrapped_locale.cc \
+ money_get/get/char/16.cc \
+ money_get/get/char/18.cc \
+ money_get/get/char/2.cc \
+ money_get/get/char/4.cc \
+ money_get/get/char/wrapped_env.cc \
+ money_get/get/char/wrapped_locale.cc \
+ money_get/get/wchar_t/16.cc \
+ money_get/get/wchar_t/18.cc \
+ money_get/get/wchar_t/2.cc \
+ money_get/get/wchar_t/4.cc \
+ money_get/get/wchar_t/wrapped_env.cc \
+ money_get/get/wchar_t/wrapped_locale.cc \
+ money_put/put/char/2.cc \
+ money_put/put/char/wrapped_env.cc \
+ money_put/put/char/wrapped_locale.cc \
+ money_put/put/wchar_t/2.cc \
+ money_put/put/wchar_t/wrapped_env.cc \
+ money_put/put/wchar_t/wrapped_locale.cc \
+ moneypunct/members/char/wrapped_locale.cc \
+ moneypunct/members/wchar_t/wrapped_locale.cc \
+ num_get/get/char/3.cc \
+ num_get/get/char/wrapped_env.cc \
+ num_get/get/char/wrapped_locale.cc \
+ num_get/get/wchar_t/3.cc \
+ num_get/get/wchar_t/wrapped_env.cc \
+ num_get/get/wchar_t/wrapped_locale.cc \
+ num_put/put/char/3.cc \
+ num_put/put/char/wrapped_env.cc \
+ num_put/put/char/wrapped_locale.cc \
+ num_put/put/wchar_t/3.cc \
+ num_put/put/wchar_t/wrapped_env.cc \
+ num_put/put/wchar_t/wrapped_locale.cc \
+ numpunct/members/char/wrapped_locale.cc \
+ numpunct/members/wchar_t/wrapped_locale.cc \
+ time_get/date_order/char/wrapped_locale.cc \
+ time_get/date_order/wchar_t/wrapped_locale.cc \
+ time_get/get_date/char/2.cc \
+ time_get/get_date/char/wrapped_env.cc \
+ time_get/get_date/char/wrapped_locale.cc \
+ time_get/get_date/wchar_t/2.cc \
+ time_get/get_date/wchar_t/wrapped_env.cc \
+ time_get/get_date/wchar_t/wrapped_locale.cc \
+ time_get/get_monthname/char/2.cc \
+ time_get/get_monthname/char/wrapped_env.cc \
+ time_get/get_monthname/char/wrapped_locale.cc \
+ time_get/get_monthname/wchar_t/2.cc \
+ time_get/get_monthname/wchar_t/wrapped_env.cc \
+ time_get/get_monthname/wchar_t/wrapped_locale.cc \
+ time_get/get_time/char/2.cc \
+ time_get/get_time/char/wrapped_env.cc \
+ time_get/get_time/char/wrapped_locale.cc \
+ time_get/get_time/wchar_t/2.cc \
+ time_get/get_time/wchar_t/wrapped_env.cc \
+ time_get/get_time/wchar_t/wrapped_locale.cc \
+ time_get/get_weekday/char/2.cc \
+ time_get/get_weekday/char/38081-1.cc \
+ time_get/get_weekday/char/38081-2.cc \
+ time_get/get_weekday/char/wrapped_env.cc \
+ time_get/get_weekday/char/wrapped_locale.cc \
+ time_get/get_weekday/wchar_t/2.cc \
+ time_get/get_weekday/wchar_t/wrapped_env.cc \
+ time_get/get_weekday/wchar_t/wrapped_locale.cc \
+ time_get/get_year/char/wrapped_locale.cc \
+ time_get/get_year/wchar_t/wrapped_locale.cc \
+ time_put/put/char/3.cc \
+ time_put/put/char/7.cc \
+ time_put/put/char/wrapped_env.cc \
+ time_put/put/char/wrapped_locale.cc \
+ time_put/put/wchar_t/3.cc \
+ time_put/put/wchar_t/7.cc \
+ time_put/put/wchar_t/wrapped_env.cc \
+ time_put/put/wchar_t/wrapped_locale.cc
diff --git a/lang/gcc-aux/Makefile.version b/lang/gcc-aux/Makefile.version
new file mode 100644
index 00000000000..883d6a911a5
--- /dev/null
+++ b/lang/gcc-aux/Makefile.version
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.version,v 1.1 2014/04/30 16:24:39 marino Exp $
+#
+
+SNAPSHOT= 20140422
+GCC_BRANCH= 4.9
+GCC_POINT= 0
+GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT}
diff --git a/lang/gcc-aux/buildlink3.mk b/lang/gcc-aux/buildlink3.mk
index 79fb20228a4..f7c1ccfa361 100644
--- a/lang/gcc-aux/buildlink3.mk
+++ b/lang/gcc-aux/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/07/16 19:34:27 marino Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2014/04/30 16:24:39 marino Exp $
BUILDLINK_TREE+= gcc-aux
.if !defined(GCC_AUX_BUILDLINK3_MK)
GCC_AUX_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.gcc-aux+= gcc-aux>=20120614
+BUILDLINK_API_DEPENDS.gcc-aux+= gcc-aux>=20140422
BUILDLINK_PKGSRCDIR.gcc-aux?= ../../lang/gcc-aux
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/lang/gcc-aux/distinfo b/lang/gcc-aux/distinfo
index 9b88ff3ea6a..e0330feb76a 100644
--- a/lang/gcc-aux/distinfo
+++ b/lang/gcc-aux/distinfo
@@ -1,20 +1,29 @@
-$NetBSD: distinfo,v 1.6 2013/12/29 19:16:53 marino Exp $
+$NetBSD: distinfo,v 1.7 2014/04/30 16:24:39 marino Exp $
-SHA1 (gcc-4.7.3.tar.bz2) = 69e02737bd6e1a7c6047d801600d39c32b9427ca
-RMD160 (gcc-4.7.3.tar.bz2) = b4ba153b098cad726ecd28195ee445aa542d37ae
-Size (gcc-4.7.3.tar.bz2) = 82904224 bytes
-SHA1 (gnat-bootstrap.i386.dragonfly.tar.bz2) = d7a8103243a2df3723d9d3c3ec0da9c3bb725214
-RMD160 (gnat-bootstrap.i386.dragonfly.tar.bz2) = 9e6fde444e0ed76ee404810af6d6b7eb48659c09
-Size (gnat-bootstrap.i386.dragonfly.tar.bz2) = 28205489 bytes
-SHA1 (gnat-bootstrap.i386.netbsd.tar.bz2) = 19b61f54fae8e237a4e678ff03f20f50b47db1df
-RMD160 (gnat-bootstrap.i386.netbsd.tar.bz2) = ade03f223b2af229daece20a749915f7da0eb0a6
-Size (gnat-bootstrap.i386.netbsd.tar.bz2) = 27654956 bytes
-SHA1 (gnat-bootstrap.x86_64.dragonfly.tar.bz2) = 77a637a497c61e4085de31b24a205f24b1776a15
-RMD160 (gnat-bootstrap.x86_64.dragonfly.tar.bz2) = 4d0eb7b8a5f901333f1ffd190a5bf72072b2b52e
-Size (gnat-bootstrap.x86_64.dragonfly.tar.bz2) = 31380342 bytes
-SHA1 (gnat-bootstrap2.x86_64.netbsd.tar.bz2) = d94354ff0254015f0e10946529fcc8867e7e1407
-RMD160 (gnat-bootstrap2.x86_64.netbsd.tar.bz2) = 21fed1a92f67132e694b18bf94f05a6f3a5dc573
-Size (gnat-bootstrap2.x86_64.netbsd.tar.bz2) = 48612587 bytes
-SHA1 (gnat-bootstrap.i386.solaris.tar.bz2) = 4962657bfc894a20ad3102c1f6fe8e566b47cb51
-RMD160 (gnat-bootstrap.i386.solaris.tar.bz2) = ae72e76d0aba94451d99b9a70a3c049c9258cc82
-Size (gnat-bootstrap.i386.solaris.tar.bz2) = 43247034 bytes
+SHA1 (ada-bootstrap.i386.dragonfly.36A.tar.bz2) = 7e0725889ae752e6a9fdbac5b1d2ef0e3f62822e
+RMD160 (ada-bootstrap.i386.dragonfly.36A.tar.bz2) = f62c00515588804ce69368507822f30380d7e48d
+Size (ada-bootstrap.i386.dragonfly.36A.tar.bz2) = 39357314 bytes
+SHA1 (ada-bootstrap.i386.freebsd.100B.tar.bz2) = b7ff322bbcfa403d37d917d6e88e306de0857251
+RMD160 (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 7a85e0f073dafe9b0d37b493dbb4268bd2f39601
+Size (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 41229192 bytes
+SHA1 (ada-bootstrap.i386.freebsd.84.tar.bz2) = 54c3d59fd2ca75bb91255296bc0f9d6028ac2cd2
+RMD160 (ada-bootstrap.i386.freebsd.84.tar.bz2) = 8ceb3957708eb9ccc8ce2ff1ea26949683ee2fa7
+Size (ada-bootstrap.i386.freebsd.84.tar.bz2) = 39727003 bytes
+SHA1 (ada-bootstrap.i386.netbsd.614.tar.bz2) = 2c29209b086dcf3076428f232fadf306b9a227c6
+RMD160 (ada-bootstrap.i386.netbsd.614.tar.bz2) = f0ecb9b0d69c2d097c6405e0db581f606b372017
+Size (ada-bootstrap.i386.netbsd.614.tar.bz2) = 37900035 bytes
+SHA1 (ada-bootstrap.x86_64.dragonfly.36A.tar.bz2) = 85ceea8d0bd0d1b8c1f91ea6d7ffb2ffe4a4c7da
+RMD160 (ada-bootstrap.x86_64.dragonfly.36A.tar.bz2) = 7ca8ccff5a4400a7e4fc9ad1d11c64f3c92d54f4
+Size (ada-bootstrap.x86_64.dragonfly.36A.tar.bz2) = 40747242 bytes
+SHA1 (ada-bootstrap.x86_64.freebsd.100B.tar.bz2) = edfe60c5f42bbeb145d7070ed868135ebc60c2de
+RMD160 (ada-bootstrap.x86_64.freebsd.100B.tar.bz2) = 0d50885402208caafbc133ffc3b8684e89a50cae
+Size (ada-bootstrap.x86_64.freebsd.100B.tar.bz2) = 42163803 bytes
+SHA1 (ada-bootstrap.x86_64.freebsd.84.tar.bz2) = b5c76ce07df6e944742eda5f860352c8e179b988
+RMD160 (ada-bootstrap.x86_64.freebsd.84.tar.bz2) = 334c2375ee35bdf931a3a476e794e494ff252515
+Size (ada-bootstrap.x86_64.freebsd.84.tar.bz2) = 40227668 bytes
+SHA1 (ada-bootstrap.x86_64.netbsd.614.tar.bz2) = 683f58e6e394a508a52ec1dc5f3d9ca2869d5252
+RMD160 (ada-bootstrap.x86_64.netbsd.614.tar.bz2) = 4574857089e82fb80725161cc8b625ce75f6810e
+Size (ada-bootstrap.x86_64.netbsd.614.tar.bz2) = 39348972 bytes
+SHA1 (gcc-4.9.0.tar.bz2) = fbde8eb49f2b9e6961a870887cf7337d31cd4917
+RMD160 (gcc-4.9.0.tar.bz2) = ac561660744127fa009ae75202d1ac81ac8d7668
+Size (gcc-4.9.0.tar.bz2) = 89677407 bytes
diff --git a/lang/gcc-aux/files/diff-ada b/lang/gcc-aux/files/diff-ada
index f9da88c5c2b..5d65a860e1e 100644
--- a/lang/gcc-aux/files/diff-ada
+++ b/lang/gcc-aux/files/diff-ada
@@ -1,6 +1,6 @@
--- gcc/ada/a-exetim-posix.adb.orig
+++ gcc/ada/a-exetim-posix.adb
-@@ -106,11 +106,11 @@
+@@ -105,11 +105,11 @@
-- Time is equal to Duration (although it is a private type) and
-- CPU_Time is equal to Time.
@@ -14,7 +14,7 @@
-- Function from the POSIX.1b Realtime Extensions library
begin
-@@ -118,7 +118,7 @@
+@@ -117,7 +117,7 @@
raise Program_Error;
end if;
@@ -445,7 +445,7 @@
+end Ada.Interrupts.Names;
--- gcc/ada/adaint.c.orig
+++ gcc/ada/adaint.c
-@@ -1077,6 +1077,7 @@
+@@ -1144,6 +1144,7 @@
strcpy (path, "GNAT-XXXXXX");
#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) \
@@ -453,7 +453,7 @@
|| defined (linux) || defined(__GLIBC__)) && !defined (__vxworks)
return mkstemp (path);
#elif defined (__Lynx__)
-@@ -1227,7 +1228,49 @@
+@@ -1310,7 +1311,49 @@
free (pname);
}
@@ -503,16 +503,18 @@
|| defined (__OpenBSD__) || defined(__GLIBC__)
#define MAX_SAFE_PATH 1000
char *tmpdir = getenv ("TMPDIR");
-@@ -2468,6 +2511,8 @@
+@@ -2562,7 +2605,9 @@
+ {
int cores = 1;
- #if defined (linux) || defined (sun) || defined (AIX) \
-+ || defined (__FreeBSD__) || defined (__DragonFly__) \
-+ || defined (__OpenBSD__) || defined (__NetBSD__) \
- || (defined (__alpha__) && defined (_osf_)) || defined (__APPLE__)
+-#if defined (linux) || defined (sun) || defined (AIX) || defined (__APPLE__)
++#if defined (linux) || defined (sun) || defined (AIX) \
++ || defined (__APPLE__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
++ || defined (__DragonFly__) || defined (__NetBSD__)
cores = (int) sysconf (_SC_NPROCESSORS_ONLN);
-@@ -3530,26 +3575,214 @@
+ #elif defined (__hpux__)
+@@ -3608,35 +3653,6 @@
}
#endif
@@ -527,228 +529,30 @@
- && ! defined (__hpux__) \
- && ! defined (__APPLE__) \
- && ! defined (_AIX) \
-- && ! (defined (__alpha__) && defined (__osf__)) \
- && ! defined (VMS) \
-- && ! defined (__MINGW32__) \
-- && ! (defined (__mips) && defined (__sgi)))
+- && ! defined (__MINGW32__))
-
-/* Dummy function to satisfy g-trasym.o. See the preprocessor conditional
- just above for a list of native platforms that provide a non-dummy
- version of this procedure in libaddr2line.a. */
-+/* run-time symbolic traceback support */
-+#if defined (__DragonFly__) \
-+ || defined (__FreeBSD__) \
-+ || defined (__OpenBSD__) \
-+ || defined (__NetBSD__) \
-+ || (defined (__sun__) && defined (__i386__) && defined (__SVR4))
-+
-+/* The above platforms use the external program /usr/bin/addr2line */
-+#define EXTERNAL_SYMTRACE
-+
-+#elif defined (VMS) \
-+ || defined (_AIX) \
-+ || defined (__Lynx__) \
-+ || defined (__hpux__) \
-+ || defined (__APPLE__) \
-+ || defined (__MINGW32__) \
-+ || (defined (__mips) && defined (__sgi)) \
-+ || (defined (__alpha__) && defined (__osf__)) \
-+ || (defined (linux) && defined (i386)) \
-+ || (defined (linux) && defined (powerpc)) \
-+ || (defined (linux) && defined (__ia64__)) \
-+ || (defined (linux) && defined (__x86_64__)) \
-+ || (defined (__SVR4) && defined (__sun__) && defined (sparc))
-+
-+/* The above platforms use the system library libaddr2line.a */
-+#define NATIVE_SYMTRACE
-+#endif
-+
-+#if defined (EXTERNAL_SYMTRACE) && !defined (IS_CROSS)
-+
-+/*
-+ Copyright (C) 1999 by Juergen Pfeifer <juergen.pfeifer@gmx.net>
-+ Ada for Linux Team (ALT)
-+ Heavily modified by John Marino <http://www.dragonlace.net>
-+
-+ Permission is hereby granted, free of charge, to any person obtaining a
-+ copy of this software and associated documentation files (the
-+ "Software"), to deal in the Software without restriction, including
-+ without limitation the rights to use, copy, modify, merge, publish,
-+ distribute, distribute with modifications, sublicense, and/or sell
-+ copies of the Software, and to permit persons to whom the Software is
-+ furnished to do so, subject to the following conditions:
-+
-+ The above copyright notice and this permission notice shall be included
-+ in all copies or substantial portions of the Software.
-+
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-+ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+ Except as contained in this notice, the name(s) of the above copyright
-+ holders shall not be used in advertising or otherwise to promote the
-+ sale, use or other dealings in this Software without prior written
-+ authorization.
-+*/
-+
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <string.h>
-+#include <signal.h>
-+
-+#define CLOSE_SENDPIPE close(sendpipe[0]); close(sendpipe[1])
-+#define CLOSE_READPIPE close(readpipe[0]); close(readpipe[1])
-+#define DUP2CLOSE(oldfd, newfd) dup2(oldfd, newfd); close(oldfd);
-+#define RESTSIG sigaction(SIGPIPE,&oact,NULL)
-+
-+#define MAX_LINE 1024
-+#define PARENT_READ readpipe[0]
-+#define CHILD_WRITE readpipe[1]
-+#define CHILD_READ sendpipe[0]
-+#define PARENT_WRITE sendpipe[1]
-+
-+#if defined (__sun__)
-+#define ADDR2LINE_PROG "/usr/gnu/bin/addr2line"
-+#else
-+#define ADDR2LINE_PROG "/usr/bin/addr2line"
-+#endif
-+
-+void
-+convert_addresses (const char *file_name,
-+ void *addrs,
-+ int n_addr,
-+ void *buf,
-+ int *len)
-+{
-+ int max_len = *len;
-+ pid_t childpid;
-+
-+ struct sigaction act, oact;
-+
-+ int sendpipe[2] = {-1,-1}, /* parent -> child */
-+ readpipe[2] = {-1,-1}; /* parent <- child */
-+
-+ *len = 0;
-+ act.sa_handler = SIG_IGN;
-+ sigemptyset(&act.sa_mask);
-+ act.sa_flags = 0;
-+ if (sigaction(SIGPIPE,&act,&oact) < 0)
-+ return;
-+
-+ if (pipe(sendpipe) < 0) { RESTSIG; return; }
-+ if (pipe(readpipe) < 0) { CLOSE_SENDPIPE; RESTSIG; return; }
-+ if ((childpid = fork()) < 0) {
-+ CLOSE_READPIPE;
-+ CLOSE_SENDPIPE;
-+ RESTSIG;
-+ return;
-+ }
-+
-+ if (childpid == 0) { /* child process */
-+ close(PARENT_WRITE);
-+ close(PARENT_READ);
-+ if ((CHILD_READ != STDIN_FILENO) && (CHILD_WRITE != STDOUT_FILENO)) {
-+ if ((CHILD_READ == STDOUT_FILENO) && (CHILD_WRITE == STDIN_FILENO)) {
-+ const int temp_fd = dup(CHILD_WRITE);
-+ close (CHILD_WRITE);
-+ DUP2CLOSE (CHILD_READ, STDIN_FILENO);
-+ DUP2CLOSE (temp_fd, STDOUT_FILENO);
-+ }
-+ else if ((CHILD_READ == STDIN_FILENO) && (CHILD_WRITE > 1)) {
-+ DUP2CLOSE (CHILD_WRITE, STDOUT_FILENO);
-+ }
-+ else if ((CHILD_READ > 1) && (CHILD_WRITE == STDOUT_FILENO)) {
-+ DUP2CLOSE (CHILD_READ, STDIN_FILENO);
-+ }
-+ else if ((CHILD_READ > 1) && (CHILD_WRITE == STDIN_FILENO)) {
-+ DUP2CLOSE (CHILD_WRITE, STDOUT_FILENO);
-+ DUP2CLOSE (CHILD_READ, STDIN_FILENO);
-+ }
-+ else {
-+ /* CHILD_READ >= 1 and CHILD_WRITE > 1 */
-+ DUP2CLOSE (CHILD_READ, STDIN_FILENO);
-+ DUP2CLOSE (CHILD_WRITE, STDOUT_FILENO);
-+ }
-+ }
-+ /* As pointed out by Florian Weimer to JP, it is a security threat to call
-+ the script with a user defined environment and using the path. That
-+ would be Trojans pleasure. Therefore the absolute path to addr2line
-+ and an empty environment is used. That should be safe.
-+ */
-+ char *const argv[] = { "addr2line",
-+ "-e", file_name,
-+ "--demangle=gnat",
-+ "--functions",
-+ "--basenames",
-+ NULL };
-+ char *const envp[] = { NULL };
-+ if (execve(ADDR2LINE_PROG, argv, envp) < 0) {
-+ close (CHILD_WRITE);
-+ close (CHILD_READ);
-+ RESTSIG;
-+ exit (1);
-+ }
-+ }
-+
-+ /* Below this line is parent process */
-+ int i, n;
-+ char hex[16];
-+ char line[MAX_LINE + 1];
-+ char *p;
-+ char *s = buf;
-+ long *trace_address = addrs;
-+
-+ close(CHILD_WRITE);
-+ close(CHILD_READ);
-+
-+ for(i=0; i < n_addr; i++) {
-+ snprintf(hex,sizeof(hex),"%#lx\n",*trace_address);
-+ write(PARENT_WRITE,hex,strlen(hex));
-+ n = read(PARENT_READ,line,MAX_LINE);
-+ if (n<=0)
-+ break;
-+
-+ line[n]=0;
-+ /* We have approx. 16 additional chars for "%#lx in " clause.
-+ We use this info to prevent a buffer overrun. */
-+ if (n + 16 + (*len) > max_len)
-+ break;
-+
-+ p = strchr(line,'\n');
-+ if (p) {
-+ if (*(p+1)) {
-+ *p = 0;
-+ *len += snprintf(s, (max_len - (*len)), "%#lx in %s at %s",
-+ *trace_address, line, p+1);
-+ }
-+ else {
-+ *len += snprintf(s, (max_len - (*len)), "%#lx at %s",
-+ *trace_address, line);
-+ }
-+ s = buf + (*len);
-+ }
-+ trace_address += 1;
-+ }
-+ close (PARENT_WRITE);
-+ close (PARENT_READ);
-+ RESTSIG;
-+}
-+
-+#elif defined (IS_CROSS) || !defined (NATIVE_SYMTRACE)
-
-+/* run-time symbolic traceback support
-+ Dummy function to satisfy g-trasym.o. */
- void
- convert_addresses (const char *file_name ATTRIBUTE_UNUSED,
- void *addrs ATTRIBUTE_UNUSED,
+-
+-void
+-convert_addresses (const char *file_name ATTRIBUTE_UNUSED,
+- void *addrs ATTRIBUTE_UNUSED,
+- int n_addr ATTRIBUTE_UNUSED,
+- void *buf ATTRIBUTE_UNUSED,
+- int *len ATTRIBUTE_UNUSED)
+-{
+- *len = 0;
+-}
+-#endif
+-
+ #if defined (_WIN32)
+ int __gnat_argument_needs_quote = 1;
+ #else
--- gcc/ada/cio.c.orig
+++ gcc/ada/cio.c
-@@ -46,7 +46,8 @@
+@@ -49,7 +49,8 @@
/* Don't use macros on GNU/Linux since they cause incompatible changes between
glibc 2.0 and 2.1 */
@@ -772,21 +576,20 @@
#ifdef stderr
# undef stderr
-@@ -187,7 +188,10 @@
+@@ -187,7 +188,9 @@
*p = '\\';
}
--#elif defined (sgi) || defined (__FreeBSD__)
-+#elif defined (sgi) \
-+ || defined (__FreeBSD__) \
-+ || defined (__DragonFly__) \
-+ || defined (__OpenBSD__)
+-#elif defined (__FreeBSD__)
++#elif defined (__FreeBSD__) \
++ || defined (__DragonFly__) \
++ || defined (__OpenBSD__)
/* Use realpath function which resolves links and references to . and ..
on those Unix systems that support it. Note that GNU/Linux provides it but
--- gcc/ada/env.c.orig
+++ gcc/ada/env.c
-@@ -188,7 +188,9 @@
+@@ -180,7 +180,9 @@
LIB$SIGNAL (status);
}
@@ -797,7 +600,7 @@
setenv (name, value, 1);
#else
-@@ -310,6 +312,7 @@
+@@ -301,6 +303,7 @@
}
#elif defined (__MINGW32__) || defined (__FreeBSD__) || defined (__APPLE__) \
|| (defined (__vxworks) && defined (__RTP__)) || defined (__CYGWIN__) \
@@ -805,48 +608,9 @@
|| defined (__NetBSD__) || defined (__OpenBSD__) || defined (__rtems__)
/* On Windows, FreeBSD and MacOS there is no function to clean all the
environment but there is a "clean" way to unset a variable. So go
---- gcc/ada/errno.c.orig
-+++ gcc/ada/errno.c
-@@ -39,6 +39,7 @@
- #define _REENTRANT
- #define _THREAD_SAFE
- #define _SGI_MP_SOURCE
-+#define GNAT_SET_ERRNO
-
- #ifdef MaRTE
-
-@@ -52,6 +53,17 @@
-
- #endif
-
-+#ifdef __ANDROID__
-+
-+/* The ANDROID errno.h file also defines __set_errno as an external variable
-+ for use with syscalls. It should not be referenced directly, but we are
-+ going to do it anyway because the alternative solution is to rename all
-+ uses of __set_errno in GNAT. */
-+
-+#undef GNAT_SET_ERRNO
-+#endif
-+
-+
- #include <errno.h>
- int
- __get_errno(void)
-@@ -59,8 +71,10 @@
- return errno;
- }
-
-+#ifdef GNAT_SET_ERRNO
- void
- __set_errno(int err)
- {
- errno = err;
- }
-+#endif
--- gcc/ada/g-comlin.adb.orig
+++ gcc/ada/g-comlin.adb
-@@ -514,6 +514,7 @@
+@@ -525,6 +525,7 @@
begin
Index_In_Switches := 0;
Switch_Length := 0;
@@ -856,7 +620,7 @@
-- at the start of the first switch.
--- gcc/ada/g-expect.adb.orig
+++ gcc/ada/g-expect.adb
-@@ -1332,15 +1332,20 @@
+@@ -1335,15 +1335,20 @@
-- The following commands are not executed on Unix systems, and are only
-- required for Windows systems. We are now in the parent process.
@@ -886,7 +650,7 @@
---------------------------
--- /dev/null
+++ gcc/ada/g-socthi-bsd.adb
-@@ -0,0 +1,376 @@
+@@ -0,0 +1,356 @@
+------------------------------------------------------------------------------
+-- --
+-- GNAT COMPILER COMPONENTS --
@@ -895,7 +659,7 @@
+-- --
+-- B o d y --
+-- --
-+-- Copyright (C) 2001-2010, AdaCore --
++-- Copyright (C) 2001-2013, AdaCore --
+-- --
+-- GNAT is free software; you can redistribute it and/or modify it under --
+-- terms of the GNU General Public License as published by the Free Soft- --
@@ -933,9 +697,6 @@
+
+package body GNAT.Sockets.Thin is
+
-+ Unknown_System_Error : constant C.Strings.chars_ptr :=
-+ C.Strings.New_String ("Unknown system error");
-+
+ function Syscall_Accept
+ (S : C.int;
+ Addr : System.Address;
@@ -1050,12 +811,11 @@
+ Addr : System.Address;
+ Addrlen : not null access C.int) return C.int
+ is
-+ Res : constant C.int := Syscall_Accept (S, Addr, Addrlen);
++ R : constant C.int := Syscall_Accept (S, Addr, Addrlen);
+ begin
+
-+ Disable_SIGPIPE (Res);
-+ return Res;
-+
++ Disable_SIGPIPE (R);
++ return R;
+ end C_Accept;
+
+ ---------------
@@ -1068,9 +828,7 @@
+ Namelen : C.int) return C.int
+ is
+ begin
-+
+ return Syscall_Connect (S, Name, Namelen);
-+
+ end C_Connect;
+
+ ------------------
@@ -1079,29 +837,29 @@
+
+ function Socket_Ioctl
+ (S : C.int;
-+ Req : C.int;
++ Req : SOSC.IOCTL_Req_T;
+ Arg : access C.int) return C.int
+ is
-+ -- Currently all requests are of the FIONBIO type, so always calc flags
-+ use Interfaces;
-+ flags : constant Unsigned_32 :=
-+ Unsigned_32 (C_Fcntl (S, SOSC.F_GETFL, 0));
-+ nonblock : constant Unsigned_32 := Unsigned_32 (SOSC.FNDELAY);
-+ enabled : constant Boolean := Arg.all = 1;
-+ newval : C.int;
+ begin
+ if Req = SOSC.FIONBIO then
-+ if enabled then
-+ newval := C.int (flags or nonblock);
-+ elsif (flags and nonblock) > 0 then
-+ newval := C.int (flags - nonblock);
-+ else
-+ newval := C.int (flags);
-+ end if;
-+ return C_Fcntl (Fd => S, Cmd => SOSC.F_SETFL, Val => newval);
-+ else
-+ return C_Ioctl (Fd => S, Req => Req, Arg => Arg);
++ declare
++ use Interfaces;
++ flags : constant Unsigned_32 :=
++ Unsigned_32 (C_Fcntl (S, SOSC.F_GETFL, 0));
++ nonblock : constant Unsigned_32 := Unsigned_32 (SOSC.O_NDELAY);
++ enabled : constant Boolean := Arg.all = 1;
++ newval : C.int := C.int (flags);
++ begin
++ if enabled then
++ newval := C.int (flags or nonblock);
++ elsif (flags and nonblock) > 0 then
++ newval := C.int (flags - nonblock);
++ end if;
++ return C_Fcntl (Fd => S, Cmd => SOSC.F_SETFL, Val => newval);
++ end;
+ end if;
++
++ return C_Ioctl (S, Req, Arg);
+ end Socket_Ioctl;
+
+ ------------
@@ -1115,9 +873,7 @@
+ Flags : C.int) return C.int
+ is
+ begin
-+
+ return Syscall_Recv (S, Msg, Len, Flags);
-+
+ end C_Recv;
+
+ ----------------
@@ -1133,9 +889,7 @@
+ Fromlen : not null access C.int) return C.int
+ is
+ begin
-+
+ return Syscall_Recvfrom (S, Msg, Len, Flags, From, Fromlen);
-+
+ end C_Recvfrom;
+
+ ---------------
@@ -1148,9 +902,7 @@
+ Flags : C.int) return System.CRTL.ssize_t
+ is
+ begin
-+
+ return Syscall_Recvmsg (S, Msg, Flags);
-+
+ end C_Recvmsg;
+
+ ---------------
@@ -1163,9 +915,7 @@
+ Flags : C.int) return System.CRTL.ssize_t
+ is
+ begin
-+
+ return Syscall_Sendmsg (S, Msg, Flags);
-+
+ end C_Sendmsg;
+
+ --------------
@@ -1181,9 +931,7 @@
+ Tolen : C.int) return C.int
+ is
+ begin
-+
+ return Syscall_Sendto (S, Msg, Len, Flags, To, Tolen);
-+
+ end C_Sendto;
+
+ --------------
@@ -1195,12 +943,10 @@
+ Typ : C.int;
+ Protocol : C.int) return C.int
+ is
-+ Res : constant C.int := Syscall_Socket (Domain, Typ, Protocol);
++ R : constant C.int := Syscall_Socket (Domain, Typ, Protocol);
+ begin
-+
-+ Disable_SIGPIPE (Res);
-+ return Res;
-+
++ Disable_SIGPIPE (R);
++ return R;
+ end C_Socket;
+
+ --------------
@@ -1258,14 +1004,12 @@
+ -- Socket_Error_Message --
+ --------------------------
+
-+ function Socket_Error_Message
-+ (Errno : Integer) return C.Strings.chars_ptr
-+ is separate;
++ function Socket_Error_Message (Errno : Integer) return String is separate;
+
+end GNAT.Sockets.Thin;
--- /dev/null
+++ gcc/ada/g-socthi-netbsd.adb
-@@ -0,0 +1,378 @@
+@@ -0,0 +1,358 @@
+------------------------------------------------------------------------------
+-- --
+-- GNAT COMPILER COMPONENTS --
@@ -1274,7 +1018,7 @@
+-- --
+-- B o d y --
+-- --
-+-- Copyright (C) 2001-2010, AdaCore --
++-- Copyright (C) 2001-2013, AdaCore --
+-- --
+-- GNAT is free software; you can redistribute it and/or modify it under --
+-- terms of the GNU General Public License as published by the Free Soft- --
@@ -1314,9 +1058,6 @@
+
+package body GNAT.Sockets.Thin is
+
-+ Unknown_System_Error : constant C.Strings.chars_ptr :=
-+ C.Strings.New_String ("Unknown system error");
-+
+ function Syscall_Accept
+ (S : C.int;
+ Addr : System.Address;
@@ -1431,12 +1172,11 @@
+ Addr : System.Address;
+ Addrlen : not null access C.int) return C.int
+ is
-+ Res : constant C.int := Syscall_Accept (S, Addr, Addrlen);
++ R : constant C.int := Syscall_Accept (S, Addr, Addrlen);
+ begin
+
-+ Disable_SIGPIPE (Res);
-+ return Res;
-+
++ Disable_SIGPIPE (R);
++ return R;
+ end C_Accept;
+
+ ---------------
@@ -1449,9 +1189,7 @@
+ Namelen : C.int) return C.int
+ is
+ begin
-+
+ return Syscall_Connect (S, Name, Namelen);
-+
+ end C_Connect;
+
+ ------------------
@@ -1460,29 +1198,29 @@
+
+ function Socket_Ioctl
+ (S : C.int;
-+ Req : C.int;
++ Req : SOSC.IOCTL_Req_T;
+ Arg : access C.int) return C.int
+ is
-+ -- Currently all requests are of the FIONBIO type, so always calc flags
-+ use Interfaces;
-+ flags : constant Unsigned_32 :=
-+ Unsigned_32 (C_Fcntl (S, SOSC.F_GETFL, 0));
-+ nonblock : constant Unsigned_32 := Unsigned_32 (SOSC.FNDELAY);
-+ enabled : constant Boolean := Arg.all = 1;
-+ newval : C.int;
+ begin
+ if Req = SOSC.FIONBIO then
-+ if enabled then
-+ newval := C.int (flags or nonblock);
-+ elsif (flags and nonblock) > 0 then
-+ newval := C.int (flags - nonblock);
-+ else
-+ newval := C.int (flags);
-+ end if;
-+ return C_Fcntl (Fd => S, Cmd => SOSC.F_SETFL, Val => newval);
-+ else
-+ return C_Ioctl (Fd => S, Req => Req, Arg => Arg);
++ declare
++ use Interfaces;
++ flags : constant Unsigned_32 :=
++ Unsigned_32 (C_Fcntl (S, SOSC.F_GETFL, 0));
++ nonblock : constant Unsigned_32 := Unsigned_32 (SOSC.O_NDELAY);
++ enabled : constant Boolean := Arg.all = 1;
++ newval : C.int := C.int (flags);
++ begin
++ if enabled then
++ newval := C.int (flags or nonblock);
++ elsif (flags and nonblock) > 0 then
++ newval := C.int (flags - nonblock);
++ end if;
++ return C_Fcntl (Fd => S, Cmd => SOSC.F_SETFL, Val => newval);
++ end;
+ end if;
++
++ return C_Ioctl (S, Req, Arg);
+ end Socket_Ioctl;
+
+ ------------
@@ -1496,9 +1234,7 @@
+ Flags : C.int) return C.int
+ is
+ begin
-+
+ return Syscall_Recv (S, Msg, Len, Flags);
-+
+ end C_Recv;
+
+ ----------------
@@ -1514,9 +1250,7 @@
+ Fromlen : not null access C.int) return C.int
+ is
+ begin
-+
+ return Syscall_Recvfrom (S, Msg, Len, Flags, From, Fromlen);
-+
+ end C_Recvfrom;
+
+ ---------------
@@ -1529,9 +1263,7 @@
+ Flags : C.int) return System.CRTL.ssize_t
+ is
+ begin
-+
+ return Syscall_Recvmsg (S, Msg, Flags);
-+
+ end C_Recvmsg;
+
+ ---------------
@@ -1544,9 +1276,7 @@
+ Flags : C.int) return System.CRTL.ssize_t
+ is
+ begin
-+
+ return Syscall_Sendmsg (S, Msg, Flags);
-+
+ end C_Sendmsg;
+
+ --------------
@@ -1562,9 +1292,7 @@
+ Tolen : C.int) return C.int
+ is
+ begin
-+
+ return Syscall_Sendto (S, Msg, Len, Flags, To, Tolen);
-+
+ end C_Sendto;
+
+ --------------
@@ -1576,12 +1304,10 @@
+ Typ : C.int;
+ Protocol : C.int) return C.int
+ is
-+ Res : constant C.int := Syscall_Socket (Domain, Typ, Protocol);
++ R : constant C.int := Syscall_Socket (Domain, Typ, Protocol);
+ begin
-+
-+ Disable_SIGPIPE (Res);
-+ return Res;
-+
++ Disable_SIGPIPE (R);
++ return R;
+ end C_Socket;
+
+ --------------
@@ -1639,14 +1365,12 @@
+ -- Socket_Error_Message --
+ --------------------------
+
-+ function Socket_Error_Message
-+ (Errno : Integer) return C.Strings.chars_ptr
-+ is separate;
++ function Socket_Error_Message (Errno : Integer) return String is separate;
+
+end GNAT.Sockets.Thin;
--- /dev/null
+++ gcc/ada/g-socthi-netbsd6.ads
-@@ -0,0 +1,260 @@
+@@ -0,0 +1,259 @@
+------------------------------------------------------------------------------
+-- --
+-- GNAT COMPILER COMPONENTS --
@@ -1655,7 +1379,7 @@
+-- --
+-- S p e c --
+-- --
-+-- Copyright (C) 2001-2010, AdaCore --
++-- Copyright (C) 2001-2013, AdaCore --
+-- --
+-- GNAT is free software; you can redistribute it and/or modify it under --
+-- terms of the GNU General Public License as published by the Free Soft- --
@@ -1684,7 +1408,7 @@
+
+-- This is the NetBSD 6+ version
+
-+with Interfaces.C.Strings;
++with Interfaces.C;
+
+with GNAT.OS_Lib;
+with GNAT.Sockets.Thin_Common;
@@ -1707,7 +1431,7 @@
+ function Socket_Errno return Integer renames GNAT.OS_Lib.Errno;
+ -- Returns last socket error number
+
-+ function Socket_Error_Message (Errno : Integer) return C.Strings.chars_ptr;
++ function Socket_Error_Message (Errno : Integer) return String;
+ -- Returns the error message string for the error number Errno. If Errno is
+ -- not known, returns "Unknown system error".
+
@@ -1717,8 +1441,7 @@
+
+ package Host_Error_Messages is
+
-+ function Host_Error_Message
-+ (H_Errno : Integer) return C.Strings.chars_ptr;
++ function Host_Error_Message (H_Errno : Integer) return String;
+ -- Returns the error message string for the host error number H_Errno.
+ -- If H_Errno is not known, returns "Unknown system error".
+
@@ -1769,7 +1492,7 @@
+
+ function Socket_Ioctl
+ (S : C.int;
-+ Req : C.int;
++ Req : SOSC.IOCTL_Req_T;
+ Arg : access C.int) return C.int;
+
+ function C_Listen
@@ -2084,12 +1807,21 @@
--- gcc/ada/gsocket.h.orig
+++ gcc/ada/gsocket.h
-@@ -203,8 +203,19 @@
+@@ -29,7 +29,7 @@
+ * *
+ ****************************************************************************/
+
+-#if defined(__nucleus__) || defined(VTHREADS) || defined(__ANDROID__)
++#if defined(__nucleus__) || defined(VTHREADS)
+
+ #warning Sockets not supported on these platforms
+ #undef HAVE_SOCKETS
+@@ -198,8 +198,19 @@
#include <netdb.h>
#endif
-#if defined (_AIX) || defined (__FreeBSD__) || defined (__hpux__) || \
-- defined (__osf__) || defined (_WIN32) || defined (__APPLE__)
+- defined (_WIN32) || defined (__APPLE__)
+#if defined(__ANDROID__)
+#include <sys/select.h>
+#endif
@@ -2099,14 +1831,14 @@
+ || defined (__DragonFly__) \
+ || defined (__NetBSD__) \
+ || defined (__OpenBSD__) \
++ || defined (__ANDROID__) \
+ || defined (__hpux__) \
-+ || defined (__osf__) \
+ || defined (_WIN32) \
+ || defined (__APPLE__)
# define HAVE_THREAD_SAFE_GETxxxBYyyy 1
- #elif defined (sgi) || defined (linux) || defined (__GLIBC__) || \
-@@ -236,7 +247,13 @@
+ #elif defined (linux) || defined (__GLIBC__) || \
+@@ -231,7 +242,13 @@
# endif
#endif
@@ -2123,25 +1855,16 @@
# define Has_Sockaddr_Len 0
--- gcc/ada/init.c.orig
+++ gcc/ada/init.c
-@@ -536,7 +536,7 @@
- /* GNU/Linux Section */
- /*********************/
-
--#elif defined (linux)
-+#elif defined (linux) && !defined(__ANDROID__)
-
- #include <signal.h>
-
-@@ -1787,7 +1787,7 @@
+@@ -1623,7 +1623,7 @@
/* FreeBSD Section */
/*******************/
-#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined (__DragonFly__)
++#elif defined (__FreeBSD__) || defined (__DragonFly__)
#include <signal.h>
#include <sys/ucontext.h>
-@@ -1832,7 +1832,7 @@
+@@ -1668,7 +1668,7 @@
}
void
@@ -2150,85 +1873,7 @@
{
struct sigaction act;
-@@ -1854,6 +1854,77 @@
- }
-
- /*******************/
-+/* Android Section */
-+/*******************/
-+
-+#elif defined(__ANDROID__)
-+
-+#include <signal.h>
-+
-+static void
-+__gnat_error_handler (int sig,
-+ struct siginfo *si ATTRIBUTE_UNUSED,
-+ void *ucontext ATTRIBUTE_UNUSED)
-+{
-+ struct Exception_Data *exception;
-+ const char *msg;
-+
-+ switch (sig)
-+ {
-+ case SIGFPE:
-+ exception = &constraint_error;
-+ msg = "SIGFPE";
-+ break;
-+
-+ case SIGILL:
-+ exception = &constraint_error;
-+ msg = "SIGILL";
-+ break;
-+
-+ case SIGSEGV:
-+ exception = &storage_error;
-+ msg = "stack overflow or erroneous memory access";
-+ break;
-+
-+ case SIGBUS:
-+ exception = &constraint_error;
-+ msg = "SIGBUS";
-+ break;
-+
-+ default:
-+ exception = &program_error;
-+ msg = "unhandled signal";
-+ }
-+
-+ Raise_From_Signal_Handler (exception, msg);
-+}
-+
-+void
-+__gnat_install_handler (void)
-+{
-+ struct sigaction act;
-+
-+ act.sa_sigaction = __gnat_error_handler;
-+ act.sa_flags = SA_NODEFER | SA_RESTART | SA_SIGINFO;
-+ sigemptyset (&act.sa_mask);
-+
-+ /* Do not install handlers if interrupt state is "System". */
-+ if (__gnat_get_interrupt_state (SIGABRT) != 's')
-+ sigaction (SIGABRT, &act, NULL);
-+ if (__gnat_get_interrupt_state (SIGFPE) != 's')
-+ sigaction (SIGFPE, &act, NULL);
-+ if (__gnat_get_interrupt_state (SIGILL) != 's')
-+ sigaction (SIGILL, &act, NULL);
-+ if (__gnat_get_interrupt_state (SIGBUS) != 's')
-+ sigaction (SIGBUS, &act, NULL);
-+ if (__gnat_get_interrupt_state (SIGSEGV) != 's')
-+ sigaction (SIGSEGV, &act, NULL);
-+
-+ __gnat_handler_installed = 1;
-+}
-+
-+
-+/*******************/
- /* VxWorks Section */
- /*******************/
-
-@@ -2450,9 +2521,13 @@
+@@ -2461,9 +2461,13 @@
initialization of the FP processor. This version is used under INTERIX
and WIN32. */
@@ -2247,7 +1892,7 @@
--- gcc/ada/initialize.c.orig
+++ gcc/ada/initialize.c
-@@ -257,8 +257,11 @@
+@@ -258,8 +258,11 @@
/* __gnat_initialize (init_float version) */
/******************************************/
@@ -2263,7 +1908,7 @@
--- gcc/ada/link.c.orig
+++ gcc/ada/link.c
-@@ -133,7 +133,10 @@
+@@ -103,7 +103,10 @@
unsigned char __gnat_separate_run_path_options = 0;
const char *__gnat_default_libgcc_subdir = "lib";
@@ -2277,7 +1922,7 @@
char __gnat_shared_libgnat_default = STATIC;
--- gcc/ada/make.adb.orig
+++ gcc/ada/make.adb
-@@ -669,7 +669,7 @@
+@@ -670,7 +670,7 @@
-- Compiler, Binder & Linker Data and Subprograms --
----------------------------------------------------
@@ -2328,7 +1973,7 @@
Current := Element.Next;
--- gcc/ada/mlib-utl.adb.orig
+++ gcc/ada/mlib-utl.adb
-@@ -433,7 +433,7 @@
+@@ -440,7 +440,7 @@
if Driver_Name = No_Name then
if Gcc_Exec = null then
if Gcc_Name = null then
@@ -2339,7 +1984,7 @@
Gcc_Exec := Locate_Exec_On_Path (Gcc_Name.all);
--- gcc/ada/prj-makr.adb.orig
+++ gcc/ada/prj-makr.adb
-@@ -114,7 +114,7 @@
+@@ -116,7 +116,7 @@
procedure Dup2 (Old_Fd, New_Fd : File_Descriptor);
@@ -2348,586 +1993,6 @@
Gcc_Path : String_Access := null;
Non_Empty_Node : constant Project_Node_Id := 1;
---- gcc/ada/s-fileio.adb.orig
-+++ gcc/ada/s-fileio.adb
-@@ -231,7 +231,7 @@
- Close_Status : int := 0;
- Dup_Strm : Boolean := False;
- File : AFCB_Ptr renames File_Ptr.all;
-- Errno : Integer;
-+ Errno : Integer := 0;
-
- begin
- -- Take a task lock, to protect the global data value Open_Files
---- /dev/null
-+++ gcc/ada/s-osinte-android.ads
-@@ -0,0 +1,566 @@
-+------------------------------------------------------------------------------
-+-- --
-+-- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS --
-+-- --
-+-- S Y S T E M . O S _ I N T E R F A C E --
-+-- --
-+-- S p e c --
-+-- --
-+-- Copyright (C) 1991-1994, Florida State University --
-+-- Copyright (C) 1995-2010, Free Software Foundation, Inc. --
-+-- --
-+-- GNARL is free software; you can redistribute it and/or modify it under --
-+-- terms of the GNU General Public License as published by the Free Soft- --
-+-- ware Foundation; either version 2, or (at your option) any later ver- --
-+-- sion. GNARL is distributed in the hope that it will be useful, but WITH- --
-+-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-+-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-+-- for more details. You should have received a copy of the GNU General --
-+-- Public License distributed with GNARL; see file COPYING. If not, write --
-+-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
-+-- Boston, MA 02110-1301, USA. --
-+-- --
-+-- As a special exception, if other files instantiate generics from this --
-+-- unit, or you link this unit with other files to produce an executable, --
-+-- this unit does not by itself cause the resulting executable to be --
-+-- covered by the GNU General Public License. This exception does not --
-+-- however invalidate any other reasons why the executable file might be --
-+-- covered by the GNU Public License. --
-+-- --
-+-- GNARL was developed by the GNARL team at Florida State University. --
-+-- Extensive contributions were provided by Ada Core Technologies, Inc. --
-+-- --
-+------------------------------------------------------------------------------
-+
-+-- This is a GNU/Linux (GNU/LinuxThreads) version of this package
-+
-+-- This package encapsulates all direct interfaces to OS services
-+-- that are needed by the tasking run-time (libgnarl).
-+
-+-- PLEASE DO NOT add any with-clauses to this package or remove the pragma
-+-- Preelaborate. This package is designed to be a bottom-level (leaf) package.
-+
-+with Ada.Unchecked_Conversion;
-+with Interfaces.C;
-+with System.Linux;
-+
-+package System.OS_Interface is
-+ pragma Preelaborate;
-+
-+ subtype int is Interfaces.C.int;
-+ subtype char is Interfaces.C.char;
-+ subtype short is Interfaces.C.short;
-+ subtype long is Interfaces.C.long;
-+ subtype unsigned is Interfaces.C.unsigned;
-+ subtype unsigned_short is Interfaces.C.unsigned_short;
-+ subtype unsigned_long is Interfaces.C.unsigned_long;
-+ subtype unsigned_char is Interfaces.C.unsigned_char;
-+ subtype plain_char is Interfaces.C.plain_char;
-+ subtype size_t is Interfaces.C.size_t;
-+
-+ -----------
-+ -- Errno --
-+ -----------
-+
-+ function errno return int;
-+ pragma Import (C, errno, "__get_errno");
-+
-+ EAGAIN : constant := System.Linux.EAGAIN;
-+ EINTR : constant := System.Linux.EINTR;
-+ EINVAL : constant := System.Linux.EINVAL;
-+ ENOMEM : constant := System.Linux.ENOMEM;
-+ EPERM : constant := System.Linux.EPERM;
-+ ETIMEDOUT : constant := System.Linux.ETIMEDOUT;
-+
-+ -------------
-+ -- Signals --
-+ -------------
-+
-+ Max_Interrupt : constant := 63;
-+ type Signal is new int range 0 .. Max_Interrupt;
-+ for Signal'Size use int'Size;
-+
-+ SIGHUP : constant := System.Linux.SIGHUP;
-+ SIGINT : constant := System.Linux.SIGINT;
-+ SIGQUIT : constant := System.Linux.SIGQUIT;
-+ SIGILL : constant := System.Linux.SIGILL;
-+ SIGTRAP : constant := System.Linux.SIGTRAP;
-+ SIGIOT : constant := System.Linux.SIGIOT;
-+ SIGABRT : constant := System.Linux.SIGABRT;
-+ SIGFPE : constant := System.Linux.SIGFPE;
-+ SIGKILL : constant := System.Linux.SIGKILL;
-+ SIGBUS : constant := System.Linux.SIGBUS;
-+ SIGSEGV : constant := System.Linux.SIGSEGV;
-+ SIGPIPE : constant := System.Linux.SIGPIPE;
-+ SIGALRM : constant := System.Linux.SIGALRM;
-+ SIGTERM : constant := System.Linux.SIGTERM;
-+ SIGUSR1 : constant := System.Linux.SIGUSR1;
-+ SIGUSR2 : constant := System.Linux.SIGUSR2;
-+ SIGCLD : constant := System.Linux.SIGCLD;
-+ SIGCHLD : constant := System.Linux.SIGCHLD;
-+ SIGPWR : constant := System.Linux.SIGPWR;
-+ SIGWINCH : constant := System.Linux.SIGWINCH;
-+ SIGURG : constant := System.Linux.SIGURG;
-+ SIGPOLL : constant := System.Linux.SIGPOLL;
-+ SIGIO : constant := System.Linux.SIGIO;
-+ SIGLOST : constant := System.Linux.SIGLOST;
-+ SIGSTOP : constant := System.Linux.SIGSTOP;
-+ SIGTSTP : constant := System.Linux.SIGTSTP;
-+ SIGCONT : constant := System.Linux.SIGCONT;
-+ SIGTTIN : constant := System.Linux.SIGTTIN;
-+ SIGTTOU : constant := System.Linux.SIGTTOU;
-+ SIGVTALRM : constant := System.Linux.SIGVTALRM;
-+ SIGPROF : constant := System.Linux.SIGPROF;
-+ SIGXCPU : constant := System.Linux.SIGXCPU;
-+ SIGXFSZ : constant := System.Linux.SIGXFSZ;
-+ SIGUNUSED : constant := System.Linux.SIGUNUSED;
-+ SIGSTKFLT : constant := System.Linux.SIGSTKFLT;
-+ SIGLTHRRES : constant := System.Linux.SIGLTHRRES;
-+ SIGLTHRCAN : constant := System.Linux.SIGLTHRCAN;
-+ SIGLTHRDBG : constant := System.Linux.SIGLTHRDBG;
-+
-+ SIGADAABORT : constant := SIGABRT;
-+ -- Change this if you want to use another signal for task abort.
-+ -- SIGTERM might be a good one.
-+
-+ type Signal_Set is array (Natural range <>) of Signal;
-+
-+ Unmasked : constant Signal_Set := (
-+ SIGTRAP,
-+ -- To enable debugging on multithreaded applications, mark SIGTRAP to
-+ -- be kept unmasked.
-+
-+ SIGBUS,
-+
-+ SIGTTIN, SIGTTOU, SIGTSTP,
-+ -- Keep these three signals unmasked so that background processes
-+ -- and IO behaves as normal "C" applications
-+
-+ SIGPROF,
-+ -- To avoid confusing the profiler
-+
-+ SIGKILL, SIGSTOP,
-+ -- These two signals actually cannot be masked;
-+ -- POSIX simply won't allow it.
-+
-+ SIGLTHRRES, SIGLTHRCAN, SIGLTHRDBG);
-+ -- These three signals are used by GNU/LinuxThreads starting from
-+ -- glibc 2.1 (future 2.2).
-+
-+ Reserved : constant Signal_Set :=
-+ -- I am not sure why the following two signals are reserved.
-+ -- I guess they are not supported by this version of GNU/Linux.
-+ (SIGVTALRM, SIGUNUSED);
-+
-+ type sigset_t is private;
-+
-+ function sigaddset (set : access sigset_t; sig : Signal) return int;
-+ pragma Import (C, sigaddset, "sigaddset");
-+
-+ function sigdelset (set : access sigset_t; sig : Signal) return int;
-+ pragma Import (C, sigdelset, "sigdelset");
-+
-+ function sigfillset (set : access sigset_t) return int;
-+ pragma Import (C, sigfillset, "sigfillset");
-+
-+ function sigismember (set : access sigset_t; sig : Signal) return int;
-+ pragma Import (C, sigismember, "sigismember");
-+
-+ function sigemptyset (set : access sigset_t) return int;
-+ pragma Import (C, sigemptyset, "sigemptyset");
-+
-+ type union_type_3 is new String (1 .. 116);
-+ type siginfo_t is record
-+ si_signo : int;
-+ si_code : int;
-+ si_errno : int;
-+ X_data : union_type_3;
-+ end record;
-+ pragma Convention (C, siginfo_t);
-+
-+ type struct_sigaction is record
-+ sa_handler : System.Address;
-+ sa_mask : sigset_t;
-+ sa_flags : Interfaces.C.unsigned_long;
-+ sa_restorer : System.Address;
-+ end record;
-+ pragma Convention (C, struct_sigaction);
-+
-+ type struct_sigaction_ptr is access all struct_sigaction;
-+
-+ type Machine_State is record
-+ eip : unsigned_long;
-+ ebx : unsigned_long;
-+ esp : unsigned_long;
-+ ebp : unsigned_long;
-+ esi : unsigned_long;
-+ edi : unsigned_long;
-+ end record;
-+ type Machine_State_Ptr is access all Machine_State;
-+
-+ SA_SIGINFO : constant := System.Linux.SA_SIGINFO;
-+ SA_ONSTACK : constant := System.Linux.SA_ONSTACK;
-+
-+ SIG_BLOCK : constant := 0;
-+ SIG_UNBLOCK : constant := 1;
-+ SIG_SETMASK : constant := 2;
-+
-+ SIG_DFL : constant := 0;
-+ SIG_IGN : constant := 1;
-+
-+ function sigaction
-+ (sig : Signal;
-+ act : struct_sigaction_ptr;
-+ oact : struct_sigaction_ptr) return int;
-+ pragma Import (C, sigaction, "sigaction");
-+
-+ ----------
-+ -- Time --
-+ ----------
-+
-+ type timespec is private;
-+
-+ function To_Duration (TS : timespec) return Duration;
-+ pragma Inline (To_Duration);
-+
-+ function To_Timespec (D : Duration) return timespec;
-+ pragma Inline (To_Timespec);
-+
-+ function sysconf (name : int) return long;
-+ pragma Import (C, sysconf);
-+
-+ SC_CLK_TCK : constant := 2;
-+ SC_NPROCESSORS_ONLN : constant := 84;
-+
-+ -------------------------
-+ -- Priority Scheduling --
-+ -------------------------
-+
-+ SCHED_OTHER : constant := 0;
-+ SCHED_FIFO : constant := 1;
-+ SCHED_RR : constant := 2;
-+
-+ function To_Target_Priority
-+ (Prio : System.Any_Priority) return Interfaces.C.int;
-+ -- Maps System.Any_Priority to a POSIX priority
-+
-+ -------------
-+ -- Process --
-+ -------------
-+
-+ type pid_t is private;
-+
-+ function kill (pid : pid_t; sig : Signal) return int;
-+ pragma Import (C, kill, "kill");
-+
-+ function getpid return pid_t;
-+ pragma Import (C, getpid, "getpid");
-+
-+ -------------
-+ -- Threads --
-+ -------------
-+
-+ type Thread_Body is access
-+ function (arg : System.Address) return System.Address;
-+ pragma Convention (C, Thread_Body);
-+
-+ function Thread_Body_Access is new
-+ Ada.Unchecked_Conversion (System.Address, Thread_Body);
-+
-+ type pthread_t is new unsigned_long;
-+ subtype Thread_Id is pthread_t;
-+
-+ function To_pthread_t is new Ada.Unchecked_Conversion
-+ (unsigned_long, pthread_t);
-+
-+ type pthread_mutex_t is limited private;
-+ type pthread_cond_t is limited private;
-+ type pthread_attr_t is limited private;
-+ type pthread_mutexattr_t is limited private;
-+ type pthread_condattr_t is limited private;
-+ type pthread_key_t is private;
-+
-+ PTHREAD_CREATE_DETACHED : constant := 1;
-+
-+ -----------
-+ -- Stack --
-+ -----------
-+
-+ type stack_t is record
-+ ss_sp : System.Address;
-+ ss_flags : int;
-+ ss_size : size_t;
-+ end record;
-+ pragma Convention (C, stack_t);
-+
-+ function sigaltstack
-+ (ss : not null access stack_t;
-+ oss : access stack_t) return int;
-+ pragma Import (C, sigaltstack, "sigaltstack");
-+
-+ Alternate_Stack : aliased System.Address;
-+ pragma Import (C, Alternate_Stack, "__gnat_alternate_stack");
-+ -- The alternate signal stack for stack overflows
-+
-+ Alternate_Stack_Size : constant := 16 * 1024;
-+ -- This must be in keeping with init.c:__gnat_alternate_stack
-+
-+ function Get_Stack_Base (thread : pthread_t) return Address;
-+ pragma Inline (Get_Stack_Base);
-+ -- This is a dummy procedure to share some GNULLI files
-+
-+ ---------------------------------------
-+ -- Nonstandard Thread Initialization --
-+ ---------------------------------------
-+
-+ procedure pthread_init;
-+ pragma Inline (pthread_init);
-+ -- This is a dummy procedure to share some GNULLI files
-+
-+ -------------------------
-+ -- POSIX.1c Section 3 --
-+ -------------------------
-+
-+ function sigwait (set : access sigset_t; sig : access Signal) return int;
-+ pragma Import (C, sigwait, "sigwait");
-+
-+ function pthread_kill (thread : pthread_t; sig : Signal) return int;
-+ pragma Import (C, pthread_kill, "pthread_kill");
-+
-+ function pthread_sigmask
-+ (how : int;
-+ set : access sigset_t;
-+ oset : access sigset_t) return int;
-+ pragma Import (C, pthread_sigmask, "pthread_sigmask");
-+
-+ --------------------------
-+ -- POSIX.1c Section 11 --
-+ --------------------------
-+
-+ function pthread_mutexattr_init
-+ (attr : access pthread_mutexattr_t) return int;
-+ pragma Import (C, pthread_mutexattr_init, "pthread_mutexattr_init");
-+
-+ function pthread_mutexattr_destroy
-+ (attr : access pthread_mutexattr_t) return int;
-+ pragma Import (C, pthread_mutexattr_destroy, "pthread_mutexattr_destroy");
-+
-+ function pthread_mutex_init
-+ (mutex : access pthread_mutex_t;
-+ attr : access pthread_mutexattr_t) return int;
-+ pragma Import (C, pthread_mutex_init, "pthread_mutex_init");
-+
-+ function pthread_mutex_destroy (mutex : access pthread_mutex_t) return int;
-+ pragma Import (C, pthread_mutex_destroy, "pthread_mutex_destroy");
-+
-+ function pthread_mutex_lock (mutex : access pthread_mutex_t) return int;
-+ pragma Import (C, pthread_mutex_lock, "pthread_mutex_lock");
-+
-+ function pthread_mutex_unlock (mutex : access pthread_mutex_t) return int;
-+ pragma Import (C, pthread_mutex_unlock, "pthread_mutex_unlock");
-+
-+ function pthread_condattr_init
-+ (attr : access pthread_condattr_t) return int;
-+ pragma Import (C, pthread_condattr_init, "pthread_condattr_init");
-+
-+ function pthread_condattr_destroy
-+ (attr : access pthread_condattr_t) return int;
-+ pragma Import (C, pthread_condattr_destroy, "pthread_condattr_destroy");
-+
-+ function pthread_cond_init
-+ (cond : access pthread_cond_t;
-+ attr : access pthread_condattr_t) return int;
-+ pragma Import (C, pthread_cond_init, "pthread_cond_init");
-+
-+ function pthread_cond_destroy (cond : access pthread_cond_t) return int;
-+ pragma Import (C, pthread_cond_destroy, "pthread_cond_destroy");
-+
-+ function pthread_cond_signal (cond : access pthread_cond_t) return int;
-+ pragma Import (C, pthread_cond_signal, "pthread_cond_signal");
-+
-+ function pthread_cond_wait
-+ (cond : access pthread_cond_t;
-+ mutex : access pthread_mutex_t) return int;
-+ pragma Import (C, pthread_cond_wait, "pthread_cond_wait");
-+
-+ function pthread_cond_timedwait
-+ (cond : access pthread_cond_t;
-+ mutex : access pthread_mutex_t;
-+ abstime : access timespec) return int;
-+ pragma Import (C, pthread_cond_timedwait, "pthread_cond_timedwait");
-+
-+ --------------------------
-+ -- POSIX.1c Section 13 --
-+ --------------------------
-+
-+ type struct_sched_param is record
-+ sched_priority : int; -- scheduling priority
-+ end record;
-+ pragma Convention (C, struct_sched_param);
-+
-+ function pthread_setschedparam
-+ (thread : pthread_t;
-+ policy : int;
-+ param : access struct_sched_param) return int;
-+ pragma Import (C, pthread_setschedparam, "pthread_setschedparam");
-+
-+ function pthread_attr_setschedpolicy
-+ (attr : access pthread_attr_t;
-+ policy : int) return int;
-+ pragma Import
-+ (C, pthread_attr_setschedpolicy, "pthread_attr_setschedpolicy");
-+
-+ function sched_yield return int;
-+ pragma Import (C, sched_yield, "sched_yield");
-+
-+ ---------------------------
-+ -- P1003.1c - Section 16 --
-+ ---------------------------
-+
-+ function pthread_attr_init
-+ (attributes : access pthread_attr_t) return int;
-+ pragma Import (C, pthread_attr_init, "pthread_attr_init");
-+
-+ function pthread_attr_destroy
-+ (attributes : access pthread_attr_t) return int;
-+ pragma Import (C, pthread_attr_destroy, "pthread_attr_destroy");
-+
-+ function pthread_attr_setdetachstate
-+ (attr : access pthread_attr_t;
-+ detachstate : int) return int;
-+ pragma Import
-+ (C, pthread_attr_setdetachstate, "pthread_attr_setdetachstate");
-+
-+ function pthread_attr_setstacksize
-+ (attr : access pthread_attr_t;
-+ stacksize : size_t) return int;
-+ pragma Import (C, pthread_attr_setstacksize, "pthread_attr_setstacksize");
-+
-+ function pthread_create
-+ (thread : access pthread_t;
-+ attributes : access pthread_attr_t;
-+ start_routine : Thread_Body;
-+ arg : System.Address) return int;
-+ pragma Import (C, pthread_create, "pthread_create");
-+
-+ procedure pthread_exit (status : System.Address);
-+ pragma Import (C, pthread_exit, "pthread_exit");
-+
-+ function pthread_self return pthread_t;
-+ pragma Import (C, pthread_self, "pthread_self");
-+
-+ function lwp_self return System.Address;
-+ pragma Import (C, lwp_self, "__gnat_lwp_self");
-+
-+ --------------------------
-+ -- POSIX.1c Section 17 --
-+ --------------------------
-+
-+ function pthread_setspecific
-+ (key : pthread_key_t;
-+ value : System.Address) return int;
-+ pragma Import (C, pthread_setspecific, "pthread_setspecific");
-+
-+ function pthread_getspecific (key : pthread_key_t) return System.Address;
-+ pragma Import (C, pthread_getspecific, "pthread_getspecific");
-+
-+ type destructor_pointer is access procedure (arg : System.Address);
-+ pragma Convention (C, destructor_pointer);
-+
-+ function pthread_key_create
-+ (key : access pthread_key_t;
-+ destructor : destructor_pointer) return int;
-+ pragma Import (C, pthread_key_create, "pthread_key_create");
-+
-+ CPU_SETSIZE : constant := 1_024;
-+
-+ type bit_field is array (1 .. CPU_SETSIZE) of Boolean;
-+ for bit_field'Size use CPU_SETSIZE;
-+ pragma Pack (bit_field);
-+ pragma Convention (C, bit_field);
-+
-+ type cpu_set_t is record
-+ bits : bit_field;
-+ end record;
-+ pragma Convention (C, cpu_set_t);
-+
-+ function pthread_setaffinity_np
-+ (thread : pthread_t;
-+ cpusetsize : size_t;
-+ cpuset : access cpu_set_t) return int;
-+ pragma Import (C, pthread_setaffinity_np, "pthread_setaffinity_np");
-+ pragma Weak_External (pthread_setaffinity_np);
-+ -- Use a weak symbol because this function may be available or not,
-+ -- depending on the version of the system.
-+
-+ function pthread_attr_setaffinity_np
-+ (attr : access pthread_attr_t;
-+ cpusetsize : size_t;
-+ cpuset : access cpu_set_t) return int;
-+ pragma Import (C, pthread_attr_setaffinity_np,
-+ "pthread_attr_setaffinity_np");
-+ pragma Weak_External (pthread_attr_setaffinity_np);
-+ -- Use a weak symbol because this function may be available or not,
-+ -- depending on the version of the system.
-+
-+private
-+
-+ type sigset_t is array (0 .. 127) of unsigned_char;
-+ pragma Convention (C, sigset_t);
-+ for sigset_t'Alignment use Interfaces.C.unsigned_long'Alignment;
-+
-+ pragma Warnings (Off);
-+ for struct_sigaction use record
-+ sa_handler at Linux.sa_handler_pos range 0 .. Standard'Address_Size - 1;
-+ sa_mask at Linux.sa_mask_pos range 0 .. 1023;
-+ sa_flags at Linux.sa_flags_pos range 0 .. Standard'Address_Size - 1;
-+ end record;
-+ -- We intentionally leave sa_restorer unspecified and let the compiler
-+ -- append it after the last field, so disable corresponding warning.
-+ pragma Warnings (On);
-+
-+ type pid_t is new int;
-+
-+ type time_t is new long;
-+
-+ type timespec is record
-+ tv_sec : time_t;
-+ tv_nsec : long;
-+ end record;
-+ pragma Convention (C, timespec);
-+
-+ type pthread_attr_t is record
-+ detachstate : int;
-+ schedpolicy : int;
-+ schedparam : struct_sched_param;
-+ inheritsched : int;
-+ scope : int;
-+ guardsize : size_t;
-+ stackaddr_set : int;
-+ stackaddr : System.Address;
-+ stacksize : size_t;
-+ end record;
-+ pragma Convention (C, pthread_attr_t);
-+
-+ type pthread_condattr_t is record
-+ dummy : int;
-+ end record;
-+ pragma Convention (C, pthread_condattr_t);
-+
-+ type pthread_mutexattr_t is record
-+ mutexkind : int;
-+ end record;
-+ pragma Convention (C, pthread_mutexattr_t);
-+
-+ type pthread_mutex_t is new System.Linux.pthread_mutex_t;
-+
-+ type unsigned_long_long_t is mod 2 ** 64;
-+ -- Interfaces.C.Extensions isn't preelaborated so cannot be with-ed
-+
-+ type pthread_cond_t is array (0 .. 47) of unsigned_char;
-+ pragma Convention (C, pthread_cond_t);
-+ for pthread_cond_t'Alignment use unsigned_long_long_t'Alignment;
-+
-+ type pthread_key_t is new unsigned;
-+
-+end System.OS_Interface;
--- /dev/null
+++ gcc/ada/s-osinte-dragonfly.adb
@@ -0,0 +1,116 @@
@@ -7889,204 +6954,31 @@
+ end Initialize;
+
+end System.OS_Primitives;
---- gcc/ada/s-rannum.adb.orig
-+++ gcc/ada/s-rannum.adb
-@@ -290,7 +290,7 @@
- X : Real; -- Scaled mantissa
- R : Unsigned_32; -- Supply of random bits
- R_Bits : Natural; -- Number of bits left in R
-- K : Bit_Count; -- Next decrement to exponent
-+ K : Bit_Count := 0; -- Next decrement to exponent
-
- begin
- Mantissa := Random (Gen) / 2**Extra_Bits;
---- gcc/ada/sem_aggr.adb.orig
-+++ gcc/ada/sem_aggr.adb
-@@ -1726,6 +1726,9 @@
- Discard : Node_Id;
- pragma Warnings (Off, Discard);
-
-+ Delete_Choice : Boolean;
-+ -- Used when replacing a subtype choice with predicate by a list
-+
- Aggr_Low : Node_Id := Empty;
- Aggr_High : Node_Id := Empty;
- -- The actual low and high bounds of this sub-aggregate
-@@ -1766,6 +1769,8 @@
- Assoc := First (Component_Associations (N));
- while Present (Assoc) loop
- Choice := First (Choices (Assoc));
-+ Delete_Choice := False;
-+
- while Present (Choice) loop
- if Nkind (Choice) = N_Others_Choice then
- Others_Present := True;
-@@ -1792,10 +1797,56 @@
- Error_Msg_N
- ("(Ada 83) illegal context for OTHERS choice", N);
- end if;
-+
-+ elsif Is_Entity_Name (Choice) then
-+ Analyze (Choice);
-+
-+ declare
-+ E : constant Entity_Id := Entity (Choice);
-+ New_Cs : List_Id;
-+ P : Node_Id;
-+ C : Node_Id;
-+
-+ begin
-+ if Is_Type (E) and then Has_Predicates (E) then
-+ Freeze_Before (N, E);
-+
-+ -- If the subtype has a static predicate, replace the
-+ -- original choice with the list of individual values
-+ -- covered by the predicate.
-+
-+ if Present (Static_Predicate (E)) then
-+ Delete_Choice := True;
-+
-+ New_Cs := New_List;
-+ P := First (Static_Predicate (E));
-+ while Present (P) loop
-+ C := New_Copy (P);
-+ Set_Sloc (C, Sloc (Choice));
-+ Append_To (New_Cs, C);
-+ Next (P);
-+ end loop;
-+
-+ Insert_List_After (Choice, New_Cs);
-+ end if;
-+ end if;
-+ end;
- end if;
-
- Nb_Choices := Nb_Choices + 1;
-- Next (Choice);
-+
-+ declare
-+ C : constant Node_Id := Choice;
-+
-+ begin
-+ Next (Choice);
-+
-+ if Delete_Choice then
-+ Remove (C);
-+ Nb_Choices := Nb_Choices - 1;
-+ Delete_Choice := False;
-+ end if;
-+ end;
- end loop;
-
- Next (Assoc);
-@@ -1998,6 +2049,7 @@
- Nb_Discrete_Choices := Nb_Discrete_Choices + 1;
- Table (Nb_Discrete_Choices).Choice_Lo := Low;
- Table (Nb_Discrete_Choices).Choice_Hi := High;
-+ Table (Nb_Discrete_Choices).Choice_Node := Choice;
-
- Next (Choice);
-
-@@ -2115,7 +2167,7 @@
- then
- Error_Msg_N
- ("duplicate choice values in array aggregate",
-- Table (J).Choice_Hi);
-+ Table (J).Choice_Node);
- return Failure;
-
- elsif not Others_Present then
---- /dev/null
-+++ gcc/ada/signal_android.c
-@@ -0,0 +1,77 @@
-+/*
-+ * Copyright (C) 2008 The Android Open Source Project
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * * Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in
-+ * the documentation and/or other materials provided with the
-+ * distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+#include <limits.h> /* For LONG_BIT */
-+#include <string.h> /* For memset() */
-+
-+typedef unsigned long sigset_t;
-+
-+
-+int
-+sigismember(sigset_t *set, int signum)
-+{
-+ unsigned long *local_set = (unsigned long *)set;
-+ signum--;
-+ return (int)((local_set[signum/LONG_BIT] >> (signum%LONG_BIT)) & 1);
-+}
-+
-+
-+int
-+sigaddset(sigset_t *set, int signum)
-+{
-+ unsigned long *local_set = (unsigned long *)set;
-+ signum--;
-+ local_set[signum/LONG_BIT] |= 1UL << (signum%LONG_BIT);
-+ return 0;
-+}
-+
-+
-+int
-+sigdelset(sigset_t *set, int signum)
-+{
-+ unsigned long *local_set = (unsigned long *)set;
-+ signum--;
-+ local_set[signum/LONG_BIT] &= ~(1UL << (signum%LONG_BIT));
-+ return 0;
-+}
-+
-+
-+int
-+sigemptyset(sigset_t *set)
-+{
-+ memset(set, 0, sizeof *set);
-+ return 0;
-+}
-+
-+
-+int
-+sigfillset(sigset_t *set)
-+{
-+ memset(set, ~0, sizeof *set);
-+ return 0;
-+}
-+
+--- gcc/ada/socket.c.orig
++++ gcc/ada/socket.c
+@@ -65,7 +65,10 @@
+ int s_port;
+ __netdb_char_ptr s_proto;
+ };
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) \
++ || defined(__DragonFly__) \
++ || defined(__OpenBSD__) \
++ || defined(__NetBSD__)
+ typedef unsigned int IOCTL_Req_T;
+ #else
+ typedef int IOCTL_Req_T;
--- gcc/ada/sysdep.c.orig
+++ gcc/ada/sysdep.c
-@@ -256,6 +256,7 @@
+@@ -263,6 +263,7 @@
|| defined (__MACHTEN__) || defined (__hpux__) || defined (_AIX) \
|| (defined (__svr4__) && defined (i386)) || defined (__Lynx__) \
|| defined (__CYGWIN__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
+ || defined (__DragonFly__) \
|| defined (__GLIBC__) || defined (__APPLE__)
- #ifdef __MINGW32__
-@@ -314,6 +315,7 @@
+ # ifdef __MINGW32__
+@@ -320,6 +321,7 @@
|| defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (__hpux__) \
|| defined (_AIX) || (defined (__svr4__) && defined (i386)) \
|| defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
@@ -8094,26 +6986,25 @@
|| defined (__GLIBC__) || defined (__APPLE__)
char c;
int nread;
-@@ -334,6 +336,7 @@
- || defined (__osf__) || defined (__MACHTEN__) || defined (__hpux__) \
+@@ -340,6 +342,7 @@
+ || defined (__MACHTEN__) || defined (__hpux__) \
|| defined (_AIX) || (defined (__svr4__) && defined (i386)) \
|| defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
+ || defined (__DragonFly__) \
|| defined (__GLIBC__) || defined (__APPLE__)
eof_ch = termios_rec.c_cc[VEOF];
-@@ -845,8 +848,12 @@
- /* Darwin, Free BSD, Linux, Tru64, where component tm_gmtoff is present in
+@@ -853,8 +856,11 @@
+ /* Darwin, Free BSD, Linux, where component tm_gmtoff is present in
struct tm */
-#elif defined (__APPLE__) || defined (__FreeBSD__) || defined (linux) ||\
-- (defined (__alpha__) && defined (__osf__)) || defined (__GLIBC__)
+- defined (__GLIBC__)
+#elif defined (__APPLE__) \
-+ || defined (__FreeBSD__) \
-+ || defined (__DragonFly__) \
-+ || defined (linux) \
-+ || (defined (__alpha__) && defined (__osf__)) \
-+ || defined (__GLIBC__)
++ || defined (__DragonFly__) \
++ || defined (__FreeBSD__) \
++ || defined (linux) \
++ || defined (__GLIBC__)
{
localtime_r (timer, &tp);
*off = tp.tm_gmtoff;
@@ -8993,9 +7884,237 @@
+ ZCX_By_Default : constant Boolean := False;
+
+end System;
+--- gcc/ada/terminals.c.orig
++++ gcc/ada/terminals.c
+@@ -31,8 +31,7 @@
+
+ /* First all usupported platforms. Add stubs for exported routines. */
+
+-#if defined (VMS) || defined (__vxworks) || defined (__Lynx__) || \
+- defined (__ANDROID__)
++#if defined (VMS) || defined (__vxworks) || defined (__Lynx__)
+
+ void * __gnat_new_tty (void) { return (void*)0; }
+ char * __gnat_tty_name (void* t) { return (char*)0; }
+@@ -1010,7 +1009,11 @@
+ # include <sys/stropts.h>
+ #endif
+
++#ifdef __ANDROID__
++#define CDISABLE _PC_VDISABLE
++#else
+ #define CDISABLE _POSIX_VDISABLE
++#endif
+
+ /* On HP-UX and Sun system, there is a bzero function but with a different
+ signature. Use memset instead */
+--- /dev/null
++++ gcc/ada/traceback_symbolic.c
+@@ -0,0 +1,201 @@
++/*
++ Copyright (C) 1999 by Juergen Pfeifer <juergen.pfeifer@gmx.net>
++ Ada for Linux Team (ALT)
++ Heavily modified by John Marino <http://www.dragonlace.net>
++
++ Permission is hereby granted, free of charge, to any person obtaining a
++ copy of this software and associated documentation files (the
++ "Software"), to deal in the Software without restriction, including
++ without limitation the rights to use, copy, modify, merge, publish,
++ distribute, distribute with modifications, sublicense, and/or sell
++ copies of the Software, and to permit persons to whom the Software is
++ furnished to do so, subject to the following conditions:
++
++ The above copyright notice and this permission notice shall be included
++ in all copies or substantial portions of the Software.
++
++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
++ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
++ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
++ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++ Except as contained in this notice, the name(s) of the above copyright
++ holders shall not be used in advertising or otherwise to promote the
++ sale, use or other dealings in this Software without prior written
++ authorization.
++*/
++
++#ifdef IS_CROSS
++
++
++/*
++ * Running addr2line doesn't make sense for cross-compiled objects.
++ * Create a dummy function to satisfy g-trasym.o
++ */
++
++void
++convert_addresses (const char *file_name ATTRIBUTE_UNUSED,
++ void *addrs ATTRIBUTE_UNUSED,
++ int n_addr ATTRIBUTE_UNUSED,
++ void *buf ATTRIBUTE_UNUSED,
++ int *len ATTRIBUTE_UNUSED)
++{
++ *len = 0;
++}
++
++#else
++
++
++/*
++ * use the external program /usr/bin/addr2line to convert addresses
++ * into file names and line numbers
++ */
++
++#include <sys/types.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++#include <signal.h>
++
++#define CLOSE_SENDPIPE close(sendpipe[0]); close(sendpipe[1])
++#define CLOSE_READPIPE close(readpipe[0]); close(readpipe[1])
++#define DUP2CLOSE(oldfd, newfd) dup2(oldfd, newfd); close(oldfd);
++#define RESTSIG sigaction(SIGPIPE,&oact,NULL)
++
++#define MAX_LINE 1024
++#define PARENT_READ readpipe[0]
++#define CHILD_WRITE readpipe[1]
++#define CHILD_READ sendpipe[0]
++#define PARENT_WRITE sendpipe[1]
++
++#if defined (__sun__)
++#define ADDR2LINE_PROG "/usr/gnu/bin/addr2line"
++#else
++#define ADDR2LINE_PROG "/usr/bin/addr2line"
++#endif
++
++void
++convert_addresses (const char *file_name,
++ void *addrs,
++ int n_addr,
++ void *buf,
++ int *len)
++{
++ int max_len = *len;
++ pid_t childpid;
++
++ struct sigaction act, oact;
++
++ int sendpipe[2] = {-1,-1}, /* parent -> child */
++ readpipe[2] = {-1,-1}; /* parent <- child */
++
++ *len = 0;
++ act.sa_handler = SIG_IGN;
++ sigemptyset(&act.sa_mask);
++ act.sa_flags = 0;
++ if (sigaction(SIGPIPE,&act,&oact) < 0)
++ return;
++
++ if (pipe(sendpipe) < 0) { RESTSIG; return; }
++ if (pipe(readpipe) < 0) { CLOSE_SENDPIPE; RESTSIG; return; }
++ if ((childpid = fork()) < 0) {
++ CLOSE_READPIPE;
++ CLOSE_SENDPIPE;
++ RESTSIG;
++ return;
++ }
++
++ if (childpid == 0) { /* child process */
++ close(PARENT_WRITE);
++ close(PARENT_READ);
++ if ((CHILD_READ != STDIN_FILENO) && (CHILD_WRITE != STDOUT_FILENO)) {
++ if ((CHILD_READ == STDOUT_FILENO) && (CHILD_WRITE == STDIN_FILENO)) {
++ const int temp_fd = dup(CHILD_WRITE);
++ close (CHILD_WRITE);
++ DUP2CLOSE (CHILD_READ, STDIN_FILENO);
++ DUP2CLOSE (temp_fd, STDOUT_FILENO);
++ }
++ else if ((CHILD_READ == STDIN_FILENO) && (CHILD_WRITE > 1)) {
++ DUP2CLOSE (CHILD_WRITE, STDOUT_FILENO);
++ }
++ else if ((CHILD_READ > 1) && (CHILD_WRITE == STDOUT_FILENO)) {
++ DUP2CLOSE (CHILD_READ, STDIN_FILENO);
++ }
++ else if ((CHILD_READ > 1) && (CHILD_WRITE == STDIN_FILENO)) {
++ DUP2CLOSE (CHILD_WRITE, STDOUT_FILENO);
++ DUP2CLOSE (CHILD_READ, STDIN_FILENO);
++ }
++ else {
++ /* CHILD_READ >= 1 and CHILD_WRITE > 1 */
++ DUP2CLOSE (CHILD_READ, STDIN_FILENO);
++ DUP2CLOSE (CHILD_WRITE, STDOUT_FILENO);
++ }
++ }
++ /* As pointed out by Florian Weimer to JP, it is a security threat to call
++ the script with a user defined environment and using the path. That
++ would be Trojans pleasure. Therefore the absolute path to addr2line
++ and an empty environment is used. That should be safe.
++ */
++ char *const argv[] = { "addr2line",
++ "-e", file_name,
++ "--demangle=gnat",
++ "--functions",
++ "--basenames",
++ NULL };
++ char *const envp[] = { NULL };
++ if (execve(ADDR2LINE_PROG, argv, envp) < 0) {
++ close (CHILD_WRITE);
++ close (CHILD_READ);
++ RESTSIG;
++ exit (1);
++ }
++ }
++
++ /* Below this line is parent process */
++ int i, n;
++ char hex[16];
++ char line[MAX_LINE + 1];
++ char *p;
++ char *s = buf;
++ long *trace_address = addrs;
++
++ close(CHILD_WRITE);
++ close(CHILD_READ);
++
++ for(i=0; i < n_addr; i++) {
++ snprintf(hex,sizeof(hex),"%#lx\n",*trace_address);
++ write(PARENT_WRITE,hex,strlen(hex));
++ n = read(PARENT_READ,line,MAX_LINE);
++ if (n<=0)
++ break;
++
++ line[n]=0;
++ /* We have approx. 16 additional chars for "%#lx in " clause.
++ We use this info to prevent a buffer overrun. */
++ if (n + 16 + (*len) > max_len)
++ break;
++
++ p = strchr(line,'\n');
++ if (p) {
++ if (*(p+1)) {
++ *p = 0;
++ *len += snprintf(s, (max_len - (*len)), "%#lx in %s at %s",
++ *trace_address, line, p+1);
++ }
++ else {
++ *len += snprintf(s, (max_len - (*len)), "%#lx at %s",
++ *trace_address, line);
++ }
++ s = buf + (*len);
++ }
++ trace_address += 1;
++ }
++ close (PARENT_WRITE);
++ close (PARENT_READ);
++ RESTSIG;
++}
++
++#endif
--- gcc/ada/tracebak.c.orig
+++ gcc/ada/tracebak.c
-@@ -217,6 +217,23 @@
+@@ -288,6 +288,23 @@
#error Unhandled darwin architecture.
#endif
@@ -9006,7 +8125,7 @@
+ || defined (__FreeBSD__) \
+ || defined (__OpenBSD__) \
+ || defined (__DragonFly__) )
-+
++
+#define USE_GCC_UNWINDER
+/* The generic unwinder is not used for this target because the default
+ implementation doesn't unwind on the BSD platforms. AMD64 targets use the
@@ -9016,26 +8135,66 @@
+#define PC_ADJUST -2
+/* The minimum size of call instructions on this architecture is 2 bytes */
+
- /*------------------------ PPC AIX/Older Darwin -------------------------*/
+ /*---------------------- PPC AIX/PPC Lynx 178/Older Darwin ------------------*/
#elif ((defined (_POWER) && defined (_AIX)) || \
- (defined (__ppc__) && defined (__APPLE__)))
+ (defined (__powerpc__) && defined (__Lynx__) && !defined(__ELF__)) || \
+--- gcc/ada/gcc-interface/Make-lang.in.orig
++++ gcc/ada/gcc-interface/Make-lang.in
+@@ -584,7 +584,7 @@
+ ada/widechar.o
+
+ # Language-independent object files.
+-ADA_BACKEND = $(BACKEND) attribs.o
++ADA_BACKEND = $(BACKEND2) attribs.o
+
+ # List of target dependent sources, overridden below as necessary
+ TARGET_ADA_SRCS =
--- gcc/ada/gcc-interface/Makefile.in.orig
+++ gcc/ada/gcc-interface/Makefile.in
-@@ -1037,6 +1037,7 @@
- ifeq ($(strip $(filter-out %86 %x86_64 solaris2%,$(arch) $(osys))),)
+@@ -1044,6 +1044,7 @@
+ ifeq ($(strip $(filter-out arm% linux-androideabi,$(target_cpu) $(target_os))),)
+ LIBGNAT_TARGET_PAIRS = \
+ a-intnam.ads<a-intnam-linux.ads \
++ g-socthi.adb<g-socthi-bsd.adb \
+ s-inmaop.adb<s-inmaop-posix.adb \
+ s-intman.adb<s-intman-android.adb \
+ s-linux.ads<s-linux-android.ads \
+@@ -1056,13 +1057,9 @@
+ system.ads<system-linux-armel.ads \
+ a-exexpr.adb<a-exexpr-gcc.adb \
+ s-excmac.ads<s-excmac-arm.ads \
+- $(DUMMY_SOCKETS_TARGET_PAIRS)
+-
+- TOOLS_TARGET_PAIRS = \
+- mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+- indepsw.adb<indepsw-gnu.adb
++ a-exexpr.adb<a-exexpr-gcc.adb \
++ s-excmac.ads<s-excmac-arm.ads
+
+- GNATRTL_SOCKETS_OBJS =
+ EXTRA_GNATRTL_TASKING_OBJS=s-linux.o
+ EXTRA_LIBGNAT_OBJS+=raise-gcc.o sigtramp-armdroid.o
+ EXTRA_GNATRTL_NONTASKING_OBJS+=g-cppexc.o s-excmac.o
+@@ -1076,6 +1073,7 @@
+ ifeq ($(strip $(filter-out sparc% sun solaris%,$(target_cpu) $(target_vendor) $(target_os))),)
LIBGNAT_TARGET_PAIRS_COMMON = \
a-intnam.ads<a-intnam-solaris.ads \
+ g-trasym.adb<g-trasym-bsd.adb \
s-inmaop.adb<s-inmaop-posix.adb \
s-intman.adb<s-intman-solaris.adb \
s-mudido.adb<s-mudido-affinity.adb \
-@@ -1205,14 +1206,21 @@
- LIBRARY_VERSION := $(LIB_VERSION)
- endif
+@@ -1118,6 +1116,8 @@
+ TOOLS_TARGET_PAIRS=mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb
-+
-+# FREEBSD i386
- ifeq ($(strip $(filter-out %86 freebsd%,$(arch) $(osys))),)
+ EH_MECHANISM=-gcc
++ EXTRA_LIBGNAT_SRCS+= traceback_symbolic.c
++ EXTRA_LIBGNAT_OBJS+= traceback_symbolic.o
+ THREADSLIB = -lposix4 -lthread
+ MISCLIB = -lposix4 -lnsl -lsocket
+ SO_OPTS = -Wl,-h,
+@@ -1329,12 +1329,17 @@
+ # x86 FreeBSD
+ ifeq ($(strip $(filter-out %86 freebsd%,$(target_cpu) $(target_os))),)
LIBGNAT_TARGET_PAIRS = \
+ a-exetim.adb<a-exetim-posix.adb \
+ a-exetim.ads<a-exetim-default.ads \
@@ -9053,7 +8212,7 @@
s-taprop.adb<s-taprop-posix.adb \
s-taspri.ads<s-taspri-posix.ads \
s-tpopsp.adb<s-tpopsp-posix.adb \
-@@ -1220,10 +1228,11 @@
+@@ -1342,11 +1347,12 @@
$(X86_TARGET_PAIRS) \
system.ads<system-freebsd-x86.ads
@@ -9061,19 +8220,16 @@
- mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb
GNATLIB_SHARED = gnatlib-shared-dual
-+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
++ EXTRA_LIBGNAT_SRCS+= traceback_symbolic.c
++ EXTRA_LIBGNAT_OBJS+= traceback_symbolic.o
+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
-+
+
EH_MECHANISM=-gcc
THREADSLIB= -lpthread
- GMEM_LIB = gmemlib
-@@ -1231,14 +1240,21 @@
- MISCLIB = -lutil
- endif
-
-+
-+# FREEBSD AMD64
- ifeq ($(strip $(filter-out %86_64 freebsd%,$(arch) $(osys))),)
+@@ -1358,12 +1364,17 @@
+ # x86-64 FreeBSD
+ ifeq ($(strip $(filter-out %86_64 freebsd%,$(target_cpu) $(target_os))),)
LIBGNAT_TARGET_PAIRS = \
+ a-exetim.adb<a-exetim-posix.adb \
+ a-exetim.ads<a-exetim-default.ads \
@@ -9091,7 +8247,7 @@
s-taprop.adb<s-taprop-posix.adb \
s-taspri.ads<s-taspri-posix.ads \
s-tpopsp.adb<s-tpopsp-posix.adb \
-@@ -1246,10 +1262,11 @@
+@@ -1371,11 +1382,240 @@
$(X86_64_TARGET_PAIRS) \
system.ads<system-freebsd-x86_64.ads
@@ -9099,19 +8255,20 @@
- mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb
GNATLIB_SHARED = gnatlib-shared-dual
++ EXTRA_LIBGNAT_SRCS+= traceback_symbolic.c
++ EXTRA_LIBGNAT_OBJS+= traceback_symbolic.o
+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
+
- EH_MECHANISM=-gcc
- THREADSLIB= -lpthread
- GMEM_LIB = gmemlib
-@@ -1257,6 +1274,268 @@
- MISCLIB = -lutil
- endif
-
++ EH_MECHANISM=-gcc
++ THREADSLIB= -lpthread
++ GMEM_LIB = gmemlib
++ LIBRARY_VERSION := $(LIB_VERSION)
++ MISCLIB = -lutil
++endif
+
-+# DRAGONFLY i386
-+ifeq ($(strip $(filter-out %86 dragonfly%,$(arch) $(osys))),)
++# x86 DragonFly
++ifeq ($(strip $(filter-out %86 dragonfly%,$(target_cpu) $(target_os))),)
+ LIBGNAT_TARGET_PAIRS = \
+ a-exetim.adb<a-exetim-posix.adb \
+ a-exetim.ads<a-exetim-default.ads \
@@ -9133,6 +8290,8 @@
+
+ GNATLIB_SHARED = gnatlib-shared-dual
+
++ EXTRA_LIBGNAT_SRCS+= traceback_symbolic.c
++ EXTRA_LIBGNAT_OBJS+= traceback_symbolic.o
+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
+
@@ -9143,9 +8302,8 @@
+ MISCLIB = -lutil
+endif
+
-+
-+# DRAGONFLY AMD64
-+ifeq ($(strip $(filter-out x86_64 dragonfly%,$(arch) $(osys))),)
++# x86_64 DragonFly
++ifeq ($(strip $(filter-out x86_64 dragonfly%,$(target_cpu) $(target_os))),)
+ LIBGNAT_TARGET_PAIRS = \
+ a-exetim.adb<a-exetim-posix.adb \
+ a-exetim.ads<a-exetim-default.ads \
@@ -9167,6 +8325,8 @@
+
+ GNATLIB_SHARED = gnatlib-shared-dual
+
++ EXTRA_LIBGNAT_SRCS+= traceback_symbolic.c
++ EXTRA_LIBGNAT_OBJS+= traceback_symbolic.o
+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
+
@@ -9177,9 +8337,8 @@
+ MISCLIB = -lutil
+endif
+
-+
-+# OPENBSD i386
-+ifeq ($(strip $(filter-out %86 openbsd%,$(arch) $(osys))),)
++# x86 OpenBSD
++ifeq ($(strip $(filter-out %86 openbsd%,$(target_cpu) $(target_os))),)
+ LIBGNAT_TARGET_PAIRS = \
+ a-exetim.adb<a-exetim-posix.adb \
+ a-exetim.ads<a-exetim-default.ads \
@@ -9201,6 +8360,8 @@
+
+ GNATLIB_SHARED = gnatlib-shared-dual
+
++ EXTRA_LIBGNAT_SRCS+= traceback_symbolic.c
++ EXTRA_LIBGNAT_OBJS+= traceback_symbolic.o
+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
+
@@ -9211,9 +8372,8 @@
+ MISCLIB = -lutil
+endif
+
-+
-+# OPENBSD AMD64
-+ifeq ($(strip $(filter-out x86_64 openbsd%,$(arch) $(osys))),)
++# x86_64 OpenBSD
++ifeq ($(strip $(filter-out x86_64 openbsd%,$(target_cpu) $(target_os))),)
+ LIBGNAT_TARGET_PAIRS = \
+ a-exetim.adb<a-exetim-posix.adb \
+ a-exetim.ads<a-exetim-default.ads \
@@ -9235,6 +8395,8 @@
+
+ GNATLIB_SHARED = gnatlib-shared-dual
+
++ EXTRA_LIBGNAT_SRCS+= traceback_symbolic.c
++ EXTRA_LIBGNAT_OBJS+= traceback_symbolic.o
+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
+
@@ -9245,9 +8407,8 @@
+ MISCLIB = -lutil
+endif
+
-+
-+# NETBSD i386 (5+ only)
-+ifeq ($(strip $(filter-out %86 netbsd%,$(arch) $(osys))),)
++# x86 NetBSD (5+ only)
++ifeq ($(strip $(filter-out %86 netbsd%,$(target_cpu) $(target_os))),)
+ LIBGNAT_TARGET_PAIRS = \
+ a-exetim.adb<a-exetim-posix.adb \
+ a-exetim.ads<a-exetim-default.ads \
@@ -9265,7 +8426,7 @@
+ $(X86_TARGET_PAIRS) \
+ system.ads<system-netbsd-x86.ads
+
-+ ifeq ($(strip $(filter-out %86 netbsdelf5%,$(arch) $(osys))),)
++ ifeq ($(strip $(filter-out %86 netbsdelf5%,$(target_cpu) $(target_os))),)
+ LIBGNAT_TARGET_PAIRS+= \
+ s-osinte.ads<s-osinte-netbsd.ads \
+ s-osprim.adb<s-osprim-bsd32.adb
@@ -9278,6 +8439,8 @@
+
+ GNATLIB_SHARED = gnatlib-shared-dual
+
++ EXTRA_LIBGNAT_SRCS+= traceback_symbolic.c
++ EXTRA_LIBGNAT_OBJS+= traceback_symbolic.o
+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
+
@@ -9288,9 +8451,8 @@
+ MISCLIB = -lutil
+endif
+
-+
-+# NETBSD AMD64 (5+ only)
-+ifeq ($(strip $(filter-out x86_64 netbsd%,$(arch) $(osys))),)
++# x86_64 NetBSD (5+ only)
++ifeq ($(strip $(filter-out x86_64 netbsd%,$(target_cpu) $(target_os))),)
+ LIBGNAT_TARGET_PAIRS = \
+ a-exetim.adb<a-exetim-posix.adb \
+ a-exetim.ads<a-exetim-default.ads \
@@ -9308,7 +8470,7 @@
+ $(X86_64_TARGET_PAIRS) \
+ system.ads<system-netbsd-x86_64.ads
+
-+ ifeq ($(strip $(filter-out x86_64 netbsd5%,$(arch) $(osys))),)
++ ifeq ($(strip $(filter-out x86_64 netbsd5%,$(target_cpu) $(target_os))),)
+ LIBGNAT_TARGET_PAIRS+= \
+ s-osinte.ads<s-osinte-netbsd.ads \
+ s-osprim.adb<s-osprim-bsd32.adb
@@ -9321,133 +8483,70 @@
+
+ GNATLIB_SHARED = gnatlib-shared-dual
+
-+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
++ EXTRA_LIBGNAT_SRCS+= traceback_symbolic.c
++ EXTRA_LIBGNAT_OBJS+= traceback_symbolic.o
+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
-+
-+ EH_MECHANISM=-gcc
-+ THREADSLIB= -lpthread
-+ GMEM_LIB = gmemlib
-+ LIBRARY_VERSION := $(LIB_VERSION)
-+ MISCLIB = -lutil
-+endif
-+
-+
-+# ANDROID (ARM)
-+ifeq ($(strip $(filter-out arm% android eabi,$(targ))),)
-+ LIBGNAT_TARGET_PAIRS = \
-+ a-intnam.ads<a-intnam-linux.ads \
-+ g-trasym.ads<g-trasym-unimplemented.ads \
-+ g-trasym.adb<g-trasym-unimplemented.adb \
-+ s-inmaop.adb<s-inmaop-posix.adb \
-+ s-intman.adb<s-intman-posix.adb \
-+ s-linux.ads<s-linux.ads \
-+ s-osinte.adb<s-osinte-posix.adb \
-+ s-mudido.adb<s-mudido-affinity.adb \
-+ s-osinte.ads<s-osinte-android.ads \
-+ s-osprim.adb<s-osprim-posix.adb \
-+ s-taprop.adb<s-taprop-linux.adb \
-+ s-tasinf.ads<s-tasinf-linux.ads \
-+ s-tasinf.adb<s-tasinf-linux.adb \
-+ s-taspri.ads<s-taspri-posix-noaltstack.ads \
-+ s-tpopsp.adb<s-tpopsp-posix-foreign.adb
-+
-+ ifeq ($(strip $(filter-out arm%b,$(arch))),)
-+ LIBGNAT_TARGET_PAIRS += \
-+ system.ads<system-linux-armeb.ads
-+ else
-+ LIBGNAT_TARGET_PAIRS += \
-+ system.ads<system-linux-armel.ads
-+ endif
-+
-+ EXTRA_LIBGNAT_SRCS+= signal_android.c
-+ EXTRA_LIBGNAT_OBJS+= signal_android.o
-+ EXTRA_GNATRTL_TASKING_OBJS= s-linux.o
-+ EH_MECHANISM=
-+ THREADSLIB=
-+ MISCLIB=
-+ GNATLIB_SHARED= gnatlib-shared-dual
-+ GMEM_LIB= gmemlib
-+ LIBRARY_VERSION:= $(LIB_VERSION)
-+endif
-+
-+
- ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
- LIBGNAT_TARGET_PAIRS_COMMON = \
- a-intnam.ads<a-intnam-linux.ads \
---- gnattools/configure.orig
-+++ gnattools/configure
-@@ -2058,7 +2058,27 @@
- s390*-*-linux*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb"
+
+ EH_MECHANISM=-gcc
+ THREADSLIB= -lpthread
+--- gnattools/configure.ac.orig
++++ gnattools/configure.ac
+@@ -79,11 +79,27 @@
+ mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb \
+ indepsw.adb<indepsw-darwin.adb"
;;
-- *86-*-freebsd*)
-+ *86-*-freebsd* | x86_64-*-freebsd*)
++ *-*-dragonfly*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+ indepsw.adb<indepsw-gnu.adb"
+ ;;
-+ *86-*-dragonfly* | x86_64-*-dragonfly*)
+ *-*-freebsd*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+ indepsw.adb<indepsw-gnu.adb"
+ ;;
++ *-*-netbsd*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+ indepsw.adb<indepsw-gnu.adb"
+ ;;
-+ *86-*-openbsd* | x86_64-*-openbsd*)
++ *-*-openbsd*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+ indepsw.adb<indepsw-gnu.adb"
+ ;;
-+ *86-*-netbsdelf* | x86_64-*-netbsd*)
++ # Next line covers arm*-*-linux-androideabi
+ *-*-linux*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+--- gnattools/configure.orig
++++ gnattools/configure
+@@ -2039,11 +2039,27 @@
+ mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb \
+ indepsw.adb<indepsw-darwin.adb"
+ ;;
++ *-*-dragonfly*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+ indepsw.adb<indepsw-gnu.adb"
+ ;;
-+ arm*-android-eabi)
- TOOLS_TARGET_PAIRS="\
- mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
- indepsw.adb<indepsw-gnu.adb"
---- gnattools/configure.ac.orig
-+++ gnattools/configure.ac
-@@ -98,11 +98,31 @@
- s390*-*-linux*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb"
- ;;
-- *86-*-freebsd*)
-+ *86-*-freebsd* | x86_64-*-freebsd*)
+ *-*-freebsd*)
TOOLS_TARGET_PAIRS="\
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
indepsw.adb<indepsw-gnu.adb"
;;
-+ *86-*-dragonfly* | x86_64-*-dragonfly*)
++ *-*-netbsd*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+ indepsw.adb<indepsw-gnu.adb"
+ ;;
-+ *86-*-openbsd* | x86_64-*-openbsd*)
++ *-*-openbsd*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+ indepsw.adb<indepsw-gnu.adb"
+ ;;
-+ *86-*-netbsdelf* | x86_64-*-netbsd*)
-+ TOOLS_TARGET_PAIRS="\
-+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
-+ indepsw.adb<indepsw-gnu.adb"
-+ ;;
-+ arm*-android-eabi)
-+ TOOLS_TARGET_PAIRS="\
-+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
-+ indepsw.adb<indepsw-gnu.adb"
-+ ;;
- mips-sgi-irix*)
- TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-irix.adb"
- ;;
---- gcc/ada/gcc-interface/Make-lang.in.orig
-+++ gcc/ada/gcc-interface/Make-lang.in
-@@ -541,7 +541,7 @@
- ada/widechar.o
-
- # Language-independent object files.
--ADA_BACKEND = $(BACKEND) attribs.o
-+ADA_BACKEND = $(BACKEND2) attribs.o
-
- # List of target dependent sources, overridden below as necessary
- TARGET_ADA_SRCS =
++ # Next line covers arm*-*-linux-androideabi
+ *-*-linux*)
+ TOOLS_TARGET_PAIRS="\
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
diff --git a/lang/gcc-aux/files/diff-ada-testsuite b/lang/gcc-aux/files/diff-ada-testsuite
index 1ef31b75e77..c94e9a3e576 100644
--- a/lang/gcc-aux/files/diff-ada-testsuite
+++ b/lang/gcc-aux/files/diff-ada-testsuite
@@ -70,7 +70,7 @@
counti=0
@@ -233,10 +249,13 @@
if [ $? -eq 0 ]; then
- extraflags="$extraflags -gnat95"
+ extraflags="$extraflags -fstack-check"
fi
+ inform $countdown $i
+ countdown=`expr $countdown - 1`
@@ -109,11 +109,426 @@
egrep -e '(==== |\+\+\+\+ |\!\!\!\! )' ${i}.log > /dev/null 2>&1
if [ $? -ne 0 ]; then
grep 'tasking not implemented' ${i}.log > /dev/null 2>&1
+--- /dev/null
++++ gcc/testsuite/ada/acats/run_remote.sh
+@@ -0,0 +1,412 @@
++#!/bin/sh
++# Run ACATS with the GNU Ada compiler
++
++# The following functions are to be customized if you run in cross
++# environment or want to change compilation flags. Note that for
++# tests requiring checks not turned on by default, this script
++# automatically adds the needed flags to pass (ie: -gnato or -gnatE).
++
++# gccflags="-O3 -fomit-frame-pointer -funroll-all-loops -finline-functions"
++# gnatflags="-gnatN"
++
++gccflags="-O2"
++gnatflags="-gnatws"
++tabtarget="/data/local/testsuite"
++STRIP="arm-aux-linux-androideabi-strip"
++
++target_run () {
++ # Run on rooted tablet (port 22 vs port 2222)
++ BN=`basename $*`
++ $STRIP_FOR_TARGET $*
++ /usr/bin/scp -qp $* root@tablet:$tabtarget/
++ /usr/bin/ssh -q tablet $tabtarget/$BN
++}
++
++target_cmd () {
++ /usr/bin/ssh -q tablet "$1"
++}
++
++# End of customization section.
++
++display_noeol () {
++ printf "$@"
++ printf "$@" >> $dir/acats.sum
++ printf "$@" >> $dir/acats.log
++}
++
++display () {
++ echo "$@"
++ echo "$@" >> $dir/acats.sum
++ echo "$@" >> $dir/acats.log
++}
++
++log () {
++ echo "$@" >> $dir/acats.sum
++ echo "$@" >> $dir/acats.log
++}
++
++inform () {
++ printf "%04d %7s" $1 $2
++}
++
++disinform () {
++ printf "\r"
++}
++
++dir=`${PWDCMD-pwd}`
++
++if [ "$testdir" = "" ]; then
++ echo You must use make check or make check-ada
++ exit 1
++fi
++
++if [ "$dir" = "$testdir" ]; then
++ echo "error: srcdir must be different than objdir, exiting."
++ exit 1
++fi
++
++target_gnatmake () {
++ echo gnatmake-cross --GCC=\"$GCC\" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC=\"$GCC\"
++ gnatmake-cross --GCC="$GCC" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC="$GCC"
++}
++
++target_gcc () {
++ $GCC $gccflags $*
++}
++
++clean_dir () {
++ rm -f "$binmain" *.o *.ali > /dev/null 2>&1
++}
++
++find_main () {
++ ls ${i}?.adb > ${i}.lst 2> /dev/null
++ ls ${i}*m.adb >> ${i}.lst 2> /dev/null
++ ls ${i}.adb >> ${i}.lst 2> /dev/null
++ main=`tail -1 ${i}.lst`
++}
++
++split_testid () {
++ local mysplit=`echo $1 | awk -F/ '{print "section=" $1 "; TN=" $2 "; prog=" $3 ";"}'`
++ eval ${mysplit}
++}
++
++EXTERNAL_OBJECTS=""
++# Global variable to communicate external objects to link with.
++
++rm -f $dir/acats.sum $dir/acats.log $dir/transfer.lst
++
++display "Test Run By $USER on `date`"
++
++display " === acats configuration ==="
++
++target=`$GCC -dumpmachine`
++
++display target gcc is $GCC
++display `$GCC -v 2>&1`
++display host=`gcc -dumpmachine`
++display target=$target
++display `type gnatmake-cross`
++gnatls-cross -v >> $dir/acats.log
++display ""
++
++# Let's be tidy and clear off the remote device first
++target_cmd "cd ${tabtarget}; rm logs/*; rmdir logs; rm *"
++
++display " === acats support ==="
++display_noeol "Generating support files..."
++
++rm -rf $dir/support
++mkdir -p $dir/support
++cd $dir/support
++
++cp $testdir/support/*.ada $testdir/support/*.a $testdir/support/*.tst $dir/support
++
++# Find out the size in bit of an address on the target
++target_gnatmake $testdir/support/impbit.adb >> $dir/acats.log 2>&1
++target_run $dir/support/impbit > $dir/support/impbit.out 2>&1
++target_bit=`cat $dir/support/impbit.out`
++echo target_bit="$target_bit" >> $dir/acats.log
++
++# Find out a suitable asm statement
++# Adapted from configure.ac gcc_cv_as_dwarf2_debug_line
++case "$target" in
++ ia64*-*-* | s390*-*-*)
++ target_insn="nop 0"
++ ;;
++ mmix-*-*)
++ target_insn="swym 0"
++ ;;
++ *)
++ target_insn="nop"
++ ;;
++esac
++echo target_insn="$target_insn" >> $dir/acats.log
++
++sed -e "s,ACATS4GNATDIR,$dir,g" \
++ < $testdir/support/impdef.a > $dir/support/impdef.a
++sed -e "s,ACATS4GNATDIR,$dir,g" \
++ -e "s,ACATS4GNATBIT,$target_bit,g" \
++ -e "s,ACATS4GNATINSN,$target_insn,g" \
++ < $testdir/support/macro.dfs > $dir/support/MACRO.DFS
++sed -e "s,ACATS4GNATDIR,$dir,g" \
++ < $testdir/support/tsttests.dat > $dir/support/TSTTESTS.DAT
++
++cp $testdir/tests/cd/*.c $dir/support
++cp $testdir/tests/cxb/*.c $dir/support
++grep -v '^#' $testdir/norun.lst | sort > $dir/support/norun.lst
++
++rm -rf $dir/run
++mv $dir/tests $dir/tests.$$ 2> /dev/null
++rm -rf $dir/tests.$$ &
++mkdir -p $dir/run
++
++cp -pr $testdir/tests $dir/
++
++for i in $dir/support/*.ada $dir/support/*.a; do
++ host_gnatchop $i >> $dir/acats.log 2>&1
++done
++
++# These tools are used to preprocess some ACATS sources
++# they need to be compiled native on the host.
++
++host_gnatmake -q -gnatws macrosub.adb
++if [ $? -ne 0 ]; then
++ display "**** Failed to compile macrosub"
++ exit 1
++fi
++./macrosub > macrosub.out 2>&1
++
++gcc -c cd300051.c
++host_gnatmake -q -gnatws widechr.adb
++if [ $? -ne 0 ]; then
++ display "**** Failed to compile widechr"
++ exit 1
++fi
++./widechr > widechr.out 2>&1
++
++rm -f $dir/support/macrosub
++rm -f $dir/support/widechr
++rm -f $dir/support/*.ali
++rm -f $dir/support/*.o
++
++display " done."
++
++# From here, all compilations will be made by the target compiler
++
++display_noeol "Compiling support files..."
++
++target_gcc -c *.c
++if [ $? -ne 0 ]; then
++ display "**** Failed to compile C code"
++ exit 1
++fi
++
++host_gnatchop *.adt >> $dir/acats.log 2>&1
++
++target_gnatmake -c -gnato -gnatE *.ads >> $dir/acats.log 2>&1
++target_gnatmake -c -gnato -gnatE *.adb >> $dir/acats.log 2>&1
++
++display " done."
++display ""
++display " === acats tests ==="
++
++if [ $# -eq 0 ]; then
++ chapters=`cd $dir/tests; echo [a-z]*`
++else
++ chapters=$*
++fi
++
++glob_countn=0
++glob_countok=0
++glob_countu=0
++countdown=0
++
++for chapter in $chapters; do
++ if [ -d $dir/tests/$chapter ]; then
++ cd $dir/tests/$chapter
++ ls *.a *.ada *.adt *.am *.dep 2> /dev/null | sed -e 's/\(.*\)\..*/\1/g' | \
++ cut -c1-7 | sort | uniq | comm -23 - $dir/support/norun.lst \
++ > $dir/tests/$chapter/${chapter}.lst
++ countn=`wc -l < $dir/tests/$chapter/${chapter}.lst`
++ countdown=`expr $countdown + $countn`
++ fi
++done
++
++cat > $dir/execute.sh << EOF
++inform () {
++ printf "left: %04d" \$1
++}
++disinform () {
++ printf "\r"
++}
++cycle () {
++ local countx=0
++ local total=\$(echo \$testlist | awk '{print NF}')
++ mkdir -p logs
++ echo "Executing \$total tests on remote device"
++ inform \$total
++ for x in \$testlist; do
++ timeout -t 30 ./\${x} > logs/\${x}.log 2>&1
++ countx=\$(expr \$countx + 1)
++ if [ \$countx -eq 25 ]; then
++ total=\$(expr \$total - 25)
++ countx=0
++ disinform
++ inform \$total
++ fi
++ done
++ disinform
++ tar -czf remote.logs.tar.gz logs
++}
++testlist=" \\
++EOF
++
++display "All tests are being cross-compiled without execution first."
++
++for chapter in $chapters; do
++ if [ ! -d $dir/tests/$chapter ]; then
++ continue
++ fi
++
++ countn=`wc -l < $dir/tests/$chapter/${chapter}.lst`
++ glob_countn=`expr $glob_countn + $countn`
++ counti=0
++ for i in `cat $dir/tests/$chapter/${chapter}.lst`; do
++ counti=`expr $counti + 1`
++ extraflags="-gnat95"
++ grep $i $testdir/overflow.lst > /dev/null 2>&1
++ if [ $? -eq 0 ]; then
++ extraflags="$extraflags -gnato"
++ fi
++ grep $i $testdir/elabd.lst > /dev/null 2>&1
++ if [ $? -eq 0 ]; then
++ extraflags="$extraflags -gnatE"
++ fi
++ grep $i $testdir/floatstore.lst > /dev/null 2>&1
++ if [ $? -eq 0 ]; then
++ extraflags="$extraflags -ffloat-store"
++ fi
++ grep $i $testdir/stackcheck.lst > /dev/null 2>&1
++ if [ $? -eq 0 ]; then
++ extraflags="$extraflags -fstack-check"
++ fi
++ inform $countdown $i
++ countdown=`expr $countdown - 1`
++ test=$dir/tests/$chapter/$i
++ mkdir $test && cd $test >> $dir/acats.log 2>&1
++
++ if [ $? -ne 0 ]; then
++ disinform
++ display "FAIL: $i"
++ failed="${failed}${i} "
++ clean_dir
++ continue
++ fi
++
++ host_gnatchop -c -w `ls ${test}*.a ${test}*.ada ${test}*.adt ${test}*.am ${test}*.dep 2> /dev/null` >> $dir/acats.log 2>&1
++ find_main
++ if [ -z "$main" ]; then
++ sync
++ find_main
++ fi
++ binmain=`echo $main | sed -e 's/\(.*\)\..*/\1/g'`
++ echo "BUILD $main" >> $dir/acats.log
++ EXTERNAL_OBJECTS=""
++ case $i in
++ cxb30*) EXTERNAL_OBJECTS="$dir/support/cxb30040.o $dir/support/cxb30060.o $dir/support/cxb30130.o $dir/support/cxb30131.o";;
++ ca1020e) rm -f ca1020e_func1.adb ca1020e_func2.adb ca1020e_proc1.adb ca1020e_proc2.adb > /dev/null 2>&1;;
++ ca14028) rm -f ca14028_func2.ads ca14028_func3.ads ca14028_proc1.ads ca14028_proc3.ads > /dev/null 2>&1;;
++ cxh1001) extraflags="-a -f"; echo "pragma Normalize_Scalars;" > gnat.adc
++ esac
++ if [ "$main" = "" ]; then
++ disinform
++ display "FAIL: $i"
++ failed="${failed}${i} "
++ clean_dir
++ continue
++ fi
++
++ target_gnatmake $extraflags -I$dir/support $main >> $dir/acats.log 2>&1
++ if [ $? -ne 0 ]; then
++ disinform
++ display "FAIL: $i"
++ failed="${failed}${i} "
++ clean_dir
++ continue
++ fi
++ echo $chapter/$i/$binmain >> $dir/transfer.lst
++ echo "$binmain \\" >> $dir/execute.sh
++ $STRIP $binmain
++ disinform
++ done
++done
++echo '"' >> $dir/execute.sh
++echo "cycle" >> $dir/execute.sh
++
++sync
++display "Transfer files to remote device: root@tablet:$tabtarget/"
++cd $dir/tests
++cat $dir/transfer.lst | xargs tar --strip-components=2 -czf - | \
++ target_cmd "tar -C $tabtarget -xzf -"
++cd $dir
++tar -czf - execute.sh | target_cmd "tar -C $tabtarget -xzf -"
++target_cmd "cd $tabtarget; sh execute.sh"
++rm -rf $dir/logs $dir/remote.logs.tar.gz
++/usr/bin/scp -q root@tablet:$tabtarget/remote.logs.tar.gz $dir/
++tar -xzf $dir/remote.logs.tar.gz
++
++countdown=`wc -l < $dir/transfer.lst`
++glob_countn=${countdown}
++for i in `cat $dir/transfer.lst`; do
++ split_testid $i
++ if [ "$section" != "$savedsect" ]; then
++ display Running chapter $section ...
++ fi
++ savedsect=$section
++
++ #inform $countdown $TN
++ countdown=`expr $countdown - 1`
++ proglog="$dir/logs/${prog}.log"
++ echo "RUN $prog" >> $dir/acats.log
++ if [ ! -f $proglog ]; then
++ echo "LOG NOT FOUND!" >> $proglog
++ fi
++
++ cat $proglog >> $dir/acats.log
++
++ egrep -e '(==== |\+\+\+\+ |\!\!\!\! )' $proglog > /dev/null 2>&1
++ if [ $? -ne 0 ]; then
++ grep 'tasking not implemented' $proglog > /dev/null 2>&1
++
++ if [ $? -ne 0 ]; then
++ display "FAIL: ${TN}"
++ failed="${failed}${TN} "
++ else
++ log "UNSUPPORTED: ${TN}"
++ glob_countn=`expr $glob_countn - 1`
++ glob_countu=`expr $glob_countu + 1`
++ fi
++ else
++ log "PASS: ${TN}"
++ glob_countok=`expr $glob_countok + 1`
++ fi
++ cd $dir/tests/$section/$TN
++ clean_dir
++ #disinform
++done
++
++display " === acats Summary ==="
++display "# of expected passes $glob_countok"
++display "# of unexpected failures `expr $glob_countn - $glob_countok`"
++
++if [ $glob_countu -ne 0 ]; then
++ display "# of unsupported tests $glob_countu"
++fi
++
++if [ $glob_countok -ne $glob_countn ]; then
++ display "*** FAILURES: $failed"
++fi
++
++display "$0 completed at `date`"
++
++exit 0
--- gcc/testsuite/gnat.dg/test_raise_from_pure.adb.orig
+++ gcc/testsuite/gnat.dg/test_raise_from_pure.adb
@@ -1,4 +1,4 @@
---- { dg-do run { xfail arm*-*-* } }
-+-- { dg-do run { xfail arm*-*-* *-*-openbsd* } }
+--- { dg-do run }
++-- { dg-do run { xfail *-*-openbsd* } }
-- { dg-options "-O2" }
-- This is an optimization test and its failure is only a missed optimization.
diff --git a/lang/gcc-aux/files/diff-core b/lang/gcc-aux/files/diff-core
index 10c21d7ba5d..4a8f1d90dbf 100644
--- a/lang/gcc-aux/files/diff-core
+++ b/lang/gcc-aux/files/diff-core
@@ -1,143 +1,3 @@
---- gcc/DEV-PHASE.orig
-+++ gcc/DEV-PHASE
-@@ -0,0 +1 @@
-+release
---- gcc/config.gcc.orig
-+++ gcc/config.gcc
-@@ -581,6 +581,9 @@
- "" | yes | posix)
- thread_file='posix'
- ;;
-+ gnat | single)
-+ # Let these non-posix thread selections fall through if requested
-+ ;;
- *)
- echo 'Unknown thread configuration for FreeBSD'
- exit 1
-@@ -597,6 +600,26 @@
- # need_64bit_hwint=yes # system compiler has this for all arch!
- use_gcc_stdint=wrap
- ;;
-+*-*-dragonfly*)
-+ gas=yes
-+ gnu_ld=yes
-+ tmake_file="t-slibgcc"
-+ case ${enable_threads} in
-+ "" | yes | posix)
-+ thread_file='posix'
-+ ;;
-+ no | gnat | single)
-+ # Let these non-posix thread selections fall through if requested
-+ ;;
-+ *)
-+ echo 'Unknown thread configuration for DragonFly BSD'
-+ exit 1
-+ ;;
-+ esac
-+ extra_options="$extra_options rpath.opt dragonfly.opt"
-+ default_use_cxa_atexit=yes
-+ use_gcc_stdint=wrap
-+ ;;
- *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
- extra_options="$extra_options gnu-user.opt"
- gas=yes
-@@ -652,6 +675,7 @@
- esac
- ;;
- *-*-netbsd*)
-+ use_gcc_stdint=wrap
- tmake_file="t-slibgcc"
- gas=yes
- gnu_ld=yes
-@@ -903,7 +927,32 @@
- tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h newlib-stdint.h"
- tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
- ;;
--arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
-+arm*-android-eabi*)
-+ gas=yes
-+ gnu_ld=yes
-+ case ${enable_threads} in
-+ "" | yes | posix) thread_file='posix' ;;
-+ esac
-+ tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h"
-+ tm_file="$tm_file arm/elf.h arm/linux-gas.h arm/linux-elf.h arm/bpabi.h arm/linux-eabi.h"
-+ tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h arm/aout.h arm/arm.h"
-+
-+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_BIONIC ANDROID_DEFAULT=1"
-+ case $target in
-+ arm*b-*)
-+ tm_defines="$tm_defines TARGET_BIG_ENDIAN_DEFAULT=1"
-+ ;;
-+ esac
-+ extra_options="$extra_options linux.opt linux-android.opt"
-+ default_use_cxa_atexit=yes
-+ use_gcc_tgmath=no
-+ use_gcc_stdint=wrap
-+
-+ # The BPABI long long divmod functions return a 128-bit value in registers r0-r3.
-+ # Correctly modeling that requires the use of TImode.
-+ need_64bit_hwint=yes
-+ ;;
-+arm*-*-symbianelf* | arm*-*-rtems*)
- # The BPABI long long divmod functions return a 128-bit value in
- # registers r0-r3. Correctly modeling that requires the use of
- # TImode.
-@@ -912,11 +961,6 @@
- tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
- tmake_file="arm/t-arm arm/t-arm-elf"
- case ${target} in
-- arm*-*-eabi*)
-- tm_file="$tm_file newlib-stdint.h"
-- tmake_file="${tmake_file} arm/t-bpabi"
-- use_gcc_stdint=wrap
-- ;;
- arm*-*-rtems*)
- tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"
- tmake_file="${tmake_file} arm/t-bpabi t-rtems arm/t-rtems-eabi"
-@@ -1216,19 +1260,31 @@
- x86_64-*-elf*)
- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h"
- ;;
-+i[34567]86-*-dragonfly*)
-+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h dragonfly.h dragonfly-stdint.h i386/dragonfly.h"
-+ tmake_file="${tmake_file} i386/t-crtstuff"
-+ ;;
-+x86_64-*-dragonfly*)
-+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h dragonfly.h dragonfly-stdint.h i386/x86-64.h i386/dragonfly.h"
-+ tmake_file="${tmake_file} i386/t-crtstuff"
-+ ;;
- i[34567]86-*-freebsd*)
- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
-+ tmake_file="${tmake_file} i386/t-crtstuff"
- ;;
- x86_64-*-freebsd*)
- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
-+ tmake_file="${tmake_file} i386/t-crtstuff"
- ;;
- i[34567]86-*-netbsdelf*)
-- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
-+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h netbsd-stdint.h"
- extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
-+ tmake_file="${tmake_file} i386/t-crtstuff"
- ;;
- x86_64-*-netbsd*)
-- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
-+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h netbsd-stdint.h"
- extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
-+ tmake_file="${tmake_file} i386/t-crtstuff"
- ;;
- i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
- tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
-@@ -3577,6 +3633,8 @@
- ;;
- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
- ;;
-+ i[34567]86-*-dragonfly* | x86_64-*-dragonfly*)
-+ ;;
- i[34567]86-*-freebsd* | x86_64-*-freebsd*)
- ;;
- ia64*-*-linux*)
--- /dev/null
+++ gcc/config/dragonfly-stdint.h
@@ -0,0 +1,56 @@
@@ -288,7 +148,7 @@
+ } \
+ %{static:-Bstatic} \
+ } \
-+ %{!static:--hash-style=both -rpath @PREFIX@/gcc-aux/lib} \
++ %{!static:--hash-style=gnu -rpath @PREFIX@/gcc-aux/lib} \
+ %{symbolic:-Bsymbolic}"
+
+#undef LINK_SPEC
@@ -573,20 +433,22 @@
+
--- gcc/config/i386/freebsd.h.orig
+++ gcc/config/i386/freebsd.h
-@@ -91,6 +91,12 @@
+@@ -90,6 +90,14 @@
When the -shared link option is used a final link is not being
done. */
+#if FBSD_MAJOR < 9
+#define ELF_HASH_STYLE ""
-+#else
++#elif FBSD_MAJOR < 10
+#define ELF_HASH_STYLE "--hash-style=both "
++#else
++#define ELF_HASH_STYLE "--hash-style=gnu "
+#endif
+
#undef LINK_SPEC
#define LINK_SPEC "\
%{p:%nconsider using '-pg' instead of '-p' with gprof(1)} \
-@@ -102,6 +108,7 @@
+@@ -101,6 +109,7 @@
%{rdynamic:-export-dynamic} \
-dynamic-linker %(fbsd_dynamic_linker) } \
%{static:-Bstatic}} \
@@ -594,7 +456,7 @@
%{symbolic:-Bsymbolic}"
/* A C statement to output to the stdio stream FILE an assembler
-@@ -148,3 +155,5 @@
+@@ -147,3 +156,5 @@
#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
@@ -645,7 +507,7 @@
+#endif
--- gcc/ginclude/stddef.h.orig
+++ gcc/ginclude/stddef.h
-@@ -53,12 +53,21 @@
+@@ -50,12 +50,21 @@
one less case to deal with in the following. */
#if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__)
#include <machine/ansi.h>
@@ -667,7 +529,7 @@
/* In 4.3bsd-net2, machine/ansi.h defines these symbols, which are
defined if the corresponding type is *not* defined.
FreeBSD-2.1 defines _MACHINE_ANSI_H_ instead of _ANSI_H_.
-@@ -136,6 +145,7 @@
+@@ -133,6 +142,7 @@
#ifndef _BSD_PTRDIFF_T_
#ifndef ___int_ptrdiff_t_h
#ifndef _GCC_PTRDIFF_T
@@ -675,7 +537,7 @@
#define _PTRDIFF_T
#define _T_PTRDIFF_
#define _T_PTRDIFF
-@@ -144,10 +154,12 @@
+@@ -141,10 +151,12 @@
#define _BSD_PTRDIFF_T_
#define ___int_ptrdiff_t_h
#define _GCC_PTRDIFF_T
@@ -688,15 +550,15 @@
#endif /* _GCC_PTRDIFF_T */
#endif /* ___int_ptrdiff_t_h */
#endif /* _BSD_PTRDIFF_T_ */
-@@ -201,6 +213,7 @@
+@@ -198,6 +210,7 @@
#define _GCC_SIZE_T
#define _SIZET_
#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+ || defined(__DragonFly__) \
|| defined(__FreeBSD_kernel__)
/* __size_t is a typedef on FreeBSD 5, must not trash it. */
- #else
-@@ -307,7 +320,7 @@
+ #elif defined (__VMS__)
+@@ -306,7 +319,7 @@
/* FreeBSD 5 can't be handled well using "traditional" logic above
since it no longer defines _BSD_RUNE_T_ yet still desires to export
rune_t in some cases... */
@@ -722,107 +584,12 @@
+ || defined (__CYGWIN32__) \
+ || defined (__MINGW32__) \
+ || defined (HAVE_DECL_BASENAME)
- extern char *basename (const char *);
+ extern char *basename (const char *) ATTRIBUTE_RETURNS_NONNULL ATTRIBUTE_NONNULL(1);
#else
/* Do not allow basename to be used if there is no prototype seen. We
---- libgcc/config.host.orig
-+++ libgcc/config.host
-@@ -174,6 +174,17 @@
- tmake_file="$tmake_file t-darwin ${cpu_type}/t-darwin t-libgcc-pic t-slibgcc-darwin"
- extra_parts="crt3.o crttms.o crttme.o"
- ;;
-+arm*-android-eabi*)
-+ tmake_file="t-slibgcc-elf-ver t-linux arm/t-arm"
-+ tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
-+ tmake_file="$tmake_file arm/t-linux-androideabi arm/t-arm-softfp soft-fp/t-softfp"
-+ extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-+ ;;
-+*-*-dragonfly*)
-+ tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip"
-+ tmake_file="$tmake_file t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
-+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+ ;;
- *-*-freebsd*)
- # This is the generic ELF configuration of FreeBSD. Later
- # machine-specific sections may refine and add to this
-@@ -202,7 +213,8 @@
- extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
- ;;
- *-*-netbsd*)
-- tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
-+ tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip"
-+ tmake_file="$tmake_file t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
- # NetBSD 1.7 and later are set up to use GCC's crtstuff for
- # ELF configurations. We will clear extra_parts in the
- # a.out configurations.
-@@ -266,8 +278,10 @@
- esac
-
- case ${host} in
--*-*-darwin* | *-*-freebsd* | *-*-netbsd* | *-*-openbsd* | *-*-solaris2* | \
-- alpha*-dec-osf5.1*)
-+*-*-freebsd* | *-*-dragonfly* | *-*-netbsd* | *-*-openbsd*)
-+ enable_execute_stack=enable-execute-stack-freebsd.c
-+ ;;
-+*-*-darwin* | *-*-solaris2* | alpha*-dec-osf5.1*)
- enable_execute_stack=enable-execute-stack-mprotect.c
- ;;
- i[34567]86-*-mingw* | x86_64-*-mingw*)
-@@ -358,11 +372,11 @@
- tmake_file="$tmake_file arm/t-arm arm/t-elf t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp"
- extra_parts="$extra_parts crti.o crtn.o"
- ;;
--arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
-+arm*-*-symbianelf* | arm*-*-rtems*)
- tmake_file="${tmake_file} arm/t-arm arm/t-elf t-fixedpoint-gnu-prefix"
- tm_file="$tm_file arm/bpabi-lib.h"
- case ${host} in
-- arm*-*-eabi* | arm*-*-rtems*)
-+ arm*-*-rtems*)
- tmake_file="${tmake_file} arm/t-bpabi"
- extra_parts="crtbegin.o crtend.o crti.o crtn.o"
- ;;
-@@ -526,16 +540,29 @@
- x86_64-*-elf*)
- tmake_file="$tmake_file i386/t-crtstuff t-crtstuff-pic t-libgcc-pic"
- ;;
-+i[34567]86-*-dragonfly*)
-+ tmake_file="${tmake_file} i386/t-dragonfly i386/t-crtstuff"
-+ md_unwind_header=i386/dragonfly-unwind.h
-+ ;;
-+x86_64-*-dragonfly*)
-+ tmake_file="${tmake_file} i386/t-dragonfly i386/t-crtstuff"
-+ md_unwind_header=i386/dragonfly-unwind.h
-+ ;;
- i[34567]86-*-freebsd*)
- tmake_file="${tmake_file} i386/t-freebsd i386/t-crtstuff"
-+ md_unwind_header=i386/freebsd-unwind.h
- ;;
- x86_64-*-freebsd*)
- tmake_file="${tmake_file} i386/t-freebsd i386/t-crtstuff"
-+ md_unwind_header=i386/freebsd-unwind.h
- ;;
- i[34567]86-*-netbsdelf*)
-+ tmake_file="${tmake_file} i386/t-crtstuff"
-+ md_unwind_header=i386/netbsd-unwind.h
- ;;
- x86_64-*-netbsd*)
- tmake_file="${tmake_file} i386/t-crtstuff"
-+ md_unwind_header=i386/netbsd-unwind.h
- ;;
- i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
- ;;
-@@ -1167,6 +1194,7 @@
- i[34567]86-*-gnu* | \
- i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]* | \
- i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw* | \
-+ i[34567]86-*-dragonfly* | x86_64-*-dragonfly* | \
- i[34567]86-*-freebsd* | x86_64-*-freebsd*)
- tmake_file="${tmake_file} t-softfp-tf"
- if test "${host_address}" = 32; then
--- libgcc/crtstuff.c.orig
+++ libgcc/crtstuff.c
-@@ -81,11 +81,19 @@
+@@ -79,11 +79,19 @@
}
#endif
@@ -906,7 +673,7 @@
+}
--- libgcc/unwind-dw2-fde-dip.c.orig
+++ libgcc/unwind-dw2-fde-dip.c
-@@ -54,11 +54,19 @@
+@@ -58,11 +58,19 @@
#endif
#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
@@ -1090,12 +857,13 @@
+#endif /* ifdef __x86_64__ */
--- /dev/null
+++ libgcc/config/i386/freebsd-unwind.h
-@@ -0,0 +1,179 @@
+@@ -0,0 +1,198 @@
+/* DWARF2 EH unwinding support for FreeBSD: AMD x86-64 and x86.
-+ Copyright (C) 2010, 2012 John Marino <draco@marino.st>
-+
-+/* Do code reading to identify a signal frame, and set the frame
-+ state data appropriately. See unwind-dw2.c for the structs. */
++ * Copyright (C) 2010, 2012, 2014 John Marino <draco@marino.st>
++ *
++ * Do code reading to identify a signal frame, and set the frame
++ * state data appropriately. See unwind-dw2.c for the structs.
++ */
+
+#include <sys/types.h>
+#include <signal.h>
@@ -1131,12 +899,13 @@
+x86_64_freebsd_fallback_frame_state
+(struct _Unwind_Context *context, _Unwind_FrameState *fs)
+{
-+ unsigned char *pc = context->ra;
-+ unsigned char *sigtramp_start, *sigtramp_end;
+ struct sigframe *sf;
+ long new_cfa;
+
+#if (__FreeBSD__ < 9)
++ unsigned char *pc = context->ra;
++ unsigned char *sigtramp_start, *sigtramp_end;
++
+ x86_64_sigtramp_range(&sigtramp_start, &sigtramp_end);
+ if (pc >= sigtramp_end || pc < sigtramp_start)
+ return _URC_END_OF_STACK;
@@ -1210,6 +979,12 @@
+
+#define MD_FALLBACK_FRAME_STATE_FOR x86_freebsd_fallback_frame_state
+
++/*
++ * We can't use KERN_PS_STRINGS anymore if we want to support FreeBSD32
++ * compat on AMD64. The sigtramp is in a shared page in that case so the
++ * x86_sigtramp_range only works on a true i386 system. We have to
++ * search for the sigtramp frame if we want it working everywhere.
++
+#include <sys/sysctl.h>
+static void
+x86_sigtramp_range (unsigned char **start, unsigned char **end)
@@ -1226,20 +1001,31 @@
+ *start = (unsigned char *)ps_strings - 128;
+ *end = (unsigned char *)ps_strings;
+}
++*/
+
+
+static _Unwind_Reason_Code
+x86_freebsd_fallback_frame_state
+(struct _Unwind_Context *context, _Unwind_FrameState *fs)
+{
-+ unsigned char *pc = context->ra;
-+ unsigned char *sigtramp_start, *sigtramp_end;
+ struct sigframe *sf;
+ long new_cfa;
+
-+ x86_sigtramp_range(&sigtramp_start, &sigtramp_end);
++/*
++ * i386 sigtramp frame we are looking for follows.
++ * Apparently PSL_VM is variable, so we can't look past context->ra + 4
++ * <sigcode>:
++ * 0: ff 54 24 10 call *0x10(%esp) *SIGF_HANDLER
++ * 4: 8d 44 24 20 lea 0x20(%esp),%eax SIGF_UC
++ * 8: 50 push %eax
++ * 9: f7 40 54 00 00 02 00 testl $0x20000,0x54(%eax) $PSL_VM
++ * 10: 75 03 jne 15 <sigcode+0x15>
++ * 12: 8e 68 14 mov 0x14(%eax),%gs UC_GS
++ * 15: b8 a1 01 00 00 mov 0x1a1,%eax $SYS_sigreturn
++ */
+
-+ if (pc >= sigtramp_end || pc < sigtramp_start)
++ if (!( *(unsigned int *)(context->ra - 4) == 0x102454ff
++ && *(unsigned int *)(context->ra) == 0x2024448d ))
+ return _URC_END_OF_STACK;
+
+ sf = (struct sigframe *) context->cfa;
@@ -1471,9 +1257,87 @@
#endif
+#endif
}
+--- gcc/config.gcc.orig
++++ gcc/config.gcc
+@@ -687,6 +687,26 @@
+ # need_64bit_hwint=yes # system compiler has this for all arch!
+ use_gcc_stdint=wrap
+ ;;
++*-*-dragonfly*)
++ gas=yes
++ gnu_ld=yes
++ tmake_file="t-slibgcc"
++ case ${enable_threads} in
++ "" | yes | posix)
++ thread_file='posix'
++ ;;
++ no | gnat | single)
++ # Let these non-posix thread selections fall through if requested
++ ;;
++ *)
++ echo 'Unknown thread configuration for DragonFly BSD'
++ exit 1
++ ;;
++ esac
++ extra_options="$extra_options rpath.opt dragonfly.opt"
++ default_use_cxa_atexit=yes
++ use_gcc_stdint=wrap
++ ;;
+ *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
+ extra_options="$extra_options gnu-user.opt"
+ gas=yes
+@@ -743,6 +763,7 @@
+ target_has_targetcm=yes
+ ;;
+ *-*-netbsd*)
++ use_gcc_stdint=wrap
+ tmake_file="t-slibgcc"
+ gas=yes
+ gnu_ld=yes
+@@ -1352,6 +1373,14 @@
+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h i386/rdos.h i386/rdos64.h"
+ tmake_file="i386/t-i386elf t-svr4"
+ ;;
++i[34567]86-*-dragonfly*)
++ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h dragonfly.h dragonfly-stdint.h i386/dragonfly.h"
++ tmake_file="${tmake_file} i386/t-crtstuff"
++ ;;
++x86_64-*-dragonfly*)
++ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h dragonfly.h dragonfly-stdint.h i386/x86-64.h i386/dragonfly.h"
++ tmake_file="${tmake_file} i386/t-crtstuff"
++ ;;
+ i[34567]86-*-freebsd*)
+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
+ ;;
+@@ -1359,12 +1388,14 @@
+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
+ ;;
+ i[34567]86-*-netbsdelf*)
+- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
++ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h netbsd-stdint.h"
+ extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
++ tmake_file="${tmake_file} i386/t-crtstuff"
+ ;;
+ x86_64-*-netbsd*)
+- tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
++ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h netbsd-stdint.h"
+ extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
++ tmake_file="${tmake_file} i386/t-crtstuff"
+ ;;
+ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
+ tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
+@@ -4109,6 +4140,8 @@
+ ;;
+ i[34567]86-*-mingw* | x86_64-*-mingw*)
+ ;;
++ i[34567]86-*-dragonfly* | x86_64-*-dragonfly*)
++ ;;
+ i[34567]86-*-freebsd* | x86_64-*-freebsd*)
+ ;;
+ ia64*-*-linux*)
--- gcc/configure.orig
+++ gcc/configure
-@@ -26902,6 +26902,20 @@
+@@ -27421,6 +27421,20 @@
gcc_cv_target_dl_iterate_phdr=no
fi
;;
@@ -1484,57 +1348,47 @@
+ gcc_cv_target_dl_iterate_phdr=no
+ fi
+ ;;
-+ *-*-netbsd*)
-+ if grep dl_iterate_phdr $target_header_dir/link_elf.h > /dev/null 2>&1; then
-+ gcc_cv_target_dl_iterate_phdr=yes
-+ else
-+ gcc_cv_target_dl_iterate_phdr=no
-+ fi
-+ ;;
++# *-*-netbsd* | *-*-openbsd*)
++# if grep dl_iterate_phdr $target_header_dir/link_elf.h > /dev/null 2>&1; then
++# gcc_cv_target_dl_iterate_phdr=yes
++# else
++# gcc_cv_target_dl_iterate_phdr=no
++# fi
++# ;;
esac
if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
--- gcc/Makefile.in.orig
+++ gcc/Makefile.in
-@@ -1165,7 +1165,6 @@
- insn-automata.o \
+@@ -1152,7 +1152,6 @@
insn-emit.o \
insn-extract.o \
+ insn-latencytab.o \
- insn-modes.o \
insn-opinit.o \
insn-output.o \
insn-peep.o \
-@@ -1484,13 +1483,18 @@
+@@ -1487,13 +1486,18 @@
ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \
- $(OBJS-libcommon-target) @TREEBROWSER@ main.o gccspec.o cppspec.o \
- $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) mips-tfile.o mips-tdump.o \
-- $(GCOV_OBJS) $(GCOV_DUMP_OBJS)
-+ $(GCOV_OBJS) $(GCOV_DUMP_OBJS) insn-modes.o insn-modes-ada.o
+ $(OBJS-libcommon-target) @TREEBROWSER@ main.o c-family/cppspec.o \
+ $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) $(GCOV_OBJS) $(GCOV_DUMP_OBJS) \
+- lto-wrapper.o
++ insn-modes.o insn-modes-ada.o lto-wrapper.o
# This lists all host object files, whether they are included in this
# compilation or not.
ALL_HOST_OBJS = $(ALL_HOST_FRONTEND_OBJS) $(ALL_HOST_BACKEND_OBJS)
--BACKEND = main.o @TREEBROWSER@ libbackend.a libcommon-target.a libcommon.a \
-+BACKEND = main.o @TREEBROWSER@ insn-modes.o libbackend.a \
-+ libcommon-target.a libcommon.a \
+ BACKEND = libbackend.a main.o @TREEBROWSER@ libcommon-target.a libcommon.a \
++ insn-modes.o \
+ $(CPPLIB) $(LIBDECNUMBER)
+
-+BACKEND2 = main.o @TREEBROWSER@ insn-modes-ada.o libbackend.a \
-+ libcommon-target.a libcommon.a \
++BACKEND2 = libbackend.a main.o @TREEBROWSER@ libcommon-target.a libcommon.a \
++ insn-modes-ada.o \
$(CPPLIB) $(LIBDECNUMBER)
- MOSTLYCLEANFILES = insn-flags.h insn-config.h insn-codes.h \
-@@ -3522,6 +3526,8 @@
- $(TM_H) $(RTL_H) $(DIAGNOSTIC_CORE_H) insn-config.h $(RECOG_H)
- insn-modes.o : insn-modes.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
- $(MACHMODE_H)
-+insn-modes-ada.o : insn-modes-ada.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-+ $(TM_H) $(MACHMODE_H)
- insn-opinit.o : insn-opinit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
- $(TM_H) $(RTL_H) $(TM_P_H) insn-config.h $(FLAGS_H) $(RECOG_H) \
- $(EXPR_H) $(OPTABS_H) reload.h
-@@ -3615,6 +3621,7 @@
+ # This is defined to "yes" if Tree checking is enabled, which roughly means
+@@ -2124,6 +2128,7 @@
insn-modes.c: s-modes; @true
insn-modes.h: s-modes-h; @true
@@ -1542,7 +1396,7 @@
min-insn-modes.c: s-modes-m; @true
s-modes: build/genmodes$(build_exeext)
-@@ -3632,6 +3639,12 @@
+@@ -2141,6 +2146,12 @@
$(SHELL) $(srcdir)/../move-if-change tmp-min-modes.c min-insn-modes.c
$(STAMP) s-modes-m
@@ -1555,54 +1409,135 @@
insn-preds.c: s-preds; @true
tm-preds.h: s-preds-h; @true
tm-constrs.h: s-constrs-h; @true
-@@ -4394,7 +4407,7 @@
- DESTDIR=$(@D) \
- $(SHELL) $(srcdir)/doc/install.texi2html
-
--MANFILES = doc/gcov.1 doc/cpp.1 doc/gcc.1 doc/gfdl.7 doc/gpl.7 doc/fsf-funding.7
-+MANFILES = doc/gcov.1 doc/cpp.1 doc/gcc.1
-
- generated-manpages: man
-
-@@ -4546,7 +4559,7 @@
- # Install the driver last so that the window when things are
- # broken is small.
- install: install-common $(INSTALL_HEADERS) \
-- install-cpp install-man install-info install-@POSUB@ \
-+ install-cpp install-man install-@POSUB@ \
- install-driver install-lto-wrapper install-gcc-ar
-
- ifeq ($(enable_plugin),yes)
-@@ -4671,6 +4684,9 @@
- -rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)$(exeext)
- -( cd $(DESTDIR)$(bindir) && \
- $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) )
+@@ -3217,6 +3228,9 @@
+ ( cd $(DESTDIR)$(bindir) && \
+ $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) ); \
+ fi
+ -if [ -f gnat1$(exeext) ] ; then \
+ ( cd $(DESTDIR)$(bindir) && $(LN) $(GCC_INSTALL_NAME)$(exeext) ada$(exeext) ) \
+ fi
- -if [ -f gcc-cross$(exeext) ] ; then \
- if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
- rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
-@@ -4744,10 +4760,7 @@
- install-man: lang.install-man \
- $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
- $(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext) \
-- $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext) \
-- $(DESTDIR)$(man7dir)/fsf-funding$(man7ext) \
-- $(DESTDIR)$(man7dir)/gfdl$(man7ext) \
-- $(DESTDIR)$(man7dir)/gpl$(man7ext)
-+ $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
+ -if [ ! -f gcc-cross$(exeext) ] \
+ && [ "$(GCC_INSTALL_NAME)" != "$(GCC_TARGET_INSTALL_NAME)" ]; then \
+ rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-tmp$(exeext); \
+--- libgcc/config.host.orig
++++ libgcc/config.host
+@@ -207,6 +207,11 @@
+ tmake_file="$tmake_file t-darwin ${cpu_type}/t-darwin t-libgcc-pic t-slibgcc-darwin"
+ extra_parts="crt3.o crttms.o crttme.o"
+ ;;
++*-*-dragonfly*)
++ tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip"
++ tmake_file="$tmake_file t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
++ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
++ ;;
+ *-*-freebsd*)
+ # This is the generic ELF configuration of FreeBSD. Later
+ # machine-specific sections may refine and add to this
+@@ -238,7 +243,8 @@
+ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+ ;;
+ *-*-netbsd*)
+- tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
++ tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip"
++ tmake_file="$tmake_file t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
+ # NetBSD 1.7 and later are set up to use GCC's crtstuff for
+ # ELF configurations. We will clear extra_parts in the
+ # a.out configurations.
+@@ -302,7 +308,10 @@
+ esac
+
+ case ${host} in
+-*-*-darwin* | *-*-freebsd* | *-*-netbsd* | *-*-openbsd* | *-*-solaris2*)
++*-*-dragonfly* | *-*-freebsd* | *-*-netbsd* | *-*-openbsd*)
++ enable_execute_stack=enable-execute-stack-freebsd.c
++ ;;
++*-*-darwin* | *-*-solaris2*)
+ enable_execute_stack=enable-execute-stack-mprotect.c
+ ;;
+ i[34567]86-*-mingw* | x86_64-*-mingw*)
+@@ -545,16 +554,29 @@
+ x86_64-*-elf*)
+ tmake_file="$tmake_file i386/t-crtstuff t-crtstuff-pic t-libgcc-pic"
+ ;;
++i[34567]86-*-dragonfly*)
++ tmake_file="${tmake_file} i386/t-dragonfly i386/t-crtstuff"
++ md_unwind_header=i386/dragonfly-unwind.h
++ ;;
++x86_64-*-dragonfly*)
++ tmake_file="${tmake_file} i386/t-dragonfly i386/t-crtstuff"
++ md_unwind_header=i386/dragonfly-unwind.h
++ ;;
+ i[34567]86-*-freebsd*)
+ tmake_file="${tmake_file} i386/t-freebsd i386/t-crtstuff"
++ md_unwind_header=i386/freebsd-unwind.h
+ ;;
+ x86_64-*-freebsd*)
+ tmake_file="${tmake_file} i386/t-freebsd i386/t-crtstuff"
++ md_unwind_header=i386/freebsd-unwind.h
+ ;;
+ i[34567]86-*-netbsdelf*)
++ tmake_file="${tmake_file} i386/t-crtstuff"
++ md_unwind_header=i386/netbsd-unwind.h
+ ;;
+ x86_64-*-netbsd*)
+ tmake_file="${tmake_file} i386/t-crtstuff"
++ md_unwind_header=i386/netbsd-unwind.h
+ ;;
+ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
+ ;;
+@@ -1262,6 +1284,7 @@
+ i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]* | \
+ i[34567]86-*-cygwin* | x86_64-*-cygwin* | \
+ i[34567]86-*-mingw* | x86_64-*-mingw* | \
++ i[34567]86-*-dragonfly* | x86_64-*-dragonfly* | \
+ i[34567]86-*-freebsd* | x86_64-*-freebsd* | \
+ i[34567]86-*-openbsd* | x86_64-*-openbsd*)
+ tmake_file="${tmake_file} t-softfp-tf"
+--- libcilkrts/runtime/os-unix.c.orig
++++ libcilkrts/runtime/os-unix.c
+@@ -56,6 +56,12 @@
+ // Uses sysconf(_SC_NPROCESSORS_ONLN) in verbose output
+ #elif defined __FreeBSD__
+ // No additional include files
++#elif defined __DragonFly__
++// No additional include files
++#elif defined __NetBSD__
++// No additional include files
++#elif defined __OpenBSD__
++// No additional include files
+ #elif defined __CYGWIN__
+ // Cygwin on Windows - no additional include files
+ #elif defined __VXWORKS__
+@@ -374,7 +380,8 @@
+ assert((unsigned)count == count);
+
+ return count;
+-#elif defined __FreeBSD__ || defined __CYGWIN__
++#elif defined __FreeBSD__ || defined __CYGWIN__ || defined __DragonFly__ \
++ || defined __NetBSD__ || defined __OpenBSD__
+ int ncores = sysconf(_SC_NPROCESSORS_ONLN);
+
+ return ncores;
+@@ -402,6 +409,12 @@
+ // On MacOS, call sched_yield to yield quantum. I'm not sure why we
+ // don't do this on Linux also.
+ sched_yield();
++#elif defined(__DragonFly__)
++ sched_yield();
++#elif defined(__NetBSD__)
++ sched_yield();
++#elif defined(__OpenBSD__)
++ sched_yield();
+ #elif defined(__MIC__)
+ // On MIC, pthread_yield() really trashes things. Arch's measurements
+ // showed that calling _mm_delay_32() (or doing nothing) was a better
+--- libitm/configure.tgt.orig
++++ libitm/configure.tgt
+@@ -138,6 +138,7 @@
+ ;;
- $(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7 installdirs
- -rm -f $@
---- configure.orig
-+++ configure
-@@ -14419,7 +14419,7 @@
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }; stage1_cflags="$stage1_cflags -fkeep-inline-functions"
-+$as_echo "yes" >&6; };
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
+ *-*-gnu* | *-*-k*bsd*-gnu \
++ | *-*-dragonfly* \
+ | *-*-netbsd* | *-*-freebsd* | *-*-openbsd* \
+ | *-*-solaris2* | *-*-sysv4* | *-*-hpux11* \
+ | *-*-darwin* | *-*-aix*)
diff --git a/lang/gcc-aux/files/diff-cxx b/lang/gcc-aux/files/diff-cxx
index 105792caeb6..29ed481a78e 100644
--- a/lang/gcc-aux/files/diff-cxx
+++ b/lang/gcc-aux/files/diff-cxx
@@ -1,104 +1,3 @@
---- libstdc++-v3/acinclude.m4.orig
-+++ libstdc++-v3/acinclude.m4
-@@ -1903,7 +1903,7 @@
- AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
- GLIBCXX_ENABLE(clocale,auto,[[[=MODEL]]],
- [use MODEL for target locale package],
-- [permit generic|gnu|ieee_1003.1-2001|newlib|yes|no|auto])
-+ [permit generic|gnu|ieee_1003.1-2001|newlib|darwin|dragonfly|yes|no|auto])
-
- # Deal with gettext issues. Default to not using it (=no) until we detect
- # support for it later. Let the user turn it off via --e/d, but let that
-@@ -1930,6 +1930,9 @@
- darwin* | freebsd*)
- enable_clocale_flag=darwin
- ;;
-+ dragonfly*)
-+ enable_clocale_flag=dragonfly
-+ ;;
- *)
- if test x"$with_newlib" = x"yes"; then
- enable_clocale_flag=newlib
-@@ -2018,7 +2021,22 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ dragonfly)
-+ AC_MSG_RESULT(dragonfly)
-
-+ CLOCALE_H=config/locale/generic/c_locale.h
-+ CLOCALE_CC=config/locale/dragonfly/c_locale.cc
-+ CCODECVT_CC=config/locale/generic/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/generic/collate_members.cc
-+ CCTYPE_CC=config/locale/dragonfly/ctype_members.cc
-+ CMESSAGES_H=config/locale/generic/messages_members.h
-+ CMESSAGES_CC=config/locale/generic/messages_members.cc
-+ CMONEY_CC=config/locale/generic/monetary_members.cc
-+ CNUMERIC_CC=config/locale/generic/numeric_members.cc
-+ CTIME_H=config/locale/generic/time_members.h
-+ CTIME_CC=config/locale/generic/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
-+ ;;
- gnu)
- AC_MSG_RESULT(gnu)
-
---- libstdc++-v3/configure.orig
-+++ libstdc++-v3/configure
-@@ -15738,7 +15738,7 @@
- if test "${enable_clocale+set}" = set; then :
- enableval=$enable_clocale;
- case "$enableval" in
-- generic|gnu|ieee_1003.1-2001|newlib|yes|no|auto) ;;
-+ generic|gnu|ieee_1003.1-2001|newlib|darwin|dragonfly|yes|no|auto) ;;
- *) as_fn_error "Unknown argument to enable/disable clocale" "$LINENO" 5 ;;
- esac
-
-@@ -15776,6 +15776,9 @@
- darwin* | freebsd*)
- enable_clocale_flag=darwin
- ;;
-+ dragonfly*)
-+ enable_clocale_flag=dragonfly
-+ ;;
- *)
- if test x"$with_newlib" = x"yes"; then
- enable_clocale_flag=newlib
-@@ -15917,7 +15920,23 @@
- CTIME_CC=config/locale/generic/time_members.cc
- CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
- ;;
-+ dragonfly)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: dragonfly" >&5
-+$as_echo "dragonfly" >&6; }
-
-+ CLOCALE_H=config/locale/generic/c_locale.h
-+ CLOCALE_CC=config/locale/dragonfly/c_locale.cc
-+ CCODECVT_CC=config/locale/generic/codecvt_members.cc
-+ CCOLLATE_CC=config/locale/generic/collate_members.cc
-+ CCTYPE_CC=config/locale/dragonfly/ctype_members.cc
-+ CMESSAGES_H=config/locale/generic/messages_members.h
-+ CMESSAGES_CC=config/locale/generic/messages_members.cc
-+ CMONEY_CC=config/locale/generic/monetary_members.cc
-+ CNUMERIC_CC=config/locale/generic/numeric_members.cc
-+ CTIME_H=config/locale/generic/time_members.h
-+ CTIME_CC=config/locale/generic/time_members.cc
-+ CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
-+ ;;
- gnu)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: gnu" >&5
- $as_echo "gnu" >&6; }
---- libstdc++-v3/configure.host.orig
-+++ libstdc++-v3/configure.host
-@@ -239,6 +239,9 @@
- os_include_dir="os/djgpp"
- error_constants_dir="os/djgpp"
- ;;
-+ dragonfly*)
-+ os_include_dir="os/bsd/dragonfly"
-+ ;;
- freebsd*)
- os_include_dir="os/bsd/freebsd"
- ;;
--- /dev/null
+++ libstdc++-v3/config/locale/dragonfly/c_locale.cc
@@ -0,0 +1,300 @@
@@ -581,7 +480,7 @@
+}
--- /dev/null
+++ libstdc++-v3/config/os/bsd/dragonfly/ctype_base.h
-@@ -0,0 +1,60 @@
+@@ -0,0 +1,75 @@
+// Locale support -*- C++ -*-
+
+// Copyright (C) 2000, 2003, 2009, 2010 Free Software Foundation, Inc.
@@ -611,8 +510,6 @@
+//
+
+// Information as gleaned from /usr/include/ctype.h on DragonFly.
-+// Full details can be found from git repo at:
-+// http://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/include/ctype.h
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
@@ -626,7 +523,23 @@
+
+ // NB: Offsets into ctype<char>::_M_table force a particular size
+ // on the mask type. Because of this, we don't use an enum.
-+ typedef uint16_t mask;
++#ifdef _CTYPE_S
++ // DragonFly 3.6 and later
++ typedef unsigned long mask;
++ static const mask upper = _CTYPE_U;
++ static const mask lower = _CTYPE_L;
++ static const mask alpha = _CTYPE_A;
++ static const mask digit = _CTYPE_D;
++ static const mask xdigit = _CTYPE_X;
++ static const mask space = _CTYPE_S;
++ static const mask print = _CTYPE_R;
++ static const mask graph = _CTYPE_A | _CTYPE_D | _CTYPE_P;
++ static const mask cntrl = _CTYPE_C;
++ static const mask punct = _CTYPE_P;
++ static const mask alnum = _CTYPE_A | _CTYPE_D;
++#else
++ // DragonFly 3.4 and older
++ typedef unsigned short mask;
+ static const mask upper = _CTYPEMASK_U;
+ static const mask lower = _CTYPEMASK_L;
+ static const mask alpha = _CTYPEMASK_A;
@@ -638,6 +551,7 @@
+ static const mask cntrl = _CTYPEMASK_C;
+ static const mask punct = _CTYPEMASK_P;
+ static const mask alnum = _CTYPEMASK_A | _CTYPEMASK_D;
++#endif
+ };
+
+_GLIBCXX_END_NAMESPACE_VERSION
@@ -746,7 +660,7 @@
+} // namespace
--- /dev/null
+++ libstdc++-v3/config/os/bsd/dragonfly/ctype_inline.h
-@@ -0,0 +1,161 @@
+@@ -0,0 +1,187 @@
+// Locale support -*- C++ -*-
+
+// Copyright (C) 2000, 2003, 2004, 2005, 2009, 2010
@@ -795,7 +709,11 @@
+ if (_M_table)
+ return _M_table[static_cast<unsigned char>(__c)] & __m;
+ else
++#ifdef _CTYPE_S
++ return __istype(__c, __m);
++#else
+ return __libc_ctype_ [__c + 1] & __m;
++#endif
+ }
+
+ const char*
@@ -808,6 +726,10 @@
+ else
+ for (;__low < __high; ++__vec, ++__low)
+ {
++#ifdef _CTYPE_S
++ *__vec = __maskrune (*__low, upper | lower | alpha | digit | xdigit
++ | space | print | graph | cntrl | punct | alnum);
++#else
+ mask __m = 0;
+ if (this->is(upper, *__low)) __m |= upper;
+ if (this->is(lower, *__low)) __m |= lower;
@@ -822,6 +744,7 @@
+ // Do not include explicit line for alnum mask since it is a
+ // pure composite of masks on DragonFly.
+ *__vec = __m;
++#endif
+ }
+ return __high;
+ }
@@ -859,7 +782,11 @@
+ ctype<wchar_t>::
+ do_is(mask __m, wchar_t __c) const
+ {
++#ifdef _CTYPE_S
++ return __istype (__c, __m);
++#else
+ return __libc_ctype_ [__c + 1] & __m;
++#endif
+ }
+
+ inline const wchar_t*
@@ -867,6 +794,10 @@
+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
+ {
+ for (; __lo < __hi; ++__vec, ++__lo)
++#ifdef _CTYPE_S
++ *__vec = __maskrune (*__lo, upper | lower | alpha | digit | xdigit
++ | space | print | graph | cntrl | punct | alnum);
++#else
+ {
+ mask __m = 0;
+ if (isupper (*__lo)) __m |= _CTYPEMASK_U;
@@ -884,6 +815,7 @@
+
+ *__vec = __m;
+ }
++#endif
+ return __hi;
+ }
+
@@ -891,7 +823,11 @@
+ ctype<wchar_t>::
+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
+ {
++#ifdef _CTYPE_S
++ while (__lo < __hi && ! __istype (*__lo, __m))
++#else
+ while (__lo < __hi && !(__libc_ctype_ [*__lo + 1] & __m))
++#endif
+ ++__lo;
+ return __lo;
+ }
@@ -900,7 +836,11 @@
+ ctype<wchar_t>::
+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
+ {
++#ifdef _CTYPE_S
++ while (__lo < __hi && __istype (*__lo, __m))
++#else
+ while (__lo < __hi && (__libc_ctype_ [*__lo + 1] & __m))
++#endif
+ ++__lo;
+ return __lo;
+ }
@@ -954,6 +894,14 @@
+#endif
--- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig
+++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
+@@ -1,6 +1,6 @@
+ // Locale support -*- C++ -*-
+
+-// Copyright (C) 2000-2014 Free Software Foundation, Inc.
++// Copyright (C) 2000, 2009, 2011, 2012 Free Software Foundation, Inc.
+ //
+ // This file is part of the GNU ISO C++ Library. This library is free
+ // software; you can redistribute it and/or modify it under the
@@ -30,7 +30,7 @@
// Full details can be found from the CVS files at:
// anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h
@@ -1022,6 +970,14 @@
--- libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc.orig
+++ libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc
+@@ -1,6 +1,6 @@
+ // Locale support -*- C++ -*-
+
+-// Copyright (C) 2011-2014 Free Software Foundation, Inc.
++// Copyright (C) 2011 Free Software Foundation, Inc.
+ //
+ // This file is part of the GNU ISO C++ Library. This library is free
+ // software; you can redistribute it and/or modify it under the
@@ -38,11 +38,17 @@
// Information as gleaned from /usr/include/ctype.h
@@ -1076,6 +1032,14 @@
return __high;
--- libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h.orig
+++ libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h
+@@ -1,6 +1,6 @@
+ // Locale support -*- C++ -*-
+
+-// Copyright (C) 2000-2014 Free Software Foundation, Inc.
++// Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
+ //
+ // This file is part of the GNU ISO C++ Library. This library is free
+ // software; you can redistribute it and/or modify it under the
@@ -48,7 +48,7 @@
is(const char* __low, const char* __high, mask* __vec) const
{
@@ -1085,3 +1049,91 @@
return __high;
}
+--- libstdc++-v3/acinclude.m4.orig
++++ libstdc++-v3/acinclude.m4
+@@ -1989,6 +1989,9 @@
+ darwin* | freebsd*)
+ enable_clocale_flag=darwin
+ ;;
++ dragonfly*)
++ enable_clocale_flag=dragonfly
++ ;;
+ openbsd*)
+ enable_clocale_flag=newlib
+ ;;
+@@ -2075,6 +2078,23 @@
+ CMESSAGES_H=config/locale/generic/messages_members.h
+ CMESSAGES_CC=config/locale/generic/messages_members.cc
+ CMONEY_CC=config/locale/generic/monetary_members.cc
++ CNUMERIC_CC=config/locale/generic/numeric_members.cc
++ CTIME_H=config/locale/generic/time_members.h
++ CTIME_CC=config/locale/generic/time_members.cc
++ CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
++ ;;
++
++ dragonfly)
++ AC_MSG_RESULT(dragonfly)
++
++ CLOCALE_H=config/locale/generic/c_locale.h
++ CLOCALE_CC=config/locale/dragonfly/c_locale.cc
++ CCODECVT_CC=config/locale/generic/codecvt_members.cc
++ CCOLLATE_CC=config/locale/generic/collate_members.cc
++ CCTYPE_CC=config/locale/dragonfly/ctype_members.cc
++ CMESSAGES_H=config/locale/generic/messages_members.h
++ CMESSAGES_CC=config/locale/generic/messages_members.cc
++ CMONEY_CC=config/locale/generic/monetary_members.cc
+ CNUMERIC_CC=config/locale/generic/numeric_members.cc
+ CTIME_H=config/locale/generic/time_members.h
+ CTIME_CC=config/locale/generic/time_members.cc
+--- libstdc++-v3/configure.orig
++++ libstdc++-v3/configure
+@@ -15849,6 +15849,9 @@
+ darwin* | freebsd*)
+ enable_clocale_flag=darwin
+ ;;
++ dragonfly*)
++ enable_clocale_flag=dragonfly
++ ;;
+ openbsd*)
+ enable_clocale_flag=newlib
+ ;;
+@@ -15988,6 +15991,24 @@
+ CMESSAGES_H=config/locale/generic/messages_members.h
+ CMESSAGES_CC=config/locale/generic/messages_members.cc
+ CMONEY_CC=config/locale/generic/monetary_members.cc
++ CNUMERIC_CC=config/locale/generic/numeric_members.cc
++ CTIME_H=config/locale/generic/time_members.h
++ CTIME_CC=config/locale/generic/time_members.cc
++ CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
++ ;;
++
++ dragonfly)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: dragonfly" >&5
++$as_echo "dragonfly" >&6; }
++
++ CLOCALE_H=config/locale/generic/c_locale.h
++ CLOCALE_CC=config/locale/dragonfly/c_locale.cc
++ CCODECVT_CC=config/locale/generic/codecvt_members.cc
++ CCOLLATE_CC=config/locale/generic/collate_members.cc
++ CCTYPE_CC=config/locale/dragonfly/ctype_members.cc
++ CMESSAGES_H=config/locale/generic/messages_members.h
++ CMESSAGES_CC=config/locale/generic/messages_members.cc
++ CMONEY_CC=config/locale/generic/monetary_members.cc
+ CNUMERIC_CC=config/locale/generic/numeric_members.cc
+ CTIME_H=config/locale/generic/time_members.h
+ CTIME_CC=config/locale/generic/time_members.cc
+--- libstdc++-v3/configure.host.orig
++++ libstdc++-v3/configure.host
+@@ -230,6 +230,12 @@
+ os_include_dir="os/generic"
+ atomicity_dir="cpu/generic"
+ ;;
++ dragonfly*)
++ os_include_dir="os/bsd/dragonfly"
++ ;;
++ linux-androideabi)
++ os_include_dir="os/bionic"
++ ;;
+ bsd*)
+ # Plain BSD attempts to share FreeBSD files.
+ os_include_dir="os/bsd/freebsd"
diff --git a/lang/gcc-aux/files/diff-cxx-testsuite b/lang/gcc-aux/files/diff-cxx-testsuite
index 13e14ac58ef..433450dca03 100644
--- a/lang/gcc-aux/files/diff-cxx-testsuite
+++ b/lang/gcc-aux/files/diff-cxx-testsuite
@@ -24,1802 +24,9 @@
ffloat (vdouble); /* { dg-warning "conversion" } */
vfloat = vdouble; /* { dg-warning "conversion" } */
ffloat (vlongdouble); /* { dg-warning "conversion" } */
---- gcc/testsuite/g++.dg/cdce3.C.orig
-+++ gcc/testsuite/g++.dg/cdce3.C
-@@ -1,4 +1,4 @@
--/* { dg-do run } */
-+/* { dg-do run { target { ! "*-*-freebsd* *-*-dragonfly* *-*-netbsd*" } } } */
- /* { dg-require-effective-target c99_runtime } */
- /* { dg-skip-if "exp2* missing despite C99 runtime" { alpha*-dec-osf5* } } */
- /* { dg-options "-O2 -fmath-errno -fdump-tree-cdce-details -lm" } */
---- gcc/testsuite/gcc.dg/builtins-config.h.orig
-+++ gcc/testsuite/gcc.dg/builtins-config.h
-@@ -16,8 +16,14 @@
- /* Interix6 doesn't have the entire C99 runtime. */
- #elif defined(__AVR__)
- /* AVR doesn't have the entire C99 runtime. */
--#elif defined(__FreeBSD__) && (__FreeBSD__ < 9)
--/* FreeBSD up to version 8 lacks support for cexp and friends. */
-+#elif defined(__FreeBSD__) && (__FreeBSD__ < 10)
-+/* FreeBSD up to version 9 lacks support for cexp and friends. */
-+#elif defined(__DragonFly__)
-+/* As of DragonFly 2.13, Full C99 support is not available.
-+ It has the same libm functionality as FreeBSD, which is missing
-+ several long-double functions. */
-+#elif defined(__NetBSD__)
-+/* As of NetBSD 5.99, libm is nowhere close to supporting C99 */
- #elif defined(__vxworks)
- /* VxWorks doesn't have a full C99 time. (cabs is missing, for example.) */
- #elif defined(_WIN32) && !defined(__CYGWIN__)
---- libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++.cc.orig
-+++ libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++.cc
-@@ -1,5 +1,5 @@
- // FreeBSD wants warning clean system headers:
--// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* } }
-+// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
- // { dg-do compile }
- // 1999-05-12 bkoz
-
---- libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++_multiple_inclusion.cc.orig
-+++ libstdc++-v3/testsuite/17_intro/headers/c++1998/stdc++_multiple_inclusion.cc
-@@ -1,5 +1,5 @@
- // FreeBSD wants warning clean system headers:
--// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* } }
-+// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
- // { dg-do compile }
- // 1999-05-12 bkoz
-
---- libstdc++-v3/testsuite/17_intro/headers/c++200x/stdc++.cc.orig
-+++ libstdc++-v3/testsuite/17_intro/headers/c++200x/stdc++.cc
-@@ -1,5 +1,5 @@
- // FreeBSD wants warning clean system headers:
--// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* } }
-+// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
- // { dg-options "-std=gnu++0x" }
- // { dg-do compile }
-
---- libstdc++-v3/testsuite/17_intro/headers/c++200x/stdc++_multiple_inclusion.cc.orig
-+++ libstdc++-v3/testsuite/17_intro/headers/c++200x/stdc++_multiple_inclusion.cc
-@@ -1,5 +1,5 @@
- // FreeBSD wants warning clean system headers:
--// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* } }
-+// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } }
- // { dg-options "-std=gnu++0x" }
- // { dg-do compile }
-
---- libstdc++-v3/testsuite/18_support/pthread_guard.cc.orig
-+++ libstdc++-v3/testsuite/18_support/pthread_guard.cc
-@@ -16,8 +16,8 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-darwin* alpha*-*-osf* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-darwin* alpha*-*-osf* } }
-
- #include <cstdlib>
- #include <pthread.h>
---- libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc.orig
-+++ libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc
-@@ -17,8 +17,8 @@
-
- // 20.6.6.2 Template class shared_ptr [util.smartptr.shared]
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread -std=gnu++0x" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread -std=gnu++0x" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads -std=gnu++0x" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
-
---- libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc.orig
-+++ libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc
-@@ -17,8 +17,8 @@
-
- // 20.6.6.2 Template class shared_ptr [util.smartptr.shared]
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
-
---- libstdc++-v3/testsuite/21_strings/basic_string/pthread18185.cc.orig
-+++ libstdc++-v3/testsuite/21_strings/basic_string/pthread18185.cc
-@@ -16,8 +16,8 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
-
- #include <ext/new_allocator.h>
---- libstdc++-v3/testsuite/21_strings/basic_string/pthread4.cc.orig
-+++ libstdc++-v3/testsuite/21_strings/basic_string/pthread4.cc
-@@ -20,8 +20,8 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
-
- #include <string>
---- libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
---- libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
---- libstdc++-v3/testsuite/23_containers/list/pthread1.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/list/pthread1.cc
-@@ -18,8 +18,8 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
-
- // This multi-threading C++/STL/POSIX code adheres to rules outlined here:
---- libstdc++-v3/testsuite/23_containers/list/pthread5.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/list/pthread5.cc
-@@ -20,8 +20,8 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
-
- #include <vector>
---- libstdc++-v3/testsuite/23_containers/map/pthread6.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/map/pthread6.cc
-@@ -19,8 +19,8 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
-
- #include <string>
---- libstdc++-v3/testsuite/23_containers/vector/debug/multithreaded_swap.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/vector/debug/multithreaded_swap.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/26_numerics/headers/cmath/c_math_dynamic.cc.orig
-+++ libstdc++-v3/testsuite/26_numerics/headers/cmath/c_math_dynamic.cc
-@@ -19,7 +19,7 @@
-
-
- // { dg-do link }
--// { dg-options "-D_XOPEN_SOURCE" { target *-*-freebsd* } }
-+// { dg-options "-D_XOPEN_SOURCE" { target *-*-freebsd* *-*-dragonfly* } }
-
- #include <cmath>
-
---- libstdc++-v3/testsuite/27_io/basic_ofstream/pthread2.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_ofstream/pthread2.cc
-@@ -19,8 +19,8 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
-
- #include <fstream>
---- libstdc++-v3/testsuite/27_io/basic_ostringstream/pthread3.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_ostringstream/pthread3.cc
-@@ -19,8 +19,8 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
-
- #include <sstream>
---- libstdc++-v3/testsuite/30_threads/async/42819.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/42819.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/async/any.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/any.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/async/async.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/async.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/async/sync.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/sync.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/call_once/39909.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/call_once/39909.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/call_once/call_once1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/call_once/call_once1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable/members/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable/members/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable/members/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable/members/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable/native_handle/typesizes.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable_any/members/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable_any/members/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable_any/members/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable_any/members/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/cons/move.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/cons/move.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/45133.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/45133.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/get.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/get.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/get2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/get2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/valid.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/valid.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/wait.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/wait.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/lock/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/lock/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/lock/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/lock/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/native_handle/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/native_handle/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/native_handle/typesizes.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/try_lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/try_lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/try_lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/try_lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/mutex/unlock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/mutex/unlock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/move.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/move.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/move_assign.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/move_assign.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke5.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/invoke5.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/reset.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/reset.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/reset2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/reset2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/swap.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/swap.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/members/valid.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/members/valid.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/cons/alloc.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/cons/move.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/cons/move.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/cons/move_assign.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/cons/move_assign.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/get_future.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/get_future.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/get_future2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/get_future2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/set_value.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/set_value.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/promise/members/swap.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/promise/members/swap.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/try_lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_mutex/unlock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/dest/destructor_locked.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/dest/destructor_locked.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/typesizes.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/native_handle/typesizes.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options "-std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options "-std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_until/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/unlock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/cons/move.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/cons/move.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/45133.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/45133.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/get.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/get.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/valid.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/valid.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/wait.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/5.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/5.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/6.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/6.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/7.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/7.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/8.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/8.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/9.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/9.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/moveable.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/moveable.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/5.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/5.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/members/hardware_concurrency.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/members/hardware_concurrency.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/swap/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/swap/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/dest/destructor_locked.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/dest/destructor_locked.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/native_handle/typesizes.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_for/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/try_lock_until/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/timed_mutex/unlock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/try_lock/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/try_lock/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/try_lock/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/try_lock/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/try_lock/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/try_lock/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/try_lock/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/try_lock/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/5.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/5.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/cons/6.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/cons/6.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/locking/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/locking/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/locking/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/locking/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/locking/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/locking/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/locking/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/1.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/unique_lock/modifiers/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/ext/rope/pthread7-rope.cc.orig
-+++ libstdc++-v3/testsuite/ext/rope/pthread7-rope.cc
-@@ -18,8 +18,8 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
-
- #include <ext/rope>
---- libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/thread/default_weaktoshared.cc.orig
-+++ libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/thread/default_weaktoshared.cc
-@@ -17,8 +17,8 @@
-
- // TR1 2.2.2 Template class shared_ptr [tr.util.smartptr.shared]
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
-
- #include <tr1/memory>
---- libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/thread/mutex_weaktoshared.cc.orig
-+++ libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/thread/mutex_weaktoshared.cc
-@@ -17,8 +17,8 @@
-
- // TR1 2.2.2 Template class shared_ptr [tr.util.smartptr.shared]
-
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
--// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
-+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
- // { dg-options "-pthreads" { target *-*-solaris* } }
-
- #include <tr1/memory>
---- libstdc++-v3/testsuite/30_threads/async/49668.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/49668.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/async/launch.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/async/launch.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/call_once/49668.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/call_once/49668.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/future/members/share.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/future/members/share.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/49668.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/49668.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/packaged_task/cons/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/2.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/2.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/3.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/3.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/this_thread/4.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/this_thread/4.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
---- libstdc++-v3/testsuite/30_threads/thread/cons/49668.cc.orig
-+++ libstdc++-v3/testsuite/30_threads/thread/cons/49668.cc
-@@ -1,5 +1,5 @@
--// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
--// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-do run { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-+// { dg-options " -std=gnu++0x -pthread" { target *-*-dragonfly* *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
- // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
- // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
- // { dg-require-cstdint "" }
--- libstdc++-v3/testsuite/lib/libstdc++.exp.orig
+++ libstdc++-v3/testsuite/lib/libstdc++.exp
-@@ -864,17 +864,18 @@
+@@ -877,17 +877,18 @@
set f [open $src "w"]
puts $f "#include <locale>"
puts $f "#include <cstdio>"
@@ -1841,2822 +48,3 @@
puts $f " return 1;"
puts $f " }"
puts $f "}"
---- libstdc++-v3/testsuite/23_containers/deque/debug/assign4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/deque/debug/assign4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/deque>
---- libstdc++-v3/testsuite/23_containers/deque/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/deque/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/deque>
---- libstdc++-v3/testsuite/23_containers/deque/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/deque/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/deque>
---- libstdc++-v3/testsuite/23_containers/list/debug/assign4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/list/debug/assign4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/list>
---- libstdc++-v3/testsuite/23_containers/list/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/list/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/list>
---- libstdc++-v3/testsuite/23_containers/list/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/list/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/list>
---- libstdc++-v3/testsuite/23_containers/map/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/map/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/map>
---- libstdc++-v3/testsuite/23_containers/map/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/map/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/map>
---- libstdc++-v3/testsuite/23_containers/multimap/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/multimap/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/map>
---- libstdc++-v3/testsuite/23_containers/multimap/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/multimap/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/map>
---- libstdc++-v3/testsuite/23_containers/multiset/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/multiset/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/set>
---- libstdc++-v3/testsuite/23_containers/multiset/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/multiset/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/set>
---- libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/set>
---- libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/set>
---- libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
-
---- libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
-
---- libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
-
---- libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
-
---- libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
-
---- libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
-
---- libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
-
---- libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-options "-std=gnu++0x" }
- // { dg-do run { xfail *-*-* } }
-
---- libstdc++-v3/testsuite/23_containers/vector/debug/assign4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/vector/debug/assign4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/vector>
---- libstdc++-v3/testsuite/23_containers/vector/debug/construct4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/vector/debug/construct4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/vector>
---- libstdc++-v3/testsuite/23_containers/vector/debug/insert4_neg.cc.orig
-+++ libstdc++-v3/testsuite/23_containers/vector/debug/insert4_neg.cc
-@@ -15,6 +15,7 @@
- // with this library; see the file COPYING3. If not see
- // <http://www.gnu.org/licenses/>.
- //
-+// { dg-require-debug-mode "" }
- // { dg-do run { xfail *-*-* } }
-
- #include <debug/vector>
---- libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -27,14 +27,14 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Baseline test in ISO-8859-1 locale
-+// Baseline test in ISO8859-1 locale
- void test02()
- {
- using namespace std;
- bool test __attribute__((unused)) = true;
- typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
-
-- locale loc = locale("en_US.ISO-8859-1");
-+ locale loc = locale("en_US.ISO8859-1");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
---- libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -27,14 +27,14 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Baseline test in ISO-8859-15 locale
-+// Baseline test in ISO8859-15 locale
- void test03()
- {
- using namespace std;
- bool test __attribute__((unused)) = true;
- typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
-
-- locale loc = locale("en_US.ISO-8859-15");
-+ locale loc = locale("en_US.ISO8859-15");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
---- libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -27,19 +27,19 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Test do_encoding with ISO-8859-1 locale.
-+// Test do_encoding with ISO8859-1 locale.
- void test02()
- {
- using namespace std;
- typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
- bool test __attribute__((unused)) = true;
-
-- locale loc = locale("en_US.ISO-8859-1");
-+ locale loc = locale("en_US.ISO8859-1");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
- int i = cvt->encoding();
-- VERIFY( i == 1 ); // ISO-8859-1 is a single-byte encoding
-+ VERIFY( i == 1 ); // ISO8859-1 is a single-byte encoding
- }
-
- int main ()
---- libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -27,19 +27,19 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Test do_encoding with ISO-8859-15 locale.
-+// Test do_encoding with ISO8859-15 locale.
- void test03()
- {
- using namespace std;
- typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
- bool test __attribute__((unused)) = true;
-
-- locale loc = locale("en_US.ISO-8859-15");
-+ locale loc = locale("en_US.ISO8859-15");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
- int i = cvt->encoding();
-- VERIFY( i == 1 ); // ISO-8859-15 is a single-byte encoding
-+ VERIFY( i == 1 ); // ISO8859-15 is a single-byte encoding
- }
-
- int main ()
---- libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -41,7 +41,7 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Baseline test for ISO-8859-1. Converts entire charset.
-+// Baseline test for ISO8859-1. Converts entire charset.
- void test02()
- {
- using namespace std;
-@@ -90,7 +90,7 @@
- wmemset(i_ref, 0xdeadbeef, size + 1);
- int_type* ito_next;
-
-- locale loc = locale("en_US.ISO-8859-1");
-+ locale loc = locale("en_US.ISO8859-1");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
---- libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -41,7 +41,7 @@
- // Required instantiation
- // codecvt<wchar_t, char, mbstate_t>
- //
--// Baseline test for ISO-8859-15. Converts entire charset.
-+// Baseline test for ISO8859-15. Converts entire charset.
- void test03()
- {
- using namespace std;
-@@ -104,7 +104,7 @@
- wmemset(i_ref, 0xdeadbeef, size + 1);
- int_type* ito_next;
-
-- locale loc = locale("en_US.ISO-8859-15");
-+ locale loc = locale("en_US.ISO8859-15");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
---- libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -63,7 +63,7 @@
- "\xff";
- int size = strlen(e_lit);
-
-- locale loc = locale("en_US.ISO-8859-1");
-+ locale loc = locale("en_US.ISO8859-1");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
---- libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -63,7 +63,7 @@
- "\xff";
- int size = strlen(e_lit);
-
-- locale loc = locale("en_US.ISO-8859-15");
-+ locale loc = locale("en_US.ISO8859-15");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
---- libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -32,12 +32,12 @@
- bool test __attribute__((unused)) = true;
- typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
-
-- locale loc = locale("en_US.ISO-8859-1");
-+ locale loc = locale("en_US.ISO8859-1");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
- int k = cvt->max_length();
-- VERIFY( k == 1 ); // ISO-8859-1 is a single-byte encoding
-+ VERIFY( k == 1 ); // ISO8859-1 is a single-byte encoding
- }
-
- int main ()
---- libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -32,12 +32,12 @@
- bool test __attribute__((unused)) = true;
- typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
-
-- locale loc = locale("en_US.ISO-8859-15");
-+ locale loc = locale("en_US.ISO8859-15");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
- int k = cvt->max_length();
-- VERIFY( k == 1 ); // ISO-8859-15 is a single-byte encoding
-+ VERIFY( k == 1 ); // ISO8859-15 is a single-byte encoding
- }
-
- int main ()
---- libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -88,7 +88,7 @@
- memset(e_ref, 0xf0, size + 1);
- ext_type* eto_next;
-
-- locale loc = locale("en_US.ISO-8859-1");
-+ locale loc = locale("en_US.ISO8859-1");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
---- libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -102,7 +102,7 @@
- memset(e_ref, 0xf0, size + 1);
- ext_type* eto_next;
-
-- locale loc = locale("en_US.ISO-8859-15");
-+ locale loc = locale("en_US.ISO8859-15");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
---- libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -60,7 +60,7 @@
- memset(e_ref, 0xf0, size + 1);
- ext_type* eto_next;
-
-- locale loc = locale("en_US.ISO-8859-1");
-+ locale loc = locale("en_US.ISO8859-1");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
---- libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -73,7 +73,7 @@
- memset(e_ref, 0xf0, size + 1);
- ext_type* eto_next;
-
-- locale loc = locale("en_US.ISO-8859-1");
-+ locale loc = locale("en_US.ISO8859-1");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
---- libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-15" }
-+// { dg-require-namedlocale "en_US.ISO8859-15" }
-
- // 2003-02-06 Petur Runolfsson <peturr02@ru.is>
-
-@@ -87,7 +87,7 @@
- memset(e_ref, 0xf0, size + 1);
- ext_type* eto_next;
-
-- locale loc = locale("en_US.ISO-8859-15");
-+ locale loc = locale("en_US.ISO8859-15");
- locale::global(loc);
- const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
-
---- libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_US.ISO-8859-1" }
-+// { dg-require-namedlocale "en_US.ISO8859-1" }
-
- // 2003-03-12 Petur Runolfsson <peturr02@ru.is>
-
-@@ -31,7 +31,7 @@
- using namespace std;
- bool test __attribute__((unused)) = true;
-
-- locale loc = locale("en_US.ISO-8859-1");
-+ locale loc = locale("en_US.ISO8859-1");
- const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
-
- char c = 0xff;
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "de_DE.ISO-8859-15@euro" }
-+// { dg-require-namedlocale "de_DE.ISO8859-15@euro" }
-
- // 2003-05-03 Petur Runolfsson <peturr02@ru.is>
-
-@@ -36,7 +36,7 @@
- putc(static_cast<unsigned char>(i), file);
- fclose(file);
-
-- locale loc (locale("de_DE.ISO-8859-15@euro"));
-+ locale loc (locale("de_DE.ISO8859-15@euro"));
- wchar_t buf[1];
- wfilebuf fb;
- fb.pubimbue(loc);
---- libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc.orig
-+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "de_DE.ISO-8859-15@euro" }
-+// { dg-require-namedlocale "de_DE.ISO8859-15@euro" }
-
- // 2003-04-30 Petur Runolfsson <peturr02@ru.is>
-
-@@ -35,7 +35,7 @@
- putc(static_cast<unsigned char>(i), file);
- fclose(file);
-
-- locale loc (locale("de_DE.ISO-8859-15@euro"));
-+ locale loc (locale("de_DE.ISO8859-15@euro"));
- locale::global(loc); // Set locale for stdin
-
- VERIFY( freopen(name, "r", stdin) );
---- libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "de_DE" }
-@@ -40,6 +40,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc
-@@ -2,7 +2,7 @@
- // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
- // { dg-options "-finput-charset=ISO8859-1" }
- // { dg-require-iconv "ISO8859-1" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "de_DE" }
-@@ -44,6 +44,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc
-@@ -1,7 +1,7 @@
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -40,6 +40,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc
-@@ -2,7 +2,7 @@
- // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
- // { dg-options "-finput-charset=ISO8859-1" }
- // { dg-require-iconv "ISO8859-1" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "de_DE" }
-@@ -44,6 +44,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "de_DE" }
-@@ -35,6 +35,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc
-@@ -2,7 +2,7 @@
- // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
- // { dg-options "-finput-charset=ISO8859-1" }
- // { dg-require-iconv "ISO8859-1" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "de_DE" }
-@@ -39,6 +39,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -43,6 +43,6 @@
- two.push_back(&test01);
- two.push_back(&test02);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -38,6 +38,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -37,6 +37,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -37,6 +37,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/locale/cons/40184.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/locale/cons/40184.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // Copyright (C) 2009 Free Software Foundation
- //
-@@ -29,7 +29,7 @@
- using namespace std;
- bool test __attribute__((unused)) = true;
-
-- locale locf(locale("C"), "ja_JP.eucjp", locale::monetary);
-+ locale locf(locale("C"), "ja_JP.eucJP", locale::monetary);
-
- const moneypunct<wchar_t, false>& mpf =
- use_facet<moneypunct<wchar_t, false> >(locf);
-@@ -40,7 +40,7 @@
-
- VERIFY( mpf.curr_symbol() == mpf_copy.curr_symbol() );
-
-- locale loct(locale("C"), "ja_JP.eucjp", locale::monetary);
-+ locale loct(locale("C"), "ja_JP.eucJP", locale::monetary);
-
- const moneypunct<wchar_t, true>& mpt =
- use_facet<moneypunct<wchar_t, true> >(loct);
---- libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "fr_FR" }
- // { dg-require-namedlocale "en_US" }
-@@ -45,6 +45,6 @@
- two.push_back(&test01);
- two.push_back(&test02);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE@euro" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -69,6 +69,6 @@
- two.push_back(&test06);
- two.push_back(&test07);
- two.push_back(&test08);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE@euro" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -69,6 +69,6 @@
- two.push_back(&test06);
- two.push_back(&test07);
- two.push_back(&test08);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE@euro" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -59,6 +59,6 @@
- two.push_back(&test04);
- two.push_back(&test05);
- two.push_back(&test06);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE@euro" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -59,6 +59,6 @@
- two.push_back(&test04);
- two.push_back(&test05);
- two.push_back(&test06);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-@@ -38,6 +38,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -38,6 +38,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -59,6 +59,6 @@
- two.push_back(&test04);
- two.push_back(&test05);
- two.push_back(&test06);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -59,6 +59,6 @@
- two.push_back(&test04);
- two.push_back(&test05);
- two.push_back(&test06);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
- // { dg-require-namedlocale "es_ES" }
-@@ -55,6 +55,6 @@
- two.push_back(&test03);
- two.push_back(&test04);
- two.push_back(&test05);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -54,6 +54,6 @@
- two.push_back(&test03);
- two.push_back(&test04);
- two.push_back(&test05);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "is_IS" }
-@@ -40,6 +40,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_US" }
- // { dg-require-namedlocale "is_IS" }
-@@ -40,6 +40,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test02);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,6 +32,6 @@
- using namespace __gnu_test;
- func_callback two;
- two.push_back(&test01);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -44,6 +44,6 @@
- two.push_back(&test01);
- two.push_back(&test02);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -44,6 +44,6 @@
- two.push_back(&test01);
- two.push_back(&test02);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -44,6 +44,6 @@
- two.push_back(&test01);
- two.push_back(&test02);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -44,6 +44,6 @@
- two.push_back(&test01);
- two.push_back(&test02);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -44,6 +44,6 @@
- two.push_back(&test01);
- two.push_back(&test02);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -44,6 +44,6 @@
- two.push_back(&test01);
- two.push_back(&test02);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "en_HK" }
-
-@@ -44,6 +44,6 @@
- two.push_back(&test01);
- two.push_back(&test02);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "en_HK" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -44,6 +44,6 @@
- two.push_back(&test01);
- two.push_back(&test02);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -37,6 +37,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -37,6 +37,6 @@
- func_callback two;
- two.push_back(&test01);
- two.push_back(&test03);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc
-@@ -80,6 +80,6 @@
- two.push_back(&test08);
- two.push_back(&test09);
- two.push_back(&test10);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc
-@@ -2,7 +2,7 @@
- // { dg-require-namedlocale "en_HK" }
- // { dg-require-namedlocale "es_ES" }
- // { dg-require-namedlocale "fr_FR@euro" }
--// { dg-require-namedlocale "ja_JP.eucjp" }
-+// { dg-require-namedlocale "ja_JP.eucJP" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -81,6 +81,6 @@
- two.push_back(&test08);
- two.push_back(&test09);
- two.push_back(&test10);
-- run_tests_wrapped_locale("ja_JP.eucjp", two);
-+ run_tests_wrapped_locale("ja_JP.eucJP", two);
- return 0;
- }
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/16.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/16.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2004-03-02 Paolo Carlini <pcarlini@suse.de>
-
-@@ -37,7 +37,7 @@
- // basic construction
- locale loc_c = locale::classic();
- locale loc_de = locale("de_DE@euro");
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_hk != loc_de );
- VERIFY( loc_c != loc_hk );
-
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/18.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/18.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2004-03-15 Paolo Carlini <pcarlini@suse.de>
-
-@@ -36,7 +36,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- iterator_type end, end01, end02;
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-09-12 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -35,7 +35,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- // total EPA budget FY 2002
-@@ -80,7 +80,7 @@
- VERIFY( result11 == digits4 );
- VERIFY( err11 == ios_base::eofbit );
-
-- // for the "en_HK" locale the parsing of the very same input streams must
-+ // for the "zh_HK" locale the parsing of the very same input streams must
- // be successful without showbase too, since the symbol field appears in
- // the first positions in the format and the symbol, when present, must be
- // consumed.
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-09-12 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -35,7 +35,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- // input less than frac_digits
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_env.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/16.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/16.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2004-03-02 Paolo Carlini <pcarlini@suse.de>
-
-@@ -37,7 +37,7 @@
- // basic construction
- locale loc_c = locale::classic();
- locale loc_de = locale("de_DE@euro");
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_hk != loc_de );
- VERIFY( loc_c != loc_hk );
-
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/18.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/18.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2004-03-15 Paolo Carlini <pcarlini@suse.de>
-
-@@ -36,7 +36,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- iterator_type end, end01, end02;
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-09-12 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -35,7 +35,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- // total EPA budget FY 2002
-@@ -80,7 +80,7 @@
- VERIFY( result11 == digits4 );
- VERIFY( err11 == ios_base::eofbit );
-
-- // for the "en_HK" locale the parsing of the very same input streams must
-+ // for the "zh_HK" locale the parsing of the very same input streams must
- // be successful without showbase too, since the symbol field appears in
- // the first positions in the format and the symbol, when present, must be
- // consumed.
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-09-12 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -35,7 +35,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- // input less than frac_digits
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -36,7 +36,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -36,7 +36,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE@euro" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-11-21 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -34,7 +34,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-11-21 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -34,7 +34,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/num_put/put/char/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-11-19 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -34,7 +34,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
---- libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
---- libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-11-19 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -34,7 +34,7 @@
-
- // basic construction
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_c != loc_hk );
-
- // sanity check the data is correct.
---- libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
-
- // 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
-@@ -36,7 +36,7 @@
-
- // basic construction and sanity checks.
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- locale loc_de = locale("de_DE");
- VERIFY( loc_hk != loc_c );
- VERIFY( loc_hk != loc_de );
-@@ -76,7 +76,7 @@
- VERIFY( time10.tm_year == time_bday.tm_year );
- VERIFY( errorstate == ios_base::eofbit );
-
-- // inspection of named locales, en_HK
-+ // inspection of named locales, zh_HK
- iss.imbue(loc_hk);
- iss.str("Sunday, April 04, 1971");
- iterator_type is_it20(iss);
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
-
- // 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
-@@ -36,7 +36,7 @@
-
- // basic construction and sanity checks.
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- locale loc_de = locale("de_DE");
- VERIFY( loc_hk != loc_c );
- VERIFY( loc_hk != loc_de );
-@@ -76,7 +76,7 @@
- VERIFY( time10.tm_year == time_bday.tm_year );
- VERIFY( errorstate == ios_base::eofbit );
-
-- // inspection of named locales, en_HK
-+ // inspection of named locales, zh_HK
- iss.imbue(loc_hk);
- iss.str(L"Sunday, April 04, 1971");
- iterator_type is_it20(iss);
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
-
- // 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
-@@ -35,7 +35,7 @@
-
- // basic construction and sanity checks.
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- locale loc_de = locale("de_DE");
- VERIFY( loc_hk != loc_c );
- VERIFY( loc_hk != loc_de );
-@@ -63,7 +63,7 @@
- VERIFY( time10.tm_mon == time_bday.tm_mon );
- VERIFY( errorstate == ios_base::eofbit );
-
-- // inspection of named locales, en_HK
-+ // inspection of named locales, zh_HK
- iss.imbue(loc_hk);
- const time_get<char>& tim_get2 = use_facet<time_get<char> >(iss.getloc());
- iss.str("April");
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
-
- // 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
-@@ -36,7 +36,7 @@
-
- // basic construction and sanity checks.
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- locale loc_de = locale("de_DE");
- VERIFY( loc_hk != loc_c );
- VERIFY( loc_hk != loc_de );
-@@ -64,7 +64,7 @@
- VERIFY( time10.tm_mon == time_bday.tm_mon );
- VERIFY( errorstate == ios_base::eofbit );
-
-- // inspection of named locales, en_HK
-+ // inspection of named locales, zh_HK
- iss.imbue(loc_hk);
- const time_get<wchar_t>& tim_get2 = use_facet<time_get<wchar_t> >(iss.getloc());
- iss.str(L"April");
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -35,7 +35,7 @@
-
- // basic construction and sanity check
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_hk != loc_c );
-
- const string empty;
-@@ -48,7 +48,7 @@
- const ios_base::iostate good = ios_base::goodbit;
- ios_base::iostate errorstate = good;
-
-- // inspection of named locales, en_HK
-+ // inspection of named locales, zh_HK
- iss.imbue(loc_hk);
- iss.str("12:00:00 PST");
- // Hong Kong in California! Well, they have Paris in Vegas... this
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -35,7 +35,7 @@
-
- // basic construction and sanity check
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_hk != loc_c );
-
- const wstring empty;
-@@ -48,7 +48,7 @@
- const ios_base::iostate good = ios_base::goodbit;
- ios_base::iostate errorstate = good;
-
-- // inspection of named locales, en_HK
-+ // inspection of named locales, zh_HK
- iss.imbue(loc_hk);
- iss.str(L"12:00:00 PST");
- // Hong Kong in California! Well, they have Paris in Vegas... this
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
-
- // 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
-@@ -36,7 +36,7 @@
-
- // basic construction and sanity checks.
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- locale loc_de = locale("de_DE");
- VERIFY( loc_hk != loc_c );
- VERIFY( loc_hk != loc_de );
-@@ -65,7 +65,7 @@
- VERIFY( time10.tm_wday == time_bday.tm_wday );
- VERIFY( errorstate == ios_base::eofbit );
-
-- // inspection of named locales, en_HK
-+ // inspection of named locales, zh_HK
- iss.imbue(loc_hk);
- iss.str("Sunday");
- iterator_type is_it20(iss);
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc
-@@ -1,6 +1,6 @@
- // { dg-require-namedlocale "ja_JP.eucjp" }
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
-
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
-
- // 2001-09-21 Benjamin Kosnik <bkoz@redhat.com>
-@@ -36,7 +36,7 @@
-
- // basic construction and sanity checks.
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- locale loc_de = locale("de_DE");
- VERIFY( loc_hk != loc_c );
- VERIFY( loc_hk != loc_de );
-@@ -65,7 +65,7 @@
- VERIFY( time10.tm_wday == time_bday.tm_wday );
- VERIFY( errorstate == ios_base::eofbit );
-
-- // inspection of named locales, en_HK
-+ // inspection of named locales, zh_HK
- iss.imbue(loc_hk);
- iss.str(L"Sunday");
- iterator_type is_it20(iss);
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
-
- // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com>
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "ja_JP.eucjp" }
-
---- libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -38,7 +38,7 @@
-
- // basic construction and sanity check.
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_hk != loc_c );
-
- // create an ostream-derived object, cache the time_put facet
---- libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -41,7 +41,7 @@
-
- // basic construction and sanity check
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_hk != loc_c );
-
- // create an ostream-derived object, cache the time_put facet
---- libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
- // { dg-require-namedlocale "fr_FR@euro" }
-
---- libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
- // { dg-require-namedlocale "fr_FR@euro" }
-
---- libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -38,7 +38,7 @@
-
- // basic construction and sanity check
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_hk != loc_c );
-
- // create an ostream-derived object, cache the time_put facet
---- libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
-
- // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -41,7 +41,7 @@
-
- // basic construction and sanity check
- locale loc_c = locale::classic();
-- locale loc_hk = locale("en_HK");
-+ locale loc_hk = locale("zh_HK");
- VERIFY( loc_hk != loc_c );
-
- // create an ostream-derived object, cache the time_put facet
---- libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
- // { dg-require-namedlocale "fr_FR@euro" }
-
---- libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc
-@@ -1,5 +1,5 @@
- // { dg-require-namedlocale "de_DE" }
--// { dg-require-namedlocale "en_HK" }
-+// { dg-require-namedlocale "zh_HK" }
- // { dg-require-namedlocale "es_ES" }
- // { dg-require-namedlocale "fr_FR@euro" }
- // { dg-require-namedlocale "ja_JP.eucjp" }
---- libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-03-12 Petur Runolfsson <peturr02@ru.is>
-
-@@ -31,7 +31,7 @@
- using namespace std;
- bool test __attribute__((unused)) = true;
-
-- locale loc = locale("se_NO.UTF-8");
-+ locale loc = locale("no_NO.UTF-8");
- const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
-
- const wchar_t* wstrlit = L"\x80";
---- libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-03-12 Petur Runolfsson <peturr02@ru.is>
-
-@@ -31,7 +31,7 @@
- using namespace std;
- bool test __attribute__((unused)) = true;
-
-- locale loc = locale("se_NO.UTF-8");
-+ locale loc = locale("no_NO.UTF-8");
- const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
-
- const char* strlit = "\xc2\x80";
---- libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-09-08 Petur Runolfsson <peturr02@ru.is>
-
-@@ -91,7 +91,7 @@
- const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
-
- const int loops = 2 * BUFSIZ / wlen;
-- locale loc = locale("se_NO.UTF-8");
-+ locale loc = locale("no_NO.UTF-8");
-
- FILE* file = fopen(name, "w");
- for (int i = 0; i < loops; ++i)
---- libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-09-08 Petur Runolfsson <peturr02@ru.is>
-
-@@ -35,7 +35,7 @@
- bool test __attribute__((unused)) = true;
- const char name[] = "tmp_seekoff-2.tst";
-
-- locale loc = locale("se_NO.UTF-8");
-+ locale loc = locale("no_NO.UTF-8");
-
- const size_t size = 10;
- wchar_t buf[size];
---- libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-10-07 Petur Runolfsson <peturr02@ru.is>
- //
-@@ -93,7 +93,7 @@
- const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
-
- const int loops = 2 * BUFSIZ / wlen;
-- locale loc = locale("se_NO.UTF-8");
-+ locale loc = locale("no_NO.UTF-8");
-
- FILE* file = fopen(name, "w");
- for (int i = 0; i < loops; ++i)
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-09-04 Petur Runolfsson <peturr02@ru.is>
-
-@@ -86,7 +86,7 @@
- const size_t clen = sizeof(cstr) / sizeof(cstr[0]);
- const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
-
-- locale loc = locale("se_NO.UTF-8");
-+ locale loc = locale("no_NO.UTF-8");
-
- FILE* file = fopen(name, "w");
- fwrite(cstr, 1, clen, file);
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-09-04 Petur Runolfsson <peturr02@ru.is>
-
-@@ -86,7 +86,7 @@
- const size_t clen = sizeof(cstr) / sizeof(cstr[0]);
- const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
-
-- locale loc = locale("se_NO.UTF-8");
-+ locale loc = locale("no_NO.UTF-8");
-
- FILE* file = fopen(name, "w");
- fwrite(cstr, 1, clen, file);
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-09-04 Petur Runolfsson <peturr02@ru.is>
-
-@@ -87,7 +87,7 @@
- const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
-
- const int loops = 2 * BUFSIZ / wlen;
-- locale loc = locale("se_NO.UTF-8");
-+ locale loc = locale("no_NO.UTF-8");
-
- FILE* file = fopen(name, "w");
- for (int i = 0; i < loops; ++i)
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-09-04 Petur Runolfsson <peturr02@ru.is>
- // Adapted from 27_io/basic_filebuf/underflow/char/2.cc
-@@ -31,7 +31,7 @@
- bool test __attribute__((unused)) = true;
- using namespace std;
-
-- locale loc (locale("se_NO.UTF-8"));
-+ locale loc (locale("no_NO.UTF-8"));
- wfilebuf fb_out, fb_in_out;
- fb_out.pubimbue(loc);
- fb_in_out.pubimbue(loc);
---- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc.orig
-+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-09-04 Petur Runolfsson <peturr02@ru.is>
-
-@@ -35,7 +35,7 @@
-
- wfilebuf fb;
- fb.pubsetbuf(0, 0);
-- fb.pubimbue(locale("se_NO.UTF-8"));
-+ fb.pubimbue(locale("no_NO.UTF-8"));
-
- FILE* file = fopen(name, "w");
- setvbuf(file, 0, _IONBF, 0);
---- libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc.orig
-+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-05-01 Petur Runolfsson <peturr02@ru.is>
-
-@@ -33,7 +33,7 @@
- bool test __attribute__((unused)) = true;
- const char* name = "tmp_10";
-
-- locale loc(locale("se_NO.UTF-8"));
-+ locale loc(locale("no_NO.UTF-8"));
- locale::global(loc);
- wcin.imbue(loc);
- wcout.imbue(loc);
---- libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc.orig
-+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-05-01 Petur Runolfsson <peturr02@ru.is>
-
-@@ -33,7 +33,7 @@
- bool test __attribute__((unused)) = true;
- const char* name = "tmp_11";
-
-- locale loc(locale("se_NO.UTF-8"));
-+ locale loc(locale("no_NO.UTF-8"));
- locale::global(loc);
- wcin.imbue(loc);
- wcout.imbue(loc);
---- libstdc++-v3/testsuite/27_io/objects/wchar_t/12.cc.orig
-+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/12.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-09-04 Petur Runolfsson <peturr02@ru.is>
-
-@@ -38,7 +38,7 @@
- bool test __attribute__((unused)) = true;
- const char* name = "tmp_12";
-
-- locale loc(locale("se_NO.UTF-8"));
-+ locale loc(locale("no_NO.UTF-8"));
- locale::global(loc);
- std::ios_base::sync_with_stdio(false);
- wcout.imbue(loc);
---- libstdc++-v3/testsuite/27_io/objects/wchar_t/13.cc.orig
-+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/13.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "se_NO.UTF-8" }
-+// { dg-require-namedlocale "no_NO.UTF-8" }
-
- // 2003-09-04 Petur Runolfsson <peturr02@ru.is>
-
-@@ -36,7 +36,7 @@
- bool test __attribute__((unused)) = true;
- const char* name = "tmp_13";
-
-- locale loc(locale("se_NO.UTF-8"));
-+ locale loc(locale("no_NO.UTF-8"));
- locale::global(loc);
- std::ios_base::sync_with_stdio(false);
- wcin.imbue(loc);
---- libstdc++-v3/testsuite/22_locale/facet/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/facet/2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "es_MX" }
-+// { dg-require-namedlocale "es_ES" }
-
- // 2000-08-31 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -84,7 +84,7 @@
- // 4: Named locale should destroy facets when it goes out of scope.
- // Not quite sure how to test for this w/o valgrind at the moment.
- {
-- locale loc03 = locale("es_MX");
-+ locale loc03 = locale("es_ES");
- }
- }
-
---- libstdc++-v3/testsuite/22_locale/locale/cons/5.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/locale/cons/5.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "en_PH" }
-+// { dg-require-namedlocale "en_NZ" }
- // { dg-require-namedlocale "de_DE" }
- // { dg-require-namedlocale "it_IT" }
-
-@@ -76,21 +76,21 @@
- }
- setenv("LC_ALL", "", 1);
-
-- // Check that a "en_PH" LC_ALL is equivalent to "en_PH".
-- if (!setenv("LC_ALL", "en_PH", 1))
-+ // Check that a "en_NZ" LC_ALL is equivalent to "en_PH".
-+ if (!setenv("LC_ALL", "en_NZ", 1))
- {
- locale loc = locale("");
-- VERIFY( loc.name() == "en_PH" );
-+ VERIFY( loc.name() == "en_NZ" );
- }
- setenv("LC_ALL", "", 1);
-
- // Explicit check that LC_ALL sets regardless of LC_* and LANG.
-- if (!setenv("LANG", "es_MX", 1) && !setenv("LC_COLLATE", "de_DE", 1))
-+ if (!setenv("LANG", "es_ES", 1) && !setenv("LC_COLLATE", "de_DE", 1))
- {
-- if (!setenv("LC_ALL", "en_PH", 1))
-+ if (!setenv("LC_ALL", "en_NZ", 1))
- {
- locale loc = locale("");
-- VERIFY( loc.name() == "en_PH" );
-+ VERIFY( loc.name() == "en_NZ" );
- }
- setenv("LC_ALL", "", 1);
- setenv("LANG", LANG_orig ? LANG_orig : "", 1);
---- libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc
-@@ -1,5 +1,5 @@
--// { dg-require-namedlocale "en_PH" }
--// { dg-require-namedlocale "es_MX" }
-+// { dg-require-namedlocale "en_NZ" }
-+// { dg-require-namedlocale "es_ES" }
-
- // 2000-09-13 Benjamin Kosnik <bkoz@redhat.com>
-
-@@ -32,8 +32,8 @@
- using namespace std;
- bool test __attribute__((unused)) = true;
-
-- const string ph("en_PH");
-- const string mx("es_MX");
-+ const string ph("en_NZ");
-+ const string mx("es_ES");
- const char* orig = setlocale(LC_ALL, 0);
- const char* testph = setlocale(LC_ALL, ph.c_str());
- const char* testmx = setlocale(LC_ALL, mx.c_str());
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ru_RU.ISO-8859-5" }
-+// { dg-require-namedlocale "ru_RU.ISO8859-5" }
-
- // Copyright (C) 2010, 2011 Free Software Foundation
- //
-@@ -33,7 +33,7 @@
- typedef istreambuf_iterator<char> iterator_type;
-
- // basic construction
-- locale loc("ru_RU.ISO-8859-5");
-+ locale loc("ru_RU.ISO8859-5");
-
- // create an ostream-derived object, cache the time_get facet
- iterator_type end;
---- libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc.orig
-+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc
-@@ -1,4 +1,4 @@
--// { dg-require-namedlocale "ru_RU.UTF8" }
-+// { dg-require-namedlocale "ru_RU.UTF-8" }
-
- // 2010-01-05 Paolo Carlini <paolo.carlini@oracle.com>
-
-@@ -34,7 +34,7 @@
- typedef istreambuf_iterator<char> iterator_type;
-
- // basic construction
-- locale loc("ru_RU.UTF8");
-+ locale loc("ru_RU.UTF-8");
-
- // create an ostream-derived object, cache the time_get facet
- iterator_type end;
diff --git a/lang/gcc-aux/files/diff-fortran b/lang/gcc-aux/files/diff-fortran
index 83d9ea31bb4..caf531d1909 100644
--- a/lang/gcc-aux/files/diff-fortran
+++ b/lang/gcc-aux/files/diff-fortran
@@ -1,6 +1,6 @@
--- gcc/fortran/f95-lang.c.orig
+++ gcc/fortran/f95-lang.c
-@@ -819,10 +819,17 @@
+@@ -718,10 +718,17 @@
gfc_define_builtin ("__builtin_cabsl", func_clongdouble_longdouble,
BUILT_IN_CABSL, "cabsl", ATTR_CONST_NOTHROW_LEAF_LIST);
@@ -20,53 +20,23 @@
BUILT_IN_COPYSIGNL, "copysignl",
--- libgfortran/acinclude.m4.orig
+++ libgfortran/acinclude.m4
-@@ -99,7 +99,7 @@
+@@ -100,7 +100,7 @@
[Define to 1 if the target supports #pragma weak])
fi
case "$host" in
-- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | alpha*-dec-osf* )
-+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | alpha*-dec-osf* | *-*-netbsd* )
+- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* )
++ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-netbsd* )
AC_DEFINE(GTHREAD_USE_WEAK, 0,
[Define to 0 if the target shouldn't use #pragma weak])
;;
---- libquadmath/Makefile.in.orig
-+++ libquadmath/Makefile.in
-@@ -388,15 +388,14 @@
-
- # Subdir rules rely on $(FLAGS_TO_PASS)
- @BUILD_LIBQUADMATH_TRUE@FLAGS_TO_PASS = $(AM_MAKEFLAGS)
--@BUILD_LIBQUADMATH_TRUE@MAKEOVERRIDES =
--@BUILD_LIBQUADMATH_TRUE@@GENINSRC_FALSE@STAMP_GENINSRC =
-+@BUILD_LIBQUADMATH_TRUE@MAKEOVERRIDES =
-+@BUILD_LIBQUADMATH_TRUE@@GENINSRC_FALSE@STAMP_GENINSRC =
-
- # AM_CONDITIONAL on configure option --generated-files-in-srcdir
- @BUILD_LIBQUADMATH_TRUE@@GENINSRC_TRUE@STAMP_GENINSRC = stamp-geninsrc
--@BUILD_INFO_FALSE@@BUILD_LIBQUADMATH_TRUE@STAMP_BUILD_INFO =
-+@BUILD_LIBQUADMATH_TRUE@STAMP_BUILD_INFO =
-
- # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO])
--@BUILD_INFO_TRUE@@BUILD_LIBQUADMATH_TRUE@STAMP_BUILD_INFO = stamp-build-info
- @BUILD_LIBQUADMATH_TRUE@CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libquadmath.info
- @BUILD_LIBQUADMATH_TRUE@MAINTAINERCLEANFILES = $(srcdir)/libquadmath.info
-
-@@ -1247,7 +1246,7 @@
-
- info-am: $(INFO_DEPS)
-
--install-data-am: install-info-am install-nodist_libsubincludeHEADERS
-+install-data-am: install-nodist_libsubincludeHEADERS
-
- install-dvi: install-dvi-am
-
--- libgfortran/configure.orig
+++ libgfortran/configure
-@@ -25564,7 +25564,7 @@
+@@ -26340,7 +26340,7 @@
fi
case "$host" in
-- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | alpha*-dec-osf* )
-+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | alpha*-dec-osf* | *-*-netbsd* )
+- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* )
++ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-netbsd* )
$as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h
diff --git a/lang/gcc-aux/files/diff-fortran-testsuite b/lang/gcc-aux/files/diff-fortran-testsuite
index 789a9a2d468..4241318f23f 100644
--- a/lang/gcc-aux/files/diff-fortran-testsuite
+++ b/lang/gcc-aux/files/diff-fortran-testsuite
@@ -1,23 +1,3 @@
---- gcc/testsuite/gfortran.dg/large_real_kind_2.F90.orig
-+++ gcc/testsuite/gfortran.dg/large_real_kind_2.F90
-@@ -1,6 +1,6 @@
- ! { dg-do run }
- ! { dg-require-effective-target fortran_large_real }
--! { dg-xfail-if "" { "*-*-freebsd*" } { "*" } { "" } }
-+! { dg-skip-if "Requires cpowl,coshl,sinhl,tanhl,acoshl,asinhl,atanhl,expl,logl,ccosl,csinl,cexpl,clogl" { "x86_64-*-freebsd* x86_64-*-dragonfly* x86_64-*-netbsd*" } { "*" } { "" } }
-
- ! Testing library calls on large real kinds (larger than kind=8)
- implicit none
---- gcc/testsuite/gfortran.dg/large_real_kind_3.F90.orig
-+++ gcc/testsuite/gfortran.dg/large_real_kind_3.F90
-@@ -1,6 +1,6 @@
- ! { dg-do run }
- ! { dg-require-effective-target fortran_large_real }
--! { dg-xfail-if "" { "*-*-freebsd*" } { "*" } { "" } }
-+! { dg-skip-if "Requires erfl,erfcl with -O0" { "x86_64-*-freebsd* x86_64-*-dragonfly* x86_64-*-netbsd*" } { "-O0" } { "" } }
-
- ! Testing erf and erfc library calls on large real kinds (larger than kind=8)
- implicit none
--- gcc/testsuite/gfortran.dg/open_errors.f90.orig
+++ gcc/testsuite/gfortran.dg/open_errors.f90
@@ -22,7 +22,7 @@
diff --git a/lang/gcc-aux/files/diff-gcc-testsuite b/lang/gcc-aux/files/diff-gcc-testsuite
index f313ca030d1..a9a330ecf55 100644
--- a/lang/gcc-aux/files/diff-gcc-testsuite
+++ b/lang/gcc-aux/files/diff-gcc-testsuite
@@ -1,14 +1,3 @@
---- gcc/testsuite/gcc.dg/pch/pch.exp.orig
-+++ gcc/testsuite/gcc.dg/pch/pch.exp
-@@ -44,6 +44,8 @@
- set test "largefile.c"
- set testh "largefile.hs"
- set f [open $test w]
-+puts $f "/* { dg-do run { target *-*-solaris* } } */"
-+puts $f "/* { dg-error \"dummy\" \"fool dejagnu\" { target { ! *-*-solaris* } 20 } } */"
- puts $f "/* { dg-timeout-factor 4.0 } */"
- set v 0
- for { set v 0 } { $v < 10000 } { incr v } {
--- gcc/testsuite/gcc.dg/format/ext-1.c.orig
+++ gcc/testsuite/gcc.dg/format/ext-1.c
@@ -8,7 +8,7 @@
@@ -44,3 +33,14 @@
__extension__ typedef __INTMAX_TYPE__ intmax_t;
__extension__ typedef __UINTMAX_TYPE__ uintmax_t;
+--- gcc/testsuite/gcc.dg/pch/pch.exp.orig
++++ gcc/testsuite/gcc.dg/pch/pch.exp
+@@ -44,6 +44,8 @@
+ set test "largefile.c"
+ set testh "largefile.hs"
+ set f [open $test w]
++puts $f "/* { dg-do run { target *-*-solaris* } } */"
++puts $f "/* { dg-error \"dummy\" \"fool dejagnu\" { target { ! *-*-solaris* } 20 } } */"
+ puts $f "/* { dg-timeout-factor 4.0 } */"
+ set v 0
+ for { set v 0 } { $v < 10000 } { incr v } {
diff --git a/lang/gcc-aux/files/diff-static-version b/lang/gcc-aux/files/diff-static-version
deleted file mode 100644
index a64e558e5c2..00000000000
--- a/lang/gcc-aux/files/diff-static-version
+++ /dev/null
@@ -1,16 +0,0 @@
---- gcc/Makefile.in.2
-+++ gcc/Makefile.in
-@@ -320,11 +320,11 @@
- # This is where we get zlib from. zlibdir is -L../zlib and zlibinc is
- # -I../zlib, unless we were configured with --with-system-zlib, in which
- # case both are empty.
--ZLIB = @zlibdir@ -lz
-+ZLIB = -Wl,-Bstatic -lz -Wl,-Bdynamic
- ZLIBINC = @zlibinc@
-
- # How to find GMP
--GMPLIBS = @GMPLIBS@
-+GMPLIBS = -Wl,-Bstatic @GMPLIBS@ -Wl,-Bdynamic
- GMPINC = @GMPINC@
-
- # How to find PPL
diff --git a/lang/gcc-aux/options.mk b/lang/gcc-aux/options.mk
index 7a4defd2bc2..6812c4ceeca 100644
--- a/lang/gcc-aux/options.mk
+++ b/lang/gcc-aux/options.mk
@@ -1,41 +1,21 @@
-# $NetBSD: options.mk,v 1.1 2012/07/08 19:30:38 marino Exp $
+# $NetBSD: options.mk,v 1.2 2014/04/30 16:24:39 marino Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gcc-aux
-PKG_SUPPORTED_OPTIONS= ada cxx fortran objc testsuite nls static
-PKG_SUGGESTED_OPTIONS= ada cxx fortran objc
-
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+= static
-.endif
+PKG_SUPPORTED_OPTIONS= fortran objc testsuite nls static bootstrap
+PKG_SUGGESTED_OPTIONS= fortran objc nls
.include "../../mk/bsd.options.mk"
-#########################
-## ADD LANGUAGE: Ada ##
-#########################
-
-.if !empty(PKG_OPTIONS:Mada)
-LANGS+= ada
-APPLY_DIFFS+= ada
-.endif
-
-
-#########################
-## ADD LANGUAGE: C++ ##
-#########################
-
-.if !empty(PKG_OPTIONS:Mcxx)
-LANGS+= c++
-APPLY_DIFFS+= cxx
-.endif
+# Bootstrap is essentially a maintainer option and it will ignore
+# all other options because it is intent on building a bootstrap compiler.
#############################
## ADD LANGUAGE: Fortran ##
#############################
-.if empty(PKG_OPTIONS:Mfortran)
+.if empty(PKG_OPTIONS:Mfortran) || !empty(PKG_OPTIONS:Mbootstrap)
EXTRA_CONFARGS+= --disable-libquadmath
.else
LANGS+= fortran
@@ -52,7 +32,7 @@ EXTRA_CONFARGS+= --enable-libquadmath
## ADD LANGUAGE: Objective-C ##
#################################
-.if !empty(PKG_OPTIONS:Mobjc)
+.if !empty(PKG_OPTIONS:Mobjc) && empty(PKG_OPTIONS:Mbootstrap)
LANGS+= objc
.endif
@@ -61,7 +41,7 @@ LANGS+= objc
## TESTSUITE SUPPORT ##
#########################
-.if !empty(PKG_OPTIONS:Mtestsuite)
+.if !empty(PKG_OPTIONS:Mtestsuite) && empty(PKG_OPTIONS:Mbootstrap)
BUILD_DEPENDS+= dejagnu>=1.4:../../devel/dejagnu
APPLY_DIFFS+= ada-testsuite
APPLY_DIFFS+= cxx-testsuite
@@ -74,9 +54,13 @@ APPLY_DIFFS+= fortran-testsuite
## NATIONAL LANGUAGE SUPPORT ##
#################################
-.if !empty(PKG_OPTIONS:Mnls)
+.if !empty(PKG_OPTIONS:Mnls) && empty(PKG_OPTIONS:Mbootstrap)
+USE_BUILTIN.iconv= no
USE_TOOLS+= msgfmt
EXTRA_CONFARGS+= --enable-nls
+EXTRA_CONFARGS+= --with-libiconv-prefix=${PREFIX}
+MY_MAKE_ENV+= ICONVPREFIX=${PREFIX}
+.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.else
EXTRA_CONFARGS+= --disable-nls
@@ -87,10 +71,20 @@ EXTRA_CONFARGS+= --disable-nls
## STATICALLY BUILT OPTION ##
###############################
-# NetBSD must be built statically to support dl_iterate_phdr
-# error handling. The base compiler doesn't support despite it although
-# NetBSD's realtime linker supports dl_iterate_phdr
-# Setting the option by default on NetBSD is cosmetic; regardless of
-# setting, NetBSD will always be built statically.
-#
-# The "static" option is handled in the post-extract phase.
+.if !empty(PKG_OPTIONS:Mstatic) && empty(PKG_OPTIONS:Mbootstrap)
+EXTRA_CONFARGS+= --with-stage1-ldflags=-static
+.endif
+
+
+#################################
+## BOOTSTRAP COMPILER OPTION ##
+#################################
+
+.if !empty(PKG_OPTIONS:Mbootstrap)
+EXTRA_CONFARGS+= --disable-shared --disable-lto
+EXTRA_CONFARGS+= --with-stage1-ldflags=-static
+EXTRA_CONFARGS+= --with-boot-ldflags=-static
+.else
+EXTRA_CONFARGS+= --enable-shared
+EXTRA_CONFARGS+= --disable-bootstrap
+.endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 15:33:25 +0000