diff -u gcc-4.7-4.7.2/debian/changelog gcc-4.7-4.7.2/debian/changelog --- gcc-4.7-4.7.2/debian/changelog +++ gcc-4.7-4.7.2/debian/changelog @@ -1,3 +1,68 @@ +gcc-4.7 (4.7.2-5ubuntu1) quantal; urgency=low + + * Merge with Debian. + + -- Matthias Klose Tue, 16 Oct 2012 00:42:44 +0200 + +gcc-4.7 (4.7.2-5) UNRELEASED; urgency=low + + * Update to SVN 20121015 (r192393) from the gcc-4_7-branch. + + [ Matthias Klose ] + * Update the Linaro support to the 4.7-2012.10 release. + * Define MULTIARCH_DIRNAME for arm64 (Wookey). + * Let the lib*objc-dev packages depend on the lib*gcc-dev packages. + * Let the libstdc++-dev package depend on the libgcc-dev package. + * Drop the dependency of the libstdc++-dev package on g++, make + libstdc++-dev Multi-Arch: same. Closes: #678623. + * Install override files before calling dh_fixperms. + * Backport the libffi arm64 port. + + [ Thibaut Girka ] + * Split out lib*gcc-dev packages. + * Split out lib*objc-dev packages. + + -- Matthias Klose Tue, 16 Oct 2012 00:05:44 +0200 + +gcc-4.7 (4.7.2-4ubuntu1) quantal; urgency=low + + * Merge with Debian. + + -- Matthias Klose Wed, 10 Oct 2012 01:16:02 +0200 + +gcc-4.7 (4.7.2-4) unstable; urgency=low + + * Fix PR c++/54858 (ice on valid), taken from the branch. + * Build again Go on armel and armhf. + + -- Matthias Klose Tue, 09 Oct 2012 12:00:59 +0200 + +gcc-4.7 (4.7.2-3) unstable; urgency=low + + * Revert the fix PR c/33763, and just disable the sorry message, + taken from the branch. Closes: #678589. LP: #1062343. + * Update libgo to 1.0.3. + * Go fixes: + - Fix a, b, c := b, a, 1 when a and b already exist. + - Fix some type reflection strings. + - Fix parse of (<- chan <- chan <- int)(x). + - Fix handling of omitted expression in switch. + - Better error for switch on non-comparable type. + * Fix PR debug/53135 (ice on valid), PR target/54703 (x86, wrong code), + PR c++/54777 (c++11, rejects valid), taken from the 4.7 branch. + * gcc-4.7-base: ensure smooth upgrades from squeeze by adding + Breaks: gcj-4.4-base (<< 4.4.6-9~), gnat-4.4-base (<< 4.4.6-3~) + as in gcc-4.4-base (multiarch patches re-worked in 4.6.1-8/4.4.6-9). + Fixes some squeeze->wheezy upgrade paths where apt chooses to hold back + gcc-4.4-base and keep gcj-4.4-base installed instead of upgrading + gcc-4.4-base and removing the obsolete gcj-4.4-base (Andreas Beckmann). + Closes: #677582. + * Add arm64 support, partly based on Wookey's patches (only applied for + arm64). Disabled for arm64 are ssp, gomp, mudflap, boehm-gc, Ada, ObjC, + Obj-C++ and Java). + + -- Matthias Klose Fri, 05 Oct 2012 20:00:30 +0200 + gcc-4.7 (4.7.2-2ubuntu1) quantal; urgency=low * Merge with Debian. diff -u gcc-4.7-4.7.2/debian/control gcc-4.7-4.7.2/debian/control --- gcc-4.7-4.7.2/debian/control +++ gcc-4.7-4.7.2/debian/control @@ -19,7 +19,7 @@ Priority: required Depends: ${misc:Depends} Replaces: ${base:Replaces} -Breaks: gcj-4.6-base (<< 4.6.1-4~), gnat-4.6 (<< 4.6.1-5~), dehydra (<= 0.9.hg20110609-2) +Breaks: gcj-4.4-base (<< 4.4.6-9~), gnat-4.4-base (<< 4.4.6-3~), gcj-4.6-base (<< 4.6.1-4~), gnat-4.6 (<< 4.6.1-5~), dehydra (<= 0.9.hg20110609-2) Description: GCC, the GNU Compiler Collection (base package) This package contains files common to all languages and libraries contained in the GNU Compiler Collection (GCC). @@ -38,6 +38,18 @@ that GCC uses to overcome shortcomings of particular machines, or special needs for some languages. +Package: libgcc-4.7-dev +Architecture: any +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libitm}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc-4.7 (<< ${gcc:SplitVersion}) +Multi-Arch: same +Description: GCC support library (development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: libgcc1-dbg Architecture: any Section: debug @@ -103,6 +115,17 @@ that GCC uses to overcome shortcomings of particular machines, or special needs for some languages. +Package: lib64gcc-4.7-dev +Architecture: i386 powerpc sparc s390 mips mipsel +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc-4.7-multilib (<< ${gcc:SplitVersion}) +Description: GCC support library (64bit development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: lib64gcc1-dbg Architecture: i386 powerpc sparc s390 mips mipsel Section: debug @@ -122,6 +145,17 @@ that GCC uses to overcome shortcomings of particular machines, or special needs for some languages. +Package: lib32gcc-4.7-dev +Architecture: amd64 ppc64 kfreebsd-amd64 s390x +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc-4.7-multilib (<< ${gcc:SplitVersion}) +Description: GCC support library (32 bit development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: lib32gcc1-dbg Architecture: amd64 ppc64 kfreebsd-amd64 s390x Section: debug @@ -141,6 +175,17 @@ that GCC uses to overcome shortcomings of particular machines, or special needs for some languages. +Package: libhfgcc-4.7-dev +Architecture: armel +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc-4.7-multilib (<< ${gcc:SplitVersion}) +Description: GCC support library (hard float ABI development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: libhfgcc1-dbg Architecture: armel Section: debug @@ -161,6 +206,17 @@ that GCC uses to overcome shortcomings of particular machines, or special needs for some languages. +Package: libsfgcc-4.7-dev +Architecture: armhf +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc-4.7-multilib (<< ${gcc:SplitVersion}) +Description: GCC support library (soft float ABI development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: libsfgcc1-dbg Architecture: armhf Section: debug @@ -181,6 +237,17 @@ that GCC uses to overcome shortcomings of particular machines, or special needs for some languages. +Package: libn32gcc-4.7-dev +Architecture: mips mipsel +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc-4.7-multilib (<< ${gcc:SplitVersion}) +Description: GCC support library (n32 development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: libn32gcc1-dbg Architecture: mips mipsel Section: debug @@ -193,7 +260,7 @@ Architecture: any Section: devel Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), cpp-4.7 (= ${gcc:Version}), binutils (>= ${binutils:Version}), ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libitm}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends} +Depends: gcc-4.7-base (= ${gcc:Version}), cpp-4.7 (= ${gcc:Version}), binutils (>= ${binutils:Version}), libgcc-4.7-dev (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: ${dep:libcdev} Suggests: ${gcc:multilib}, libmudflap0-4.7-dev (>= ${gcc:Version}), gcc-4.7-doc (>= ${gcc:SoftVersion}), gcc-4.7-locales (>= ${gcc:SoftVersion}), libgcc1-dbg, libgomp1-dbg, libitm1-dbg, libquadmath0-dbg, libmudflap0-dbg, ${dep:libcloog}, ${dep:gold} Provides: c-compiler @@ -204,7 +271,7 @@ Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc Section: devel Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), gcc-4.7 (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Depends: gcc-4.7-base (= ${gcc:Version}), gcc-4.7 (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarchdev}, ${shlibs:Depends}, ${misc:Depends} Suggests: ${dep:libmudflapbiarch} Description: GNU C compiler (multilib files) This is the GNU C compiler, a fairly portable optimizing compiler for C. @@ -816,7 +883,7 @@ Package: gobjc++-4.7 Architecture: any Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), gobjc-4.7 (= ${gcc:Version}), g++-4.7 (= ${gcc:Version}), ${shlibs:Depends}, libobjc4 (>= ${gcc:Version}), ${misc:Depends} +Depends: gcc-4.7-base (= ${gcc:Version}), gobjc-4.7 (= ${gcc:Version}), g++-4.7 (= ${gcc:Version}), ${shlibs:Depends}, libobjc-4.7-dev (= ${gcc:Version}), ${misc:Depends} Suggests: ${gobjcxx:multilib}, gcc-4.7-doc (>= ${gcc:SoftVersion}) Provides: objc++-compiler Description: GNU Objective-C++ compiler @@ -839,7 +906,7 @@ Package: gobjc-4.7 Architecture: any Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), gcc-4.7 (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libobjc4 (>= ${gcc:Version}), ${misc:Depends} +Depends: gcc-4.7-base (= ${gcc:Version}), gcc-4.7 (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libobjc-4.7-dev (= ${gcc:Version}), ${misc:Depends} Suggests: ${gobjc:multilib}, gcc-4.7-doc (>= ${gcc:SoftVersion}), libobjc4-dbg Provides: objc-compiler Description: GNU Objective-C compiler @@ -851,7 +918,7 @@ Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc Section: devel Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), gobjc-4.7 (= ${gcc:Version}), gcc-4.7-multilib (= ${gcc:Version}), ${dep:libobjcbiarch}, ${shlibs:Depends}, ${misc:Depends} +Depends: gcc-4.7-base (= ${gcc:Version}), gobjc-4.7 (= ${gcc:Version}), gcc-4.7-multilib (= ${gcc:Version}), ${dep:libobjcbiarchdev}, ${shlibs:Depends}, ${misc:Depends} Description: GNU Objective-C compiler (multilib files) This is the GNU Objective-C compiler, which compiles Objective-C on platforms supported by the gcc compiler. @@ -870,6 +937,17 @@ Description: Runtime library for GNU Objective-C applications Library needed for GNU ObjC applications linked against the shared library. +Package: libobjc-4.7-dev +Architecture: any +Section: libdevel +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), libgcc-4.7-dev (= ${gcc:Version}), libobjc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc-4.7 (<< ${gcc:SplitVersion}) +Multi-Arch: same +Description: Runtime library for GNU Objective-C applications (development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: libobjc4-dbg Section: debug Architecture: any @@ -888,6 +966,16 @@ Description: Runtime library for GNU Objective-C applications (64bit) Library needed for GNU ObjC applications linked against the shared library. +Package: lib64objc-4.7-dev +Architecture: i386 powerpc sparc s390 mips mipsel +Section: libdevel +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), lib64gcc-4.7-dev (= ${gcc:Version}), lib64objc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc-4.7-multilib (<< ${gcc:SplitVersion}) +Description: Runtime library for GNU Objective-C applications (64bit development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: lib64objc4-dbg Section: debug Architecture: i386 powerpc sparc s390 mips mipsel @@ -905,6 +993,16 @@ Description: Runtime library for GNU Objective-C applications (32bit) Library needed for GNU ObjC applications linked against the shared library. +Package: lib32objc-4.7-dev +Architecture: amd64 ppc64 kfreebsd-amd64 s390x +Section: libdevel +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), lib32gcc-4.7-dev (= ${gcc:Version}), lib32objc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc-4.7-multilib (<< ${gcc:SplitVersion}) +Description: Runtime library for GNU Objective-C applications (32bit development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: lib32objc4-dbg Section: debug Architecture: amd64 ppc64 kfreebsd-amd64 s390x @@ -921,6 +1019,16 @@ Description: Runtime library for GNU Objective-C applications (n32) Library needed for GNU ObjC applications linked against the shared library. +Package: libn32objc-4.7-dev +Architecture: mips mipsel +Section: libdevel +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), libn32gcc-4.7-dev (= ${gcc:Version}), libn32objc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc-4.7-multilib (<< ${gcc:SplitVersion}) +Description: Runtime library for GNU Objective-C applications (n32 development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: libn32objc4-dbg Section: debug Architecture: mips mipsel @@ -938,6 +1046,16 @@ Description: Runtime library for GNU Objective-C applications (hard float ABI) Library needed for GNU ObjC applications linked against the shared library. +Package: libhfobjc-4.7-dev +Architecture: armel +Section: libdevel +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), libhfgcc-4.7-dev (= ${gcc:Version}), libhfobjc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc-4.7-multilib (<< ${gcc:SplitVersion}) +Description: Runtime library for GNU Objective-C applications (hard float ABI development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: libhfobjc4-dbg Section: debug Architecture: armel @@ -956,6 +1074,16 @@ Description: Runtime library for GNU Objective-C applications (soft float ABI) Library needed for GNU ObjC applications linked against the shared library. +Package: libsfobjc-4.7-dev +Architecture: armhf +Section: libdevel +Priority: optional +Depends: gcc-4.7-base (= ${gcc:Version}), libsfgcc-4.7-dev (= ${gcc:Version}), libsfobjc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc-4.7-multilib (<< ${gcc:SplitVersion}) +Description: Runtime library for GNU Objective-C applications (soft float development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: libsfobjc4-dbg Section: debug Architecture: armhf @@ -1309,9 +1437,10 @@ Package: libstdc++6-4.7-dev Architecture: any +Multi-Arch: same Section: libdevel Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), g++-4.7 (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), ${dep:libcdev}, ${misc:Depends} +Depends: gcc-4.7-base (= ${gcc:Version}), libgcc-4.7-dev (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), ${dep:libcdev}, ${misc:Depends} Conflicts: libg++27-dev, libg++272-dev (<< 2.7.2.8-1), libstdc++2.8-dev, libg++2.8-dev, libstdc++2.9-dev, libstdc++2.9-glibc2.1-dev, libstdc++2.10-dev (<< 1:2.95.3-2), libstdc++3.0-dev Suggests: libstdc++6-4.7-doc Provides: libstdc++-dev diff -u gcc-4.7-4.7.2/debian/rules.parameters gcc-4.7-4.7.2/debian/rules.parameters --- gcc-4.7-4.7.2/debian/rules.parameters +++ gcc-4.7-4.7.2/debian/rules.parameters @@ -2,15 +2,15 @@ GCC_VERSION := 4.7.2 NEXT_GCC_VERSION := 4.7.3 BASE_VERSION := 4.7 -SOURCE_VERSION := 4.7.2-1ubuntu1 -DEB_VERSION := 4.7.2-1ubuntu1 -DEB_EVERSION := 1:4.7.2-1ubuntu1 +SOURCE_VERSION := 4.7.2-5ubuntu1 +DEB_VERSION := 4.7.2-5ubuntu1 +DEB_EVERSION := 1:4.7.2-5ubuntu1 GDC_BASE_VERSION := DEB_GDC_VERSION := DEB_SOVERSION := 4.7 DEB_SOEVERSION := 1:4.7 DEB_LIBGCC_SOVERSION := 1:4.7 -DEB_LIBGCC_VERSION := 1:4.7.2-1ubuntu1 +DEB_LIBGCC_VERSION := 1:4.7.2-5ubuntu1 DEB_STDCXX_SOVERSION := 4.7 DEB_GCJ_SOVERSION := 4.7 PKG_GCJ_EXT := 13 diff -u gcc-4.7-4.7.2/debian/rules.defs gcc-4.7-4.7.2/debian/rules.defs --- gcc-4.7-4.7.2/debian/rules.defs +++ gcc-4.7-4.7.2/debian/rules.defs @@ -407,7 +407,7 @@ ada_no_systems := ada_no_cross := yes ada_no_snap := no -ifneq (,$(filter $(DEB_TARGET_ARCH),armhf m68k powerpcspe sh4 sparc64)) +ifneq (,$(filter $(DEB_TARGET_ARCH),arm64 armhf m68k powerpcspe sh4 sparc64)) ada_no_snap := yes endif @@ -416,7 +416,7 @@ with_ada := yes endif endif -ifneq (,$(findstring $(DEB_TARGET_ARCH_CPU),$(ada_no_cpus))) +ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(ada_no_cpus))) with_ada := disabled for cpu $(DEB_TARGET_ARCH_CPU) endif ifneq (,$(findstring $(DEB_TARGET_GNU_SYSTEM),$(ada_no_systems))) @@ -517,7 +517,7 @@ # - To build gcc and java from separate sources: # with_separate_libgcj=yes, with_standalone_gcj=no -java_no_cpus := # mips mipsel +java_no_cpus := arm64 # mips mipsel java_no_systems := knetbsd-gnu java_no_cross := yes @@ -534,7 +534,7 @@ ifeq ($(with_base_only),yes) with_java := no endif -ifneq (,$(findstring $(DEB_TARGET_ARCH_CPU),$(java_no_cpus))) +ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(java_no_cpus))) with_java := disabled for cpu $(DEB_TARGET_ARCH_CPU) endif ifneq (,$(filter $(DEB_TARGET_GNU_SYSTEM),$(java_no_systems))) @@ -620,12 +620,16 @@ go_no_cross := yes go_no_cross := no +ifneq (,$(findstring gccgo, $(PKGSOURCE))) + with_separate_libgo := yes +endif + go_no_cpus := avr arm hppa m68k sh4 sparc sparc64 ifeq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid maverick natty oneiric)) go_no_cpus := $(filter-out arm, $(go_no_cpus)) endif ifneq ($(trunk_build),yes) - go_no_cpus := $(go_no_cpus) alpha + go_no_cpus := $(go_no_cpus) alpha arm64 endif go_no_systems := gnu kfreebsd-gnu @@ -634,14 +638,14 @@ with_go := yes endif endif -ifneq (,$(findstring $(DEB_TARGET_ARCH_CPU),$(go_no_cpus))) +ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(go_no_cpus))) with_go := disabled for cpu $(DEB_TARGET_ARCH_CPU) endif ifneq (,$(findstring $(DEB_TARGET_GNU_SYSTEM),$(go_no_systems))) with_go := disabled for system $(DEB_TARGET_GNU_SYSTEM) endif ifeq ($(go_no_cross)-$(DEB_CROSS),yes-yes) - with_go := diasbled for cross compiler package + with_go := disabled for cross compiler package endif with_go := $(call envfilt, go, , , $(with_go)) @@ -723,7 +727,7 @@ endif endif ifeq ($(fortran_no_cross)-$(DEB_CROSS),yes-yes) - with_fortran := diasbled for cross compiler package + with_fortran := disabled for cross compiler package endif with_fortran := $(call envfilt, fortran, , , $(with_fortran)) @@ -755,10 +759,14 @@ ifneq ($(with_base_only),yes) ifneq ($(separate_lang),yes) with_objc := yes + objc_no_archs = arm64 + ifneq (,$(filter $(DEB_TARGET_ARCH),$(objc_no_archs))) + with_objc := + endif endif endif ifeq ($(objc_no_cross)-$(DEB_CROSS),yes-yes) - with_objc := diasbled for cross compiler package + with_objc := disabled for cross compiler package endif with_objc := $(call envfilt, objc, obj-c++, , $(with_objc)) @@ -767,9 +775,9 @@ with_objc_gc := yes # disable ObjC garbage collection library (needs libgc) - libgc_no_cpus := avr mips mipsel # alpha amd64 arm armel armhf hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 s390x sparc + libgc_no_cpus := arm64 avr mips mipsel # alpha amd64 arm armel armhf hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 s390x sparc libgc_no_systems := knetbsd-gnu - ifneq (,$(findstring $(DEB_TARGET_ARCH_CPU),$(libgc_no_cpus))) + ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(libgc_no_cpus))) with_objc_gc := disabled for cpu $(DEB_TARGET_ARCH_CPU) endif ifneq (,$(findstring $(DEB_TARGET_GNU_SYSTEM),$(libgc_no_systems))) @@ -791,13 +799,15 @@ # ObjC++ ---------------------- objcxx_no_cross := no -ifneq ($(with_base_only),yes) - ifneq ($(separate_lang),yes) - with_objcxx := yes +ifeq ($(with_objc),yes) + ifneq ($(with_base_only),yes) + ifneq ($(separate_lang),yes) + with_objcxx := yes + endif endif endif ifeq ($(objcxx_no_cross)-$(DEB_CROSS),yes-yes) - with_objcxx := diasbled for cross compiler package + with_objcxx := disabled for cross compiler package endif with_objcxx := $(call envfilt, obj-c++, , c++ objc, $(with_objcxx)) @@ -829,7 +839,7 @@ # ssp & libssp ------------------------- with_ssp := yes -ssp_no_archs = alpha hppa ia64 m68k +ssp_no_archs = alpha arm64 hppa ia64 m68k ifneq (, $(filter $(DEB_TARGET_ARCH),$(ssp_no_archs) $(ssp_no_archs:%=uclibc-%))) with_ssp := not available on $(DEB_TARGET_ARCH) endif @@ -846,10 +856,18 @@ # mudflap ------------------- with_mudflap := yes with_mudflap := $(call envfilt, mudflap, , , $(with_mudflap)) +mudflap_no_archs = arm64 +ifneq (,$(filter $(DEB_TARGET_ARCH),$(mudflap_no_archs))) + with_mudflap := +endif # gomp -------------------- with_gomp := yes with_gomp := $(call envfilt, gomp, , , $(with_gomp)) +gomp_no_archs = arm64 +ifneq (,$(filter $(DEB_TARGET_ARCH),$(gomp_no_archs))) + with_gomp := +endif # itm -------------------- itm_archs = amd64 i386 @@ -1021,9 +1039,9 @@ ifneq (,$(findstring $(DEB_TARGET_GNU_SYSTEM),$(check_no_systems))) with_check := disabled for system $(DEB_TARGET_GNU_SYSTEM) endif -ifeq ($(distribution)-$(DEB_HOST_ARCH),Ubuntu-armel) +ifeq ($(distribution)-$(DEB_HOST_ARCH),Ubuntu-hppa) ifneq ($(single_package),yes) - with_check := disabled, testsuite timeouts + with_check := disabled, testsuite timeouts with expect endif endif ifneq (,$(findstring gdc,$(PKGSOURCE))) @@ -1129,6 +1147,9 @@ ifeq ($(with_go),yes) biarch_multidir_names += libgo endif + ifeq ($(trunk_build),yes) + biarch_multidir_names += libbacktrace + endif export biarch_multidir_names ifneq (,$$(findstring 32,$1)) TARGET64_MACHINE := $$(strip $$(subst $$(DEB_TARGET_GNU_CPU),$$(biarch_cpu), \ diff -u gcc-4.7-4.7.2/debian/rules.conf gcc-4.7-4.7.2/debian/rules.conf --- gcc-4.7-4.7.2/debian/rules.conf +++ gcc-4.7-4.7.2/debian/rules.conf @@ -472,6 +472,7 @@ DEB_GCJ_SOVERSION := 4.7 DEB_GOMP_SOVERSION := $(DEB_SOVERSION) DEB_GCCMATH_SOVERSION := $(DEB_SOVERSION) +DEB_GCC_SPLIT_VERSION := 4.7.2-4ubuntu2 DEB_GCC_VERSION := $(DEB_VERSION) DEB_GCJ_VERSION := $(DEB_VERSION) @@ -506,28 +507,57 @@ ifeq ($(with_shared_libgcc),yes) LIBGCC_DEP := libgcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) +LIBGCC_BIARCH_DEV_DEP := LIBGCC_BIARCH_DEP := ifeq ($(biarch64),yes) LIBGCC_BIARCH_DEP := lib64gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) + LIBGCC_BIARCH_DEV_DEP := lib64gcc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) endif ifeq ($(biarch32),yes) LIBGCC_BIARCH_DEP := lib32gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) + LIBGCC_BIARCH_DEV_DEP := lib32gcc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) endif ifeq ($(biarchn32),yes) ifeq ($(biarch64),yes) LIBGCC_BIARCH_DEP := lib64gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)), libn32gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) + LIBGCC_BIARCH_DEV_DEP := lib64gcc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}), libn32gcc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) else LIBGCC_BIARCH_DEP := libn32gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) + LIBGCC_BIARCH_DEV_DEP := libn32gcc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) endif endif ifeq ($(biarchhf),yes) LIBGCC_BIARCH_DEP := libhfgcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) | libgcc1-armhf + LIBGCC_BIARCH_DEV_DEP := libhfgcc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) endif ifeq ($(biarchsf),yes) LIBGCC_BIARCH_DEP := libsfgcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION)) | libgcc1-armel + LIBGCC_BIARCH_DEV_DEP := libsfgcc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) endif endif # $(with_shared_libgcc) +LIBOBJC_BIARCH_DEV_DEP := +ifeq ($(biarch64),yes) + LIBOBJC_BIARCH_DEV_DEP := lib64gobjc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) +endif +ifeq ($(biarch32),yes) + LIBOBJC_BIARCH_DEV_DEP := lib32gobjc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) +endif +ifeq ($(biarchn32),yes) + ifeq ($(biarch64),yes) + LIBOBJC_BIARCH_DEV_DEP := lib64gobjc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}), libn32gobjc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) + else + LIBOBJC_BIARCH_DEV_DEP := libn32gobjc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) + endif +endif +ifeq ($(biarchhf),yes) + LIBOBJC_BIARCH_DEV_DEP := libhfgobjc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) +endif +ifeq ($(biarchsf),yes) + LIBOBJC_BIARCH_DEV_DEP := libsfgobjc-$(BASE_VERSION)-dev$(LS) (= $${gcc:Version}) +endif + + GNAT_VERSION := $(BASE_VERSION) LIBGNAT_DEP := @@ -829,6 +859,7 @@ echo 'gcc:Version=$(DEB_GCC_VERSION)'; \ echo 'gcc:EpochVersion=$(DEB_EVERSION)'; \ echo 'gcc:SoftVersion=$(DEB_GCC_SOFT_VERSION)'; \ + echo 'gcc:SplitVersion=$(DEB_GCC_SPLIT_VERSION)'; \ echo 'gdc:Version=$(DEB_GDC_VERSION)'; \ echo 'gcj:Version=$(DEB_GCJ_VERSION)'; \ echo 'gcj:SoftVersion=$(DEB_GCJ_SOFT_VERSION)'; \ @@ -837,6 +868,7 @@ echo 'binutils:Version=$(BINUTILSV)'; \ echo 'dep:libgcc=$(LIBGCC_DEP)'; \ echo 'dep:libgccbiarch=$(LIBGCC_BIARCH_DEP)'; \ + echo 'dep:libgccbiarchdev=$(LIBGCC_BIARCH_DEV_DEP)'; \ echo 'dep:libc=$(LIBC_DEP) (>= $(libc_ver))'; \ echo 'dep:libcdev=$(LIBC_DEV_DEP)'; \ echo 'dep:libcbiarch=$(LIBC_BIARCH_DEP)'; \ @@ -882,7 +914,7 @@ ifeq ($(multilib),yes) echo 'dep:libgfortranbiarch=$(libgfortranbiarch)' \ >> debian/substvars.local.tmp - echo 'dep:libobjcbiarch=$(libobjcbiarch)' \ + echo 'dep:libobjcbiarchdev=$(LIBOBJC_BIARCH_DEV_DEP)' \ >> debian/substvars.local.tmp ifeq ($(with_mudflap),yes) echo 'dep:libmudflapbiarch=$(libmudflapbiarch)' \ diff -u gcc-4.7-4.7.2/debian/control.m4 gcc-4.7-4.7.2/debian/control.m4 --- gcc-4.7-4.7.2/debian/control.m4 +++ gcc-4.7-4.7.2/debian/control.m4 @@ -105,7 +105,7 @@ Priority: PRI(required) Depends: ${misc:Depends} Replaces: ${base:Replaces} -Breaks: gcj-4.6-base (<< 4.6.1-4~), gnat-4.6 (<< 4.6.1-5~), dehydra (<= 0.9.hg20110609-2) +Breaks: gcj-4.4-base (<< 4.4.6-9~), gnat-4.4-base (<< 4.4.6-3~), gcj-4.6-base (<< 4.6.1-4~), gnat-4.6 (<< 4.6.1-5~), dehydra (<= 0.9.hg20110609-2) Description: GCC, the GNU Compiler Collection (base package) This package contains files common to all languages and libraries contained in the GNU Compiler Collection (GCC). @@ -180,6 +180,19 @@ environment. ')`'dnl +Package: libgcc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`any') +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: BASEDEP, ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libitm}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc`'PV (<< ${gcc:SplitVersion}) +ifdef(`MULTIARCH', `Multi-Arch: same +')`'dnl +Description: GCC support library (development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: libgcc1-dbg`'LS Architecture: ifdef(`TARGET',`all',`any') Section: debug @@ -289,6 +302,17 @@ environment. ')`'dnl +Package: lib64gcc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`biarch64_archs') +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: BASEDEP, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc`'PV-multilib (<< ${gcc:SplitVersion}) +Description: GCC support library (64bit development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: lib64gcc1-dbg`'LS Architecture: ifdef(`TARGET',`all',`biarch64_archs') Section: debug @@ -322,6 +346,17 @@ environment. ')`'dnl +Package: lib32gcc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`biarch32_archs') +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: BASEDEP, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc`'PV-multilib (<< ${gcc:SplitVersion}) +Description: GCC support library (32 bit development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: lib32gcc1-dbg`'LS Architecture: ifdef(`TARGET',`all',`biarch32_archs') Section: debug @@ -370,6 +405,17 @@ environment. ')`'dnl +Package: libhfgcc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`biarchhf_archs') +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: BASEDEP, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc`'PV-multilib (<< ${gcc:SplitVersion}) +Description: GCC support library (hard float ABI development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: libhfgcc1-dbg`'LS Architecture: ifdef(`TARGET',`all',`biarchhf_archs') Section: debug @@ -404,6 +450,17 @@ environment. ')`'dnl +Package: libsfgcc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`biarchsf_archs') +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: BASEDEP, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc`'PV-multilib (<< ${gcc:SplitVersion}) +Description: GCC support library (soft float ABI development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: libsfgcc1-dbg`'LS Architecture: ifdef(`TARGET',`all',`biarchsf_archs') Section: debug @@ -438,6 +495,17 @@ environment. ')`'dnl +Package: libn32gcc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`biarchn32_archs') +Section: libdevel +Priority: optional +Recommends: ${dep:libcdev} +Depends: BASEDEP, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Replaces: gcc`'PV-multilib (<< ${gcc:SplitVersion}) +Description: GCC support library (n32 development files) + This package contains the headers and static library files necessary for + building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. + Package: libn32gcc1-dbg`'LS Architecture: ifdef(`TARGET',`all',`biarchn32_archs') Section: debug @@ -488,7 +556,7 @@ Architecture: any Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') -Depends: BASEDEP, cpp`'PV`'TS (= ${gcc:Version}), binutils`'TS (>= ${binutils:Version}), ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libitm}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends} +Depends: BASEDEP, cpp`'PV`'TS (= ${gcc:Version}), binutils`'TS (>= ${binutils:Version}), libgcc`'PV-dev`'LS (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: ${dep:libcdev} Suggests: ${gcc:multilib}, libmudflap`'MF_SO`'PV-dev`'LS (>= ${gcc:Version}), gcc`'PV-doc (>= ${gcc:SoftVersion}), gcc`'PV-locales (>= ${gcc:SoftVersion}), libgcc`'GCC_SO-dbg`'LS, libgomp`'GOMP_SO-dbg`'LS, libitm`'ITM_SO-dbg`'LS, libquadmath`'QMATH_SO-dbg`'LS, libmudflap`'MF_SO-dbg`'LS, ${dep:libcloog}, ${dep:gold} Provides: c-compiler`'TS @@ -504,7 +572,7 @@ Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') -Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} +Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarchdev}, ${shlibs:Depends}, ${misc:Depends} Suggests: ${dep:libmudflapbiarch} Description: GNU C compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') This is the GNU C compiler, a fairly portable optimizing compiler for C. @@ -1277,7 +1345,7 @@ Package: gobjc++`'PV`'TS Architecture: any Priority: ifdef(`TARGET',`extra',`PRI(optional)') -Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), g++`'PV`'TS (= ${gcc:Version}), ${shlibs:Depends}, libobjc`'OBJC_SO`'LS (>= ${gcc:Version}), ${misc:Depends} +Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), g++`'PV`'TS (= ${gcc:Version}), ${shlibs:Depends}, libobjc`'PV-dev`'LS (= ${gcc:Version}), ${misc:Depends} Suggests: ${gobjcxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}) Provides: objc++-compiler`'TS Description: GNU Objective-C++ compiler @@ -1306,7 +1374,7 @@ Package: gobjc`'PV`'TS Architecture: any Priority: ifdef(`TARGET',`extra',`PRI(optional)') -Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libobjc`'OBJC_SO`'LS (>= ${gcc:Version}), ${misc:Depends} +Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libobjc`'PV-dev`'LS (= ${gcc:Version}), ${misc:Depends} Suggests: ${gobjc:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libobjc`'OBJC_SO-dbg`'LS Provides: objc-compiler`'TS ifdef(`__sparc__',`Conflicts: gcc`'PV-sparc64', `dnl') @@ -1320,7 +1388,7 @@ Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') -Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libobjcbiarch}, ${shlibs:Depends}, ${misc:Depends} +Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libobjcbiarchdev}, ${shlibs:Depends}, ${misc:Depends} Description: GNU Objective-C compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') This is the GNU Objective-C compiler, which compiles Objective-C on platforms supported by the gcc compiler. @@ -1343,6 +1411,18 @@ Description: Runtime library for GNU Objective-C applications Library needed for GNU ObjC applications linked against the shared library. +Package: libobjc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`any') +Section: libdevel +Priority: optional +Depends: BASEDEP, libgcc`'PV-dev`'LS (= ${gcc:Version}), libobjc`'OBJC_SO`'LS (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc`'PV (<< ${gcc:SplitVersion}) +ifdef(`MULTIARCH', `Multi-Arch: same +')`'dnl +Description: Runtime library for GNU Objective-C applications (development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: libobjc`'OBJC_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`all',`any') @@ -1363,6 +1443,16 @@ Description: Runtime library for GNU Objective-C applications (64bit) Library needed for GNU ObjC applications linked against the shared library. +Package: lib64objc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`biarch64_archs') +Section: libdevel +Priority: optional +Depends: BASEDEP, lib64gcc`'PV-dev`'LS (= ${gcc:Version}), lib64objc`'OBJC_SO`'LS (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc`'PV-multilib (<< ${gcc:SplitVersion}) +Description: Runtime library for GNU Objective-C applications (64bit development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: lib64objc`'OBJC_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`all',`biarch64_archs') @@ -1382,6 +1472,16 @@ Description: Runtime library for GNU Objective-C applications (32bit) Library needed for GNU ObjC applications linked against the shared library. +Package: lib32objc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`biarch32_archs') +Section: libdevel +Priority: optional +Depends: BASEDEP, lib32gcc`'PV-dev`'LS (= ${gcc:Version}), lib32objc`'OBJC_SO`'LS (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc`'PV-multilib (<< ${gcc:SplitVersion}) +Description: Runtime library for GNU Objective-C applications (32bit development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: lib32objc`'OBJC_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`all',`biarch32_archs') @@ -1400,6 +1500,16 @@ Description: Runtime library for GNU Objective-C applications (n32) Library needed for GNU ObjC applications linked against the shared library. +Package: libn32objc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`biarchn32_archs') +Section: libdevel +Priority: optional +Depends: BASEDEP, libn32gcc`'PV-dev`'LS (= ${gcc:Version}), libn32objc`'OBJC_SO`'LS (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc`'PV-multilib (<< ${gcc:SplitVersion}) +Description: Runtime library for GNU Objective-C applications (n32 development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: libn32objc`'OBJC_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`all',`biarchn32_archs') @@ -1419,6 +1529,16 @@ Description: Runtime library for GNU Objective-C applications (hard float ABI) Library needed for GNU ObjC applications linked against the shared library. +Package: libhfobjc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`biarchhf_archs') +Section: libdevel +Priority: optional +Depends: BASEDEP, libhfgcc`'PV-dev`'LS (= ${gcc:Version}), libhfobjc`'OBJC_SO`'LS (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc`'PV-multilib (<< ${gcc:SplitVersion}) +Description: Runtime library for GNU Objective-C applications (hard float ABI development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: libhfobjc`'OBJC_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`all',`biarchhf_archs') @@ -1439,6 +1559,16 @@ Description: Runtime library for GNU Objective-C applications (soft float ABI) Library needed for GNU ObjC applications linked against the shared library. +Package: libsfobjc`'PV-dev`'LS +Architecture: ifdef(`TARGET',`all',`biarchsf_archs') +Section: libdevel +Priority: optional +Depends: BASEDEP, libsfgcc`'PV-dev`'LS (= ${gcc:Version}), libsfobjc`'OBJC_SO`'LS (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: gobjc`'PV-multilib (<< ${gcc:SplitVersion}) +Description: Runtime library for GNU Objective-C applications (soft float development files) + This package contains the headers and static library files needed to build + GNU ObjC applications. + Package: libsfobjc`'OBJC_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`all',`biarchsf_archs') @@ -2129,9 +2259,11 @@ ifenabled(`c++dev',` Package: libstdc++CXX_SO`'PV-dev`'LS Architecture: ifdef(`TARGET',`all',`any') +ifdef(`MULTIARCH', `Multi-Arch: same +')`'dnl Section: ifdef(`TARGET',`devel',`libdevel') Priority: ifdef(`TARGET',`extra',PRI(optional)) -Depends: BASEDEP, g++`'PV`'TS (= ${gcc:Version}), libstdc++CXX_SO`'LS (>= ${gcc:Version}), ${dep:libcdev}, ${misc:Depends} +Depends: BASEDEP, libgcc`'PV-dev`'LS (= ${gcc:Version}), libstdc++CXX_SO`'LS (>= ${gcc:Version}), ${dep:libcdev}, ${misc:Depends} ifdef(`TARGET',`',`dnl native Conflicts: libg++27-dev, libg++272-dev (<< 2.7.2.8-1), libstdc++2.8-dev, libg++2.8-dev, libstdc++2.9-dev, libstdc++2.9-glibc2.1-dev, libstdc++2.10-dev (<< 1:2.95.3-2), libstdc++3.0-dev Suggests: libstdc++CXX_SO`'PV-doc diff -u gcc-4.7-4.7.2/debian/rules.patch gcc-4.7-4.7.2/debian/rules.patch --- gcc-4.7-4.7.2/debian/rules.patch +++ gcc-4.7-4.7.2/debian/rules.patch @@ -14,8 +14,8 @@ debian_patches = \ $(if $(with_linaro_branch),gcc-linaro) \ - -# svn-updates$(if $(with_linaro_branch),-linaro) \ + svn-updates$(if $(with_linaro_branch),-linaro) \ + svn-libstdc++ \ ifeq ($(with_java),yes) # debian_patches += \ @@ -26,8 +26,7 @@ debian_patches += \ rename-info-files \ $(if $(with_linaro_branch),gcc-linaro-doc) \ - -# $(if $(with_linaro_branch),,svn-doc-updates) \ + $(if $(with_linaro_branch),,svn-doc-updates) \ else endif @@ -37,6 +36,10 @@ # boehm-gc-nocheck: seems to work on the buildds \ debian_patches += \ + $(if $(with_linaro_branch),,aarch64-branch) \ + aarch64-multiarch \ + aarch64-libffi \ + aarch64-libffi-testsuite \ gcc-textdomain \ gcc-driver-extra-langs @@ -81,13 +84,6 @@ libiberty-md5 \ libgo-hardening \ pr26155 \ - go-fixes \ - pr54103 \ - pr54312 \ - pr54552 \ - pr54563 \ - pr54564 \ - pr54638 \ arm-no-va_list-warn \ # $(if $(filter yes, $(DEB_CROSS)),,gcc-print-file-name) \ @@ -216,11 +212,6 @@ debian_patches += gcc-sysroot debian_patches += libgo-mksysinfo -ifeq ($(trunk_build),yes) - debian_patches += pr33763-trunk -else - debian_patches += pr33763 -endif ifeq ($(with_softfloat),yes) debian_patches += arm-multilib-soft-float diff -u gcc-4.7-4.7.2/debian/rules2 gcc-4.7-4.7.2/debian/rules2 --- gcc-4.7-4.7.2/debian/rules2 +++ gcc-4.7-4.7.2/debian/rules2 @@ -521,7 +521,7 @@ bootstrap_target = bootstrap-lean # no profiledbootstrap on the following architectures # - m68k: we're happy that it builds at all - no_profiled_bs_archs := alpha arm hppa m68k + no_profiled_bs_archs := alpha arm arm64 hppa m68k ifeq (,$(findstring $(DEB_TARGET_GNU_CPU),$(no_profiled_bs_archs))) bootstrap_target = profiledbootstrap # FIXME: disabled for first uploads @@ -536,12 +536,12 @@ # disable profiled bootstrap on slow archs, get to testing first ... ifeq ($(distribution),Debian) - ifneq (,$(filter $(DEB_TARGET_ARCH), arm armel armhf mips mipsel sparc)) + ifneq (,$(filter $(DEB_TARGET_ARCH), arm arm64 armel armhf mips mipsel sparc)) bootstrap_target = bootstrap-lean endif endif ifeq ($(distribution),Ubuntu) - ifneq (,$(filter $(DEB_TARGET_ARCH), sparc)) + ifneq (,$(filter $(DEB_TARGET_ARCH), arm64 sparc)) bootstrap_target = bootstrap-lean endif endif @@ -550,7 +550,7 @@ DEJAGNU_TIMEOUT=300 # Increase the timeout for one testrun on slow architectures ifeq ($(distribution),Debian) - ifneq (,$(findstring $(DEB_TARGET_ARCH),arm armel armhf hppa m68k sparc)) + ifneq (,$(findstring $(DEB_TARGET_ARCH),arm arm64 armel armhf hppa m68k sparc)) DEJAGNU_TIMEOUT=600 else ifneq (,$(findstring $(DEB_TARGET_GNU_CPU),amd64 i386 i486 i686 lpia)) DEJAGNU_TIMEOUT=180 @@ -559,7 +559,7 @@ DEJAGNU_TIMEOUT=900 endif else ifeq ($(distribution),Ubuntu) - ifneq (,$(findstring $(DEB_TARGET_ARCH),armel armhf hppa ia64 sparc)) + ifneq (,$(findstring $(DEB_TARGET_ARCH),arm64 armel armhf hppa ia64 sparc)) DEJAGNU_TIMEOUT=600 else ifneq (,$(findstring $(DEB_TARGET_GNU_CPU),amd64 i386 i486 i686 lpia)) DEJAGNU_TIMEOUT=180 diff -u gcc-4.7-4.7.2/debian/rules.d/binary-snapshot.mk gcc-4.7-4.7.2/debian/rules.d/binary-snapshot.mk --- gcc-4.7-4.7.2/debian/rules.d/binary-snapshot.mk +++ gcc-4.7-4.7.2/debian/rules.d/binary-snapshot.mk @@ -70,6 +70,20 @@ find $(d_snap) -name '*.gch' -type d | xargs -r rm -rf find $(d_snap) -name '*.la' -o -name '*.lai' | xargs -r rm -f + : # FIXME: libbacktrace is not installed by default + for d in . 32 n32 64 sf hf; do \ + if [ -f $(buildlibdir)/$$d/libbacktrace/.libs/libbacktrace.a ]; then \ + install -m644 $(buildlibdir)/$$d/libbacktrace/.libs/libbacktrace.a \ + $(d_snap)/$(gcc_lib_dir)/$$d; \ + fi; \ + done + if [ -f $(buildlibdir)/libbacktrace/backtrace-supported.h ]; then \ + install -m644 $(buildlibdir)/libbacktrace/backtrace-supported.h \ + $(d_snap)/$(gcc_lib_dir)/include/; \ + install -m644 $(srcdir)/libbacktrace/backtrace.h \ + $(d_snap)/$(gcc_lib_dir)/include/; \ + fi + rm -rf $(d_snap)/$(PF)/lib/nof ifeq ($(with_java),yes) mv $(d)/usr/lib/jvm $(d_snap)/usr/lib/ diff -u gcc-4.7-4.7.2/debian/rules.d/binary-libobjc.mk gcc-4.7-4.7.2/debian/rules.d/binary-libobjc.mk --- gcc-4.7-4.7.2/debian/rules.d/binary-libobjc.mk +++ gcc-4.7-4.7.2/debian/rules.d/binary-libobjc.mk @@ -1,22 +1,25 @@ ifeq ($(with_objcdev),yes) - $(lib_binaries) += libobjc + $(lib_binaries) += libobjc libobjc-dev endif ifeq ($(with_lib64objc),yes) - $(lib_binaries) += lib64objc + $(lib_binaries) += lib64objc lib64objc-dev endif ifeq ($(with_lib32objc),yes) - $(lib_binaries) += lib32objc + $(lib_binaries) += lib32objc lib32objc-dev endif ifeq ($(with_libn32objc),yes) - $(lib_binaries) += libn32objc + $(lib_binaries) += libn32objc libn32objc-dev endif ifeq ($(with_libhfobjc),yes) - $(lib_binaries) += libhfobjc + $(lib_binaries) += libhfobjc libhfobjc-dev endif ifeq ($(with_libsfobjc),yes) - $(lib_binaries) += libsfobjc + $(lib_binaries) += libsfobjc libsfobjc-dev endif +files_lobjcdev= \ + $(gcc_lib_dir)/include/objc + files_lobjc = \ $(usr_lib$(2))/libobjc.so.* ifeq ($(with_objc_gc),yes) @@ -55,9 +58,45 @@ trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp) endef + +define __do_libobjc_dev + dh_testdir + dh_testroot + mv $(install_stamp) $(install_stamp)-tmp + + rm -rf $(d_l) + dh_installdirs -p$(p_l) \ + $(gcc_lib_dir$(2)) + DH_COMPAT=2 dh_movefiles -p$(p_l) \ + $(files_lobjcdev) + + $(call install_gcc_lib,libobjc,$(OBJC_SONAME),$(2),$(p_l)) + $(if $(filter yes,$(with_objc_gc)), + dh_link -p$(p_l) \ + /$(usr_lib$(2))/libobjc_gc.so.$(OBJC_SONAME) \ + /$(gcc_lib_dir$(2))/libobjc_gc.so + ) + + debian/dh_doclink -p$(p_l) $(p_base) + + dh_compress -p$(p_l) + dh_fixperms -p$(p_l) + $(cross_gencontrol) dh_gencontrol -p$(p_l) \ + -- -v$(DEB_VERSION) $(common_substvars) + $(call cross_mangle_control,$(p_l)) + dh_installdeb -p$(p_l) + dh_md5sums -p$(p_l) + dh_builddeb -p$(p_l) + + trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp) +endef + + + # ---------------------------------------------------------------------- do_libobjc = $(call __do_libobjc,lib$(1)objc$(OBJC_SONAME),$(1)) +do_libobjc_dev = $(call __do_libobjc_dev,lib$(1)objc-$(BASE_VERSION)-dev,$(1)) $(binary_stamp)-libobjc: $(install_stamp) $(call do_libobjc,) @@ -78,0 +118,20 @@ + + +$(binary_stamp)-libobjc-dev: $(install_stamp) + $(call do_libobjc_dev,) + +$(binary_stamp)-lib64objc-dev: $(install_stamp) + $(call do_libobjc_dev,64) + +$(binary_stamp)-lib32objc-dev: $(install_stamp) + $(call do_libobjc_dev,32) + +$(binary_stamp)-libn32objc-dev: $(install_stamp) + $(call do_libobjc_dev,n32) + +$(binary_stamp)-libhfobjc-dev: $(install_stamp) + $(call do_libobjc_dev,hf) + +$(binary_stamp)-libsfobjc-dev: $(install_stamp) + $(call do_libobjc_dev,sf) + diff -u gcc-4.7-4.7.2/debian/rules.d/binary-gcc.mk gcc-4.7-4.7.2/debian/rules.d/binary-gcc.mk --- gcc-4.7-4.7.2/debian/rules.d/binary-gcc.mk +++ gcc-4.7-4.7.2/debian/rules.d/binary-gcc.mk @@ -33,30 +33,6 @@ $(PF)/bin/$(cmd_prefix)gcc-{ar,ranlib,nm}$(pkg_ver) \ $(PF)/share/man/man1/$(cmd_prefix)gcc-{ar,nm,ranlib}$(pkg_ver).1 \ $(gcc_lexec_dir)/{collect2,lto1,lto-wrapper} \ - $(gcc_lib_dir)/include/std*.h \ - $(shell for h in \ - README features.h arm_neon.h loongson.h \ - {cpuid,decfloat,float,iso646,limits,mm3dnow,mm_malloc}.h \ - {ppu_intrinsics,paired,spu2vmx,vec_types,si2vmx}.h \ - {,a,b,e,i,n,p,s,t,w,x}mmintrin.h mmintrin-common.h \ - {abm,avx,avx2,bmi,bmi2,f16c,fma,fma4,ia32,}intrin.h \ - {lwp,lzcnt,popcnt,tbm,x86,xop,}intrin.h \ - {cross-stdarg,syslimits,unwind,unwind-arm-common,varargs}.h; \ - do \ - test -e $(d)/$(gcc_lib_dir)/include/$$h \ - && echo $(gcc_lib_dir)/include/$$h; \ - test -e $(d)/$(gcc_lib_dir)/include-fixed/$$h \ - && echo $(gcc_lib_dir)/include-fixed/$$h; \ - done) \ - $(shell for d in \ - asm bits gnu linux $(TARGET_ALIAS) \ - $(subst $(DEB_TARGET_GNU_CPU),$(biarch_cpu),$(TARGET_ALIAS)); \ - do \ - test -e $(d)/$(gcc_lib_dir)/include/$$d \ - && echo $(gcc_lib_dir)/include/$$d; \ - test -e $(d)/$(gcc_lib_dir)/include-fixed/$$d \ - && echo $(gcc_lib_dir)/include-fixed/$$d; \ - done) \ $(shell test -e $(d)/$(gcc_lib_dir)/SYSCALLS.c.X \ && echo $(gcc_lib_dir)/SYSCALLS.c.X) @@ -65,28 +41,6 @@ $(PF)/share/man/man1/$(cmd_prefix){gcc,gcov}$(pkg_ver).1 endif -ifeq ($(with_libssp),yes) - files_gcc += $(gcc_lib_dir)/include/ssp -endif -ifeq ($(with_gomp),yes) - files_gcc += $(gcc_lib_dir)/include/omp.h -endif -ifeq ($(with_qmath),yes) - files_gcc += $(gcc_lib_dir)/include/quadmath{,_weak}.h -endif - -ifeq ($(DEB_TARGET_ARCH),ia64) - files_gcc += $(gcc_lib_dir)/include/ia64intrin.h -endif - -ifeq ($(DEB_TARGET_ARCH),m68k) - files_gcc += $(gcc_lib_dir)/include/math-68881.h -endif - -ifeq ($(DEB_TARGET_ARCH),$(findstring $(DEB_TARGET_ARCH),powerpc ppc64 powerpcspe)) - files_gcc += $(gcc_lib_dir)/include/{altivec.h,ppc-asm.h,spe.h} -endif - usr_doc_files = debian/README.Bugs \ $(shell test -f $(srcdir)/FAQ && echo $(srcdir)/FAQ) \ $(shell test -f test-summary && echo test-summary) @@ -100,53 +54,6 @@ p_pld = gcc$(pkg_ver)-plugin-dev$(cross_bin_arch) d_pld = debian/$(p_pld) -# __do_gcc_libs(flavour,package,todir,fromdir) -define __do_gcc_libs - dh_installdirs -p$(2) $(3) -# stage1 builds static libgcc only - $(if $(filter $(DEB_STAGE),stage1),, - : # libgcc_s.so may be a linker script on some architectures - set -e; \ - if [ -h $(4)/libgcc_s.so ]; then \ - rm -f $(4)/libgcc_s.so; \ - dh_link -p$(2) /$(libgcc_dir$(1))/libgcc_s.so.$(GCC_SONAME) \ - $(3)/libgcc_s.so; \ - else \ - mv $(4)/libgcc_s.so $(d)/$(3)/libgcc_s.so; \ - dh_link -p$(2) /$(libgcc_dir$(1))/libgcc_s.so.$(GCC_SONAME) \ - $(3)/libgcc_s.so.$(GCC_SONAME); \ - fi; \ - $(if $(1), dh_link -p$(2) /$(3)/libgcc_s.so \ - $(gcc_lib_dir)/libgcc_s_$(1).so;) - ) - DH_COMPAT=2 dh_movefiles -p$(2) \ - $(3)/{libgcc*,libgcov.a,*.o} - $(if $(filter yes, $(with_lib$(1)gmath)), - $(call install_gcc_lib,libgcc-math,$(GCC_SONAME),$(1),$(2)) - ) - $(if $(filter yes, $(with_libssp)), - $(call install_gcc_lib,libssp,$(SSP_SONAME),$(1),$(2)) - ) - $(if $(filter yes, $(with_ssp)), - mv $(4)/libssp_nonshared.a debian/$(2)/$(3)/; - ) - $(if $(filter yes, $(with_gomp)), - $(call install_gcc_lib,libgomp,$(GOMP_SONAME),$(1),$(2)) - ) - $(if $(filter yes, $(with_itm)), - $(call install_gcc_lib,libitm,$(ITM_SONAME),$(1),$(2)) - ) - $(if $(filter yes, $(with_qmath)), - $(call install_gcc_lib,libquadmath,$(QMATH_SONAME),$(1),$(2)) - ) - -endef - -# do_gcc_libs(flavour,pkg) -define do_gcc_libs - $(call __do_gcc_libs,$(1),$(2),$(gcc_lib_dir$(1)),$(d)/$(usr_lib$(1))) -endef - # ---------------------------------------------------------------------- $(binary_stamp)-gcc: $(install_dependencies) dh_testdir @@ -156,8 +63,6 @@ rm -rf $(d_gcc) dh_installdirs -p$(p_gcc) $(dirs_gcc) - $(call do_gcc_libs,,$(p_gcc)) - ifeq ($(with_linaro_branch),yes) if [ -f $(srcdir)/ChangeLog.linaro ]; then \ cp -p $(srcdir)/ChangeLog.linaro \ @@ -256,16 +161,9 @@ rm -rf $(d_gcc_m) dh_installdirs -p$(p_gcc_m) $(docdir) - $(foreach flavour,$(flavours), \ - $(call do_gcc_libs,$(flavour),$(p_gcc_m))) - debian/dh_doclink -p$(p_gcc_m) $(p_base) debian/dh_rmemptydirs -p$(p_gcc_m) - mkdir -p $(d_gcc_m)/usr/share/lintian/overrides - cp -p debian/$(p_gcc_m).overrides \ - $(d_gcc_m)/usr/share/lintian/overrides/$(p_gcc_m) - dh_strip -p$(p_gcc_m) dh_compress -p$(p_gcc_m) dh_shlibdeps -p$(p_gcc_m) diff -u gcc-4.7-4.7.2/debian/rules.d/binary-objc.mk gcc-4.7-4.7.2/debian/rules.d/binary-objc.mk --- gcc-4.7-4.7.2/debian/rules.d/binary-objc.mk +++ gcc-4.7-4.7.2/debian/rules.d/binary-objc.mk @@ -11,23 +11,10 @@ dirs_objc = \ $(docdir)/$(p_base)/ObjC \ - $(gcc_lexec_dir) \ - $(gcc_lib_dir)/include + $(gcc_lexec_dir) files_objc = \ - $(gcc_lexec_dir)/cc1obj \ - $(gcc_lib_dir)/include/objc - -define do_objc - dh_installdirs -p$(2) $(gcc_lib_dir$(1)) - $(call install_gcc_lib,libobjc,$(OBJC_SONAME),$(1),$(2)) - $(if $(filter yes,$(with_objc_gc)), - dh_link -p$(2) \ - /$(usr_lib$(1))/libobjc_gc.so.$(OBJC_SONAME) \ - /$(gcc_lib_dir$(1))/libobjc_gc.so - ) - -endef + $(gcc_lexec_dir)/cc1obj $(binary_stamp)-objc: $(install_stamp) dh_testdir @@ -38,8 +25,6 @@ dh_installdirs -p$(p_objc) $(dirs_objc) DH_COMPAT=2 dh_movefiles -p$(p_objc) $(files_objc) - $(call do_objc,,$(p_objc)) - cp -p $(srcdir)/libobjc/{README*,THREADS*} \ $(d_objc)/$(docdir)/$(p_base)/ObjC/. @@ -70,9 +55,6 @@ rm -rf $(d_objc_m) dh_installdirs -p$(p_objc_m) $(docdir) - $(foreach flavour,$(flavours), \ - $(call do_objc,$(flavour),$(p_objc_m))) - debian/dh_doclink -p$(p_objc_m) $(p_base) dh_strip -p$(p_objc_m) diff -u gcc-4.7-4.7.2/debian/rules.d/binary-libgcc.mk gcc-4.7-4.7.2/debian/rules.d/binary-libgcc.mk --- gcc-4.7-4.7.2/debian/rules.d/binary-libgcc.mk +++ gcc-4.7-4.7.2/debian/rules.d/binary-libgcc.mk @@ -1,52 +1,210 @@ ifeq ($(with_libgcc),yes) $(lib_binaries) += libgcc + ifeq ($(with_dev),yes) #TODO + $(lib_binaries) += libgcc-dev + endif ifeq ($(with_lib64gcc),yes) $(lib_binaries) += lib64gcc + ifeq ($(with_dev),yes) #TODO + $(lib_binaries) += lib64gcc-dev + endif endif ifeq ($(biarch32),yes) $(lib_binaries) += lib32gcc + ifeq ($(with_dev),yes) #TODO + $(lib_binaries) += lib32gcc-dev + endif endif ifeq ($(biarchn32),yes) $(lib_binaries) += libn32gcc + ifeq ($(with_dev),yes) #TODO + $(lib_binaries) += libn32gcc-dev + endif endif ifeq ($(biarchhf),yes) $(lib_binaries) += libhfgcc + ifeq ($(with_dev),yes) #TODO + $(lib_binaries) += libhfgcc-dev + endif endif ifeq ($(biarchsf),yes) $(lib_binaries) += libsfgcc + ifeq ($(with_dev),yes) #TODO + $(lib_binaries) += libsfgcc-dev + endif endif endif +header_files = \ + $(gcc_lib_dir)/include/std*.h \ + $(shell for h in \ + README features.h arm_neon.h loongson.h \ + {cpuid,decfloat,float,iso646,limits,mm3dnow,mm_malloc}.h \ + {ppu_intrinsics,paired,spu2vmx,vec_types,si2vmx}.h \ + {,a,b,e,i,n,p,s,t,w,x}mmintrin.h mmintrin-common.h \ + {abm,avx,avx2,bmi,bmi2,f16c,fma,fma4,ia32,}intrin.h \ + {lwp,lzcnt,popcnt,tbm,x86,xop,}intrin.h \ + {cross-stdarg,syslimits,unwind,unwind-arm-common,varargs}.h; \ + do \ + test -e $(d)/$(gcc_lib_dir)/include/$$h \ + && echo $(gcc_lib_dir)/include/$$h; \ + test -e $(d)/$(gcc_lib_dir)/include-fixed/$$h \ + && echo $(gcc_lib_dir)/include-fixed/$$h; \ + done) \ + $(shell for d in \ + asm bits gnu linux $(TARGET_ALIAS) \ + $(subst $(DEB_TARGET_GNU_CPU),$(biarch_cpu),$(TARGET_ALIAS)); \ + do \ + test -e $(d)/$(gcc_lib_dir)/include/$$d \ + && echo $(gcc_lib_dir)/include/$$d; \ + test -e $(d)/$(gcc_lib_dir)/include-fixed/$$d \ + && echo $(gcc_lib_dir)/include-fixed/$$d; \ + done) + +ifeq ($(with_libssp),yes) + header_files += $(gcc_lib_dir)/include/ssp +endif +ifeq ($(with_gomp),yes) + header_files += $(gcc_lib_dir)/include/omp.h +endif +ifeq ($(with_qmath),yes) + header_files += $(gcc_lib_dir)/include/quadmath{,_weak}.h +endif + +ifeq ($(DEB_TARGET_ARCH),ia64) + header_files += $(gcc_lib_dir)/include/ia64intrin.h +endif + +ifeq ($(DEB_TARGET_ARCH),m68k) + header_files += $(gcc_lib_dir)/include/math-68881.h +endif + +ifeq ($(DEB_TARGET_ARCH),$(findstring $(DEB_TARGET_ARCH),powerpc ppc64 powerpcspe)) + header_files += $(gcc_lib_dir)/include/{altivec.h,ppc-asm.h,spe.h} +endif + p_lgcc = libgcc$(GCC_SONAME)$(cross_lib_arch) p_lgccdbg = libgcc$(GCC_SONAME)-dbg$(cross_lib_arch) +p_lgccdev = libgcc-$(BASE_VERSION)-dev$(cross_lib_arch) d_lgcc = debian/$(p_lgcc) d_lgccdbg = debian/$(p_lgccdbg) +d_lgccdev = debian/$(p_lgccdev) p_l32gcc = lib32gcc$(GCC_SONAME)$(cross_lib_arch) p_l32gccdbg = lib32gcc$(GCC_SONAME)-dbg$(cross_lib_arch) +p_l32gccdev = lib32gcc-$(BASE_VERSION)-dev$(cross_lib_arch) d_l32gcc = debian/$(p_l32gcc) d_l32gccdbg = debian/$(p_l32gccdbg) +d_l32gccdev = debian/$(p_l32gccdev) p_l64gcc = lib64gcc$(GCC_SONAME)$(cross_lib_arch) p_l64gccdbg = lib64gcc$(GCC_SONAME)-dbg$(cross_lib_arch) +p_l64gccdev = lib64gcc-$(BASE_VERSION)-dev$(cross_lib_arch) d_l64gcc = debian/$(p_l64gcc) d_l64gccdbg = debian/$(p_l64gccdbg) +d_l64gccdev = debian/$(p_l64gccdev) p_ln32gcc = libn32gcc$(GCC_SONAME)$(cross_lib_arch) p_ln32gccdbg = libn32gcc$(GCC_SONAME)-dbg$(cross_lib_arch) +p_ln32gccdev = libn32gcc-$(BASE_VERSION)-dev$(cross_lib_arch) d_ln32gcc = debian/$(p_ln32gcc) d_ln32gccdbg = debian/$(p_ln32gccdbg) +d_ln32gccdev = debian/$(p_ln32gccdev) p_lhfgcc = libhfgcc$(GCC_SONAME)$(cross_lib_arch) p_lhfgccdbg = libhfgcc$(GCC_SONAME)-dbg$(cross_lib_arch) +p_lhfgccdev = libhfgcc-$(BASE_VERSION)-dev$(cross_lib_arch) d_lhfgcc = debian/$(p_lhfgcc) d_lhfgccdbg = debian/$(p_lhfgccdbg) +d_lhfgccdev = debian/$(p_lhfgccdev) p_lsfgcc = libsfgcc$(GCC_SONAME)$(cross_lib_arch) p_lsfgccdbg = libsfgcc$(GCC_SONAME)-dbg$(cross_lib_arch) +p_lsfgccdev = libsfgcc-$(BASE_VERSION)-dev$(cross_lib_arch) d_lsfgcc = debian/$(p_lsfgcc) d_lsfgccdbg = debian/$(p_lsfgccdbg) +d_lsfgccdev = debian/$(p_lsfgccdev) + +# __do_gcc_devels(flavour,package,todir,fromdir) +define __do_gcc_devels + dh_testdir + dh_testroot + mv $(install_stamp) $(install_stamp)-tmp + + rm -rf debian/$(2) + dh_installdirs -p$(2) $(docdir) #TODO + dh_installdirs -p$(2) $(3) + +# stage1 builds static libgcc only + $(if $(filter $(DEB_STAGE),stage1),, + : # libgcc_s.so may be a linker script on some architectures + set -e; \ + if [ -h $(4)/libgcc_s.so ]; then \ + rm -f $(4)/libgcc_s.so; \ + dh_link -p$(2) /$(libgcc_dir$(1))/libgcc_s.so.$(GCC_SONAME) \ + $(3)/libgcc_s.so; \ + else \ + mv $(4)/libgcc_s.so $(d)/$(3)/libgcc_s.so; \ + dh_link -p$(2) /$(libgcc_dir$(1))/libgcc_s.so.$(GCC_SONAME) \ + $(3)/libgcc_s.so.$(GCC_SONAME); \ + fi; \ + $(if $(1), dh_link -p$(2) /$(3)/libgcc_s.so \ + $(gcc_lib_dir)/libgcc_s_$(1).so;) + ) + DH_COMPAT=2 dh_movefiles -p$(2) \ + $(3)/{libgcc*,libgcov.a,*.o} \ + $(if $(1),,$(header_files)) # Only move headers for the “main” package + # If building a flavour, add a lintian override + $(if $(1), + #TODO: use a file instead of a hacky echo + # bu do we want to use one override file (in the source package) per + # flavour or not since they are essentially the same? + mkdir -p debian/$(2)/usr/share/lintian/overrides + echo "$(2) binary: binary-from-other-architecture" \ + >> debian/$(2)/usr/share/lintian/overrides/$(2) + ) + $(if $(filter yes, $(with_lib$(1)gmath)), + $(call install_gcc_lib,libgcc-math,$(GCC_SONAME),$(1),$(2)) + ) + $(if $(filter yes, $(with_libssp)), + $(call install_gcc_lib,libssp,$(SSP_SONAME),$(1),$(2)) + ) + $(if $(filter yes, $(with_ssp)), + mv $(4)/libssp_nonshared.a debian/$(2)/$(3)/; + ) + $(if $(filter yes, $(with_gomp)), + $(call install_gcc_lib,libgomp,$(GOMP_SONAME),$(1),$(2)) + ) + $(if $(filter yes, $(with_itm)), + $(call install_gcc_lib,libitm,$(ITM_SONAME),$(1),$(2)) + ) + $(if $(filter yes, $(with_qmath)), + $(call install_gcc_lib,libquadmath,$(QMATH_SONAME),$(1),$(2)) + ) + + debian/dh_doclink -p$(2) $(p_base) + debian/dh_rmemptydirs -p$(2) + + dh_strip -p$(2) + dh_compress -p$(2) + $(cross_shlibdeps) dh_shlibdeps -p$(2) + $(call cross_mangle_substvars,$(2)) + dh_fixperms -p$(2) + dh_installdeb -p$(2) + $(cross_gencontrol) dh_gencontrol -p$(2) -- -v$(DEB_VERSION) $(common_substvars) + $(call cross_mangle_control,$(2)) + dh_md5sums -p$(2) + dh_builddeb -p$(2) + + trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp) +endef + +# do_gcc_devels(flavour) +define do_gcc_devels + $(call __do_gcc_devels,$(1),$(p_l$(1)gccdev),$(gcc_lib_dir$(1)),$(d)/$(usr_lib$(1))) +endef + define __do_libgcc dh_testdir @@ -89,18 +247,18 @@ DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) $(call cross_mangle_substvars,$(p_l)) - dh_compress -p$(p_l) -p$(p_d) - dh_fixperms -p$(p_l) -p$(p_d) - $(cross_gencontrol) dh_gencontrol -p$(p_l) -p$(p_d) \ - -- -v$(DEB_LIBGCC_VERSION) $(common_substvars) - $(call cross_mangle_control,$(p_l)) - $(if $(2),, # only for native mkdir -p $(d_l)/usr/share/lintian/overrides echo '$(p_l): package-name-doesnt-match-sonames' \ > $(d_l)/usr/share/lintian/overrides/$(p_l) ) + dh_compress -p$(p_l) -p$(p_d) + dh_fixperms -p$(p_l) -p$(p_d) + $(cross_gencontrol) dh_gencontrol -p$(p_l) -p$(p_d) \ + -- -v$(DEB_LIBGCC_VERSION) $(common_substvars) + $(call cross_mangle_control,$(p_l)) + dh_installdeb -p$(p_l) -p$(p_d) dh_md5sums -p$(p_l) -p$(p_d) dh_builddeb -p$(p_l) -p$(p_d) @@ -134,0 +293,19 @@ + +$(binary_stamp)-libgcc-dev: $(install_dependencies) + $(call do_gcc_devels,) + +$(binary_stamp)-lib64gcc-dev: $(install_dependencies) + $(call do_gcc_devels,64) + +$(binary_stamp)-lib32gcc-dev: $(install_dependencies) + $(call do_gcc_devels,32) + +$(binary_stamp)-libn32gcc-dev: $(install_dependencies) + $(call do_gcc_devels,n32) + +$(binary_stamp)-libhfgcc-dev: $(install_dependencies) + $(call do_gcc_devels,hf) + +$(binary_stamp)-libsfgcc-dev: $(install_dependencies) + $(call do_gcc_devels,sf) + diff -u gcc-4.7-4.7.2/debian/rules.d/binary-fortran.mk gcc-4.7-4.7.2/debian/rules.d/binary-fortran.mk --- gcc-4.7-4.7.2/debian/rules.d/binary-fortran.mk +++ gcc-4.7-4.7.2/debian/rules.d/binary-fortran.mk @@ -68,6 +68,11 @@ debian/dh_doclink -p$(p_l) $(p_base) debian/dh_doclink -p$(p_d) $(p_base) + if [ -f debian/$(p_l).overrides ]; then \ + mkdir -p debian/$(p_l)/usr/share/lintian/overrides; \ + cp debian/$(p_l).overrides debian/$(p_l)/usr/share/lintian/overrides/$(p_l); \ + fi + dh_strip -p$(p_l) --dbg-package=$(p_d) dh_compress -p$(p_l) -p$(p_d) dh_fixperms -p$(p_l) -p$(p_d) @@ -79,10 +84,6 @@ $(cross_gencontrol) dh_gencontrol -p$(p_l) -p$(p_d) \ -- -v$(DEB_VERSION) $(common_substvars) $(call cross_mangle_control,$(p_l)) - if [ -f debian/$(p_l).overrides ]; then \ - mkdir -p debian/$(p_l)/usr/share/lintian/overrides; \ - cp debian/$(p_l).overrides debian/$(p_l)/usr/share/lintian/overrides/$(p_l); \ - fi dh_installdeb -p$(p_l) -p$(p_d) dh_md5sums -p$(p_l) -p$(p_d) dh_builddeb -p$(p_l) -p$(p_d) diff -u gcc-4.7-4.7.2/debian/patches/svn-updates.diff gcc-4.7-4.7.2/debian/patches/svn-updates.diff --- gcc-4.7-4.7.2/debian/patches/svn-updates.diff +++ gcc-4.7-4.7.2/debian/patches/svn-updates.diff @@ -1,14 +1,261062 @@ -# DP: updates from the 4.7 branch upto 2012xxxx (r191306). +# DP: updates from the 4.7 branch upto 20121015 (r192477). last_updated() { cat > ${dir}LAST_UPDATED < conftest.$ac_ext <<_LT_EOF +-#line 11773 "configure" ++#line 11774 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11876,7 +11877,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11879 "configure" ++#line 11880 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +Index: libitm/Makefile.in +=================================================================== +--- a/src/libitm/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libitm/Makefile.in (.../branches/gcc-4_7-branch) +@@ -40,13 +40,10 @@ + @ARCH_X86_TRUE@am__append_2 = x86_sse.cc x86_avx.cc + @ARCH_FUTEX_TRUE@am__append_3 = futex.cc + subdir = . +-DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \ +- $(srcdir)/../config.sub $(srcdir)/../depcomp \ +- $(srcdir)/../install-sh $(srcdir)/../ltmain.sh \ +- $(srcdir)/../missing $(srcdir)/../mkinstalldirs \ +- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/config.h.in $(srcdir)/libitm.spec.in \ +- $(top_srcdir)/configure ChangeLog ++DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/configure $(am__configure_deps) \ ++ $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ ++ $(srcdir)/libitm.spec.in $(srcdir)/../depcomp + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/asmcfi.m4 \ +@@ -97,11 +94,6 @@ + "$(DESTDIR)$(toolexeclibdir)" + LTLIBRARIES = $(toolexeclib_LTLIBRARIES) + libitm_la_LIBADD = +-am__libitm_la_SOURCES_DIST = aatree.cc alloc.cc alloc_c.cc \ +- alloc_cpp.cc barrier.cc beginend.cc clone.cc eh_cpp.cc \ +- local.cc query.cc retry.cc rwlock.cc useraction.cc util.cc \ +- sjlj.S tls.cc method-serial.cc method-gl.cc method-ml.cc \ +- hwcap.cc x86_sse.cc x86_avx.cc futex.cc + @ARCH_ARM_TRUE@am__objects_1 = hwcap.lo + @ARCH_X86_TRUE@am__objects_2 = x86_sse.lo x86_avx.lo + @ARCH_FUTEX_TRUE@am__objects_3 = futex.lo +@@ -139,7 +131,6 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libitm_la_SOURCES) +-DIST_SOURCES = $(am__libitm_la_SOURCES_DIST) + MULTISRCTOP = + MULTIBUILDTOP = + MULTIDIRS = +@@ -169,47 +160,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir dist dist-all distcheck ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-distdir = $(PACKAGE)-$(VERSION) +-top_distdir = $(distdir) +-am__remove_distdir = \ +- { test ! -d "$(distdir)" \ +- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr "$(distdir)"; }; } +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AR = @AR@ +@@ -867,185 +821,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- $(am__remove_distdir) +- test -d "$(distdir)" || mkdir "$(distdir)" +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-info +- -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -755 \ +- -exec chmod u+rwx,go+rx {} \; -o \ +- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r "$(distdir)" +-dist-gzip: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) +- +-dist-bzip2: distdir +- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 +- $(am__remove_distdir) +- +-dist-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) +- +-dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz +- $(am__remove_distdir) +- +-dist-tarZ: distdir +- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z +- $(am__remove_distdir) +- +-dist-shar: distdir +- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz +- $(am__remove_distdir) +- +-dist-zip: distdir +- -rm -f $(distdir).zip +- zip -rq $(distdir).zip $(distdir) +- $(am__remove_distdir) +- +-dist dist-all: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) +- +-# This target untars the dist file and tries a VPATH configuration. Then +-# it guarantees that the distribution is self-contained by making another +-# tarfile. +-distcheck: dist +- case '$(DIST_ARCHIVES)' in \ +- *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ +- *.tar.xz*) \ +- xz -dc $(distdir).tar.xz | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ +- *.zip*) \ +- unzip $(distdir).zip ;;\ +- esac +- chmod -R a-w $(distdir); chmod a+w $(distdir) +- mkdir $(distdir)/_build +- mkdir $(distdir)/_inst +- chmod a-w $(distdir) +- test -d $(distdir)/_build || exit 0; \ +- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ +- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && am__cwd=`pwd` \ +- && $(am__cd) $(distdir)/_build \ +- && ../configure --srcdir=.. --prefix="$$dc_install_base" \ +- $(DISTCHECK_CONFIGURE_FLAGS) \ +- && $(MAKE) $(AM_MAKEFLAGS) \ +- && $(MAKE) $(AM_MAKEFLAGS) dvi \ +- && $(MAKE) $(AM_MAKEFLAGS) check \ +- && $(MAKE) $(AM_MAKEFLAGS) install \ +- && $(MAKE) $(AM_MAKEFLAGS) installcheck \ +- && $(MAKE) $(AM_MAKEFLAGS) uninstall \ +- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ +- distuninstallcheck \ +- && chmod -R a-w "$$dc_install_base" \ +- && ({ \ +- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ +- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ +- } || { rm -rf "$$dc_destdir"; exit 1; }) \ +- && rm -rf "$$dc_destdir" \ +- && $(MAKE) $(AM_MAKEFLAGS) dist \ +- && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ +- && cd "$$am__cwd" \ +- || exit 1 +- $(am__remove_distdir) +- @(echo "$(distdir) archives ready for distribution: "; \ +- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +-distuninstallcheck: +- @$(am__cd) '$(distuninstallcheck_dir)' \ +- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ +- || { echo "ERROR: files left after uninstall:" ; \ +- if test -n "$(DESTDIR)"; then \ +- echo " (check DESTDIR support)"; \ +- fi ; \ +- $(distuninstallcheck_listfiles) ; \ +- exit 1; } >&2 +-distcleancheck: distclean +- @if test '$(srcdir)' = . ; then \ +- echo "ERROR: distcleancheck can only run from a VPATH build" ; \ +- exit 1 ; \ +- fi +- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ +- || { echo "ERROR: files left in build directory after distclean:" ; \ +- $(distcleancheck_listfiles) ; \ +- exit 1; } >&2 + check-am: all-am + check: check-recursive + all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) all-multi $(HEADERS) \ +@@ -1244,13 +1019,10 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-local all-multi am--refresh check check-am \ + clean clean-aminfo clean-generic clean-libtool clean-multi \ +- clean-toolexeclibLTLIBRARIES ctags ctags-recursive dist \ +- dist-all dist-bzip2 dist-gzip dist-info dist-lzma dist-shar \ +- dist-tarZ dist-xz dist-zip distcheck distclean \ +- distclean-compile distclean-generic distclean-hdr \ +- distclean-libtool distclean-multi distclean-tags \ +- distcleancheck distdir distuninstallcheck dvi dvi-am html \ +- html-am info info-am install install-am install-data \ ++ clean-toolexeclibLTLIBRARIES ctags ctags-recursive dist-info \ ++ distclean distclean-compile distclean-generic distclean-hdr \ ++ distclean-libtool distclean-multi distclean-tags dvi dvi-am \ ++ html html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-multi \ +Index: libitm/configure.ac +=================================================================== +--- a/src/libitm/configure.ac (.../tags/gcc_4_7_2_release) ++++ b/src/libitm/configure.ac (.../branches/gcc-4_7-branch) +@@ -70,12 +70,13 @@ + # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch + # of other PACKAGE_* variables will, however, and there's nothing + # we can do about that; they come from AC_INIT). ++# no-dist: we don't want 'dist' and related rules. + # foreign: we don't follow the normal rules for GNU packages (no COPYING + # file in the top srcdir, etc, etc), so stop complaining. + # -Wall: turns on all automake warnings... + # -Wno-portability: ...except this one, since GNU make is required. + # -Wno-override: ... and this one, since we do want this in testsuite. +-AM_INIT_AUTOMAKE([1.9.0 foreign -Wall -Wno-portability -Wno-override]) ++AM_INIT_AUTOMAKE([1.9.0 foreign no-dist -Wall -Wno-portability -Wno-override]) + AM_ENABLE_MULTILIB(, ..) + + # Calculate toolexeclibdir +Index: libitm/ChangeLog +=================================================================== +--- a/src/libitm/ChangeLog (.../tags/gcc_4_7_2_release) ++++ b/src/libitm/ChangeLog (.../branches/gcc-4_7-branch) +@@ -1,3 +1,11 @@ ++2012-09-20 Jakub Jelinek ++ ++ PR other/43620 ++ * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. ++ * Makefile.in: Regenerated. ++ * configure: Regenerated. ++ * testsuite/Makefile.in: Regenerated. ++ + 2012-09-20 Release Manager + + * GCC 4.7.2 released. +Index: libitm/testsuite/Makefile.in +=================================================================== +--- a/src/libitm/testsuite/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libitm/testsuite/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = testsuite +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/asmcfi.m4 \ +@@ -60,10 +60,8 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + DEJATOOL = $(PACKAGE) + RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AR = @AR@ +@@ -295,37 +293,6 @@ + -l='$(DEJATOOL)'; for tool in $$l; do \ + rm -f $$tool.sum $$tool.log; \ + done +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU + check: check-am +@@ -426,8 +393,8 @@ + + .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \ + clean-libtool distclean distclean-DEJAGNU distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-libtool dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ +Index: libstdc++-v3/configure +=================================================================== +--- a/src/libstdc++-v3/configure (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/configure (.../branches/gcc-4_7-branch) +@@ -3025,8 +3025,7 @@ + target_alias=${target_alias-$host_alias} + + # Handy for debugging: +-{ $as_echo "$as_me:${as_lineno-$LINENO}: $build / $host / $target / $host_alias / $target_alias" >&5 +-$as_echo "$as_me: $build / $host / $target / $host_alias / $target_alias" >&6;}; sleep 5 ++#AC_MSG_NOTICE($build / $host / $target / $host_alias / $target_alias); sleep 5 + + if test "$build" != "$host"; then + # We are being configured with some form of cross compiler. +@@ -11498,7 +11497,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11501 "configure" ++#line 11500 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11604,7 +11603,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11607 "configure" ++#line 11606 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14962,7 +14961,7 @@ + # + # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. + cat > conftest.$ac_ext << EOF +-#line 14965 "configure" ++#line 14964 "configure" + struct S { ~S(); }; + void bar(); + void foo() +@@ -15297,7 +15296,7 @@ + # Fake what AC_TRY_COMPILE does. + + cat > conftest.$ac_ext << EOF +-#line 15300 "configure" ++#line 15299 "configure" + int main() + { + typedef bool atomic_type; +@@ -15332,7 +15331,7 @@ + rm -f conftest* + + cat > conftest.$ac_ext << EOF +-#line 15335 "configure" ++#line 15334 "configure" + int main() + { + typedef short atomic_type; +@@ -15367,7 +15366,7 @@ + rm -f conftest* + + cat > conftest.$ac_ext << EOF +-#line 15370 "configure" ++#line 15369 "configure" + int main() + { + // NB: _Atomic_word not necessarily int. +@@ -15403,7 +15402,7 @@ + rm -f conftest* + + cat > conftest.$ac_ext << EOF +-#line 15406 "configure" ++#line 15405 "configure" + int main() + { + typedef long long atomic_type; +@@ -15482,7 +15481,7 @@ + # unnecessary for this test. + + cat > conftest.$ac_ext << EOF +-#line 15485 "configure" ++#line 15484 "configure" + int main() + { + _Decimal32 d1; +@@ -15524,7 +15523,7 @@ + # unnecessary for this test. + + cat > conftest.$ac_ext << EOF +-#line 15527 "configure" ++#line 15526 "configure" + template + struct same + { typedef T2 type; }; +@@ -15558,7 +15557,7 @@ + rm -f conftest* + + cat > conftest.$ac_ext << EOF +-#line 15561 "configure" ++#line 15560 "configure" + template + struct same + { typedef T2 type; }; +@@ -66485,7 +66484,9 @@ + + ac_config_files="$ac_config_files scripts/extract_symvers" + ++ac_config_files="$ac_config_files doc/xsl/customization.xsl" + ++ + # Multilibs need MULTISUBDIR defined correctly in certain makefiles so + # that multilib installs will end up installed in the correct place. + # The testsuite needs it for multilib-aware ABI baseline files. +@@ -67696,6 +67697,7 @@ + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "scripts/testsuite_flags") CONFIG_FILES="$CONFIG_FILES scripts/testsuite_flags" ;; + "scripts/extract_symvers") CONFIG_FILES="$CONFIG_FILES scripts/extract_symvers" ;; ++ "doc/xsl/customization.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/customization.xsl" ;; + "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; + "libsupc++/Makefile") CONFIG_FILES="$CONFIG_FILES libsupc++/Makefile" ;; + "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; +Index: libstdc++-v3/Makefile.in +=================================================================== +--- a/src/libstdc++-v3/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/Makefile.in (.../branches/gcc-4_7-branch) +@@ -39,7 +39,8 @@ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ + $(top_srcdir)/scripts/testsuite_flags.in \ +- $(top_srcdir)/scripts/extract_symvers.in ++ $(top_srcdir)/scripts/extract_symvers.in \ ++ $(top_srcdir)/doc/xsl/customization.xsl.in + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ +@@ -67,7 +68,8 @@ + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno + CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = scripts/testsuite_flags scripts/extract_symvers ++CONFIG_CLEAN_FILES = scripts/testsuite_flags scripts/extract_symvers \ ++ doc/xsl/customization.xsl + CONFIG_CLEAN_VPATH_FILES = + depcomp = + am__depfiles_maybe = +@@ -434,6 +436,8 @@ + cd $(top_builddir) && $(SHELL) ./config.status $@ + scripts/extract_symvers: $(top_builddir)/config.status $(top_srcdir)/scripts/extract_symvers.in + cd $(top_builddir) && $(SHELL) ./config.status $@ ++doc/xsl/customization.xsl: $(top_builddir)/config.status $(top_srcdir)/doc/xsl/customization.xsl.in ++ cd $(top_builddir) && $(SHELL) ./config.status $@ + + mostlyclean-libtool: + -rm -f *.lo +Index: libstdc++-v3/configure.ac +=================================================================== +--- a/src/libstdc++-v3/configure.ac (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/configure.ac (.../branches/gcc-4_7-branch) +@@ -434,6 +434,7 @@ + AC_CONFIG_FILES(Makefile) + AC_CONFIG_FILES([scripts/testsuite_flags],[chmod +x scripts/testsuite_flags]) + AC_CONFIG_FILES([scripts/extract_symvers],[chmod +x scripts/extract_symvers]) ++AC_CONFIG_FILES([doc/xsl/customization.xsl]) + + # Multilibs need MULTISUBDIR defined correctly in certain makefiles so + # that multilib installs will end up installed in the correct place. +Index: libstdc++-v3/doc/Makefile.in +=================================================================== +--- a/src/libstdc++-v3/doc/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/Makefile.in (.../branches/gcc-4_7-branch) +@@ -517,9 +517,10 @@ + #XSL_STYLE_DIR = /usr/share/xml/docbook/stylesheet/docbook-xsl-ns + #XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets + XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl +-XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl +-XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl ++XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml/chunk.xsl ++XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/html/docbook.xsl + XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub3/chunk.xsl ++XSL_LOCAL_STYLE = ${glibcxx_builddir}/doc/xsl/customization.xsl + LINT_FLAGS = --debug --xinclude --noent --noblanks --noout + SCHEMA_FLAGS = http://www.docbook.org/xml/5.0/dtd/docbook.dtd + #SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd +@@ -533,6 +534,7 @@ + set_xml = ${docbook_outdir}/xml/libstdc++-set-single.xml + + # HTML, all one page ++# NB: Have to generate customization XSL for UTF-8 output. + manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html + + # PDF, via dblatex +@@ -917,18 +919,21 @@ + stamp-html-docbook-data: stamp-html-docbook-images stamp-html-docbook-lwg + $(STAMP) stamp-html-docbook-data + +-# HTML, index plus chapters ++# HTML, "chunked" into index plus chapters as separate pages + stamp-html-docbook: $(xml_sources) ${docbook_outdir}/html + @echo "Generating html files..." + $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) -o ${docbook_outdir}/html/ \ +- $(XSL_HTML_STYLE) ${top_srcdir}/doc/xml/spine.xml ++ --stringparam chunker.output.encoding UTF-8 \ ++ $(XSL_HTML_STYLE) \ ++ ${top_srcdir}/doc/xml/spine.xml + $(STAMP) stamp-html-docbook + + doc-html-docbook: stamp-html-docbook-data + stamp-html-single-docbook: $(xml_sources) ${docbook_outdir}/html + @echo "Generating html single file..." + $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) -o ${manual_html} \ +- $(XSL_HTML_SINGLE_STYLE) ${top_srcdir}/doc/xml/spine.xml ++ ${XSL_LOCAL_STYLE} \ ++ ${top_srcdir}/doc/xml/spine.xml + $(STAMP) stamp-html-single-docbook + + doc-html-single-docbook: stamp-html-single-docbook +Index: libstdc++-v3/doc/html/bk02.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/bk02.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/bk02.html (.../branches/gcc-4_7-branch) +@@ -1,3 +1,3 @@ + +- +-<meta name="generator" content="DocBook XSL-NS Stylesheets V1.76.1"/><meta name="keywords" content=" ISO C++ , runtime , library "/><link rel="home" href="index.html" title="The GNU C++ Library"/><link rel="up" href="index.html" title="The GNU C++ Library"/><link rel="prev" href="manual/backwards.html" title="Backwards Compatibility"/><link rel="next" href="api.html" title="The GNU C++ Library API Reference"/></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center"/></tr><tr><td align="left"><a accesskey="p" href="manual/backwards.html">Prev</a> </td><th width="60%" align="center"> </th><td align="right"> <a accesskey="n" href="api.html">Next</a></td></tr></table><hr/></div><div class="book"><div class="titlepage"><hr/></div><div class="toc"><p><strong>Table of Contents</strong></p><dl><dt><span class="article"><a href="api.html">The GNU C++ Library API Reference</a></span></dt></dl></div></div><div class="navfooter"><hr/><table width="100%" summary="Navigation footer"><tr><td align="left"><a accesskey="p" href="manual/backwards.html">Prev</a> </td><td align="center"> </td><td align="right"> <a accesskey="n" href="api.html">Next</a></td></tr><tr><td align="left" valign="top">Backwards Compatibility </td><td align="center"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top"> The GNU C++ Library API Reference</td></tr></table></div></body></html> ++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ++<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>
Prev   Next

Table of Contents

The GNU C++ Library API Reference
Prev   Next
Backwards Compatibility Home The GNU C++ Library API Reference
+Index: libstdc++-v3/doc/html/bk03.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/bk03.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/bk03.html (.../branches/gcc-4_7-branch) +@@ -1,3 +1,3 @@ + +- +-<meta name="generator" content="DocBook XSL-NS Stylesheets V1.76.1"/><meta name="keywords" content=" ISO C++ , runtime , library "/><link rel="home" href="index.html" title="The GNU C++ Library"/><link rel="up" href="index.html" title="The GNU C++ Library"/><link rel="prev" href="api.html" title="The GNU C++ Library API Reference"/><link rel="next" href="faq.html" title="Frequently Asked Questions"/></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center"/></tr><tr><td align="left"><a accesskey="p" href="api.html">Prev</a> </td><th width="60%" align="center"> </th><td align="right"> <a accesskey="n" href="faq.html">Next</a></td></tr></table><hr/></div><div class="book"><div class="titlepage"><hr/></div><div class="toc"><p><strong>Table of Contents</strong></p><dl><dt><span class="article"><a href="faq.html">Frequently Asked Questions</a></span></dt></dl></div></div><div class="navfooter"><hr/><table width="100%" summary="Navigation footer"><tr><td align="left"><a accesskey="p" href="api.html">Prev</a> </td><td align="center"> </td><td align="right"> <a accesskey="n" href="faq.html">Next</a></td></tr><tr><td align="left" valign="top">The GNU C++ Library API Reference </td><td align="center"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top"> Frequently Asked Questions</td></tr></table></div></body></html> ++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ++<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>
Prev   Next

Table of Contents

Frequently Asked Questions
Prev   Next
The GNU C++ Library API Reference Home Frequently Asked Questions
+Index: libstdc++-v3/doc/html/faq.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/faq.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/faq.html (.../branches/gcc-4_7-branch) +@@ -1,10 +1,10 @@ + +- +-Frequently Asked Questions
Frequently Asked Questions
Prev  

Copyright © ++ ++Frequently Asked Questions

Frequently Asked Questions
Prev  

Frequently Asked Questions

Copyright © + 2008, 2010 + +- FSF +-

1.1. ++ FSF ++

1.1. + What is libstdc++? +
1.2. + Why should I use libstdc++? +@@ -18,7 +18,7 @@ + What happened to the older libg++? I need that! +
1.7. + What if I have more questions? +-
2.1. ++
2.1. + What are the license terms for libstdc++? +
2.2. + So any program which uses libstdc++ falls under the GPL? +@@ -26,7 +26,7 @@ + How is that different from the GNU {Lesser,Library} GPL? +
2.4. + I see. So, what restrictions are there on programs that use the library? +-
3.1. How do I install libstdc++? ++
3.1. How do I install libstdc++? +
3.2. How does one get current libstdc++ sources? +
3.3. How do I know if it works? +
3.4. How do I insure that the dynamically linked library will be found? +@@ -34,7 +34,7 @@ + What's libsupc++? +
3.6. + This library is HUGE! +-
4.1. ++
4.1. + Can libstdc++ be used with non-GNU compilers? +
4.2. + No 'long long' type on Solaris? +@@ -50,13 +50,13 @@ + Recent GNU/Linux glibc required? +
4.8. + Can't use wchar_t/wstring on FreeBSD +-
5.1. ++
5.1. + What works already? +
5.2. + Bugs in the ISO C++ language or library specification +
5.3. + Bugs in the compiler (gcc/g++) and not libstdc++ +-
6.1. ++
6.1. + Reopening a stream fails +
6.2. + -Weffc++ complains too much +@@ -76,7 +76,7 @@ + list::size() is O(n)! +
6.9. + Aw, that's easy to fix! +-
7.1. ++
7.1. + string::iterator is not char*; vector<T>::iterator is not T* +
7.2. + What's next after libstdc++? +@@ -91,7 +91,7 @@ + What's an ABI and why is it so messy? +
7.8. + How do I make std::vector<T>::capacity() == std::vector<T>::size? +-
1.1. ++
1.1. + What is libstdc++? +
1.2. + Why should I use libstdc++? +@@ -105,19 +105,19 @@ + What happened to the older libg++? I need that! +
1.7. + What if I have more questions? +-

1.1.

++

1.1.

+ What is libstdc++? +-

++

+ The GNU Standard C++ Library v3 is an ongoing project to + implement the ISO 14882 Standard C++ library as described in + chapters 17 through 27 and annex D. For those who want to see + exactly how far the project has come, or just want the latest + bleeding-edge code, the up-to-date source is available over + anonymous SVN, and can even be browsed over +- the web. +-

1.2.

++ the web. ++

1.2.

+ Why should I use libstdc++? +-

++

+ The completion of the ISO C++ standardization gave the C++ + community a powerful set of reuseable tools in the form of the C++ + Standard Library. However, all existing C++ implementations are +@@ -129,9 +129,9 @@ + (gcc, g++, etc) is widely + considered to be one of the leading compilers in the world. Its + development is overseen by the +- GCC team. All of ++ GCC team. All of + the rapid development and near-legendary +- portability ++ portability + that are the hallmarks of an open-source project are being + applied to libstdc++. +

+@@ -141,9 +141,9 @@ + vector<>, iostreams, and algorithms.) + Programmers will no longer need to “roll their own” + nor be worried about platform-specific incompatibilities. +-

1.3.

++

1.3.

+ Who's in charge of it? +-

++

+ The libstdc++ project is contributed to by several developers + all over the world, in the same way as GCC or the Linux kernel. + Benjamin Kosnik, Gabriel Dos Reis, Phil Edwards, Ulrich Drepper, +@@ -153,17 +153,17 @@ + Development and discussion is held on the libstdc++ mailing + list. Subscribing to the list, or searching the list + archives, is open to everyone. You can read instructions for +- doing so on the homepage. ++ doing so on the homepage. + If you have questions, ideas, code, or are just curious, sign up! +-

1.4.

++

1.4.

+ When is libstdc++ going to be finished? +-

++

+ Nathan Myers gave the best of all possible answers, responding to + a Usenet article asking this question: Sooner, if you + help. +-

1.5.

++

1.5.

+ How do I contribute to the effort? +-

++

+ Here is a page devoted to + this topic. Subscribing to the mailing list (see above, or + the homepage) is a very good idea if you have something to +@@ -172,17 +172,17 @@ + anybody who is willing to help write documentation, for example, + or has found a bug in code that we all thought was working and is + willing to provide details, is more than welcome! +-

1.6.

++

1.6.

+ What happened to the older libg++? I need that! +-

++

+ The most recent libg++ README states that libg++ is no longer + being actively maintained. It should not be used for new + projects, and is only being kicked along to support older code. +

+ More information in the backwards compatibility documentation +-

1.7.

++

1.7.

+ What if I have more questions? +-

++

+ If you have read the README file, and your question remains + unanswered, then just ask the mailing list. At present, you do not + need to be subscribed to the list to send a message to it. More +@@ -201,19 +201,19 @@ + How is that different from the GNU {Lesser,Library} GPL? +

2.4. + I see. So, what restrictions are there on programs that use the library? +-

2.1.

++

2.1.

+ What are the license terms for libstdc++? +-

++

+ See our license description + for these and related questions. +-

2.2.

++

2.2.

+ So any program which uses libstdc++ falls under the GPL? +-

++

+ No. The special exception permits use of the library in + proprietary applications. +-

2.3.

++

2.3.

+ How is that different from the GNU {Lesser,Library} GPL? +-

++

+ The LGPL requires that users be able to replace the LGPL code with a + modified version; this is trivial if the library in question is a C + shared library. But there's no way to make that work with C++, where +@@ -221,9 +221,9 @@ + are expanded inside the code that uses the library. So to allow people + to replace the library code, someone using the library would have to + distribute their own source, rendering the LGPL equivalent to the GPL. +-

2.4.

++

2.4.

+ I see. So, what restrictions are there on programs that use the library? +-

++

+ None. We encourage such programs to be released as open source, + but we won't punish you or sue you if you choose otherwise. +

3.1. How do I install libstdc++? +@@ -234,8 +234,8 @@ + What's libsupc++? +
3.6. + This library is HUGE! +-

3.1.

How do I install libstdc++? +-

++

3.1.

How do I install libstdc++? ++

+ Often libstdc++ comes pre-installed as an integral part of many + existing GNU/Linux and Unix systems, as well as many embedded + development tools. It may be necessary to install extra +@@ -247,11 +247,11 @@ + documentation for detailed + instructions. You may wish to browse those files ahead + of time to get a feel for what's required. +-

3.2.

How does one get current libstdc++ sources? +-

++

3.2.

How does one get current libstdc++ sources? ++

+ Libstdc++ sources for all official releases can be obtained as + part of the GCC sources, available from various sites and +- mirrors. A full list of ++ mirrors. A full list of + download sites is provided on the main GCC site. +

+ Current libstdc++ sources can always be checked out of the main +@@ -262,7 +262,7 @@ + Subversion, or SVN, is + one of several revision control packages. It was selected for GNU + projects because it's free (speech), free (beer), and very high +- quality. The Subversion ++ quality. The Subversion + home page has a better description. +

+ The “anonymous client checkout” feature of SVN is +@@ -270,21 +270,21 @@ + the latest libstdc++ sources. +

+ For more information +- see SVN ++ see SVN + details. +-

3.3.

How do I know if it works? +-

++

3.3.

How do I know if it works? ++

+ Libstdc++ comes with its own validation testsuite, which includes + conformance testing, regression testing, ABI testing, and + performance testing. Please consult the +- testing ++ testing + documentation for more details. +

+ If you find bugs in the testsuite programs themselves, or if you + think of a new test program that should be added to the suite, + please write up your idea and send it to the list! +-

3.4.

How do I insure that the dynamically linked library will be found? +-

++

3.4.

How do I insure that the dynamically linked library will be found? ++

+ Depending on your platform and library version, the error message might + be similar to one of the following: + 

+@@ -318,9 +318,9 @@
+     

+     Using LD_LIBRARY_PATH is not always the best solution, Finding Dynamic or Shared
+     Libraries in the manual gives some alternatives.
+-

3.5.

++

3.5.

+ What's libsupc++? +-

++

+ If the only functions from libstdc++.a + which you need are language support functions (those listed in + clause 18 of the +@@ -335,9 +335,9 @@ + using anything from the rest of the library, such as IOStreams + or vectors, then you'll still need pieces from + libstdc++.a. +-

3.6.

++

3.6.

+ This library is HUGE! +-

++

+ Usually the size of libraries on disk isn't noticeable. When a + link editor (or simply “linker”) pulls things from a + static archive library, only the necessary object files are copied +@@ -382,9 +382,9 @@ + Recent GNU/Linux glibc required? +

4.8. + Can't use wchar_t/wstring on FreeBSD +-

4.1.

++

4.1.

+ Can libstdc++ be used with non-GNU compilers? +-

++

+ Perhaps. +

+ Since the goal of ISO Standardization is for all C++ +@@ -402,9 +402,9 @@ + been known to work with versions of the EDG C++ compiler, and + vendor-specific proprietary C++ compilers such as the Intel ICC + C++ compiler. +-

4.2.

++

4.2.

+ No 'long long' type on Solaris? +-

++

+ By default we try to support the C99 long long type. + This requires that certain functions from your C library be present. +

+@@ -414,9 +414,9 @@ + commonly reported platform affected was Solaris. +

+ This has been fixed for libstdc++ releases greater than 3.0.3. +-

4.3.

++

4.3.

+ _XOPEN_SOURCE and _GNU_SOURCE are always defined? +-

On Solaris, g++ (but not gcc) always defines the preprocessor ++

On Solaris, g++ (but not gcc) always defines the preprocessor + macro _XOPEN_SOURCE. On GNU/Linux, the same happens + with _GNU_SOURCE. (This is not an exhaustive list; + other macros and other platforms are also affected.) +@@ -440,18 +440,18 @@ + g++ -E -dM - < /dev/null" to display + a list of predefined macros for any particular installation. +

This has been discussed on the mailing lists +- quite a bit. ++ quite a bit. +

This method is something of a wart. We'd like to find a cleaner + solution, but nobody yet has contributed the time. +-

4.4.

++

4.4.

+ Mac OS X ctype.h is broken! How can I fix it? +-

This is a long-standing bug in the OS X support. Fortunately, ++

This is a long-standing bug in the OS X support. Fortunately, + the patch is quite simple, and well-known. +- Here's a ++ Here's a + link to the solution. +-

4.5.

++

4.5.

+ Threading is broken on i386? +-

++

+

Support for atomic integer operations is/was broken on i386 + platforms. The assembly code accidentally used opcodes that are + only available on the i486 and later. So if you configured GCC +@@ -459,9 +459,9 @@ + on an i686, then you would encounter no problems. Only when + actually running the code on a i386 will the problem appear. +

This is fixed in 3.2.2. +-

4.6.

++

4.6.

+ MIPS atomic operations +-

++

+ The atomic locking routines for MIPS targets requires MIPS II + and later. A patch went in just after the 3.3 release to + make mips* use the generic implementation instead. You can also +@@ -469,9 +469,9 @@ +

+ The mips*-*-linux* port continues to use the MIPS II routines, and more + work in this area is expected. +-

4.7.

++

4.7.

+ Recent GNU/Linux glibc required? +-

When running on GNU/Linux, libstdc++ 3.2.1 (shared library version ++

When running on GNU/Linux, libstdc++ 3.2.1 (shared library version + 5.0.1) and later uses localization and formatting code from the system + C library (glibc) version 2.2.5 which contains necessary bugfixes. + Most GNU/Linux distros make more recent versions available now. +@@ -480,9 +480,9 @@ +

The guideline is simple: the more recent the C++ library, the + more recent the C library. (This is also documented in the main + GCC installation instructions.) +-

4.8.

++

4.8.

+ Can't use wchar_t/wstring on FreeBSD +-

++

+ Older versions of FreeBSD's C library do not have sufficient + support for wide character functions, and as a result the + libstdc++ configury decides that wchar_t support should be +@@ -499,9 +499,9 @@ + Bugs in the ISO C++ language or library specification +

5.3. + Bugs in the compiler (gcc/g++) and not libstdc++ +-

5.1.

++

5.1.

+ What works already? +-

++

+ Short answer: Pretty much everything works + except for some corner cases. Support for localization + in locale may be incomplete on non-GNU +@@ -513,24 +513,24 @@ + C++98, + TR1, and + C++11. +-

5.2.

++

5.2.

+ Bugs in the ISO C++ language or library specification +-

++

+ Unfortunately, there are some. +

+ For those people who are not part of the ISO Library Group + (i.e., nearly all of us needing to read this page in the first + place), a public list of the library defects is occasionally +- published on the WG21 ++ published on the WG21 + website. + Some of these issues have resulted in code changes in libstdc++. +

+ If you think you've discovered a new bug that is not listed, + please post a message describing your problem to the author of + the library issues list or the Usenet group comp.lang.c++.moderated. +-

5.3.

++

5.3.

+ Bugs in the compiler (gcc/g++) and not libstdc++ +-

++

+ On occasion, the compiler is wrong. Please be advised that this + happens much less often than one would think, and avoid jumping to + conclusions. +@@ -541,7 +541,7 @@ + these lists with terms describing your issue. +

+ Before reporting a bug, please examine the +- bugs database with the ++ bugs database with the + category set to “g++”. +

6.1. + Reopening a stream fails +@@ -563,19 +563,19 @@ + list::size() is O(n)! +
6.9. + Aw, that's easy to fix! +-

6.1.

++

6.1.

+ Reopening a stream fails +-

++

+ One of the most-reported non-bug reports. Executing a sequence like: +-


+-    #include <fstream>
+-    ...
+-    std::fstream  fs(“a_file”);
+-    // .
+-    // . do things with fs...
+-    // .
+-    fs.close();
+-    fs.open(“a_new_file”);
++


++    #include <fstream>
++    ...
++    std::fstream  fs(“a_file”);
++    // .
++    // . do things with fs...
++    // .
++    fs.close();
++    fs.open(“a_new_file”);
+     

+ All operations on the re-opened fs will fail, or at + least act very strangely. Yes, they often will, especially if +@@ -590,9 +590,9 @@ + Update: for GCC 4.0 we implemented the resolution + of DR #409 and open() + now calls clear() on success! +-

6.2.

++

6.2.

+ -Weffc++ complains too much +-

++

+ Many warnings are emitted when -Weffc++ is used. Making + libstdc++ -Weffc++-clean is not a goal of the project, + for a few reasons. Mainly, that option tries to enforce +@@ -602,21 +602,21 @@ + We do, however, try to have libstdc++ sources as clean as possible. If + you see some simple changes that pacify -Weffc++ + without other drawbacks, send us a patch. +-

6.3.

++

6.3.

+ Ambiguous overloads after including an old-style header +-

++

+ Another problem is the rel_ops namespace and the template + comparison operator functions contained therein. If they become + visible in the same namespace as other comparison functions + (e.g., “using” them and the <iterator> header), + then you will suddenly be faced with huge numbers of ambiguity + errors. This was discussed on the -v3 list; Nathan Myers +- sums ++ sums + things up here. The collisions with vector/string iterator + types have been fixed for 3.1. +-

6.4.

++

6.4.

+ The g++-3 headers are not ours +-

++

+ If you are using headers in + ${prefix}/include/g++-3, or if the installed + library's name looks like libstdc++-2.10.a or +@@ -630,10 +630,10 @@ + 'v'?). Starting with version 3.2 the headers are installed in + ${prefix}/include/c++/${version} as this prevents + headers from previous versions being found by mistake. +-

6.5.

++

6.5.

+ Errors about *Concept and + constraints in the STL +-

++

+ If you see compilation errors containing messages about + foo Concept and something to do with a + constraints member function, then most +@@ -647,31 +647,31 @@ + checks, is available in the + Diagnostics. + chapter of the manual. +-

6.6.

++

6.6.

+ Program crashes when using library code in a + dynamically-loaded library +-

++

+ If you are using the C++ library across dynamically-loaded + objects, make certain that you are passing the correct options + when compiling and linking: +-


+-    // compile your library components
+-    g++ -fPIC -c a.cc
+-    g++ -fPIC -c b.cc
+-    ...
+-    g++ -fPIC -c z.cc
+-
+-    // create your library
+-    g++ -fPIC -shared -rdynamic -o libfoo.so a.o b.o ... z.o
+-
+-    // link the executable
+-    g++ -fPIC -rdynamic -o foo ... -L. -lfoo -ldl
+-    

6.7.

++


++    // compile your library components
++    g++ -fPIC -c a.cc
++    g++ -fPIC -c b.cc
++    ...
++    g++ -fPIC -c z.cc
++
++    // create your library
++    g++ -fPIC -shared -rdynamic -o libfoo.so a.o b.o ... z.o
++
++    // link the executable
++    g++ -fPIC -rdynamic -o foo ... -L. -lfoo -ldl
++    

6.7.

+ “Memory leaks” in containers +-

++

+ A few people have reported that the standard containers appear + to leak memory when tested with memory checkers such as +- valgrind. ++ valgrind. + The library's default allocators keep free memory in a pool + for later reuse, rather than returning it to the OS. Although + this memory is always reachable by the library and is never +@@ -679,18 +679,18 @@ + want to test the library for memory leaks please read + Tips for memory leak hunting + first. +-

6.8.

++

6.8.

+ list::size() is O(n)! +-

++

+ See + the Containers + chapter. +-

6.9.

++

6.9.

+ Aw, that's easy to fix! +-

++

+ If you have found a bug in the library and you think you have + a working fix, then send it in! The main GCC site has a page +- on submitting ++ on submitting + patches that covers the procedure, but for libstdc++ you + should also send the patch to our mailing list in addition to + the GCC patches mailing list. The libstdc++ +@@ -718,9 +718,9 @@ + What's an ABI and why is it so messy? +

7.8. + How do I make std::vector<T>::capacity() == std::vector<T>::size? +-

7.1.

++

7.1.

+ string::iterator is not char*; vector<T>::iterator is not T* +-

++

+ If you have code that depends on container<T> iterators + being implemented as pointer-to-T, your code is broken. It's + considered a feature, not a bug, that libstdc++ points this out. +@@ -737,9 +737,9 @@ + certain expressions to &*i. Future revisions + of the Standard are expected to bless this usage for + vector<> (but not for basic_string<>). +-

7.2.

++

7.2.

+ What's next after libstdc++? +-

++

+ Hopefully, not much. The goal of libstdc++ is to produce a + fully-compliant, fully-portable Standard Library. After that, + we're mostly done: there won't be any +@@ -748,12 +748,12 @@ + There is an effort underway to add significant extensions to + the standard library specification. The latest version of + this effort is described in +- ++ + The C++ Library Technical Report 1. +-

7.3.

++

7.3.

+ What about the STL from SGI? +-

+- The STL from SGI, ++

++ The STL from SGI, + version 3.3, was the final merge of the STL codebase. The + code in libstdc++ contains many fixes and changes, and + the SGI code is no longer under active +@@ -773,24 +773,24 @@ +

+ The FAQ for SGI's STL (one jump off of their main page) is + still recommended reading. +-

7.4.

++

7.4.

+ Extensions and Backward Compatibility +-

++

+ See the link on backwards compatibility and link on evolution. +-

7.5.

++

7.5.

+ Does libstdc++ support TR1? +-

++

+ Yes. +

+ The C++ Standard Library Technical Report adds many new features to + the library. The latest version of this effort is described in +- ++ + Technical Report 1. +

+ The implementation status of TR1 in libstdc++ can be tracked on the TR1 status + page. +-

7.6.

How do I get a copy of the ISO C++ Standard? +-

++

7.6.

How do I get a copy of the ISO C++ Standard? ++

+ Copies of the full ISO 14882 standard are available on line via + the ISO mirror site for committee members. Non-members, or those + who have not paid for the privilege of sitting on the committee +@@ -798,19 +798,19 @@ + get a copy of the standard from their respective national + standards organization. In the USA, this national standards + organization is ANSI and their website is +- right here. (And if ++ right here. (And if + you've already registered with them, clicking this link will take + you to directly to the place where you can +- buy the standard on-line. ++ buy the standard on-line. +

+ Who is your country's member body? Visit the +- ISO homepage and find out! ++ ISO homepage and find out! +

+ The 2003 version of the standard (the 1998 version plus TC1) is + available in print, ISBN 0-470-84674-7. +-

7.7.

++

7.7.

+ What's an ABI and why is it so messy? +-

++

+ ABI stands for “Application Binary + Interface”. Conventionally, it refers to a great + mass of details about how arguments are arranged on the call +@@ -856,17 +856,17 @@ + so they may later be changed. Deciding which, and implementing + the decisions, must happen before you can reasonably document a + candidate C++ ABI that encompasses the standard library. +-

7.8.

++

7.8.

+ How do I make std::vector<T>::capacity() == std::vector<T>::size? +-

++

+ The standard idiom for deallocating a vector<T>'s + unused memory is to create a temporary copy of the vector and swap their + contents, e.g. for vector<T> v +-


+-     std::vector<T>(v).swap(v);
++


++     std::vector<T>(v).swap(v);
+     

+ The copy will take O(n) time and the swap is constant time. +

+ See Shrink-to-fit + strings for a similar solution for strings. +-

Prev Up 
 Home 
++

Prev Up 
 Home 
+Index: libstdc++-v3/doc/html/index.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/index.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/index.html (.../branches/gcc-4_7-branch) +@@ -1,8 +1,8 @@ + +- +-The GNU C++ Library
The GNU C++ Library
   Next

Short Contents

++ ++The GNU C++ Library

The GNU C++ Library
   Next

The GNU C++ Library

Short Contents

+ Copyright 2008, 2009, 2011 +- FSF ++ FSF + +

+ Permission is granted to copy, distribute and/or modify this +@@ -14,14 +14,14 @@ + This is the top level of the libstdc++ documentation set. The + documentation is divided into the following three sections. +

+-

Table of Contents

The GNU C++ Library Manual
I. ++

Table of Contents

The GNU C++ Library Manual
I. + Introduction + +
1. Status
Implementation Status
C++ 1998/2003
Implementation Status
Implementation Specific Behavior
C++ 2011
Implementation Specific Behavior
C++ TR1
Implementation Specific Behavior
C++ TR 24733
License
The Code: GPL
The Documentation: GPL, FDL
Bugs
Implementation Bugs
Standard Bugs
2. Setup
Prerequisites
Configure
Make
3. Using
Command Options
Headers
Header Files
Mixing Headers
The C Headers and namespace std
Precompiled Headers
Macros
Namespaces
Available Namespaces
namespace std
Using Namespace Composition
Linking
Almost Nothing
Finding Dynamic or Shared Libraries
Concurrency
Prerequisites
Thread Safety
Atomics
IO
Structure
Defaults
Future
Alternatives
Containers
Exceptions
Exception Safety
Exception Neutrality
Doing without
Compatibility
With C
With POSIX thread cancellation
Debugging Support
Using g++
Debug Versions of Library Binary Files
Memory Leak Hunting
Data Race Hunting
Using gdb
Tracking uncaught exceptions
Debug Mode
Compile Time Checking
Profile-based Performance Analysis
II. +@@ -35,13 +35,13 @@ +
Exceptions
API Reference
Adding Data to exception
Concept Checking
6. + Utilities + +-
Functors
Pairs
Memory
Allocators
Requirements
Design Issues
Implementation
Interface Design
Selecting Default Allocation Policy
Disabling Memory Caching
Using a Specific Allocator
Custom Allocators
Extension Allocators
auto_ptr
Limitations
Use in Containers
shared_ptr
Requirements
Design Issues
Implementation
Class Hierarchy
Thread Safety
Selecting Lock Policy
Related functions and classes
Use
Examples
Unresolved Issues
Acknowledgments
Traits
7. ++
Functors
Pairs
Memory
Allocators
Requirements
Design Issues
Implementation
Interface Design
Selecting Default Allocation Policy
Disabling Memory Caching
Using a Specific Allocator
Custom Allocators
Extension Allocators
auto_ptr
Limitations
Use in Containers
shared_ptr
Requirements
Design Issues
Implementation
Class Hierarchy
Thread Safety
Selecting Lock Policy
Related functions and classes
Use
Examples
Unresolved Issues
Acknowledgments
Traits
7. + Strings + +
String Classes
Simple Transformations
Case Sensitivity
Arbitrary Character Types
Tokenizing
Shrink to Fit
CString (MFC)
8. + Localization + +-
Locales
locale
Requirements
Design
Implementation
Interacting with "C" locales
Future
Facets
ctype
Implementation
Specializations
Future
codecvt
Requirements
Design
wchar_t Size
Support for Unicode
Other Issues
Implementation
Use
Future
messages
Requirements
Design
Implementation
Models
The GNU Model
Use
Future
9. ++
Locales
locale
Requirements
Design
Implementation
Interacting with "C" locales
Future
Facets
ctype
Implementation
Specializations
Future
codecvt
Requirements
Design
wchar_t Size
Support for Unicode
Other Issues
Implementation
Use
Future
messages
Requirements
Design
Implementation
Models
The GNU Model
Use
Future
9. + Containers + +
Sequences
list
list::size() is O(n)
vector
Space Overhead Management
Associative
Insertion Hints
bitset
Size Variable
Type String
Interacting with C
Containers vs. Arrays
10. +@@ -65,7 +65,7 @@ +
API Reference
III. + Extensions + +-
16. Compile Time Checks
17. Debug Mode
Intro
Semantics
Using
Using the Debug Mode
Using a Specific Debug Container
Design
Goals
Methods
The Wrapper Model
Safe Iterators
Safe Sequences (Containers)
Precondition Checking
Release- and debug-mode coexistence
Compile-time coexistence of release- and debug-mode components
Link- and run-time coexistence of release- and ++
16. Compile Time Checks
17. Debug Mode
Intro
Semantics
Using
Using the Debug Mode
Using a Specific Debug Container
Design
Goals
Methods
The Wrapper Model
Safe Iterators
Safe Sequences (Containers)
Precondition Checking
Release- and debug-mode coexistence
Compile-time coexistence of release- and debug-mode components
Link- and run-time coexistence of release- and + debug-mode components
Alternatives for Coexistence
Other Implementations
18. Parallel Mode
Intro
Semantics
Using
Prerequisite Compiler Flags
Using Parallel Mode
Using Specific Parallel Components
Design
Interface Basics
Configuration and Tuning
Setting up the OpenMP Environment
Compile Time Switches
Run Time Settings and Defaults
Implementation Namespaces
Testing
Bibliography
19. Profile Mode
Intro
Using the Profile Mode
Tuning the Profile Mode
Design
Wrapper Model
Instrumentation
Run Time Behavior
Analysis and Diagnostics
Cost Model
Reports
Testing
Extensions for Custom Containers
Empirical Cost Model
Implementation Issues
Stack Traces
Symbolization of Instruction Addresses
Concurrency
Using the Standard Library in the Instrumentation Implementation
Malloc Hooks
Construction and Destruction of Global Objects
Developer Information
Big Picture
How To Add A Diagnostic
Diagnostics
Diagnostic Template
Containers
Hashtable Too Small
Hashtable Too Large
Inefficient Hash
Vector Too Small
Vector Too Large
Vector to Hashtable
Hashtable to Vector
Vector to List
List to Vector
List to Forward List (Slist)
Ordered to Unordered Associative Container
Algorithms
Sort Algorithm Performance
Data Locality
Need Software Prefetch
Linked Structure Locality
Multithreaded Data Access
Data Dependence Violations at Container Level
False Sharing
Statistics
Bibliography
20. The mt_allocator
Intro
Design Issues
Overview
Implementation
Tunable Parameters
Initialization
Deallocation Notes
Single Thread Example
Multiple Thread Example
21. The bitmap_allocator
Design
Implementation
Free List Store
Super Block
Super Block Data Layout
Maximum Wasted Percentage
allocate
deallocate
Questions
1
2
3
Locality
Overhead and Grow Policy
22. Policy-Based Data Structures
Intro
Performance Issues
Associative
Priority Que
Goals
Associative
Policy Choices
Underlying Data Structures
Iterators
Functional
Priority Queues
Policy Choices
Underlying Data Structures
Binary Heaps
Using
Prerequisites
Organization
Tutorial
Basic Use
+ Configuring via Template Parameters +
+@@ -165,4 +165,4 @@ + +
D. + GNU General Public License version 3 +-
E. GNU Free Documentation License
The GNU C++ Library API Reference
Frequently Asked Questions
   Next
   The GNU C++ Library Manual
++
E. GNU Free Documentation License
The GNU C++ Library API Reference
Frequently Asked Questions
   Next
   The GNU C++ Library Manual
+Index: libstdc++-v3/doc/html/api.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/api.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/api.html (.../branches/gcc-4_7-branch) +@@ -1,16 +1,16 @@ + +- +-The GNU C++ Library API Reference
The GNU C++ Library API Reference
Prev  Next

Copyright © ++ ++The GNU C++ Library API Reference

The GNU C++ Library API Reference
Prev  Next

The GNU C++ Library API Reference

Copyright © + 2008 + , + 2010 + +- FSF ++ FSF + +-

++

+ The GNU C++ library sources have been specially formatted so that + with the proper invocation of another tool (Doxygen), a set of + indexed reference material can generated from the sources files +@@ -20,29 +20,29 @@ + particular include file, looking at inheritance diagrams, etc. +

+ The API documentation, rendered into HTML, can be viewed online: +-

Prev Up Next
 Home 
++

Prev Up Next
 Home 
+Index: libstdc++-v3/doc/html/manual/iterators.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/iterators.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/iterators.html (.../branches/gcc-4_7-branch) +@@ -1,14 +1,14 @@ + +- +-Chapter 10.  Iterators
Chapter 10.  ++ ++Chapter 10.  Iterators
Chapter 10.  + Iterators + +-
Prev Part II.  ++
Prev Part II.  + Standard Contents +-  Next
 Next

Chapter 10.  + Iterators +- +-

Table of Contents

Predefined
Iterators vs. Pointers
One Past the End

++ ++

Table of Contents

Predefined
Iterators vs. Pointers
One Past the End

Predefined

Iterators vs. Pointers

+ The following + FAQ entry points out that + iterators are not implemented as pointers. They are a generalization +@@ -44,7 +44,7 @@ + down through inheritance, so while the compiler has to do work + looking up all the names, your runtime code does not. (This has + been a prime concern from the beginning.) +-

This starts off sounding complicated, but is actually very easy, ++

One Past the End

This starts off sounding complicated, but is actually very easy, + especially towards the end. Trust me. +

Beginners usually have a little trouble understand the whole + 'past-the-end' thing, until they remember their early algebra classes +@@ -53,7 +53,7 @@ +

First, some history, and a reminder of some of the funkier rules in + C and C++ for builtin arrays. The following rules have always been + true for both languages: +-

  1. You can point anywhere in the array, or to the first element ++

    1. You can point anywhere in the array, or to the first element + past the end of the array. A pointer that points to one + past the end of the array is guaranteed to be as unique as a + pointer to somewhere inside the array, so that you can compare +@@ -124,7 +124,7 @@ + sequences very simple to recognize: if the two endpoints compare + equal, then the {array, sequence, container, whatever} is empty. +

      Just don't dereference end(). +-

Prev Up Next
Interacting with C Home Chapter 11.  ++

Prev Up Next
Interacting with C Home Chapter 11.  + Algorithms + +
+Index: libstdc++-v3/doc/html/manual/dynamic_memory.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/dynamic_memory.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/dynamic_memory.html (.../branches/gcc-4_7-branch) +@@ -1,13 +1,13 @@ + +- +-Dynamic Memory
Dynamic Memory
Prev Chapter 4.  ++ ++Dynamic Memory
Dynamic Memory
Prev Chapter 4.  + Support + +- Next

++

 Next

Dynamic Memory

+ There are six flavors each of new and + delete, so make certain that you're using the right + ones. Here are quickie descriptions of new: +-

  • ++

    • + single object form, throwing a + bad_alloc on errors; this is what most + people are used to using +@@ -66,7 +66,7 @@ +

      + bad_alloc is derived from the base exception + class defined in Sect1 19. +-

    Prev Up Next
    Chapter 4.  ++

    Prev Up Next
    Chapter 4.  + Support + +- Home Termination
    ++     		Home Termination
    +Index: libstdc++-v3/doc/html/manual/generalized_numeric_operations.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/generalized_numeric_operations.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/generalized_numeric_operations.html (.../branches/gcc-4_7-branch) +@@ -1,15 +1,15 @@ + +- +-Generalized Operations
    Generalized Operations
    Prev Chapter 12.  ++ ++Generalized Operations
    Generalized Operations
    Prev Chapter 12.  + Numerics + +- Next

    ++

    		 Next

    Generalized Operations

    +

    There are four generalized functions in the <numeric> header + that follow the same conventions as those in <algorithm>. Each + of them is overloaded: one signature for common default operations, + and a second for fully general operations. Their names are + self-explanatory to anyone who works with numerics on a regular basis: +-

    • accumulate

    • inner_product

    • chapterial_sum

    • adjacent_difference

    Here is a simple example of the two forms of accumulate. ++

    • accumulate

    • inner_product

    • chapterial_sum

    • adjacent_difference

    Here is a simple example of the two forms of accumulate. + 

    +    int   ar[50];
+    int   someval = somefunction();
+@@ -26,7 +26,7 @@
+       and multiplies all the members of the array; here we must obviously
+       use 1 as a starting value instead of 0.
+    
    The other three functions have similar dual-signature forms.
+-
    Prev Up Next
    Chapter 12.  ++

    Prev Up Next
    Chapter 12.  + Numerics + +- Home Interacting with C
    ++     		Home Interacting with C
    +Index: libstdc++-v3/doc/html/manual/mt_allocator.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/mt_allocator.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/mt_allocator.html (.../branches/gcc-4_7-branch) +@@ -1,10 +1,10 @@ + +- +-Chapter 20. The mt_allocator
    Chapter 20. The mt_allocator
    Prev Part III.  ++ ++Chapter 20. The mt_allocator
    Chapter 20. The mt_allocator
    Prev Part III.  + Extensions + +- Next

    Table of Contents

    Intro
    Design Issues
    Overview
    Implementation
    Tunable Parameters
    Initialization
    Deallocation Notes
    Single Thread Example
    Multiple Thread Example

    +-

    ++

    		 Next

    Chapter 20. The mt_allocator

    Table of Contents

    Intro
    Design Issues
    Overview
    Implementation
    Tunable Parameters
    Initialization
    Deallocation Notes
    Single Thread Example
    Multiple Thread Example

    ++

    Intro

    + The mt allocator [hereinafter referred to simply as "the allocator"] + is a fixed size (power of two) allocator that was initially + developed specifically to suit the needs of multi threaded +@@ -20,4 +20,4 @@ +

    + The aim of this document is to describe - from an application point of + view - the "inner workings" of the allocator. +-

    Prev Up Next
    Diagnostics Home Design Issues
    ++

Prev Up Next
Diagnostics Home Design Issues
+Index: libstdc++-v3/doc/html/manual/bk01pt03ch18s05.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch18s05.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch18s05.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Testing
Testing
Prev Chapter 18. Parallel Mode Next

++ ++Testing

Testing
Prev Chapter 18. Parallel Mode Next

Testing

+ Both the normal conformance and regression tests and the + supplemental performance tests work. +

+@@ -23,4 +23,4 @@ + additional software dependencies than the usual bare-boned text + file, and can be generated by using the make + doc-performance rule in the testsuite's Makefile. +-

Prev Up Next
Design Home Chapter 19. Profile Mode
++

Prev Up Next
Design Home Chapter 19. Profile Mode
+Index: libstdc++-v3/doc/html/manual/bk01pt03ch19s05.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch19s05.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch19s05.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Implementation Issues
Implementation Issues
Prev Chapter 19. Profile Mode Next

++ ++Implementation Issues

Implementation Issues
Prev Chapter 19. Profile Mode Next

Implementation Issues

Stack Traces

+ Accurate stack traces are needed during profiling since we group events by + call context and dynamic instance. Without accurate traces, diagnostics + may be hard to interpret. For instance, when giving advice to the user +@@ -11,24 +11,24 @@ + _GLIBCXX_PROFILE_STACK_DEPTH can be set + to 0 if you are willing to give up call context information, or to a small + positive value to reduce run time overhead. +-

++

Symbolization of Instruction Addresses

+ The profiling and analysis phases use only instruction addresses. + An external utility such as addr2line is needed to postprocess the result. + We do not plan to add symbolization support in the profile extension. + This would require access to symbol tables, debug information tables, + external programs or libraries and other system dependent information. +-

++

Concurrency

+ Our current model is simplistic, but precise. + We cannot afford to approximate because some of our diagnostics require + precise matching of operations to container instance and call context. + During profiling, we keep a single information table per diagnostic. + There is a single lock per information table. +-

++

Using the Standard Library in the Instrumentation Implementation

+ As much as we would like to avoid uses of libstdc++ within our + instrumentation library, containers such as unordered_map are very + appealing. We plan to use them as long as they are named properly + to avoid ambiguity. +-

++

Malloc Hooks

+ User applications/libraries can provide malloc hooks. + When the implementation of the malloc hooks uses stdlibc++, there can + be an infinite cycle between the profile mode instrumentation and the +@@ -42,10 +42,10 @@ + uses non-recursive locks. + XXX: A definitive solution to this problem would be for the profile extension + to use a custom allocator internally, and perhaps not to use libstdc++. +-

++

Construction and Destruction of Global Objects

+ The profiling library state is initialized at the first call to a profiling + method. This allows us to record the construction of all global objects. + However, we cannot do the same at destruction time. The trace is written + by a function registered by atexit, thus invoked by + exit. +-

Prev Up Next
Empirical Cost Model Home Developer Information
++

Prev Up Next
Empirical Cost Model Home Developer Information
+Index: libstdc++-v3/doc/html/manual/configure.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/configure.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/configure.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Configure
Configure
Prev Chapter 2. Setup Next

++ ++Configure

Configure
Prev Chapter 2. Setup Next

Configure

+ When configuring libstdc++, you'll have to configure the entire + gccsrcdir directory. Consider using the + toplevel gcc configuration option +@@ -10,7 +10,7 @@ + Here are all of the configure options specific to libstdc++. Keep + in mind that + +- they ++ they + all have opposite forms as well (enable/disable and + with/without). The defaults are for the current + development sources, which may be different than those +@@ -53,7 +53,7 @@ + choices are 'ieee_1003.1-2001' to specify an X/Open, Standard Unix + (IEEE Std. 1003.1-2001) model based on langinfo/iconv/catgets, + 'gnu' to specify a model based on functionality from the GNU C +- library (langinfo/iconv/gettext) (from glibc, the GNU C ++ library (langinfo/iconv/gettext) (from glibc, the GNU C + library), or 'generic' to use a generic "C" + abstraction which consists of "C" locale info. +

If not explicitly specified, the configure proccess tries +@@ -80,9 +80,13 @@ + (described next). +

--enable-threads=OPTION

Select a threading library. A full description is + given in the +- general compiler ++ general compiler + configuration instructions. This option can change the + library ABI. ++

--enable-libstdcxx-threads

Enable C++11 threads support. If not explicitly specified, ++ the configure process enables it if possible. It defaults to 'off' ++ on Solaris 8 and 9, where it would break symbol versioning. This ++ option can change the library ABI. +

--enable-libstdcxx-time

This is an abbreviated form of + '--enable-libstdcxx-time=yes'(described next). +

--enable-libstdcxx-time=OPTION

Enables link-type checks for the availability of the +@@ -211,4 +215,4 @@ + freestanding environment, in which only a + minimal set of headers are provided. This option builds such an + environment. +-

Prev Up Next
Chapter 2. Setup Home Make
++

Prev Up Next
Chapter 2. Setup Home Make
+Index: libstdc++-v3/doc/html/manual/status.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/status.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/status.html (.../branches/gcc-4_7-branch) +@@ -1,58 +1,58 @@ + +- +-Chapter 1. Status
Chapter 1. Status
Prev Part I.  ++ ++Chapter 1. Status
Chapter 1. Status
Prev Part I.  + Introduction + +- Next

Table of Contents

Implementation Status
C++ 1998/2003
Implementation Status
Implementation Specific Behavior
C++ 2011
Implementation Specific Behavior
C++ TR1
Implementation Specific Behavior
C++ TR 24733
License
The Code: GPL
The Documentation: GPL, FDL
Bugs
Implementation Bugs
Standard Bugs

++

 Next

Chapter 1. Status

Table of Contents

Implementation Status
C++ 1998/2003
Implementation Status
Implementation Specific Behavior
C++ 2011
Implementation Specific Behavior
C++ TR1
Implementation Specific Behavior
C++ TR 24733
License
The Code: GPL
The Documentation: GPL, FDL
Bugs
Implementation Bugs
Standard Bugs

Implementation Status

C++ 1998/2003

Implementation Status

+ This status table is based on the table of contents of ISO/IEC 14882:2003. +

+ This page describes the C++ support in mainline GCC SVN, not in any + particular release. +-

Table 1.1. C++ 1998/2003 Implementation Status

SectionDescriptionStatusComments
++

Table 1.1. C++ 1998/2003 Implementation Status

SectionDescriptionStatusComments
+ 18 +- ++ + Language support +-
18.1TypesY 
18.2Implementation propertiesY 
18.2.1Numeric Limits  
18.2.1.1Class template numeric_limitsY 
18.2.1.2numeric_limits membersY 
18.2.1.3float_round_styleY 
18.2.1.4float_denorm_styleY 
18.2.1.5numeric_limits specializationsY 
18.2.2C LibraryY 
18.3Start and terminationY 
18.4Dynamic memory managementY 
18.5Type identification  
18.5.1Class type_infoY 
18.5.2Class bad_castY 
18.5.3Class bad_typeidY 
18.6Exception handling  
18.6.1Class exceptionY 
18.6.2Violation exception-specificationsY 
18.6.3Abnormal terminationY 
18.6.4uncaught_exceptionY 
18.7Other runtime supportY 
++
18.1TypesY 
18.2Implementation propertiesY 
18.2.1Numeric Limits  
18.2.1.1Class template numeric_limitsY 
18.2.1.2numeric_limits membersY 
18.2.1.3float_round_styleY 
18.2.1.4float_denorm_styleY 
18.2.1.5numeric_limits specializationsY 
18.2.2C LibraryY 
18.3Start and terminationY 
18.4Dynamic memory managementY 
18.5Type identification  
18.5.1Class type_infoY 
18.5.2Class bad_castY 
18.5.3Class bad_typeidY 
18.6Exception handling  
18.6.1Class exceptionY 
18.6.2Violation exception-specificationsY 
18.6.3Abnormal terminationY 
18.6.4uncaught_exceptionY 
18.7Other runtime supportY 
+ 19 +- ++ + Diagnostics +-
19.1Exception classesY 
19.2AssertionsY 
19.3Error numbersY 
++
19.1Exception classesY 
19.2AssertionsY 
19.3Error numbersY 
+ 20 +- ++ + General utilities +-
20.1RequirementsY 
20.2Utility components  
20.2.1OperatorsY 
20.2.2pairY 
20.3Function objects  
20.3.1BaseY 
20.3.2Arithmetic operationY 
20.3.3ComparisonsY 
20.3.4Logical operationsY 
20.3.5NegatorsY 
20.3.6BindersY 
20.3.7Adaptors for pointers to functionsY 
20.3.8Adaptors for pointers to membersY 
20.4Memory  
20.4.1The default allocatorY 
20.4.2Raw storage iteratorY 
20.4.3Temporary buffersY 
20.4.4Specialized algorithmsY 
20.4.4.1uninitialized_copyY 
20.4.4.2uninitialized_fillY 
20.4.4.3uninitialized_fill_nY 
20.4.5Class template auto_ptrY 
20.4.6C libraryY 
++
20.1RequirementsY 
20.2Utility components  
20.2.1OperatorsY 
20.2.2pairY 
20.3Function objects  
20.3.1BaseY 
20.3.2Arithmetic operationY 
20.3.3ComparisonsY 
20.3.4Logical operationsY 
20.3.5NegatorsY 
20.3.6BindersY 
20.3.7Adaptors for pointers to functionsY 
20.3.8Adaptors for pointers to membersY 
20.4Memory  
20.4.1The default allocatorY 
20.4.2Raw storage iteratorY 
20.4.3Temporary buffersY 
20.4.4Specialized algorithmsY 
20.4.4.1uninitialized_copyY 
20.4.4.2uninitialized_fillY 
20.4.4.3uninitialized_fill_nY 
20.4.5Class template auto_ptrY 
20.4.6C libraryY 
+ 21 +- ++ + Strings +-
21.1Character traits  
21.1.1Character traits requirementsY 
21.1.2traits typedefY 
21.1.3char_traits specializations  
21.1.3.1struct char_traits<char>Y 
21.1.3.2struct char_traits<wchar_t>Y 
21.2String classesY 
21.3Class template basic_stringY 
21.4Null-terminated sequence utilitiesYC library dependency
++
21.1Character traits  
21.1.1Character traits requirementsY 
21.1.2traits typedefY 
21.1.3char_traits specializations  
21.1.3.1struct char_traits<char>Y 
21.1.3.2struct char_traits<wchar_t>Y 
21.2String classesY 
21.3Class template basic_stringY 
21.4Null-terminated sequence utilitiesYC library dependency
+ 22 +- ++ + Localization +-
22.1Locales  
22.1.1Class localeY 
22.1.2locale globalsY 
22.1.3Convenience interfaces  
22.1.3.1Character classificationY 
22.1.3.2Character conversionsY 
22.2Standard locale categories  
22.2.1ctypeY 
22.2.2Numeric  
22.2.2.1num_getY 
22.2.2.2num_putY 
22.2.3num_punctY 
22.2.4collateY 
22.2.5Time  
22.2.5.1time_getY 
22.2.5.2time_get_bynameY 
22.2.5.3time_putY 
22.2.5.3time_put_bynameY 
22.2.6Monetary  
22.2.6.1money_getY 
22.2.6.2money_putY 
22.2.6.3money_punctY 
22.2.6.4money_punct_bynameY 
22.2.7messagesY 
22.2.8Program-defined facetsY 
22.3C Library LocalesY 
++
22.1Locales  
22.1.1Class localeY 
22.1.2locale globalsY 
22.1.3Convenience interfaces  
22.1.3.1Character classificationY 
22.1.3.2Character conversionsY 
22.2Standard locale categories  
22.2.1ctypeY 
22.2.2Numeric  
22.2.2.1num_getY 
22.2.2.2num_putY 
22.2.3num_punctY 
22.2.4collateY 
22.2.5Time  
22.2.5.1time_getY 
22.2.5.2time_get_bynameY 
22.2.5.3time_putY 
22.2.5.3time_put_bynameY 
22.2.6Monetary  
22.2.6.1money_getY 
22.2.6.2money_putY 
22.2.6.3money_punctY 
22.2.6.4money_punct_bynameY 
22.2.7messagesY 
22.2.8Program-defined facetsY 
22.3C Library LocalesY 
+ 23 +- ++ + Containers +-
23.1Container requirementsY 
23.2Sequence containers  
23.2.1Class template dequeY 
23.2.2Class template listY 
23.2.3Adaptors  
23.2.3.1Class template queueY 
23.2.3.2Class template priority_queueY 
23.2.3.3Class template stackY 
23.2.4Class template vectorY 
23.2.5Class vector<bool>Y 
23.3Associative containers  
23.3.1Class template mapY 
23.3.2Class template multimapY 
23.3.3Class template setY 
23.3.4Class template multisetY 
++
23.1Container requirementsY 
23.2Sequence containers  
23.2.1Class template dequeY 
23.2.2Class template listY 
23.2.3Adaptors  
23.2.3.1Class template queueY 
23.2.3.2Class template priority_queueY 
23.2.3.3Class template stackY 
23.2.4Class template vectorY 
23.2.5Class vector<bool>Y 
23.3Associative containers  
23.3.1Class template mapY 
23.3.2Class template multimapY 
23.3.3Class template setY 
23.3.4Class template multisetY 
+ 24 +- ++ + Iterators +-
24.1RequirementsY 
24.2Header <iterator> synopsisY 
24.3Iterator primitivesY 
24.4Predefined iterators and Iterator adaptors  
24.4.1Reverse iteratorsY 
24.4.2Insert iteratorsY 
24.5Stream iterators  
24.5.1Class template istream_iteratorY 
24.5.2Class template ostream_iteratorY 
24.5.3Class template istreambuf_iteratorY 
24.5.4Class template ostreambuf_iteratorY 
++
24.1RequirementsY 
24.2Header <iterator> synopsisY 
24.3Iterator primitivesY 
24.4Predefined iterators and Iterator adaptors  
24.4.1Reverse iteratorsY 
24.4.2Insert iteratorsY 
24.5Stream iterators  
24.5.1Class template istream_iteratorY 
24.5.2Class template ostream_iteratorY 
24.5.3Class template istreambuf_iteratorY 
24.5.4Class template ostreambuf_iteratorY 
+ 25 +- ++ + Algorithms +-
25.1Non-modifying sequence operationsY 
25.2Mutating sequence operationsY 
25.3Sorting and related operationsY 
25.4C library algorithmsY 
++
25.1Non-modifying sequence operationsY 
25.2Mutating sequence operationsY 
25.3Sorting and related operationsY 
25.4C library algorithmsY 
+ 26 +- ++ + Numerics +-
26.1Numeric type requirementsY 
26.2Complex numbersY 
26.3Numeric arrays  
26.3.1Header <valarray> synopsisY 
26.3.2Class template valarrayY 
26.3.3valarray non-member operationsY 
26.3.4Class sliceY 
26.3.5Class template slice_arrayY 
26.3.6Class gsliceY 
26.3.7Class template gslice_arrayY 
26.3.8Class template mask_arrayY 
26.3.9Class template indirect_arrayY 
26.4Generalized numeric operations  
26.4.1accumulateY 
26.4.2inner_productY 
26.4.3partial_sumY 
26.4.4adjacent_differenceY 
26.4.5iotaY 
26.5C LibraryY 
++
26.1Numeric type requirementsY 
26.2Complex numbersY 
26.3Numeric arrays  
26.3.1Header <valarray> synopsisY 
26.3.2Class template valarrayY 
26.3.3valarray non-member operationsY 
26.3.4Class sliceY 
26.3.5Class template slice_arrayY 
26.3.6Class gsliceY 
26.3.7Class template gslice_arrayY 
26.3.8Class template mask_arrayY 
26.3.9Class template indirect_arrayY 
26.4Generalized numeric operations  
26.4.1accumulateY 
26.4.2inner_productY 
26.4.3partial_sumY 
26.4.4adjacent_differenceY 
26.4.5iotaY 
26.5C LibraryY 
+ 27 +- ++ + Input/output +-
27.1RequirementsY 
27.2Forward declarationsY 
27.3Standard iostream objectsY 
27.3.1Narrow stream objectsY 
27.3.2Wide stream objectsY 
27.4Iostreams base classesY 
27.5Stream buffersY 
27.6Formatting and manipulatorsY 
27.7String-based streamsY 
27.8File-based streamsY 
++
27.1RequirementsY 
27.2Forward declarationsY 
27.3Standard iostream objectsY 
27.3.1Narrow stream objectsY 
27.3.2Wide stream objectsY 
27.4Iostreams base classesY 
27.5Stream buffersY 
27.6Formatting and manipulatorsY 
27.7String-based streamsY 
27.8File-based streamsY 
+ Appendix D +- ++ + Compatibility features +-
D.1Increment operator with bool operand  
D.2static keyword  
D.3Access declarations  
D.4Implicit conversion from const strings  
D.5C standard library headers  
D.6Old iostreams members  
D.7char* streams  

++

D.1Increment operator with bool operand  
D.2static keyword  
D.3Access declarations  
D.4Implicit conversion from const strings  
D.5C standard library headers  
D.6Old iostreams members  
D.7char* streams  

Implementation Specific Behavior

+ The ISO standard defines the following phrase: +

+ [1.3.5] implementation-defined behavior +@@ -142,8 +142,8 @@ + in this chapter. +

[27.8.1.4]/16 Calling fstream::sync when + a get area exists will... whatever fflush() does, I think. +-

+- ++

C++ 2011

++ + This table is based on the table of contents of ISO/IEC + JTC1 SC22 WG21 Doc No: N3290 Date: 2011-04-11 + Final Draft International Standard, Standard for Programming Language C++ +@@ -158,25 +158,24 @@ +

+ This page describes the C++11 support in mainline GCC SVN, not in any + particular release. +-

Table 1.2. C++ 2011 Implementation Status

SectionDescriptionStatusComments
++

Table 1.2. C++ 2011 Implementation Status

SectionDescriptionStatusComments
+ 18 +- ++ + Language support +-
18.1GeneralY 
18.2TypesPartialMissing offsetof, max_align_t
18.3Implementation properties  
18.3.2Numeric Limits  
18.3.2.3Class template numeric_limitsY 
18.3.2.4numeric_limits membersY 
18.3.2.5float_round_styleN 
18.3.2.6float_denorm_styleN 
18.3.2.7numeric_limits specializationsY 
18.3.3C LibraryY 
18.4Integer types  
18.4.1Header <cstdint> synopsisY 
18.5Start and terminationPartialC library dependency for quick_exit, at_quick_exit
18.6Dynamic memory managementY 
18.7Type identification  
18.7.1Class type_infoY 
18.7.2Class bad_castY 
18.7.3Class bad_typeidY 
18.8Exception handling  
18.8.1Class exceptionY 
18.8.2Class bad_exceptionY 
18.8.3Abnormal terminationY 
18.8.4uncaught_exceptionY 
18.8.5Exception PropagationY 
18.8.6nested_exceptionY 
18.9Initializer lists  
18.9.1Initializer list constructorsY 
18.9.2Initializer list accessY 
18.9.3Initializer list range accessY 
18.10Other runtime supportY 
++
18.1GeneralY 
18.2TypesPartialMissing offsetof, max_align_t
18.3Implementation properties  
18.3.2Numeric Limits  
18.3.2.3Class template numeric_limitsY 
18.3.2.4numeric_limits membersY 
18.3.2.5float_round_styleN 
18.3.2.6float_denorm_styleN 
18.3.2.7numeric_limits specializationsY 
18.3.3C LibraryY 
18.4Integer types  
18.4.1Header <cstdint> synopsisY 
18.5Start and terminationPartialC library dependency for quick_exit, at_quick_exit
18.6Dynamic memory managementY 
18.7Type identification  
18.7.1Class type_infoY 
18.7.2Class bad_castY 
18.7.3Class bad_typeidY 
18.8Exception handling  
18.8.1Class exceptionY 
18.8.2Class bad_exceptionY 
18.8.3Abnormal terminationY 
18.8.4uncaught_exceptionY 
18.8.5Exception PropagationY 
18.8.6nested_exceptionY 
18.9Initializer lists  
18.9.1Initializer list constructorsY 
18.9.2Initializer list accessY 
18.9.3Initializer list range accessY 
18.10Other runtime supportY 
+ 19 +- ++ + Diagnostics +-
19.1GeneralY 
19.2Exception classesY 
19.3AssertionsY 
19.4Error numbersY 
19.5System error support  
19.5.1Class error_categoryY 
19.5.2Class error_codeY 
19.5.3Class error_conditionY 
19.5.4Comparison operatorsY 
19.5.5Class system_errorY 
++
19.1GeneralY 
19.2Exception classesY 
19.3AssertionsY 
19.4Error numbersY 
19.5System error support  
19.5.1Class error_categoryY 
19.5.2Class error_codeY 
19.5.3Class error_conditionY 
19.5.4Comparison operatorsY 
19.5.5Class system_errorY 
+ 20 +- ++ + General utilities +-
20.1General  
20.2Utility components  
20.2.1OperatorsY 
20.2.2SwapY 
20.2.3forward and move helpersY 
20.2.4Function template declvalY 
20.3Pairs  
20.3.1In general  
20.3.2Class template pairPartialPiecewise construction requires an accessible copy/move +- constructor.
20.3.3Specialized algorithmsY 
20.3.4Tuple-like access to pairY 
20.3.5Piecewise constructionY 
20.4Tuples  
20.4.1In general  
20.4.2Class template tuple  
20.4.2.1ConstructionY 
20.4.2.2AssignmentY 
20.4.2.3SwapY 
20.4.2.4Tuple creation functionsY 
20.4.2.5Tuple helper classesY 
20.4.2.6Element accessY 
20.4.2.7Relational operatorsY 
20.4.2.8Tuple traitsY 
20.4.2.9Tuple specialized algorithmsY 
20.5Class template bitsetY 
20.5.1bitset constructorsY 
20.5.2bitset membersY 
20.5.3bitset hash supportY 
20.5.4bitset operatorsY 
20.6Memory  
20.6.1In general  
20.6.2Header <memory> synopsis  
20.6.3Pointer traitsPartialMissing rebind
20.6.4Pointer safetyPartial 
20.6.5AlignN 
20.6.6Allocator argument tagY 
20.6.7uses_allocatorY 
20.6.8Allocator traitsPartialMissing rebind_alloc and rebind_traits
20.6.9The default allocatorY 
20.6.10Raw storage iteratorY 
20.6.11Temporary buffersY 
20.6.12Specialized algorithms  
20.6.12.1addressofY 
20.6.12.2uninitialized_copyY 
20.6.12.3uninitialized_fillY 
20.6.12.4uninitialized_fill_nY 
20.6.13C libraryY 
20.7Smart pointers  
20.7.1Class template unique_ptrY 
20.7.2Shared-ownership pointersY 
20.7.2.1Class bad_weak_ptrY 
20.7.2.2Class template shared_ptrY ++
20.1General  
20.2Utility components  
20.2.1OperatorsY 
20.2.2SwapY 
20.2.3forward and move helpersY 
20.2.4Function template declvalY 
20.3Pairs  
20.3.1In general  
20.3.2Class template pairY 
20.3.3Specialized algorithmsY 
20.3.4Tuple-like access to pairY 
20.3.5Piecewise constructionY 
20.4Tuples  
20.4.1In general  
20.4.2Class template tuple  
20.4.2.1ConstructionY 
20.4.2.2AssignmentY 
20.4.2.3SwapY 
20.4.2.4Tuple creation functionsY 
20.4.2.5Tuple helper classesY 
20.4.2.6Element accessY 
20.4.2.7Relational operatorsY 
20.4.2.8Tuple traitsY 
20.4.2.9Tuple specialized algorithmsY 
20.5Class template bitsetY 
20.5.1bitset constructorsY 
20.5.2bitset membersY 
20.5.3bitset hash supportY 
20.5.4bitset operatorsY 
20.6Memory  
20.6.1In general  
20.6.2Header <memory> synopsis  
20.6.3Pointer traitsY 
20.6.4Pointer safetyPartial 
20.6.5AlignN 
20.6.6Allocator argument tagY 
20.6.7uses_allocatorY 
20.6.8Allocator traitsY 
20.6.9The default allocatorY 
20.6.10Raw storage iteratorY 
20.6.11Temporary buffersY 
20.6.12Specialized algorithms  
20.6.12.1addressofY 
20.6.12.2uninitialized_copyY 
20.6.12.3uninitialized_fillY 
20.6.12.4uninitialized_fill_nY 
20.6.13C libraryY 
20.7Smart pointers  
20.7.1Class template unique_ptrY 
20.7.2Shared-ownership pointersY 
20.7.2.1Class bad_weak_ptrY 
20.7.2.2Class template shared_ptrY +

+ Uses code from +- boost::shared_ptr. ++ boost::shared_ptr. +

+-
20.7.2.3Class template weak_ptrY 
20.7.2.4Class template emable_shared_from_thisY 
20.7.2.5shared_ptr atomic accessPartial 
20.7.2.6Smart pointer hash supportY 
20.8Function objects  
20.8.1Definitions  
20.8.2Requirements  
20.8.3Class template reference_wrapperY 
20.8.4Arithmetic operationY 
20.8.5ComparisonsY 
20.8.6Logical operationsY 
20.8.7Bitwise operationsY 
20.8.8NegatorsY 
20.8.9Function template bindY 
20.8.10Function template mem_fnPartialMissing overloads for reference-qualified member functions
20.8.11Polymorphic function wrappers  
20.8.11.1Class bad_function_callY 
20.8.11.2Class template functionPartialMissing allocator support
20.8.12Class template hashY 
20.9Metaprogramming and type traits  
20.9.1RequirementsY 
20.9.2Header <type_traits> synopsis  
20.9.3Helper classesY 
20.9.4Unary Type TraitsY 
20.9.4.1Primary type categoriesY 
20.9.4.2Composite type traitsY 
20.9.4.3Type propertiesPartialMissing is_trivially_copyable, ++
20.7.2.3Class template weak_ptrY 
20.7.2.4Class template emable_shared_from_thisY 
20.7.2.5shared_ptr atomic accessPartial 
20.7.2.6Smart pointer hash supportY 
20.8Function objects  
20.8.1Definitions  
20.8.2Requirements  
20.8.3Class template reference_wrapperY 
20.8.4Arithmetic operationY 
20.8.5ComparisonsY 
20.8.6Logical operationsY 
20.8.7Bitwise operationsY 
20.8.8NegatorsY 
20.8.9Function template bindY 
20.8.10Function template mem_fnPartialMissing overloads for reference-qualified member functions
20.8.11Polymorphic function wrappers  
20.8.11.1Class bad_function_callY 
20.8.11.2Class template functionPartialMissing allocator support
20.8.12Class template hashY 
20.9Metaprogramming and type traits  
20.9.1RequirementsY 
20.9.2Header <type_traits> synopsis  
20.9.3Helper classesY 
20.9.4Unary Type TraitsY 
20.9.4.1Primary type categoriesY 
20.9.4.2Composite type traitsY 
20.9.4.3Type propertiesPartialMissing is_trivially_copyable, + is_assignable, is_copy_assignable, is_move_assignable, + is_trivially_constructible, is_trivially_default_constructible, + is_trivially_copy_constructible, is_trivially_move_constructible, +@@ -186,62 +185,59 @@ + is_nothrow_assignable, + is_nothrow_copy_assignable, is_nothrow_move_assignable, + is_nothrow_destructible +-
20.9.5Type property queriesY 
20.9.6Relationships between typesY 
20.9.7Transformations between types  
20.9.7.1Const-volatile modificationsY 
20.9.7.2Reference modificationsY 
20.9.7.3Sign modificationsY 
20.9.7.4Array modificationsY 
20.9.7.5Pointer modificationsY 
20.9.7.6Other transformationsY 
20.10Compile-time rational arithmetic  
20.10.1In general  
20.10.2Header <ratio> synopsis  
20.10.3Class template ratioY 
20.10.4Arithmetic on ratiosY 
20.10.5Comparison of ratiosY 
20.10.6SI types for ratioY 
20.11Time utilities  
20.11.3Clock requirementsY 
20.11.4Time-related traits  
20.11.4.1treat_as_floating_pointY 
20.11.4.2duration_valuesY 
20.11.4.3Specializations of common_typeY 
20.11.5Class template durationPartialMissing constexpr for non-member arithmetic operations
20.11.6Class template time_pointY 
20.11.7Clocks  
20.11.7.1Class system_clockY 
20.11.7.2Class steady_clockNSupport old monotonic_clock spec instead
20.11.7.3Class high_resolution_clockY 
20.11.8Date and time functionsY 
20.12Scoped allocator adaptorPartial 
20.12.1Header <scoped_allocator> synopsis  
20.12.2Scoped allocator adaptor member typesY 
20.12.3Scoped allocator adaptor constructorsY 
20.12.4Scoped allocator adaptor membersPartial 
20.12.5Scoped allocator operatorsY 
20.13Class type_indexY 
++
20.9.5Type property queriesY 
20.9.6Relationships between typesY 
20.9.7Transformations between types  
20.9.7.1Const-volatile modificationsY 
20.9.7.2Reference modificationsY 
20.9.7.3Sign modificationsY 
20.9.7.4Array modificationsY 
20.9.7.5Pointer modificationsY 
20.9.7.6Other transformationsY 
20.10Compile-time rational arithmetic  
20.10.1In general  
20.10.2Header <ratio> synopsis  
20.10.3Class template ratioY 
20.10.4Arithmetic on ratiosY 
20.10.5Comparison of ratiosY 
20.10.6SI types for ratioY 
20.11Time utilities  
20.11.3Clock requirementsY 
20.11.4Time-related traits  
20.11.4.1treat_as_floating_pointY 
20.11.4.2duration_valuesY 
20.11.4.3Specializations of common_typeY 
20.11.5Class template durationPartialMissing constexpr for non-member arithmetic operations
20.11.6Class template time_pointY 
20.11.7Clocks  
20.11.7.1Class system_clockY 
20.11.7.2Class steady_clockY 
20.11.7.3Class high_resolution_clockY 
20.11.8Date and time functionsY 
20.12Scoped allocator adaptorPartial 
20.12.1Header <scoped_allocator> synopsis  
20.12.2Scoped allocator adaptor member typesY 
20.12.3Scoped allocator adaptor constructorsY 
20.12.4Scoped allocator adaptor membersPartial 
20.12.5Scoped allocator operatorsY 
20.13Class type_indexY 
+ 21 +- ++ + Strings +-
21.1GeneralY 
21.2Character traits  
21.2.1Character traits requirementsY 
21.2.2traits typedefsY 
21.2.3char_traits specializations  
21.2.3.1struct char_traits<char>PartialMissing constexpr
21.2.3.2struct char_traits<char16_t>PartialMissing constexpr
21.2.3.3struct char_traits<char32_t>Y 
21.2.3.4struct char_traits<wchar_t>Y 
21.3String classesY 
21.4Class template basic_stringPartialMissing pop_back
21.5Numeric ConversionsY 
21.6Hash supportY 
21.7Null-terminated sequence utilitiesPartialC library dependency. ++
21.1GeneralY 
21.2Character traits  
21.2.1Character traits requirementsY 
21.2.2traits typedefsY 
21.2.3char_traits specializations  
21.2.3.1struct char_traits<char>PartialMissing constexpr
21.2.3.2struct char_traits<char16_t>PartialMissing constexpr
21.2.3.3struct char_traits<char32_t>Y 
21.2.3.4struct char_traits<wchar_t>Y 
21.3String classesY 
21.4Class template basic_stringY 
21.5Numeric ConversionsY 
21.6Hash supportY 
21.7Null-terminated sequence utilitiesPartialC library dependency. + Missing <cuchar> +-
++
+ 22 +- ++ + Localization +-
22.1GeneralY 
22.2Header <locale> synopsisY 
22.3Locales  
22.3.1Class localeY 
22.3.2locale globalsY 
22.3.3Convenience interfaces  
22.3.3.1Character classificationY 
22.3.3.2Conversions  
22.3.3.2.1Character conversionsY 
22.3.3.2.2string conversionsN 
22.3.3.2.3Buffer conversionsN 
22.4Standard locale categories  
22.4.1The ctype categoryY 
22.4.2The numeric category  
22.4.2.1num_getY 
22.4.2.2num_putY 
22.4.3The numeric punctuation facetY 
22.4.4The collate categoryY 
22.4.5The time category  
22.4.5.1Class template time_getY 
22.4.5.2Class template time_get_bynameY 
22.4.5.3Class template time_putY 
22.4.5.3Class template time_put_bynameY 
22.4.6The monetary category  
22.4.6.1Class template money_getY 
22.4.6.2Class template money_putY 
22.4.6.3Class template money_punctY 
22.4.6.4Class template money_punct_bynameY 
22.4.7The message retrieval categoryY 
22.4.8Program-defined facetsY 
22.5Standard code conversion facetsN 
22.6C Library LocalesY 
++
22.1GeneralY 
22.2Header <locale> synopsisY 
22.3Locales  
22.3.1Class localeY 
22.3.2locale globalsY 
22.3.3Convenience interfaces  
22.3.3.1Character classificationY 
22.3.3.2Conversions  
22.3.3.2.1Character conversionsY 
22.3.3.2.2string conversionsN 
22.3.3.2.3Buffer conversionsN 
22.4Standard locale categories  
22.4.1The ctype categoryY 
22.4.2The numeric category  
22.4.2.1num_getY 
22.4.2.2num_putY 
22.4.3The numeric punctuation facetY 
22.4.4The collate categoryY 
22.4.5The time category  
22.4.5.1Class template time_getY 
22.4.5.2Class template time_get_bynameY 
22.4.5.3Class template time_putY 
22.4.5.3Class template time_put_bynameY 
22.4.6The monetary category  
22.4.6.1Class template money_getY 
22.4.6.2Class template money_putY 
22.4.6.3Class template money_punctY 
22.4.6.4Class template money_punct_bynameY 
22.4.7The message retrieval categoryY 
22.4.8Program-defined facetsY 
22.5Standard code conversion facetsN 
22.6C Library LocalesY 
+ 23 +- ++ + Containers +-
23.1General  
23.2Container requirements  
23.2.1General container requirementsPartialOnly vector meets the requirements +- relating to allocator use and propagation.
23.2.2Container data racesY 
23.2.3Sequence containersY 
23.2.4Associative containersPartialMissing emplace members
23.2.5Unordered associative containersY 
23.3Sequence containers  
23.3.2Class template arrayY 
23.3.3Class template dequeY 
23.3.4Class template forward_listY 
23.3.5Class template listY 
23.3.6Class template vectorY 
23.3.7Class vector<bool>Y 
23.4Associative containers  
23.4.4Class template mapY 
23.4.5Class template multimapY 
23.4.6Class template setY 
23.4.7Class template multisetY 
23.5Unordered associative containers  
23.5.4Class template unordered_mapY 
23.5.5Class template unordered_multimapY 
23.5.6Class template unordered_setY 
23.5.7Class template unordered_multisetY 
23.6Container adaptors  
23.6.1Class template queueY 
23.6.2Class template priority_queueY 
23.6.3Class template stackY 
++
23.1General  
23.2Container requirements  
23.2.1General container requirementsPartialOnly vector meets the requirements ++ relating to allocator use and propagation.
23.2.2Container data racesY 
23.2.3Sequence containersY 
23.2.4Associative containersPartialMissing emplace members
23.2.5Unordered associative containersY 
23.3Sequence containers  
23.3.2Class template arrayY 
23.3.3Class template dequeY 
23.3.4Class template forward_listY 
23.3.5Class template listY 
23.3.6Class template vectorY 
23.3.7Class vector<bool>Y 
23.4Associative containers  
23.4.4Class template mapY 
23.4.5Class template multimapY 
23.4.6Class template setY 
23.4.7Class template multisetY 
23.5Unordered associative containers  
23.5.4Class template unordered_mapY 
23.5.5Class template unordered_multimapY 
23.5.6Class template unordered_setY 
23.5.7Class template unordered_multisetY 
23.6Container adaptors  
23.6.1Class template queueY 
23.6.2Class template priority_queueY 
23.6.3Class template stackY 
+ 24 +- ++ + Iterators +-
24.1GeneralY 
24.2Iterator requirementsY 
24.3Header <iterator> synopsisY 
24.4Iterator primitivesY 
24.5Iterator adaptors  
24.5.1Reverse iteratorsY 
24.5.2Insert iteratorsY 
24.5.3Move iteratorsY 
24.6Stream iterators  
24.6.1Class template istream_iteratorY 
24.6.2Class template ostream_iteratorY 
24.6.3Class template istreambuf_iteratorY 
24.6.4Class template ostreambuf_iteratorY 
24.6.5range accessY 
++
24.1GeneralY 
24.2Iterator requirementsY 
24.3Header <iterator> synopsisY 
24.4Iterator primitivesY 
24.5Iterator adaptors  
24.5.1Reverse iteratorsY 
24.5.2Insert iteratorsY 
24.5.3Move iteratorsY 
24.6Stream iterators  
24.6.1Class template istream_iteratorY 
24.6.2Class template ostream_iteratorY 
24.6.3Class template istreambuf_iteratorY 
24.6.4Class template ostreambuf_iteratorY 
24.6.5range accessY 
+ 25 +- ++ + Algorithms +-
25.1General  
25.2Non-modifying sequence operationsY 
25.3Mutating sequence operationsY 
25.4Sorting and related operationsY 
25.5C library algorithmsY 
++
25.1General  
25.2Non-modifying sequence operationsY 
25.3Mutating sequence operationsY 
25.4Sorting and related operationsY 
25.5C library algorithmsY 
+ 26 +- ++ + Numerics +-
26.1GeneralY 
26.2Numeric type requirementsY 
26.3The floating-point environmentY 
26.4Complex numbersPartialMissing constexpr
26.5Random number generation  
26.5.1Requirements  
26.5.2Header <random> synopsis  
26.5.3Random number engine class templates  
26.5.3.1Class template linear_congruential_engineYMissing constexpr
26.5.3.2Class template mersenne_twister_engineYMissing constexpr
26.5.3.3Class template subtract_with_carry_engineYMissing constexpr
26.5.4Random number engine adaptor class templates  
26.5.4.2Class template discard_block_engineYMissing constexpr
26.5.4.3Class template independent_bits_engineYMissing constexpr
26.5.4.4Class template shuffle_order_engineYMissing constexpr
26.5.5Engines and engine adaptors with predefined parametersY 
26.5.6Class random_deviceYMissing constexpr
26.5.7Utilities  
26.5.7.1Class seed_seqY 
26.5.7.2Function template generate_canonicalY 
26.5.8Random number distribution class templates  
26.5.8.2Uniform distributions  
26.5.8.2.1Class template uniform_int_distributionY 
26.5.8.2.2Class template uniform_real_distributionY 
26.5.8.3Bernoulli distributions  
26.5.8.3.1Class bernoulli_distributionY 
26.5.8.3.2Class template binomial_distributionY 
26.5.8.3.3Class template geometric_distributionY 
26.5.8.3.4Class template negative_binomial_distributionY 
26.5.8.4Poisson distributions  
26.5.8.4.1Class template poisson_distributionY 
26.5.8.4.2Class template exponential_distributionY 
26.5.8.4.3Class template gamma_distributionY 
26.5.8.4.4Class template weibull_distributionY 
26.5.8.4.5Class template extreme_value_distributionY 
26.5.8.5Normal distributions  
26.5.8.5.1Class template normal_distributionY 
26.5.8.5.2Class template lognormal_distributionY 
26.5.8.5.3Class template chi_squared_distributionY 
26.5.8.5.4Class template cauchy_distributionY 
26.5.8.5.5Class template fisher_f_distributionY 
26.5.8.5.6Class template student_t_distributionY 
26.5.8.6Sampling distributions  
26.5.8.6.1Class template discrete_distributionY 
26.5.8.6.2Class template piecewise_constant_distributionY 
26.5.8.6.3Class template piecewise_linear_distributionY 
26.6Numeric arrays  
26.6.1Header <valarray> synopsisY 
26.6.2Class template valarrayY 
26.6.3valarray non-member operationsY 
26.6.4Class sliceY 
26.6.5Class template slice_arrayY 
26.6.6The gslice classY 
26.6.7Class template gslice_arrayY 
26.6.8Class template mask_arrayY 
26.6.9Class template indirect_arrayY 
26.6.10valarray range accessY 
26.7Generalized numeric operations  
26.7.1Header <numeric> synopsisY 
26.7.2accumulateY 
26.7.3inner_productY 
26.7.4partial_sumY 
26.7.5adjacent_differenceY 
26.7.6iotaY 
26.8C LibraryY 
++
26.1GeneralY 
26.2Numeric type requirementsY 
26.3The floating-point environmentY 
26.4Complex numbersPartialMissing constexpr
26.5Random number generation  
26.5.1Requirements  
26.5.2Header <random> synopsis  
26.5.3Random number engine class templates  
26.5.3.1Class template linear_congruential_engineYMissing constexpr
26.5.3.2Class template mersenne_twister_engineYMissing constexpr
26.5.3.3Class template subtract_with_carry_engineYMissing constexpr
26.5.4Random number engine adaptor class templates  
26.5.4.2Class template discard_block_engineYMissing constexpr
26.5.4.3Class template independent_bits_engineYMissing constexpr
26.5.4.4Class template shuffle_order_engineYMissing constexpr
26.5.5Engines and engine adaptors with predefined parametersY 
26.5.6Class random_deviceYMissing constexpr
26.5.7Utilities  
26.5.7.1Class seed_seqY 
26.5.7.2Function template generate_canonicalY 
26.5.8Random number distribution class templates  
26.5.8.2Uniform distributions  
26.5.8.2.1Class template uniform_int_distributionY 
26.5.8.2.2Class template uniform_real_distributionY 
26.5.8.3Bernoulli distributions  
26.5.8.3.1Class bernoulli_distributionY 
26.5.8.3.2Class template binomial_distributionY 
26.5.8.3.3Class template geometric_distributionY 
26.5.8.3.4Class template negative_binomial_distributionY 
26.5.8.4Poisson distributions  
26.5.8.4.1Class template poisson_distributionY 
26.5.8.4.2Class template exponential_distributionY 
26.5.8.4.3Class template gamma_distributionY 
26.5.8.4.4Class template weibull_distributionY 
26.5.8.4.5Class template extreme_value_distributionY 
26.5.8.5Normal distributions  
26.5.8.5.1Class template normal_distributionY 
26.5.8.5.2Class template lognormal_distributionY 
26.5.8.5.3Class template chi_squared_distributionY 
26.5.8.5.4Class template cauchy_distributionY 
26.5.8.5.5Class template fisher_f_distributionY 
26.5.8.5.6Class template student_t_distributionY 
26.5.8.6Sampling distributions  
26.5.8.6.1Class template discrete_distributionY 
26.5.8.6.2Class template piecewise_constant_distributionY 
26.5.8.6.3Class template piecewise_linear_distributionY 
26.6Numeric arrays  
26.6.1Header <valarray> synopsisY 
26.6.2Class template valarrayY 
26.6.3valarray non-member operationsY 
26.6.4Class sliceY 
26.6.5Class template slice_arrayY 
26.6.6The gslice classY 
26.6.7Class template gslice_arrayY 
26.6.8Class template mask_arrayY 
26.6.9Class template indirect_arrayY 
26.6.10valarray range accessY 
26.7Generalized numeric operations  
26.7.1Header <numeric> synopsisY 
26.7.2accumulateY 
26.7.3inner_productY 
26.7.4partial_sumY 
26.7.5adjacent_differenceY 
26.7.6iotaY 
26.8C LibraryY 
+ 27 +- ++ + Input/output library +-
27.1GeneralY 
27.2Iostreams requirementsY 
27.2.1Imbue LimitationsY 
27.2.2Positioning Type LimitationsY 
27.2.3Thread safetyPartial 
27.3Forward declarationsY 
27.4Standard iostream objectsY 
27.4.1OverviewY 
27.4.2Narrow stream objectsY 
27.4.3Wide stream objectsY 
27.5Iostreams base classesPartial ++
27.1GeneralY 
27.2Iostreams requirementsY 
27.2.1Imbue LimitationsY 
27.2.2Positioning Type LimitationsY 
27.2.3Thread safetyPartial 
27.3Forward declarationsY 
27.4Standard iostream objectsY 
27.4.1OverviewY 
27.4.2Narrow stream objectsY 
27.4.3Wide stream objectsY 
27.5Iostreams base classesPartial + Missing move and swap operations on basic_ios. + Missing io_errc and iostream_category. + ios_base::failure is not derived from system_error. +-
27.6Stream buffersY 
27.7Formatting and manipulatorsPartialMissing move and swap operations
27.8String-based streamsPartialMissing move and swap operations
27.9File-based streamsPartialMissing move and swap operations
++
27.6Stream buffersY 
27.7Formatting and manipulatorsPartialMissing move and swap operations
27.8String-based streamsPartialMissing move and swap operations
27.9File-based streamsPartialMissing move and swap operations
+ 28 +- ++ + Regular expressions +-
28.1GeneralN 
28.2DefinitionsN 
28.3RequirementsN 
28.4Header <regex> synopsisN 
28.5Namespace std::regex_constantsY 
28.6Class regex_errorY 
28.7Class template regex_traitsPartial 
28.8Class template basic_regexPartial 
28.9Class template sub_matchPartial 
28.10Class template match_resultsPartial 
28.11Regular expression algorithmsN 
28.12Regular expression IteratorsN 
28.13Modified ECMAScript regular expression grammarN 
++
28.1GeneralN 
28.2DefinitionsN 
28.3RequirementsN 
28.4Header <regex> synopsisN 
28.5Namespace std::regex_constantsY 
28.6Class regex_errorY 
28.7Class template regex_traitsPartial 
28.8Class template basic_regexPartial 
28.9Class template sub_matchPartial 
28.10Class template match_resultsPartial 
28.11Regular expression algorithmsN 
28.12Regular expression IteratorsN 
28.13Modified ECMAScript regular expression grammarN 
+ 29 +- ++ + Atomic operations +-
29.1GeneralY 
29.2Header <atomic> synopsisY 
29.3Order and consistencyN 
29.4Lock-free propertyPartialMissing ATOMIC_BOOL_LOCK_FREE and +- ATOMIC_POINTER_LOCK_FREE. +- Based on _GLIBCXX_ATOMIC_PROPERTY +-
29.5Atomic typesPartialMissing constexpr
29.6Operations on atomic typesY 
29.7Flag Type and operationsY 
29.8FencesN 
++
29.1GeneralY 
29.2Header <atomic> synopsisY 
29.3Order and consistencyPartial 
29.4Lock-free propertyY 
29.5Atomic typesY 
29.6Operations on atomic typesY 
29.7Flag Type and operationsY 
29.8FencesN 
+ 30 +- ++ + Thread support +-
30.1GeneralY 
30.2RequirementsY 
30.3Threads  
30.3.1Class threadPartialthread::id comparisons not well-defined
30.3.2Namespace this_threadY 
30.4Mutual exclusion  
30.4.1Mutex requirements  
30.4.1.1In general  
30.4.1.2Mutex types  
30.4.1.2.1Class mutexY 
30.4.1.2.2Class recursive_mutexY 
30.4.1.3Timed mutex types On POSIX sytems these types are only defined if the OS +- supports the POSIX Timeouts option.
30.4.1.3.1Class timed_mutexY 
30.4.1.3.2Class recursive_timed_mutexY 
30.4.2Locks  
30.4.2.1Class template lock_guardY 
30.4.2.2Class template unique_lockY 
30.4.3Generic locking algorithmsY 
30.4.4Call once  
30.4.4.1Struct once_flagY 
30.4.4.2Function call_onceY 
30.5Condition variablesPartialMissing notify_all_at_thread_exit
30.5.1Class condition_variableY 
30.5.2Class condition_variable_anyY 
30.6Futures  
30.6.1Overview  
30.6.2Error handlingY 
30.6.3Class future_errorY 
30.6.4Shared stateY 
30.6.5Class template promisePartialMissing set_*_at_thread_exit
30.6.6Class template futurePartialTimed waiting functions do not return future_status
30.6.7Class template shared_futurePartialTimed waiting functions do not return future_status
30.6.8Function template asyncY 
30.6.9Class template packaged_taskPartialMissing make_ready_at_thread_exit
++
30.1GeneralY 
30.2RequirementsY 
30.3Threads  
30.3.1Class threadPartialthread::id comparisons not well-defined
30.3.2Namespace this_threadY 
30.4Mutual exclusion  
30.4.1Mutex requirements  
30.4.1.1In general  
30.4.1.2Mutex types  
30.4.1.2.1Class mutexY 
30.4.1.2.2Class recursive_mutexY 
30.4.1.3Timed mutex types On POSIX sytems these types are only defined if the OS ++ supports the POSIX Timeouts option.
30.4.1.3.1Class timed_mutexY 
30.4.1.3.2Class recursive_timed_mutexY 
30.4.2Locks  
30.4.2.1Class template lock_guardY 
30.4.2.2Class template unique_lockY 
30.4.3Generic locking algorithmsY 
30.4.4Call once  
30.4.4.1Struct once_flagY 
30.4.4.2Function call_onceY 
30.5Condition variablesPartialMissing notify_all_at_thread_exit
30.5.1Class condition_variableY 
30.5.2Class condition_variable_anyY 
30.6Futures  
30.6.1Overview  
30.6.2Error handlingY 
30.6.3Class future_errorY 
30.6.4Shared stateY 
30.6.5Class template promisePartialMissing set_*_at_thread_exit
30.6.6Class template futurePartialTimed waiting functions do not return future_status::deferred
30.6.7Class template shared_futurePartialTimed waiting functions do not return future_status::deferred
30.6.8Function template asyncY 
30.6.9Class template packaged_taskPartialMissing make_ready_at_thread_exit
+ Appendix D +- ++ + Compatibility features +-
D.1Increment operator with bool operand  
D.2register keyword  
D.3Implicit declaration of copy functions  
D.4Dynamic exception specifications  
D.5C standard library headers  
D.6Old iostreams members  
D.7char* streams  
D.8Function objects  
D.9Binders  
D.10auto_ptr  
D.11Violating exception-specifications  

For behaviour which is also specified by the 1998 and 2003 standards, ++

D.1Increment operator with bool operand  
D.2register keyword  
D.3Implicit declaration of copy functions  
D.4Dynamic exception specifications  
D.5C standard library headers  
D.6Old iostreams members  
D.7char* streams  
D.8Function objects  
D.9Binders  
D.10auto_ptr  
D.11Violating exception-specifications  

Implementation Specific Behavior

For behaviour which is also specified by the 1998 and 2003 standards, + see C++ 1998/2003 Implementation + Specific Behavior. This section only documents behaviour which + is new in the 2011 standard. +@@ -254,7 +250,7 @@ + native_handle_type and + native_handle are provided. The handle types + are defined in terms of the Gthreads abstraction layer. +-

  • thread: The native handle type is ++

    • thread: The native handle type is + a typedef for __gthread_t i.e. pthread_t + when GCC is configured with the posix thread + model. The value of the native handle is undefined for a thread +@@ -279,7 +275,7 @@ + launch is a scoped enumeration type with + overloaded operators to support bitmask operations. There are no + additional bitmask elements defined. +-

++

C++ TR1

+ This table is based on the table of contents of ISO/IEC DTR 19768 + Doc No: N1836=05-0096 Date: 2005-06-24 + Draft Technical Report on C++ Library Extensions +@@ -290,12 +286,12 @@ +

+ This page describes the TR1 support in mainline GCC SVN, not in any particular + release. +-

Table 1.3. C++ TR1 Implementation Status

SectionDescriptionStatusComments
2General Utilities
2.1Reference wrappers  
2.1.1Additions to header <functional> synopsisY 
2.1.2Class template reference_wrapper  
2.1.2.1reference_wrapper construct/copy/destroyY 
2.1.2.2reference_wrapper assignmentY 
2.1.2.3reference_wrapper accessY 
2.1.2.4reference_wrapper invocationY 
2.1.2.5reference_wrapper helper functionsY 
2.2Smart pointers  
2.2.1Additions to header <memory> synopsisY 
2.2.2Class bad_weak_ptrY 
2.2.3Class template shared_ptr  ++

Table 1.3. C++ TR1 Implementation Status

SectionDescriptionStatusComments
2General Utilities
2.1Reference wrappers  
2.1.1Additions to header <functional> synopsisY 
2.1.2Class template reference_wrapper  
2.1.2.1reference_wrapper construct/copy/destroyY 
2.1.2.2reference_wrapper assignmentY 
2.1.2.3reference_wrapper accessY 
2.1.2.4reference_wrapper invocationY 
2.1.2.5reference_wrapper helper functionsY 
2.2Smart pointers  
2.2.1Additions to header <memory> synopsisY 
2.2.2Class bad_weak_ptrY 
2.2.3Class template shared_ptr  +

+ Uses code from +- boost::shared_ptr. ++ boost::shared_ptr. +

+-
2.2.3.1shared_ptr constructorsY 
2.2.3.2shared_ptr destructorY 
2.2.3.3shared_ptr assignmentY 
2.2.3.4shared_ptr modifiersY 
2.2.3.5shared_ptr observersY 
2.2.3.6shared_ptr comparisonY 
2.2.3.7shared_ptr I/OY 
2.2.3.8shared_ptr specialized algorithmsY 
2.2.3.9shared_ptr castsY 
2.2.3.10get_deleterY 
2.2.4Class template weak_ptr  
2.2.4.1weak_ptr constructorsY 
2.2.4.2weak_ptr destructorY 
2.2.4.3weak_ptr assignmentY 
2.2.4.4weak_ptr modifiersY 
2.2.4.5weak_ptr observersY 
2.2.4.6weak_ptr comparisonY 
2.2.4.7weak_ptr specialized algorithmsY 
2.2.5Class template enable_shared_from_thisY 
3Function Objects
3.1DefinitionsY 
3.2Additions to <functional> synopsisY 
3.3RequirementsY 
3.4Function return typesY 
3.5Function template mem_fnY 
3.6Function object binders  
3.6.1Class template is_bind_expressionY 
3.6.2Class template is_placeholderY 
3.6.3Function template bindY 
3.6.4PlaceholdersY 
3.7Polymorphic function wrappers  
3.7.1Class bad_function_callY 
3.7.1.1bad_function_call constructorY 
3.7.2Class template function  
3.7.2.1function construct/copy/destroyY 
3.7.2.2function modifiersY 
3.7.2.3function capacityY 
3.7.2.4function invocationY 
3.7.2.5function target accessY 
3.7.2.6undefined operatorsY 
3.7.2.7null pointer comparison operatorsY 
3.7.2.8specialized algorithmsY 
4Metaprogramming and type traits
4.1RequirementsY 
4.2Header <type_traits> synopsisY 
4.3Helper classesY 
4.4General RequirementsY 
4.5Unary Type Traits  
4.5.1Primary Type CategoriesY 
4.5.2Composite type traitsY 
4.5.3Type propertiesY 
4.6Relationships between typesY 
4.7Transformations between types  
4.7.1Const-volatile modificationsY 
4.7.2Reference modificationsY 
4.7.3Array modificationsY 
4.7.4Pointer modificationsY 
4.8Other transformationsY 
4.9Implementation requirementsY 
5Numerical Facilities
5.1Random number generation  
5.1.1RequirementsY 
5.1.2Header <random> synopsisY 
5.1.3Class template variate_generatorY 
5.1.4Random number engine class templatesY 
5.1.4.1Class template linear_congruentialY 
5.1.4.2Class template mersenne_twisterY 
5.1.4.3Class template subtract_with_carryY 
5.1.4.4Class template subtract_with_carry_01Y 
5.1.4.5Class template discard_blockY 
5.1.4.6Class template xor_combineYoperator()() per N2079
5.1.5Engines with predefined parametersY 
5.1.6Class random_deviceY 
5.1.7Random distribution class templatesY 
5.1.7.1Class template uniform_intY 
5.1.7.2Class bernoulli_distributionY 
5.1.7.3Class template geometric_distributionY 
5.1.7.4Class template poisson_distributionY 
5.1.7.5Class template binomial_distributionY 
5.1.7.6Class template uniform_realY 
5.1.7.7Class template exponential_distributionY 
5.1.7.8Class template normal_distributionY 
5.1.7.9Class template gamma_distributionY 
5.2Mathematical special functionsY 
5.2.1Additions to header <cmath> synopsisY 
5.2.1.1associated Laguerre polynomialsY 
5.2.1.2associated Legendre functionsY 
5.2.1.3beta functionY 
5.2.1.4(complete) elliptic integral of the first kindY 
5.2.1.5(complete) elliptic integral of the second kindY 
5.2.1.6(complete) elliptic integral of the third kindY 
5.2.1.7confluent hypergeometric functionsY 
5.2.1.8regular modified cylindrical Bessel functionsY 
5.2.1.9cylindrical Bessel functions (of the first kind)Y 
5.2.1.10irregular modified cylindrical Bessel functionsY 
5.2.1.11cylindrical Neumann functionsY 
5.2.1.12(incomplete) elliptic integral of the first kindY 
5.2.1.13(incomplete) elliptic integral of the second kindY 
5.2.1.14(incomplete) elliptic integral of the third kindY 
5.2.1.15exponential integralY 
5.2.1.16Hermite polynomialsY 
5.2.1.17hypergeometric functionsY 
5.2.1.18Laguerre polynomialsY 
5.2.1.19Legendre polynomialsY 
5.2.1.20Riemann zeta functionY 
5.2.1.21spherical Bessel functions (of the first kind)Y 
5.2.1.22spherical associated Legendre functionsY 
5.2.1.23spherical Neumann functionsY 
5.2.2Additions to header <math.h> synopsisY 
6Containers
6.1Tuple typesY 
6.1.1Header <tuple> synopsisY 
6.1.2Additions to header <utility> synopsisY 
6.1.3Class template tupleY 
6.1.3.1ConstructionY 
6.1.3.2Tuple creation functionsY 
6.1.3.3Tuple helper classesY 
6.1.3.4Element accessY 
6.1.3.5Relational operatorsY 
6.1.4PairsY 
6.2Fixed size arrayY 
6.2.1Header <array> synopsisY 
6.2.2Class template arrayY 
6.2.2.1array constructors, copy, and assignmentY 
6.2.2.2array specialized algorithmsY 
6.2.2.3array sizeY 
6.2.2.4Zero sized arraysY 
6.2.2.5Tuple interface to class template arrayY 
6.3Unordered associative containersY 
6.3.1Unordered associative container requirementsY 
6.3.1.1Exception safety guaranteesY 
6.3.2Additions to header <functional> synopsisY 
6.3.3Class template hashY 
6.3.4Unordered associative container classesY 
6.3.4.1Header <unordered_set> synopsisY 
6.3.4.2Header <unordered_map> synopsisY 
6.3.4.3Class template unordered_setY 
6.3.4.3.1unordered_set constructorsY 
6.3.4.3.2unordered_set swapY 
6.3.4.4Class template unordered_mapY 
6.3.4.4.1unordered_map constructorsY 
6.3.4.4.2unordered_map element accessY 
6.3.4.4.3unordered_map swapY 
6.3.4.5Class template unordered_multisetY 
6.3.4.5.1unordered_multiset constructorsY 
6.3.4.5.2unordered_multiset swapY 
6.3.4.6Class template unordered_multimapY 
6.3.4.6.1unordered_multimap constructorsY 
6.3.4.6.2unordered_multimap swapY 
7Regular Expressions
7.1DefinitionsN 
7.2RequirementsN 
7.3Regular expressions summaryN 
7.4Header <regex> synopsisN 
7.5Namespace tr1::regex_constantsN 
7.5.1Bitmask Type syntax_option_typeN 
7.5.2Bitmask Type regex_constants::match_flag_typeN 
7.5.3Implementation defined error_typeN 
7.6Class regex_errorN 
7.7Class template regex_traitsN 
7.8Class template basic_regexN 
7.8.1basic_regex constantsN 
7.8.2basic_regex constructorsN 
7.8.3basic_regex assignN 
7.8.4basic_regex constant operationsN 
7.8.5basic_regex localeN 
7.8.6basic_regex swapN 
7.8.7basic_regex non-member functionsN 
7.8.7.1basic_regex non-member swapN 
7.9Class template sub_matchN 
7.9.1sub_match membersN 
7.9.2sub_match non-member operatorsN 
7.10Class template match_resultsN 
7.10.1match_results constructorsN 
7.10.2match_results sizeN 
7.10.3match_results element accessN 
7.10.4match_results formattingN 
7.10.5match_results allocatorN 
7.10.6match_results swapN 
7.11Regular expression algorithmsN 
7.11.1exceptionsN 
7.11.2regex_matchN 
7.11.3regex_searchN 
7.11.4regex_replaceN 
7.12Regular expression IteratorsN 
7.12.1Class template regex_iteratorN 
7.12.1.1regex_iterator constructorsN 
7.12.1.2regex_iterator comparisonsN 
7.12.1.3regex_iterator dereferenceN 
7.12.1.4regex_iterator incrementN 
7.12.2Class template regex_token_iteratorN 
7.12.2.1regex_token_iterator constructorsN 
7.12.2.2regex_token_iterator comparisonsN 
7.12.2.3regex_token_iterator dereferenceN 
7.12.2.4regex_token_iterator incrementN 
7.13Modified ECMAScript regular expression grammarN 
8C Compatibility
8.1Additions to header <complex>Y 
8.1.1SynopsisY 
8.1.2Function acosY 
8.1.3Function asinY 
8.1.4Function atanY 
8.1.5Function acoshY 
8.1.6Function asinhY 
8.1.7Function atanhY 
8.1.8Function fabsY 
8.1.9Additional OverloadsY 
8.2Header <ccomplex>NDR 551
8.3Header <complex.h>NDR 551
8.4Additions to header <cctype>Y 
8.4.1SynopsisY 
8.4.2Function isblankY 
8.5Additions to header <ctype.h>Y 
8.6Header <cfenv>Y 
8.6.1SynopsisY 
8.6.2DefinitionsY 
8.7Header <fenv.h>Y 
8.8Additions to header <cfloat>Y 
8.9Additions to header <float.h>Y 
8.10Additions to header <ios>N 
8.10.1SynopsisN 
8.10.2Function hexfloatN 
8.11Header <cinttypes>Y 
8.11.1SynopsisYDR 557
8.11.2DefinitionsY 
8.12Header <inttypes.h>Y 
8.13Additions to header <climits>Y 
8.14Additions to header <limits.h>Y 
8.15Additions to header <locale>N 
8.16Additions to header <cmath>Y 
8.16.1SynopsisY 
8.16.2DefinitionsY 
8.16.3Function template definitionsY 
8.16.4Additional overloadsYDR 568; DR 550
8.17Additions to header <math.h>Y 
8.18Additions to header <cstdarg>Y 
8.19Additions to header <stdarg.h>Y 
8.20The header <cstdbool>Y 
8.21The header <stdbool.h>Y 
8.22The header <cstdint>Y 
8.22.1SynopsisY 
8.22.2DefinitionsY 
8.23The header <stdint.h>Y 
8.24Additions to header <cstdio>Y 
8.24.1SynopsisY 
8.24.2DefinitionsY 
8.24.3Additional format specifiersYC library dependency
8.24.4Additions to header <stdio.h>Y 
8.25Additions to header <cstdlib>Y 
8.25.1SynopsisY 
8.25.2DefinitionsY 
8.25.3Function absY 
8.25.4Function divY 
8.26Additions to header <stdlib.h>Y 
8.27Header <ctgmath>YDR 551
8.28Header <tgmath.h>YDR 551
8.29Additions to header <ctime>YC library dependency
8.30Additions to header <cwchar>Y 
8.30.1SynopsisY 
8.30.2DefinitionsY 
8.30.3Additional wide format specifiersYC library dependency
8.31Additions to header <wchar.h>Y 
8.32Additions to header <cwctype>Y 
8.32.1SynopsisY 
8.32.2Function iswblankY 
8.33Additions to header <wctype.h>Y 

For behaviour which is specified by the 1998 and 2003 standards, ++

2.2.3.1shared_ptr constructorsY 
2.2.3.2shared_ptr destructorY 
2.2.3.3shared_ptr assignmentY 
2.2.3.4shared_ptr modifiersY 
2.2.3.5shared_ptr observersY 
2.2.3.6shared_ptr comparisonY 
2.2.3.7shared_ptr I/OY 
2.2.3.8shared_ptr specialized algorithmsY 
2.2.3.9shared_ptr castsY 
2.2.3.10get_deleterY 
2.2.4Class template weak_ptr  
2.2.4.1weak_ptr constructorsY 
2.2.4.2weak_ptr destructorY 
2.2.4.3weak_ptr assignmentY 
2.2.4.4weak_ptr modifiersY 
2.2.4.5weak_ptr observersY 
2.2.4.6weak_ptr comparisonY 
2.2.4.7weak_ptr specialized algorithmsY 
2.2.5Class template enable_shared_from_thisY 
3Function Objects
3.1DefinitionsY 
3.2Additions to <functional> synopsisY 
3.3RequirementsY 
3.4Function return typesY 
3.5Function template mem_fnY 
3.6Function object binders  
3.6.1Class template is_bind_expressionY 
3.6.2Class template is_placeholderY 
3.6.3Function template bindY 
3.6.4PlaceholdersY 
3.7Polymorphic function wrappers  
3.7.1Class bad_function_callY 
3.7.1.1bad_function_call constructorY 
3.7.2Class template function  
3.7.2.1function construct/copy/destroyY 
3.7.2.2function modifiersY 
3.7.2.3function capacityY 
3.7.2.4function invocationY 
3.7.2.5function target accessY 
3.7.2.6undefined operatorsY 
3.7.2.7null pointer comparison operatorsY 
3.7.2.8specialized algorithmsY 
4Metaprogramming and type traits
4.1RequirementsY 
4.2Header <type_traits> synopsisY 
4.3Helper classesY 
4.4General RequirementsY 
4.5Unary Type Traits  
4.5.1Primary Type CategoriesY 
4.5.2Composite type traitsY 
4.5.3Type propertiesY 
4.6Relationships between typesY 
4.7Transformations between types  
4.7.1Const-volatile modificationsY 
4.7.2Reference modificationsY 
4.7.3Array modificationsY 
4.7.4Pointer modificationsY 
4.8Other transformationsY 
4.9Implementation requirementsY 
5Numerical Facilities
5.1Random number generation  
5.1.1RequirementsY 
5.1.2Header <random> synopsisY 
5.1.3Class template variate_generatorY 
5.1.4Random number engine class templatesY 
5.1.4.1Class template linear_congruentialY 
5.1.4.2Class template mersenne_twisterY 
5.1.4.3Class template subtract_with_carryY 
5.1.4.4Class template subtract_with_carry_01Y 
5.1.4.5Class template discard_blockY 
5.1.4.6Class template xor_combineYoperator()() per N2079
5.1.5Engines with predefined parametersY 
5.1.6Class random_deviceY 
5.1.7Random distribution class templatesY 
5.1.7.1Class template uniform_intY 
5.1.7.2Class bernoulli_distributionY 
5.1.7.3Class template geometric_distributionY 
5.1.7.4Class template poisson_distributionY 
5.1.7.5Class template binomial_distributionY 
5.1.7.6Class template uniform_realY 
5.1.7.7Class template exponential_distributionY 
5.1.7.8Class template normal_distributionY 
5.1.7.9Class template gamma_distributionY 
5.2Mathematical special functionsY 
5.2.1Additions to header <cmath> synopsisY 
5.2.1.1associated Laguerre polynomialsY 
5.2.1.2associated Legendre functionsY 
5.2.1.3beta functionY 
5.2.1.4(complete) elliptic integral of the first kindY 
5.2.1.5(complete) elliptic integral of the second kindY 
5.2.1.6(complete) elliptic integral of the third kindY 
5.2.1.7confluent hypergeometric functionsY 
5.2.1.8regular modified cylindrical Bessel functionsY 
5.2.1.9cylindrical Bessel functions (of the first kind)Y 
5.2.1.10irregular modified cylindrical Bessel functionsY 
5.2.1.11cylindrical Neumann functionsY 
5.2.1.12(incomplete) elliptic integral of the first kindY 
5.2.1.13(incomplete) elliptic integral of the second kindY 
5.2.1.14(incomplete) elliptic integral of the third kindY 
5.2.1.15exponential integralY 
5.2.1.16Hermite polynomialsY 
5.2.1.17hypergeometric functionsY 
5.2.1.18Laguerre polynomialsY 
5.2.1.19Legendre polynomialsY 
5.2.1.20Riemann zeta functionY 
5.2.1.21spherical Bessel functions (of the first kind)Y 
5.2.1.22spherical associated Legendre functionsY 
5.2.1.23spherical Neumann functionsY 
5.2.2Additions to header <math.h> synopsisY 
6Containers
6.1Tuple typesY 
6.1.1Header <tuple> synopsisY 
6.1.2Additions to header <utility> synopsisY 
6.1.3Class template tupleY 
6.1.3.1ConstructionY 
6.1.3.2Tuple creation functionsY 
6.1.3.3Tuple helper classesY 
6.1.3.4Element accessY 
6.1.3.5Relational operatorsY 
6.1.4PairsY 
6.2Fixed size arrayY 
6.2.1Header <array> synopsisY 
6.2.2Class template arrayY 
6.2.2.1array constructors, copy, and assignmentY 
6.2.2.2array specialized algorithmsY 
6.2.2.3array sizeY 
6.2.2.4Zero sized arraysY 
6.2.2.5Tuple interface to class template arrayY 
6.3Unordered associative containersY 
6.3.1Unordered associative container requirementsY 
6.3.1.1Exception safety guaranteesY 
6.3.2Additions to header <functional> synopsisY 
6.3.3Class template hashY 
6.3.4Unordered associative container classesY 
6.3.4.1Header <unordered_set> synopsisY 
6.3.4.2Header <unordered_map> synopsisY 
6.3.4.3Class template unordered_setY 
6.3.4.3.1unordered_set constructorsY 
6.3.4.3.2unordered_set swapY 
6.3.4.4Class template unordered_mapY 
6.3.4.4.1unordered_map constructorsY 
6.3.4.4.2unordered_map element accessY 
6.3.4.4.3unordered_map swapY 
6.3.4.5Class template unordered_multisetY 
6.3.4.5.1unordered_multiset constructorsY 
6.3.4.5.2unordered_multiset swapY 
6.3.4.6Class template unordered_multimapY 
6.3.4.6.1unordered_multimap constructorsY 
6.3.4.6.2unordered_multimap swapY 
7Regular Expressions
7.1DefinitionsN 
7.2RequirementsN 
7.3Regular expressions summaryN 
7.4Header <regex> synopsisN 
7.5Namespace tr1::regex_constantsN 
7.5.1Bitmask Type syntax_option_typeN 
7.5.2Bitmask Type regex_constants::match_flag_typeN 
7.5.3Implementation defined error_typeN 
7.6Class regex_errorN 
7.7Class template regex_traitsN 
7.8Class template basic_regexN 
7.8.1basic_regex constantsN 
7.8.2basic_regex constructorsN 
7.8.3basic_regex assignN 
7.8.4basic_regex constant operationsN 
7.8.5basic_regex localeN 
7.8.6basic_regex swapN 
7.8.7basic_regex non-member functionsN 
7.8.7.1basic_regex non-member swapN 
7.9Class template sub_matchN 
7.9.1sub_match membersN 
7.9.2sub_match non-member operatorsN 
7.10Class template match_resultsN 
7.10.1match_results constructorsN 
7.10.2match_results sizeN 
7.10.3match_results element accessN 
7.10.4match_results formattingN 
7.10.5match_results allocatorN 
7.10.6match_results swapN 
7.11Regular expression algorithmsN 
7.11.1exceptionsN 
7.11.2regex_matchN 
7.11.3regex_searchN 
7.11.4regex_replaceN 
7.12Regular expression IteratorsN 
7.12.1Class template regex_iteratorN 
7.12.1.1regex_iterator constructorsN 
7.12.1.2regex_iterator comparisonsN 
7.12.1.3regex_iterator dereferenceN 
7.12.1.4regex_iterator incrementN 
7.12.2Class template regex_token_iteratorN 
7.12.2.1regex_token_iterator constructorsN 
7.12.2.2regex_token_iterator comparisonsN 
7.12.2.3regex_token_iterator dereferenceN 
7.12.2.4regex_token_iterator incrementN 
7.13Modified ECMAScript regular expression grammarN 
8C Compatibility
8.1Additions to header <complex>Y 
8.1.1SynopsisY 
8.1.2Function acosY 
8.1.3Function asinY 
8.1.4Function atanY 
8.1.5Function acoshY 
8.1.6Function asinhY 
8.1.7Function atanhY 
8.1.8Function fabsY 
8.1.9Additional OverloadsY 
8.2Header <ccomplex>NDR 551
8.3Header <complex.h>NDR 551
8.4Additions to header <cctype>Y 
8.4.1SynopsisY 
8.4.2Function isblankY 
8.5Additions to header <ctype.h>Y 
8.6Header <cfenv>Y 
8.6.1SynopsisY 
8.6.2DefinitionsY 
8.7Header <fenv.h>Y 
8.8Additions to header <cfloat>Y 
8.9Additions to header <float.h>Y 
8.10Additions to header <ios>N 
8.10.1SynopsisN 
8.10.2Function hexfloatN 
8.11Header <cinttypes>Y 
8.11.1SynopsisYDR 557
8.11.2DefinitionsY 
8.12Header <inttypes.h>Y 
8.13Additions to header <climits>Y 
8.14Additions to header <limits.h>Y 
8.15Additions to header <locale>N 
8.16Additions to header <cmath>Y 
8.16.1SynopsisY 
8.16.2DefinitionsY 
8.16.3Function template definitionsY 
8.16.4Additional overloadsYDR 568; DR 550
8.17Additions to header <math.h>Y 
8.18Additions to header <cstdarg>Y 
8.19Additions to header <stdarg.h>Y 
8.20The header <cstdbool>Y 
8.21The header <stdbool.h>Y 
8.22The header <cstdint>Y 
8.22.1SynopsisY 
8.22.2DefinitionsY 
8.23The header <stdint.h>Y 
8.24Additions to header <cstdio>Y 
8.24.1SynopsisY 
8.24.2DefinitionsY 
8.24.3Additional format specifiersYC library dependency
8.24.4Additions to header <stdio.h>Y 
8.25Additions to header <cstdlib>Y 
8.25.1SynopsisY 
8.25.2DefinitionsY 
8.25.3Function absY 
8.25.4Function divY 
8.26Additions to header <stdlib.h>Y 
8.27Header <ctgmath>YDR 551
8.28Header <tgmath.h>YDR 551
8.29Additions to header <ctime>YC library dependency
8.30Additions to header <cwchar>Y 
8.30.1SynopsisY 
8.30.2DefinitionsY 
8.30.3Additional wide format specifiersYC library dependency
8.31Additions to header <wchar.h>Y 
8.32Additions to header <cwctype>Y 
8.32.1SynopsisY 
8.32.2Function iswblankY 
8.33Additions to header <wctype.h>Y 

Implementation Specific Behavior

For behaviour which is specified by the 1998 and 2003 standards, + see C++ 1998/2003 Implementation + Specific Behavior. This section documents behaviour which + is required by TR1. +@@ -303,7 +299,7 @@ + 3.6.4 [tr.func.bind.place]/1 There are 29 + placeholders defined and the placeholder types are + Assignable. +-

++

C++ TR 24733

+ This table is based on the table of contents of + ISO/IEC TR 24733 Date: 2009-08-28 + Extension for the programming language C++ to support +@@ -311,27 +307,27 @@ +

+ This page describes the TR 24733 support in mainline GCC SVN, not in any + particular release. +-

Table 1.4. C++ TR 24733 Implementation Status

SectionDescriptionStatusComments
++

Table 1.4. C++ TR 24733 Implementation Status

SectionDescriptionStatusComments
+ 0 +- ++ + Introduction +-
++
+ 1 +- ++ + Normative references +-
++
+ 2 +- ++ + Conventions +-
++
+ 3 +- ++ + Decimal floating-point types +-
3.1Characteristics of decimal floating-point types  
3.2Decimal Types  
3.2.1Class decimal synopsisPartialMissing declarations for formatted input/output; non-conforming extension for functions converting to integral type
3.2.2Class decimal32PartialMissing 3.2.2.5 conversion to integral type; conforming extension for conversion from scalar decimal floating-point
3.2.3Class decimal64PartialMissing 3.2.3.5 conversion to integral type; conforming extension for conversion from scalar decimal floating-point
3.2.4Class decimal128PartialMissing 3.2.4.5 conversion to integral type; conforming extension for conversion from scalar decimal floating-point
3.2.5Initialization from coefficient and exponentY 
3.2.6Conversion to generic floating-point typeY 
3.2.7Unary arithmetic operatorsY 
3.2.8Binary arithmetic operatorsY 
3.2.9Comparison operatorsY 
3.2.10Formatted inputN 
3.2.11Formatted outputN 
3.3Additions to header limitsN 
3.4Headers cfloat and float.h  
3.4.2Additions to header cfloat synopsisY 
3.4.3Additions to header float.h synopsisN 
3.4.4Maximum finite valueY 
3.4.5EpsilonY 
3.4.6Minimum positive normal valueY 
3.4.7Minimum positive subnormal valueY 
3.4.8Evaluation formatY 
3.5Additions to cfenv and fenv.hOutside the scope of GCC 
3.6Additions to cmath and math.hOutside the scope of GCC 
3.7Additions to cstdio and stdio.hOutside the scope of GCC 
3.8Additions to cstdlib and stdlib.hOutside the scope of GCC 
3.9Additions to cwchar and wchar.hOutside the scope of GCC 
3.10FacetsN 
3.11Type traitsN 
3.12Hash functionsN 
++
3.1Characteristics of decimal floating-point types  
3.2Decimal Types  
3.2.1Class decimal synopsisPartialMissing declarations for formatted input/output; non-conforming extension for functions converting to integral type
3.2.2Class decimal32PartialMissing 3.2.2.5 conversion to integral type; conforming extension for conversion from scalar decimal floating-point
3.2.3Class decimal64PartialMissing 3.2.3.5 conversion to integral type; conforming extension for conversion from scalar decimal floating-point
3.2.4Class decimal128PartialMissing 3.2.4.5 conversion to integral type; conforming extension for conversion from scalar decimal floating-point
3.2.5Initialization from coefficient and exponentY 
3.2.6Conversion to generic floating-point typeY 
3.2.7Unary arithmetic operatorsY 
3.2.8Binary arithmetic operatorsY 
3.2.9Comparison operatorsY 
3.2.10Formatted inputN 
3.2.11Formatted outputN 
3.3Additions to header limitsN 
3.4Headers cfloat and float.h  
3.4.2Additions to header cfloat synopsisY 
3.4.3Additions to header float.h synopsisN 
3.4.4Maximum finite valueY 
3.4.5EpsilonY 
3.4.6Minimum positive normal valueY 
3.4.7Minimum positive subnormal valueY 
3.4.8Evaluation formatY 
3.5Additions to cfenv and fenv.hOutside the scope of GCC 
3.6Additions to cmath and math.hOutside the scope of GCC 
3.7Additions to cstdio and stdio.hOutside the scope of GCC 
3.8Additions to cstdlib and stdlib.hOutside the scope of GCC 
3.9Additions to cwchar and wchar.hOutside the scope of GCC 
3.10FacetsN 
3.11Type traitsN 
3.12Hash functionsN 
+ 4 +- ++ + Notes on C compatibility +-

Prev Up Next
Part I.  ++

Prev Up Next
Part I.  + Introduction + +- Home License
++ 		Home License
+Index: libstdc++-v3/doc/html/manual/policy_data_structures_design.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/policy_data_structures_design.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/policy_data_structures_design.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Design
Design
Prev Chapter 22. Policy-Based Data Structures Next

++ ++Design

Design
Prev Chapter 22. Policy-Based Data Structures Next

Design

Concepts

Null Policy Classes

+ Associative containers are typically parametrized by various + policies. For example, a hash-based associative container is + parametrized by a hash-functor, transforming each key into an +@@ -27,7 +27,7 @@ + places simplifications are made possible with this technique + include node updates in tree and trie data structures, and hash + and probe functions for hash data structures. +-

Map and Set Semantics

+ Distinguishing Between Maps and Sets +

+ Anyone familiar with the standard knows that there are four kinds +@@ -93,7 +93,7 @@ +

+ When one uses a "multimap," one should choose with care the + type of container used for secondary keys. +-

++

Alternatives to std::multiset and std::multimap

+ Brace onself: this library does not contain containers like + std::multimap or + std::multiset. Instead, these data +@@ -171,7 +171,7 @@ + naturally; collision-chaining hash tables (label B) store + equivalent-key values in the same bucket, the bucket can be + arranged so that equivalent-key values are consecutive. +-

Figure 22.8. Non-unique Mapping Standard Containers

Non-unique Mapping Standard Containers

++

Figure 22.8. Non-unique Mapping Standard Containers

Non-unique Mapping Standard Containers

+ Put differently, the standards' non-unique mapping + associative-containers are associative containers that map + primary keys to linked lists that are embedded into the +@@ -179,12 +179,12 @@ + containers from the first graphic above, this time with + the embedded linked lists of the grayed nodes marked + explicitly. +-

Figure 22.9.  ++

Figure 22.9.  + Effect of embedded lists in + std::multimap +-

Effect of embedded lists in std::multimap

++

Effect of embedded lists in std::multimap

+ These embedded linked lists have several disadvantages. +-

  1. ++

    1. + The underlying data structure embeds the linked lists + according to its own consideration, which means that the + search path for a value might include several different +@@ -215,7 +215,7 @@ + The above reasons hold even when the ratio of secondary keys to + primary keys (or average number of identical keys) is small, but + when it is large, there are more severe problems: +-

      1. ++

        1. + The underlying data structures order the links inside each + embedded linked-lists according to their internal + considerations, which effectively means that each of the +@@ -253,7 +253,7 @@ + first graphic above. Labels A and B, respectively. Each shaded + box represents some size-type or secondary + associative-container. +-

          Figure 22.10. Non-unique Mapping Containers

          Non-unique Mapping Containers

          ++

          Figure 22.10. Non-unique Mapping Containers

          Non-unique Mapping Containers

          + In the first example above, then, one would use an associative + container mapping each user to an associative container which + maps each application id to a start time (see +@@ -265,7 +265,7 @@ +

          + See the discussion in list-based container types for containers + especially suited as secondary associative-containers. +-

      ++

      Iterator Semantics

      Point and Range Iterators

      + Iterator concepts are bifurcated in this design, and are + comprised of point-type and range-type iteration. +

      +@@ -286,7 +286,7 @@ + implementation, including that of C++ standard library + components), but in this design, it is made explicit. They are + distinct types. +-

      When using this library, is necessary to differentiate ++

      Distinguishing Point and Range Iterators

      When using this library, is necessary to differentiate + between two types of methods and iterators: point-type methods and + iterators, and range-type methods and iterators. Each associative + container's interface includes the methods:

      +@@ -306,7 +306,7 @@
+ 	shows invariants for order-preserving containers: point-type
+ 	iterators are synonymous with range-type iterators.
+ 	Orthogonally,  Cshows invariants for "set"
+-	containers: iterators are synonymous with const iterators.
      Figure 22.11. Point Iterator Hierarchy
      Point Iterator Hierarchy

      Note that point-type iterators in self-organizing containers
++	containers: iterators are synonymous with const iterators.
      Figure 22.11. Point Iterator Hierarchy
      Point Iterator Hierarchy

      Note that point-type iterators in self-organizing containers
+ 	(hash-based associative containers) lack movement
+ 	operators, such as operator++ - in fact, this
+ 	is the reason why this library differentiates from the standard C++ librarys
+@@ -322,7 +322,7 @@
+ 	a concept in C++ standardese, which is the category of iterators
+ 	with no movement capabilities.) All other standard C++ library
+ 	tags, such as forward_iterator_tag retain their
+-	common use.

      ++ common use.

      Invalidation Guarantees

      + If one manipulates a container object, then iterators previously + obtained from it can be invalidated. In some cases a + previously-obtained iterator cannot be de-referenced; in other cases, +@@ -345,7 +345,7 @@ + to the question of whether point-type iterators and range-type + iterators are valid. The graphic below shows tags corresponding to + different types of invalidation guarantees. +-

      Figure 22.12. Invalidation Guarantee Tags Hierarchy

      Invalidation Guarantee Tags Hierarchy

      • ++

        Figure 22.12. Invalidation Guarantee Tags Hierarchy

        Invalidation Guarantee Tags Hierarchy

        • + basic_invalidation_guarantee + corresponds to a basic guarantee that a point-type iterator, + a found pointer, or a found reference, remains valid as long +@@ -376,7 +376,7 @@ + our opinion, an invalidation-guarantee hierarchy would solve + these problems in all container types - not just associative + containers. +-

      ++

      Genericity

      + The design attempts to address the following problem of + data-structure genericity. When writing a function manipulating + a generic container object, what is the behavior of the object? +@@ -391,7 +391,7 @@ +

      + then one needs to address the following questions in the body + of some_op_sequence: +-

      • ++

        • + Which types and methods does Cntnr support? + Containers based on hash tables can be queries for the + hash-functor type and object; this is meaningless for tree-based +@@ -418,7 +418,7 @@ + capabilities? What is the relationship between two different + data structures, if anything? +

        The remainder of this section explains these issues in +- detail.

        ++ detail.

        Tag

        + Tags are very useful for manipulating generic types. For example, if + It is an iterator class, then typename + It::iterator_category or typename +@@ -429,11 +429,11 @@ +

        + This library contains a container tag hierarchy corresponding to the + diagram below. +-

        Figure 22.13. Container Tag Hierarchy

        Container Tag Hierarchy

        ++

        Figure 22.13. Container Tag Hierarchy

        Container Tag Hierarchy

        + Given any container Cntnr, the tag of + the underlying data structure can be found via typename + Cntnr::container_category. +-

        Additionally, a traits mechanism can be used to query a ++

        Traits

        Additionally, a traits mechanism can be used to query a + container type for its attributes. Given any container + Cntnr, then <Cntnr> + is a traits class identifying the properties of the +@@ -453,7 +453,7 @@ + otherwise container_traits<Cntnr>::split_join_can_throw + will yield a compilation error. (This is somewhat similar to a + compile-time version of the COM model). +-

      ++

      By Container

      hash

      Interface

      + The collision-chaining hash-based container has the + following declaration.

      + 	  template<
+@@ -466,7 +466,7 @@
+ 	  bool Store_Hash = false,
+ 	  typename Allocator = std::allocator<char> >
+ 	  class cc_hash_table;
+-

      The parameters have the following meaning:

      1. Key is the key type.

      2. Mapped is the mapped-policy.

      3. Hash_Fn is a key hashing functor.

      4. Eq_Fn is a key equivalence functor.

      5. Comb_Hash_Fn is a range-hashing_functor; ++

        The parameters have the following meaning:

        1. Key is the key type.

        2. Mapped is the mapped-policy.

        3. Hash_Fn is a key hashing functor.

        4. Eq_Fn is a key equivalence functor.

        5. Comb_Hash_Fn is a range-hashing_functor; + it describes how to translate hash values into positions + within the table.

        6. Resize_Policy describes how a container object + should change its internal size.

        7. Store_Hash indicates whether the hash value +@@ -485,11 +485,11 @@ + typename Allocator = std::allocator<char> > + class gp_hash_table; +

          The parameters are identical to those of the +- collision-chaining container, except for the following.

          1. Comb_Probe_Fn describes how to transform a probe ++ collision-chaining container, except for the following.

            1. Comb_Probe_Fn describes how to transform a probe + sequence into a sequence of positions within the table.

            2. Probe_Fn describes a probe sequence policy.

            Some of the default template values depend on the values of +- other parameters, and are explained below.

          Following is an explanation of some functions which hashing +- involves. The graphic below illustrates the discussion.

          Figure 22.14. Hash functions, ranged-hash functions, and +- range-hashing functions

          Hash functions, ranged-hash functions, and range-hashing functions

          Let U be a domain (e.g., the integers, or the ++ other parameters, and are explained below.

          Details
          Hash Policies
          General

          Following is an explanation of some functions which hashing ++ involves. The graphic below illustrates the discussion.

          Figure 22.14. Hash functions, ranged-hash functions, and ++ range-hashing functions

          Hash functions, ranged-hash functions, and range-hashing functions

          Let U be a domain (e.g., the integers, or the + strings of 3 characters). A hash-table algorithm needs to map + elements of U "uniformly" into the range [0,..., m - + 1] (where m is a non-negative integral value, and +@@ -505,9 +505,9 @@ + Z+,

          which maps a non-negative hash value, and a non-negative + range upper-bound into a non-negative integral in the range + between 0 (inclusive) and the range upper bound (exclusive), +- i.e., for any r in Z+,

          0 ≤ g(r, m) ≤ m - 1

          The resulting ranged-hash function, is

          Equation 22.1. Ranged Hash Function

          ++ i.e., for any r in Z+,

          0 ≤ g(r, m) ≤ m - 1

          The resulting ranged-hash function, is

          Equation 22.1. Ranged Hash Function

          + f(u , m) = g(h(u), m) +-

          From the above, it is obvious that given g and ++


          From the above, it is obvious that given g and + h, f can always be composed (however the converse + is not true). The standard's hash-based containers allow specifying + a hash function, and use a hard-wired range-hashing function; +@@ -523,11 +523,11 @@ + probe function transforming the hash value into a + sequence of hash values, and a range-hashing function + transforming the sequence of hash values into a sequence of +- positions.

          Some common choices for range-hashing functions are the ++ positions.

          Range Hashing

          Some common choices for range-hashing functions are the + division, multiplication, and middle-square methods ([biblio.knuth98sorting]), defined +- as

          Equation 22.2. Range-Hashing, Division Method

          ++ as

          Equation 22.2. Range-Hashing, Division Method

          + g(r, m) = r mod m +-

          g(r, m) = ⌈ u/v ( a r mod v ) ⌉

          and

          g(r, m) = ⌈ u/v ( r2 mod v ) ⌉

          respectively, for some positive integrals u and ++


          g(r, m) = ⌈ u/v ( a r mod v ) ⌉

          and

          g(r, m) = ⌈ u/v ( r2 mod v ) ⌉

          respectively, for some positive integrals u and + v (typically powers of 2), and some a. Each of + these range-hashing functions works best for some different + setting.

          The division method (see above) is a +@@ -536,12 +536,12 @@ + implement using the low + level % (modulo) operation (for any m), or the + low level & (bit-mask) operation (for the case where +- m is a power of 2), i.e.,

          Equation 22.3. Division via Prime Modulo

          ++ m is a power of 2), i.e.,

          Equation 22.3. Division via Prime Modulo

          + g(r, m) = r % m +-

          and

          Equation 22.4. Division via Bit Mask

          ++

          and

          Equation 22.4. Division via Bit Mask

          + g(r, m) = r & m - 1, (with m = + 2k for some k) +-

          respectively.

          The % (modulo) implementation has the advantage that for ++


          respectively.

          The % (modulo) implementation has the advantage that for + m a prime far from a power of 2, g(r, m) is + affected by all the bits of r (minimizing the chance of + collision). It has the disadvantage of using the costly modulo +@@ -550,7 +550,7 @@ + relying on the fast bit-wise and operation. It has the + disadvantage that for g(r, m) is affected only by the + low order bits of r. This method is hard-wired into +- Dinkumware's implementation.

          In cases it is beneficial to allow the ++ Dinkumware's implementation.

          Ranged Hash

          In cases it is beneficial to allow the + client to directly specify a ranged-hash hash function. It is + true, that the writer of the ranged-hash function cannot rely + on the values of m having specific numerical properties +@@ -564,24 +564,24 @@ + s = [ s0,..., st - 1] +

          be a string of t characters, each of which is from + domain S. Consider the following ranged-hash +- function:

          Equation 22.5.  ++ function:

          Equation 22.5.  + A Standard String Hash Function +

          + f1(s, m) = ∑ i = + 0t - 1 si ai mod m +-

          where a is some non-negative integral value. This is ++


          where a is some non-negative integral value. This is + the standard string-hashing function used in SGI's + implementation (with a = 5). Its advantage is that + it takes into account all of the characters of the string.

          Now assume that s is the string representation of a + of a long DNA sequence (and so S = {'A', 'C', 'G', + 'T'}). In this case, scanning the entire string might be + prohibitively expensive. A possible alternative might be to use +- only the first k characters of the string, where

          |S|k ≥ m ,

          i.e., using the hash function

          Equation 22.6.  ++ only the first k characters of the string, where

          |S|k ≥ m ,

          i.e., using the hash function

          Equation 22.6.  + Only k String DNA Hash +

          + f2(s, m) = ∑ i + = 0k - 1 si ai mod m +-

          requiring scanning over only

          k = log4( m )

          characters.

          Other more elaborate hash-functions might scan k ++


          requiring scanning over only

          k = log4( m )

          characters.

          Other more elaborate hash-functions might scan k + characters starting at a random position (determined at each + resize), or scanning k random positions (determined at + each resize), i.e., using

          f3(s, m) = ∑ i = +@@ -590,12 +590,12 @@ + 1 sri ari mod + m ,

          respectively, for r0,..., rk-1 + each in the (inclusive) range [0,...,t-1].

          It should be noted that the above functions cannot be +- decomposed as per a ranged hash composed of hash and range hashing.

          This sub-subsection describes the implementation of ++ decomposed as per a ranged hash composed of hash and range hashing.

          Implementation

          This sub-subsection describes the implementation of + the above in this library. It first explains range-hashing + functions in collision-chaining tables, then ranged-hash + functions in collision-chaining tables, then probing-based + tables, and finally lists the relevant classes in this +- library.

          ++ library.

          + Range-Hashing and Ranged-Hashes in Collision-Chaining Tables +

          cc_hash_table is + parametrized by Hash_Fn and Comb_Hash_Fn, a +@@ -607,12 +607,12 @@ + the container transforms the key into a non-negative integral + using the hash functor (points B and C), and transforms the + result into a position using the combining functor (points D +- and E).

          Figure 22.15. Insert hash sequence diagram

          Insert hash sequence diagram

          If cc_hash_table's ++ and E).

          Figure 22.15. Insert hash sequence diagram

          Insert hash sequence diagram

          If cc_hash_table's + hash-functor, Hash_Fn is instantiated by null_type , then Comb_Hash_Fn is taken to be + a ranged-hash function. The graphic below shows an insert sequence + diagram. The user inserts an element (point A), the container + transforms the key into a position using the combining functor +- (points B and C).

          Figure 22.16. Insert hash sequence diagram with a null policy

          Insert hash sequence diagram with a null policy

          ++ (points B and C).

          Figure 22.16. Insert hash sequence diagram with a null policy

          Insert hash sequence diagram with a null policy

          + Probing tables +

          gp_hash_table is parametrized by + Hash_Fn, Probe_Fn, +@@ -624,10 +624,10 @@ + functor, Probe_Fn is a functor for offsets + from a hash value, and Comb_Probe_Fn + transforms a probe sequence into a sequence of positions within +- the table.

          + Pre-Defined Policies +

          This library contains some pre-defined classes +- implementing range-hashing and probing functions:

          1. direct_mask_range_hashing ++ implementing range-hashing and probing functions:

            1. direct_mask_range_hashing + and direct_mod_range_hashing + are range-hashing functions based on a bit-mask and a modulo + operation, respectively.

            2. linear_probe_fn, and +@@ -635,14 +635,14 @@ + a linear probe and a quadratic probe function, + respectively.

            + The graphic below shows the relationships. +-

            Figure 22.17. Hash policy class diagram

            Hash policy class diagram

          Hash-tables, as opposed to trees, do not naturally grow or ++

          Figure 22.17. Hash policy class diagram

          Hash policy class diagram

          Resize Policies
          General

          Hash-tables, as opposed to trees, do not naturally grow or + shrink. It is necessary to specify policies to determine how + and when a hash table should change its size. Usually, resize +- policies can be decomposed into orthogonal policies:

          1. A size policy indicating how a hash table ++ policies can be decomposed into orthogonal policies:

            1. A size policy indicating how a hash table + should grow (e.g., it should multiply by powers of + 2).

            2. A trigger policy indicating when a hash + table should grow (e.g., a load factor is +- exceeded).

          Size policies determine how a hash table changes size. These ++ exceeded).

      Size Policies

      Size policies determine how a hash table changes size. These + policies are simple, and there are relatively few sensible + options. An exponential-size policy (with the initial size and + growth factors both powers of 2) works well with a mask-based +@@ -650,7 +650,7 @@ + hard-wired policy used by Dinkumware. A + prime-list based policy works well with a modulo-prime range + hashing function and is the hard-wired policy used by SGI's +- implementation.

      Trigger policies determine when a hash table changes size. ++ implementation.

      Trigger Policies

      Trigger policies determine when a hash table changes size. + Following is a description of two policies: load-check + policies, and collision-check policies.

      Load-check policies are straightforward. The user specifies + two factors, Αmin and +@@ -668,14 +668,14 @@ + and some load factor be denoted by Α. We would like to + calculate the minimal length of k, such that if there were Α + m elements in the hash table, a probe sequence of length k would +- be found with probability at most 1/m.

      Figure 22.18. Balls and bins

      Balls and bins

      Denote the probability that a probe sequence of length ++ be found with probability at most 1/m.

      Figure 22.18. Balls and bins

      Balls and bins

      Denote the probability that a probe sequence of length + k appears in bin i by pi, the + length of the probe sequence of bin i by +- li, and assume uniform distribution. Then

      Equation 22.7.  ++ li, and assume uniform distribution. Then

      Equation 22.7.  + Probability of Probe Sequence of Length k +

      + p1 = +-

      P(l1 ≥ k) =

      ++


      P(l1 ≥ k) =

      + P(l1 ≥ α ( 1 + k / α - 1) ≤ (a) +

      + e ^ ( - ( α ( k / α - 1 )2 ) /2) +@@ -685,11 +685,11 @@ + li are negatively-dependent + ([biblio.dubhashi98neg]) + . Let +- I(.) denote the indicator function. Then

      Equation 22.8.  ++ I(.) denote the indicator function. Then

      Equation 22.8.  + Probability Probe Sequence in Some Bin +

      + P( existsi li ≥ k ) = +-

      P ( ∑ i = 1m ++


      P ( ∑ i = 1m + I(li ≥ k) ≥ 1 ) =

      P ( ∑ i = 1m I ( + li ≥ k ) ≥ m p1 ( 1 + 1 / (m + p1) - 1 ) ) ≤ (a)

      e ^ ( ( - m p1 ( 1 / (m p1) +@@ -697,11 +697,11 @@ + be applied to negatively-dependent variables ([biblio.dubhashi98neg]). Inserting the first probability + equation into the second one, and equating with 1/m, we + obtain

      k ~ √ ( 2 α ln 2 m ln(m) ) +- ) .

      This sub-subsection describes the implementation of the ++ ) .

      Implementation

      This sub-subsection describes the implementation of the + above in this library. It first describes resize policies and + their decomposition into trigger and size policies, then + describes pre-defined classes, and finally discusses controlled +- access the policies' internals.

      Each hash-based container is parametrized by a ++ access the policies' internals.

      Decomposition

      Each hash-based container is parametrized by a + Resize_Policy parameter; the container derives + publicly from Resize_Policy. For + example:

      +@@ -724,7 +724,7 @@
+ 	      a resize is needed, and if so, what is the new size (points D
+ 	      to G); following the resize, it notifies the policy that a
+ 	      resize has completed (point H); finally, the element is
+-	      inserted, and the policy notified (point I).
      Figure 22.19. Insert resize sequence diagram
      Insert resize sequence diagram

      In practice, a resize policy can be usually orthogonally
++	      inserted, and the policy notified (point I).
      Figure 22.19. Insert resize sequence diagram
      Insert resize sequence diagram

      In practice, a resize policy can be usually orthogonally
+ 	      decomposed to a size policy and a trigger policy. Consequently,
+ 	      the library contains a single class for instantiating a resize
+ 	      policy: hash_standard_resize_policy
+@@ -733,10 +733,10 @@
+ 	      both, and acts as a standard delegate ([biblio.gof])
+ 	      to these policies.
      The two graphics immediately below show sequence diagrams
+ 	      illustrating the interaction between the standard resize policy
+-	      and its trigger and size policies, respectively.
      Figure 22.20. Standard resize policy trigger sequence
+-		diagram
      Standard resize policy trigger sequence diagram

      Figure 22.21. Standard resize policy size sequence
+-		diagram
      Standard resize policy size sequence diagram

      The library includes the following +- instantiations of size and trigger policies:

      1. hash_load_check_resize_trigger ++ and its trigger and size policies, respectively.

        Figure 22.20. Standard resize policy trigger sequence ++ diagram

        Standard resize policy trigger sequence diagram

        Figure 22.21. Standard resize policy size sequence ++ diagram

        Standard resize policy size sequence diagram

      Predefined Policies

      The library includes the following ++ instantiations of size and trigger policies:

      1. hash_load_check_resize_trigger + implements a load check trigger policy.

      2. cc_hash_max_collision_check_resize_trigger + implements a collision check trigger policy.

      3. hash_exponential_size_policy + implements an exponential-size policy (which should be used +@@ -753,7 +753,7 @@ + instantiated by hash_load_check_resize_trigger, + or cc_hash_max_collision_check_resize_trigger; + Size_Policy is instantiated by hash_exponential_size_policy, +- or hash_prime_size_policy.

      There are cases where (controlled) access to resize ++ or hash_prime_size_policy.

      Controling Access to Internals

      There are cases where (controlled) access to resize + policies' internals is beneficial. E.g., it is sometimes + useful to query a hash-table for the table's actual size (as + opposed to its size() - the number of values it +@@ -798,11 +798,11 @@ +

      which resizes the container. Implementations of + Resize_Policy can export public methods for resizing + the container externally; these methods internally call +- do_resize to resize the table.

      ++ do_resize to resize the table.

      Policy Interactions

      +

      Hash-tables are unfortunately especially susceptible to + choice of policies. One of the more complicated aspects of this + is that poor combinations of good policies can form a poor +- container. Following are some considerations.

      Some combinations do not work well for probing containers. ++ container. Following are some considerations.

      probe/size/trigger

      Some combinations do not work well for probing containers. + For example, combining a quadratic probe policy with an + exponential size policy can yield a poor container: when an + element is inserted, a trigger policy might decide that there +@@ -811,13 +811,13 @@ + the unused entries.

      Unfortunately, this library cannot detect such problems at + compilation (they are halting reducible). It therefore defines + an exception class insert_error to throw an +- exception in this case.

      Some trigger policies are especially susceptible to poor ++ exception in this case.

      hash/trigger

      Some trigger policies are especially susceptible to poor + hash functions. Suppose, as an extreme case, that the hash + function transforms each key to the same hash value. After some + inserts, a collision detecting policy will always indicate that + the container needs to grow.

      The library, therefore, by design, limits each operation to + one resize. For each insert, for example, it queries +- only once whether a resize is needed.

      cc_hash_table and ++ only once whether a resize is needed.

      equivalence functors/storing hash values/hash

      cc_hash_table and + gp_hash_table are + parametrized by an equivalence functor and by a + Store_Hash parameter. If the latter parameter is +@@ -828,15 +828,15 @@ + collisions for other types.

      If a ranged-hash function or ranged probe function is + directly supplied, however, then it makes no sense to store the + hash value with each entry. This library's container will +- fail at compilation, by design, if this is attempted.

      Assume a size policy issues an increasing sequence of sizes ++ fail at compilation, by design, if this is attempted.

      size/load-check trigger

      Assume a size policy issues an increasing sequence of sizes + a, a q, a q1, a q2, ... For + example, an exponential size policy might issue the sequence of + sizes 8, 16, 32, 64, ...

      If a load-check trigger policy is used, with loads + αmin and αmax, +- respectively, then it is a good idea to have:

      1. αmax ~ 1 / q

      2. αmin < 1 / (2 q)

      This will ensure that the amortized hash cost of each ++ respectively, then it is a good idea to have:

      1. αmax ~ 1 / q

      2. αmin < 1 / (2 q)

      This will ensure that the amortized hash cost of each + modifying operation is at most approximately 3.

      αmin ~ αmax is, in + any case, a bad choice, and αmin > +- α max is horrendous.

      The tree-based container has the following declaration:

      ++	    α max is horrendous.

      tree

      Interface

      The tree-based container has the following declaration:

      + 	  template<
+ 	  typename Key,
+ 	  typename Mapped,
+@@ -850,7 +850,7 @@
+ 	  class Node_Update = null_node_update,
+ 	  typename Allocator = std::allocator<char> >
+ 	  class tree;
+-

      The parameters have the following meaning:

      1. Key is the key type.

      2. Mapped is the mapped-policy.

      3. Cmp_Fn is a key comparison functor

      4. Tag specifies which underlying data structure ++

        The parameters have the following meaning:

        1. Key is the key type.

        2. Mapped is the mapped-policy.

        3. Cmp_Fn is a key comparison functor

        4. Tag specifies which underlying data structure + to use.

        5. Node_Update is a policy for updating node + invariants.

        6. Allocator is an allocator + type.

        The Tag parameter specifies which underlying +@@ -861,7 +861,7 @@ + Note that containers based on the former two contain more types + and methods than the latter (e.g., + reverse_iterator and rbegin), and different +- exception and invalidation guarantees.

      Consider the two trees in the graphic below, labels A and B. The first ++ exception and invalidation guarantees.

      Details
      Node Invariants

      Consider the two trees in the graphic below, labels A and B. The first + is a tree of floats; the second is a tree of pairs, each + signifying a geometric line interval. Each element in a tree is refered to as a node of the tree. Of course, each of + these trees can support the usual queries: the first can easily +@@ -877,8 +877,8 @@ + each node, and maintains node invariants (see [biblio.clrs2001].) The first stores in + each node the size of the sub-tree rooted at the node; the + second stores at each node the maximal endpoint of the +- intervals at the sub-tree rooted at the node.

      Figure 22.22. Tree node invariants

      Tree node invariants

      Supporting such trees is difficult for a number of +- reasons:

      1. There must be a way to specify what a node's metadata ++ intervals at the sub-tree rooted at the node.

        Figure 22.22. Tree node invariants

        Tree node invariants

        Supporting such trees is difficult for a number of ++ reasons:

        1. There must be a way to specify what a node's metadata + should be (if any).

        2. Various operations can invalidate node + invariants. The graphic below shows how a right rotation, + performed on A, results in B, with nodes x and y having +@@ -891,9 +891,9 @@ + metadata.

        3. It is not feasible to know in advance which methods trees + can support. Besides the usual find method, the + first tree can support a find_by_order method, while +- the second can support an overlaps method.

        Figure 22.23. Tree node invalidation

        Tree node invalidation

        These problems are solved by a combination of two means: ++ the second can support an overlaps method.

      Figure 22.23. Tree node invalidation

      Tree node invalidation

      These problems are solved by a combination of two means: + node iterators, and template-template node updater +- parameters.

      Each tree-based container defines two additional iterator ++ parameters.

      Node Iterators

      Each tree-based container defines two additional iterator + types, const_node_iterator + and node_iterator. + These iterators allow descending from a node to one of its +@@ -913,14 +913,14 @@ + node_end(); +

      The first pairs return node iterators corresponding to the + root node of the tree; the latter pair returns node iterators +- corresponding to a just-after-leaf node.

      The tree-based containers are parametrized by a ++ corresponding to a just-after-leaf node.

      Node Updator

      The tree-based containers are parametrized by a + Node_Update template-template parameter. A + tree-based container instantiates + Node_Update to some + node_update class, and publicly subclasses + node_update. The graphic below shows this + scheme, as well as some predefined policies (which are explained +- below).

      Figure 22.24. A tree and its update policy

      A tree and its update policy

      node_update (an instantiation of ++ below).

      Figure 22.24. A tree and its update policy

      A tree and its update policy

      node_update (an instantiation of + Node_Update) must define metadata_type as + the type of metadata it requires. For order statistics, + e.g., metadata_type might be size_t. +@@ -939,7 +939,7 @@ + nd_it. For example, say node x in the + graphic below label A has an invalid invariant, but its' children, + y and z have valid invariants. After the invocation, all three +- nodes should have valid invariants, as in label B.

      Figure 22.25. Restoring node invariants

      Restoring node invariants

      When a tree operation might invalidate some node invariant, ++ nodes should have valid invariants, as in label B.

      Figure 22.25. Restoring node invariants

      Restoring node invariants

      When a tree operation might invalidate some node invariant, + it invokes this method in its node_update base to + restore the invariant. For example, the graphic below shows + an insert operation (point A); the tree performs some +@@ -947,15 +947,15 @@ + C, and D). (It is well known that any insert, + erase, split or join, can restore + all node invariants by a small number of node invariant updates ([biblio.clrs2001]) +- .

      Figure 22.26. Insert update sequence

      Insert update sequence

      To complete the description of the scheme, three questions +- need to be answered:

      1. How can a tree which supports order statistics define a ++ .

        Figure 22.26. Insert update sequence

        Insert update sequence

        To complete the description of the scheme, three questions ++ need to be answered:

        1. How can a tree which supports order statistics define a + method such as find_by_order?

        2. How can the node updater base access methods of the + tree?

        3. How can the following cyclic dependency be resolved? + node_update is a base class of the tree, yet it + uses node iterators defined in the tree (its child).

        The first two questions are answered by the fact that + node_update (an instantiation of + Node_Update) is a public base class +- of the tree. Consequently:

        1. Any public methods of ++ of the tree. Consequently:

          1. Any public methods of + node_update are automatically methods of + the tree ([biblio.alexandrescu01modern]). + Thus an order-statistics node updater, +@@ -983,25 +983,25 @@ + support order statistics or interval overlap queries. + Seemingly, in this case a redundant policy - a policy which + doesn't affect nodes' contents would suffice. This, would lead +- to the following drawbacks:

            1. Each node would carry a useless metadata object, wasting ++ to the following drawbacks:

              1. Each node would carry a useless metadata object, wasting + space.

              2. The tree cannot know if its + Node_Update policy actually modifies a + node's metadata (this is halting reducible). In the graphic + below, assume the shaded node is inserted. The tree would have + to traverse the useless path shown to the root, applying +- redundant updates all the way.

              Figure 22.27. Useless update path

              Useless update path

              A null policy class, null_node_update ++ redundant updates all the way.

            Figure 22.27. Useless update path

            Useless update path

            A null policy class, null_node_update + solves both these problems. The tree detects that node +- invariants are irrelevant, and defines all accordingly.

        Tree-based containers support split and join methods. ++ invariants are irrelevant, and defines all accordingly.

      Split and Join

      Tree-based containers support split and join methods. + It is possible to split a tree so that it passes + all nodes with keys larger than a given key to a different + tree. These methods have the following advantages over the + alternative of externally inserting to the destination +- tree and erasing from the source tree:

      1. These methods are efficient - red-black trees are split ++ tree and erasing from the source tree:

        1. These methods are efficient - red-black trees are split + and joined in poly-logarithmic complexity; ordered-vector + trees are split and joined at linear complexity. The + alternatives have super-linear complexity.

        2. Aside from orders of growth, these operations perform + few allocations and de-allocations. For red-black trees, allocations are not performed, +- and the methods are exception-free.

      The trie-based container has the following declaration:

      ++	    and the methods are exception-free.

Trie

Interface

The trie-based container has the following declaration:

+ 	  template<typename Key,
+ 	  typename Mapped,
+ 	  typename Cmp_Fn = std::less<Key>,
+@@ -1013,7 +1013,7 @@
+ 	  class Node_Update = null_node_update,
+ 	  typename Allocator = std::allocator<char> >
+ 	  class trie;
+-

The parameters have the following meaning:

  1. Key is the key type.

  2. Mapped is the mapped-policy.

  3. E_Access_Traits is described in below.

  4. Tag specifies which underlying data structure ++

    The parameters have the following meaning:

    1. Key is the key type.

    2. Mapped is the mapped-policy.

    3. E_Access_Traits is described in below.

    4. Tag specifies which underlying data structure + to use, and is described shortly.

    5. Node_Update is a policy for updating node + invariants. This is described below.

    6. Allocator is an allocator + type.

    The Tag parameter specifies which underlying +@@ -1023,19 +1023,19 @@ + (this implementation follows [biblio.okasaki98mereable] and + [biblio.filliatre2000ptset]). +

    A (PATRICIA) trie is similar to a tree, but with the +- following differences:

    1. It explicitly views keys as a sequence of elements. ++ following differences:

      1. It explicitly views keys as a sequence of elements. + E.g., a trie can view a string as a sequence of + characters; a trie can view a number as a sequence of + bits.

      2. It is not (necessarily) binary. Each node has fan-out n + + 1, where n is the number of distinct + elements.

      3. It stores values only at leaf nodes.

      4. Internal nodes have the properties that A) each has at + least two children, and B) each shares the same prefix with +- any of its descendant.

      A (PATRICIA) trie has some useful properties:

      1. It can be configured to use large node fan-out, giving it ++ any of its descendant.

      A (PATRICIA) trie has some useful properties:

      1. It can be configured to use large node fan-out, giving it + very efficient find performance (albeit at insertion + complexity and size).

      2. It works well for common-prefix keys.

      3. It can support efficiently queries such as which + keys match a certain prefix. This is sometimes useful in file + systems and routers, and for "type-ahead" aka predictive text matching +- on mobile devices.

    A trie inherently views its keys as sequences of elements. ++ on mobile devices.

Details
Element Access Traits

A trie inherently views its keys as sequences of elements. + For example, a trie can view a string as a sequence of + characters. A trie needs to map each of n elements to a + number in {0, n - 1}. For example, a trie can map a +@@ -1044,7 +1044,7 @@ + (const) iterators, and that the value_type of this + iterator can be cast to a size_t. There are several + reasons, though, to decouple the mechanism by which the trie +- accesses its keys' elements from the trie:

  1. In some cases, the numerical value of an element is ++ accesses its keys' elements from the trie:

    1. In some cases, the numerical value of an element is + inappropriate. Consider a trie storing DNA strings. It is + logical to use a trie with a fan-out of 5 = 1 + |{'A', 'C', + 'G', 'T'}|. This requires mapping 'T' to 3, though.

    2. In some cases the keys' iterators are different than what +@@ -1072,31 +1072,31 @@ + sub-tree with leafs "a" and "as". The maximal common prefix is + "a". The internal node contains, consequently, to const + iterators, one pointing to 'a', and the other to +- 's'.

      Figure 22.28. A PATRICIA trie

      A PATRICIA trie

    Trie-based containers support node invariants, as do ++ 's'.

    Figure 22.28. A PATRICIA trie

    A PATRICIA trie

    Node Invariants

    Trie-based containers support node invariants, as do + tree-based containers. There are two minor + differences, though, which, unfortunately, thwart sharing them +- sharing the same node-updating policies:

    1. A trie's Node_Update template-template ++ sharing the same node-updating policies:

      1. A trie's Node_Update template-template + parameter is parametrized by E_Access_Traits, while + a tree's Node_Update template-template parameter is + parametrized by Cmp_Fn.

      2. Tree-based containers store values in all nodes, while + trie-based containers (at least in this implementation) store + values in leafs.

      The graphic below shows the scheme, as well as some predefined +- policies (which are explained below).

      Figure 22.29. A trie and its update policy

      A trie and its update policy

      This library offers the following pre-defined trie node +- updating policies:

      1. ++ policies (which are explained below).

        Figure 22.29. A trie and its update policy

        A trie and its update policy

        This library offers the following pre-defined trie node ++ updating policies:

        1. + trie_order_statistics_node_update + supports order statistics. +

        2. trie_prefix_search_node_update + supports searching for ranges that match a given prefix.

        3. null_node_update +- is the null node updater.

      Trie-based containers support split and join methods; the ++ is the null node updater.

    Split and Join

    Trie-based containers support split and join methods; the + rationale is equal to that of tree-based containers supporting +- these methods.

The list-based container has the following declaration:

++	  these methods.

List

Interface

The list-based container has the following declaration:

+ 	  template<typename Key,
+ 	  typename Mapped,
+ 	  typename Eq_Fn = std::equal_to<Key>,
+ 	  typename Update_Policy = move_to_front_lu_policy<>,
+ 	  typename Allocator = std::allocator<char> >
+ 	  class list_update;
+-

The parameters have the following meaning:

  1. ++

    The parameters have the following meaning:

    1. + Key is the key type. +

    2. + Mapped is the mapped-policy. +@@ -1124,12 +1124,12 @@ + useful manner? Remarkably, many on-line competitive + algorithms exist for reordering lists to reflect access + prediction. (See [biblio.motwani95random] and [biblio.andrew04mtf]). +-

    +-

    The graphic below shows a ++

    Details

    ++

    Underlying Data Structure

    The graphic below shows a + simple list of integer keys. If we search for the integer 6, we + are paying an overhead: the link with key 6 is only the fifth + link; if it were the first link, it could be accessed +- faster.

    Figure 22.30. A simple list

    A simple list

    List-update algorithms reorder lists as elements are ++ faster.

    Figure 22.30. A simple list

    A simple list

    List-update algorithms reorder lists as elements are + accessed. They try to determine, by the access history, which + keys to move to the front of the list. Some of these algorithms + require adding some metadata alongside each entry.

    For example, in the graphic below label A shows the counter +@@ -1139,7 +1139,7 @@ + predetermined value, say 10, as shown in label C, the count is set + to 0 and the node is moved to the front of the list, as in label + D. +-

    Figure 22.31. The counter algorithm

    The counter algorithm

    this library allows instantiating lists with policies ++

    Figure 22.31. The counter algorithm

    The counter algorithm

    Policies

    this library allows instantiating lists with policies + implementing any algorithm moving nodes to the front of the + list (policies implementing algorithms interchanging nodes are + unsupported).

    Associative containers based on lists are parametrized by a +@@ -1174,7 +1174,7 @@ + the list. The latter type is very useful in this library, + since there is no need to associate metadata with each element. + (See [biblio.andrew04mtf] +-

    In this library, there are no equivalents for the standard's ++

    Use in Multimaps

    In this library, there are no equivalents for the standard's + multimaps and multisets; instead one uses an associative + container mapping primary keys to secondary keys.

    List-based containers are especially useful as associative + containers for secondary keys. In fact, they are implemented +@@ -1189,7 +1189,7 @@ + associative-containers in situations where the average ratio of + secondary keys to primary keys is low (or even 1).

    In order to reduce the per-container memory overhead as much + as possible, they are implemented as closely as possible to +- singly-linked lists.

    1. ++ singly-linked lists.

      1. + List-based containers do not store internally the number + of values that they hold. This means that their size + method has linear complexity (just like std::list). +@@ -1203,7 +1203,7 @@ + object (a hash-based container object holds a + hash functor). List-based containers, conversely, only have + class-wide policy objects. +-

    The priority queue container has the following ++

Priority Queue

Interface

The priority queue container has the following + declaration: + 

+ 	  template<typename  Value_Type,
+@@ -1211,7 +1211,7 @@
+ 	  typename  Tag = pairing_heap_tag,
+ 	  typename  Allocator = std::allocator<char > >
+ 	  class priority_queue;
+-

The parameters have the following meaning:

  1. Value_Type is the value type.

  2. Cmp_Fn is a value comparison functor

  3. Tag specifies which underlying data structure ++

    The parameters have the following meaning:

    1. Value_Type is the value type.

    2. Cmp_Fn is a value comparison functor

    3. Tag specifies which underlying data structure + to use.

    4. Allocator is an allocator + type.

    The Tag parameter specifies which underlying + data structure to use. Instantiating it bypairing_heap_tag,binary_heap_tag, +@@ -1239,7 +1239,7 @@ + insufficient for manipulating priority-queues.

    Different settings require different priority-queue + implementations which are described in later; see traits + discusses ways to differentiate between the different traits of +- different implementations.

There are many different underlying-data structures for ++ different implementations.

Details
Iterators

There are many different underlying-data structures for + implementing priority queues. Unfortunately, most such + structures are oriented towards making push and + top efficient, and consequently don't allow efficient +@@ -1306,12 +1306,12 @@ + this data and a priority queue's iterator. Using the embedded + method would need to use two associative containers. Similar + problems might arise in cases where a value can reside +- simultaneously in many priority queues.

There are three main implementations of priority queues: the ++ simultaneously in many priority queues.

Underlying Data Structure

There are three main implementations of priority queues: the + first employs a binary heap, typically one which uses a + sequence; the second uses a tree (or forest of trees), which is + typically less structured than an associative container's tree; + the third simply uses an associative container. These are +- shown in the graphic below, in labels A1 and A2, label B, and label C.

Figure 22.32. Underlying Priority-Queue Data-Structures.

Underlying Priority-Queue Data-Structures.

Roughly speaking, any value that is both pushed and popped ++ shown in the graphic below, in labels A1 and A2, label B, and label C.

Figure 22.32. Underlying Priority-Queue Data-Structures.

Underlying Priority-Queue Data-Structures.

Roughly speaking, any value that is both pushed and popped + from a priority queue must incur a logarithmic expense (in the + amortized sense). Any priority queue implementation that would + avoid this, would violate known bounds on comparison-based +@@ -1327,7 +1327,7 @@ + of push and pop operations.

This library implements different algorithms using a + single class: priority_queue. + Instantiating the Tag template parameter, "selects" +- the implementation:

  1. ++ the implementation:

    1. + Instantiating Tag = binary_heap_tag creates + a binary heap of the form in represented in the graphic with labels A1 or A2. The former is internally + selected by priority_queue +@@ -1381,7 +1381,7 @@ + at all; the priority queue itself is an associative container. + Most associative containers are too structured to compete with + priority queues in terms of push and pop +- performance.

    It would be nice if all priority queues could ++ performance.

    Traits

    It would be nice if all priority queues could + share exactly the same behavior regardless of implementation. Sadly, this is not possible. Just one for instance is in join operations: joining + two binary heaps might throw an exception (not corrupt + any of the heaps on which it operates), but joining two pairing +@@ -1391,7 +1391,7 @@ + container Cntnr, the tag of the underlying + data structure can be found via typename + Cntnr::container_category; this is one of the possible tags shown in the graphic below. +-

    Figure 22.33. Priority-Queue Data-Structure Tags.

    Priority-Queue Data-Structure Tags.

    Additionally, a traits mechanism can be used to query a ++

    Figure 22.33. Priority-Queue Data-Structure Tags.

    Priority-Queue Data-Structure Tags.

    Additionally, a traits mechanism can be used to query a + container type for its attributes. Given any container + Cntnr, then 

    __gnu_pbds::container_traits<Cntnr>

    + is a traits class identifying the properties of the +@@ -1427,4 +1427,4 @@ + erase operations is non-negligible (say + super-logarithmic in the total sequence of operations) - binary + heaps will perform badly. +-

Prev Up Next
Using Home Testing
++

Prev Up Next
Using Home Testing
+Index: libstdc++-v3/doc/html/manual/using.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/using.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/using.html (.../branches/gcc-4_7-branch) +@@ -1,15 +1,15 @@ + +- +-Chapter 3. Using
Chapter 3. Using
Prev Part I.  ++ ++Chapter 3. Using
Chapter 3. Using
Prev Part I.  + Introduction + +- Next

Table of Contents

Command Options
Headers
Header Files
Mixing Headers
The C Headers and namespace std
Precompiled Headers
Macros
Namespaces
Available Namespaces
namespace std
Using Namespace Composition
Linking
Almost Nothing
Finding Dynamic or Shared Libraries
Concurrency
Prerequisites
Thread Safety
Atomics
IO
Structure
Defaults
Future
Alternatives
Containers
Exceptions
Exception Safety
Exception Neutrality
Doing without
Compatibility
With C
With POSIX thread cancellation
Debugging Support
Using g++
Debug Versions of Library Binary Files
Memory Leak Hunting
Data Race Hunting
Using gdb
Tracking uncaught exceptions
Debug Mode
Compile Time Checking
Profile-based Performance Analysis

++

 Next

Chapter 3. Using

Table of Contents

Command Options
Headers
Header Files
Mixing Headers
The C Headers and namespace std
Precompiled Headers
Macros
Namespaces
Available Namespaces
namespace std
Using Namespace Composition
Linking
Almost Nothing
Finding Dynamic or Shared Libraries
Concurrency
Prerequisites
Thread Safety
Atomics
IO
Structure
Defaults
Future
Alternatives
Containers
Exceptions
Exception Safety
Exception Neutrality
Doing without
Compatibility
With C
With POSIX thread cancellation
Debugging Support
Using g++
Debug Versions of Library Binary Files
Memory Leak Hunting
Data Race Hunting
Using gdb
Tracking uncaught exceptions
Debug Mode
Compile Time Checking
Profile-based Performance Analysis

Command Options

+ The set of features available in the GNU C++ library is shaped + by +- several GCC ++ several GCC + Command Options. Options that impact libstdc++ are + enumerated and detailed in the table below. +

+ By default, g++ is equivalent to g++ -std=gnu++98. The standard library also defaults to this dialect. +-

Table 3.1. C++ Command Options

Option FlagsDescription
-std=c++98Use the 1998 ISO C++ standard plus amendments.
-std=gnu++98As directly above, with GNU extensions.
-std=c++11Use the 2011 ISO C++ standard.
-std=gnu++11As directly above, with GNU extensions.
-fexceptionsSee exception-free dialect
-frttiAs above, but RTTI-free dialect.
-pthread or -pthreadsFor ISO C++11 <thread>, <future>, +- <mutex>, or <condition_variable>.
-fopenmpFor parallel mode.

Prev Up Next
Make Home Headers
++

Table 3.1. C++ Command Options

Option FlagsDescription
-std=c++98Use the 1998 ISO C++ standard plus amendments.
-std=gnu++98As directly above, with GNU extensions.
-std=c++11Use the 2011 ISO C++ standard.
-std=gnu++11As directly above, with GNU extensions.
-fexceptionsSee exception-free dialect
-frttiAs above, but RTTI-free dialect.
-pthread or -pthreadsFor ISO C++11 <thread>, <future>, ++ <mutex>, or <condition_variable>.
-fopenmpFor parallel mode.

Prev Up Next
Make Home Headers
+Index: libstdc++-v3/doc/html/manual/ext_containers.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/ext_containers.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/ext_containers.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Chapter 23. HP/SGI Extensions
Chapter 23. HP/SGI Extensions
Prev Part III.  ++ ++Chapter 23. HP/SGI Extensions
Chapter 23. HP/SGI Extensions
Prev Part III.  + Extensions + +- Next

Table of Contents

Backwards Compatibility
Deprecated

A few extensions and nods to backwards-compatibility have ++

 Next

Chapter 23. HP/SGI Extensions

Table of Contents

Backwards Compatibility
Deprecated

Backwards Compatibility

A few extensions and nods to backwards-compatibility have + been made with containers. Those dealing with older SGI-style + allocators are dealt with elsewhere. The remaining ones all deal + with bits: +@@ -39,4 +39,4 @@ + 

+    size_t _Find_first() const;
+    size_t _Find_next (size_t prev) const;

The same caveat given for the _Unchecked_* functions applies here also. +-

Prev Up Next
Acknowledgments Home Deprecated
++

Prev Up Next
Acknowledgments Home Deprecated
+Index: libstdc++-v3/doc/html/manual/ext_io.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/ext_io.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/ext_io.html (.../branches/gcc-4_7-branch) +@@ -1,25 +1,25 @@ + +- +-Chapter 28. Input and Output
Chapter 28. Input and Output
Prev Part III.  ++ ++Chapter 28. Input and Output
Chapter 28. Input and Output
Prev Part III.  + Extensions + +- Next

Table of Contents

Derived filebufs

++

 Next

Chapter 28. Input and Output

Table of Contents

Derived filebufs

+ Extensions allowing filebufs to be constructed from + "C" types like FILE*s and file descriptors. +-

The v2 library included non-standard extensions to construct ++

Derived filebufs

The v2 library included non-standard extensions to construct + std::filebufs from C stdio types such as + FILE*s and POSIX file descriptors. + Today the recommended way to use stdio types with libstdc++ + IOStreams is via the stdio_filebuf class (see below), + but earlier releases provided slightly different mechanisms. +-

  • 3.0.x filebufs have another ctor with this signature: ++

    • 3.0.x filebufs have another ctor with this signature: + basic_filebuf(__c_file_type*, ios_base::openmode, int_type); + + This comes in very handy in a number of places, such as + attaching Unix sockets, pipes, and anything else which uses file + descriptors, into the IOStream buffering classes. The three + arguments are as follows: +-

      • __c_file_type* F ++

        • __c_file_type* F + // the __c_file_type typedef usually boils down to stdio's FILE +

        • ios_base::openmode M + // same as all the other uses of openmode +@@ -39,7 +39,7 @@ + the fd() function were removed from the standard + filebuf. Instead, <ext/stdio_filebuf.h> contains + a derived class called +- __gnu_cxx::stdio_filebuf. ++ __gnu_cxx::stdio_filebuf. + This class can be constructed from a C FILE* or a file + descriptor, and provides the fd() function. +-

    Prev Up Next
    Chapter 27. Iterators Home Chapter 29. Demangling
    ++

Prev Up Next
Chapter 27. Iterators Home Chapter 29. Demangling
+Index: libstdc++-v3/doc/html/manual/using_macros.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/using_macros.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/using_macros.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Macros
Macros
Prev Chapter 3. Using Next

++ ++Macros

Macros
Prev Chapter 3. Using Next

Macros

+ All library macros begin with _GLIBCXX_. +

+ Furthermore, all pre-processor macros, switches, and +@@ -74,4 +74,4 @@ +

_GLIBCXX_PROFILE

Undefined by default. When defined, compiles user code + using the profile + mode. +-

Prev Up Next
Headers Home Namespaces
++

Prev Up Next
Headers Home Namespaces
+Index: libstdc++-v3/doc/html/manual/termination.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/termination.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/termination.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Termination
Termination
Prev Chapter 4.  ++ ++Termination
Termination
Prev Chapter 4.  + Support + +- Next

++

 Next

Termination

Termination Handlers

+ Not many changes here to cstdlib. You should note that the + abort() function does not call the + destructors of automatic nor static objects, so if you're +@@ -15,7 +15,7 @@ + The good old exit() function can be a bit + funky, too, until you look closer. Basically, three points to + remember are: +-

  1. ++

    1. + Static objects are destroyed in reverse order of their creation. +

    2. + Functions registered with atexit() are called in +@@ -45,7 +45,7 @@ + functions, and the compiler/library might already be using some of + those slots. If you think you may run out, we recommend using + the xatexit/xexit combination from libiberty, which has no such limit. +-

    ++

    Verbose Terminate Handler

    + If you are having difficulty with uncaught exceptions and want a + little bit of help debugging the causes of the core dumps, you can + make use of a GNU extension, the verbose terminate handler. +@@ -118,7 +118,7 @@ + inappropriate location, + __verbose_terminate_handler will behave in + an unspecified manner. +-

Prev Up Next
Dynamic Memory Home Chapter 5.  ++

Prev Up Next
Dynamic Memory Home Chapter 5.  + Diagnostics + +
+Index: libstdc++-v3/doc/html/manual/concurrency.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/concurrency.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/concurrency.html (.../branches/gcc-4_7-branch) +@@ -1,16 +1,16 @@ + +- +-Chapter 15.  Concurrency
Chapter 15.  ++ ++Chapter 15.  Concurrency
Chapter 15.  + Concurrency + +-
Prev Part II.  ++
Prev Part II.  + Standard Contents +-  Next
 Next

Chapter 15.  + Concurrency +- ++ +

Table of Contents

API Reference

+ Facilities for concurrent operation, and control thereof. +-

++

API Reference

+ All items are declared in one of four standard header files. +

+ In header mutex, class +@@ -33,10 +33,10 @@ + and packaged_task. +

+ Full API details. +-

Prev Up Next
Chapter 14.  ++

Prev Up Next
Chapter 14.  + Atomics + +- Home Part III.  ++ Home Part III.  + Extensions + +
+Index: libstdc++-v3/doc/html/manual/ext_utilities.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/ext_utilities.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/ext_utilities.html (.../branches/gcc-4_7-branch) +@@ -1,14 +1,14 @@ + +- +-Chapter 24. Utilities
Chapter 24. Utilities
Prev Part III.  ++ ++Chapter 24. Utilities
Chapter 24. Utilities
Prev Part III.  + Extensions + +- Next

++

 Next

Chapter 24. Utilities

+ The <functional> header + contains many additional functors + and helper functions, extending section 20.3. They are + implemented in the file stl_function.h: +-

  • identity_element for addition and multiplication. ++

    • identity_element for addition and multiplication. +

    • The functor identity, whose operator() + returns the argument unchanged. +

    • Composition functors unary_function and +@@ -39,4 +39,4 @@ +

      + The specialized algorithms of section 20.4.4 are extended with + uninitialized_copy_n. +-

    Prev Up Next
    Deprecated Home Chapter 25. Algorithms
    ++

Prev Up Next
Deprecated Home Chapter 25. Algorithms
+Index: libstdc++-v3/doc/html/manual/policy_data_structures.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/policy_data_structures.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/policy_data_structures.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Chapter 22. Policy-Based Data Structures
Chapter 22. Policy-Based Data Structures
Prev Part III.  ++ ++Chapter 22. Policy-Based Data Structures
Chapter 22. Policy-Based Data Structures
Prev Part III.  + Extensions + +- Next

Table of Contents

Intro
Performance Issues
Associative
Priority Que
Goals
Associative
Policy Choices
Underlying Data Structures
Iterators
Functional
Priority Queues
Policy Choices
Underlying Data Structures
Binary Heaps
Using
Prerequisites
Organization
Tutorial
Basic Use
++
 Next

Chapter 22. Policy-Based Data Structures

Table of Contents

Intro
Performance Issues
Associative
Priority Que
Goals
Associative
Policy Choices
Underlying Data Structures
Iterators
Functional
Priority Queues
Policy Choices
Underlying Data Structures
Binary Heaps
Using
Prerequisites
Organization
Tutorial
Basic Use
+ Configuring via Template Parameters +
+ Querying Container Attributes +@@ -67,7 +67,7 @@ + Text modify Down +
Observations
Associative
Priority_Queue
Acknowledgments
+ Bibliography +-

++

Intro

+ This is a library of policy-based elementary data structures: + associative containers and priority queues. It is designed for + high-performance, flexibility, semantic safety, and conformance to +@@ -75,7 +75,7 @@ + std::tr1 (except for some points where it differs + by design). +

+-

++

Performance Issues

+

+ An attempt is made to categorize the wide variety of possible + container designs in terms of performance-impacting factors. These +@@ -95,7 +95,7 @@ +

+ Specific issues found while unraveling performance factors in the + design of associative containers and priority queues follow. +-

++

Associative

+ Associative containers depend on their composite policies to a very + large extent. Implicitly hard-wiring policies can hamper their + performance and limit their functionality. An efficient hash-based +@@ -136,7 +136,7 @@ + is a red-black tree, then splitting a reference to the container is + exception-free; if it is an ordered-vector tree, exceptions can be + thrown. +-

++

Priority Que

+ Priority queues are useful when one needs to efficiently access a + minimum (or maximum) value as the set of values changes. +

+@@ -178,7 +178,7 @@ + expense of more difference in the the kinds of operations that the + underlying data structure can support. These differences pose a + challenge when creating a uniform interface for priority queues. +-

++

Goals

+ Many fine associative-container libraries were already written, + most notably, the C++ standard's associative containers. Why + then write another library? This section shows some possible +@@ -189,14 +189,14 @@ + only then adding hash-based containers, which are fundamentally + different), did not standardize priority queues as containers, + and (in our opinion) overloads the iterator concept. +-

+-

++

Associative

++

Policy Choices

+ Associative containers require a relatively large number of + policies to function efficiently in various settings. In some + cases this is needed for making their common operations more + efficient, and in other cases this allows them to support a + larger set of operations +-

  1. ++

    1. + Hash-based containers, for example, support look-up and + insertion methods (find and + insert). In order to locate elements +@@ -251,7 +251,7 @@ + these invariants, one must supply some policy that is aware + of these changes. Without this, it would be better to use a + linked list (in itself very efficient for these purposes). +-

    Figure 22.1. Node Invariants

    Node Invariants

++

Figure 22.1. Node Invariants

Node Invariants

Underlying Data Structures

+ The standard C++ library contains associative containers based on + red-black trees and collision-chaining hash tables. These are + very useful, but they are not ideal for all types of +@@ -259,7 +259,7 @@ +

+ The figure below shows the different underlying data structures + currently supported in this library. +-

Figure 22.2. Underlying Associative Data Structures

Underlying Associative Data Structures

++

Figure 22.2. Underlying Associative Data Structures

Underlying Associative Data Structures

+ A shows a collision-chaining hash-table, B shows a probing + hash-table, C shows a red-black tree, D shows a splay tree, E shows + a tree based on an ordered vector(implicit in the order of the +@@ -308,7 +308,7 @@ + There are various other differences based on the container's + underlying data structure. For one, they can be constructed by, + and queried for, different policies. Furthermore: +-

  1. ++

    1. + Containers based on C, D, E and F store elements in a + meaningful order; the others store elements in a meaningless + (and probably time-varying) order. By implication, only +@@ -336,7 +336,7 @@ + library iterators, for example) can ease generic manipulation of + associative containers based on different underlying data + structures. +-

    ++

    Iterators

    + Iterators are centric to the design of the standard library + containers, because of the container/algorithm/iterator + decomposition that allows an algorithm to operate on a range +@@ -361,7 +361,7 @@ + "ds_gen.html#find_range">Design::Associative + Containers::Data-Structure Genericity::Point-Type and Range-Type + Methods. +-

    ++

    Using Point Iterators for Range Operations

    + Suppose cntnr is some associative + container, and say c is an object of + type cntnr. Then what will be the outcome +@@ -378,7 +378,7 @@ + no guarantee that the elements traversed will coincide with the + logical elements between 1 and 5, as in + label B. +-

    Figure 22.3. Range Iteration in Different Data Structures

    Node Invariants

    ++

    Figure 22.3. Range Iteration in Different Data Structures

    Node Invariants

    + In our opinion, this problem is not caused just because + red-black trees are order preserving while + collision-chaining hash tables are (generally) not - it +@@ -399,7 +399,7 @@ + Consequently, applying an algorithm to a sequence obtained from most + containers may or may not make sense, but applying it to a + sub-sequence of a self-organizing container does not. +-

    ++

    Cost to Point Iterators to Enable Range Operations

    + Suppose c is some collision-chaining + hash-based container object, and one calls + 

    c.find(3)

    +@@ -429,11 +429,11 @@ + list, as in the graphic below, label B. Here the iterators are as + light as can be, but the hash-table's operations are more + complicated. +-

    Figure 22.4. Point Iteration in Hash Data Structures

    Point Iteration in Hash Data Structures

    ++

    Figure 22.4. Point Iteration in Hash Data Structures

    Point Iteration in Hash Data Structures

    + It should be noted that containers based on collision-chaining + hash-tables are not the only ones with this type of behavior; + many other self-organizing data structures display it as well. +-

    Consider the following snippet:

    ++
    Invalidation Guarantees

    Consider the following snippet:

    + 	      it = c.find(3);
+ 	      c.erase(5);
+

    +@@ -445,7 +445,7 @@ + container. The graphic below shows three cases: A1 and A2 show + a red-black tree; B1 and B2 show a probing hash-table; C1 and C2 + show a collision-chaining hash table. +-

    Figure 22.5. Effect of erase in different underlying data structures

    Effect of erase in different underlying data structures

    1. ++

      Figure 22.5. Effect of erase in different underlying data structures

      Effect of erase in different underlying data structures

      1. + Erasing 5 from A1 yields A2. Clearly, an iterator to 3 can + be de-referenced and incremented. The sequence of iterators + changed, but in a way that is well-defined by the interface. +@@ -467,7 +467,7 @@ + to express whether it is valid or not. This + is true also for insert. Again, the + iterator concept seems overloaded. +-

    ++

    Functional

    +

    + The design of the functional overlay to the underlying data + structures differs slightly from some of the conventions used in +@@ -478,7 +478,7 @@ + rubric, the standard associative containers lack some useful + methods, and provide other methods which would be better + removed. +-

    1. ++

      erase

      1. + Order-preserving standard associative containers provide the + method + 

        +@@ -550,7 +550,7 @@
+ 		  is almost certain to do something
+ 		  different than erasing all elements whose keys are between 2
+ 		  and 5, and is likely to produce other undefined behavior.
+-
    + split and join +

    + It is well-known that tree-based and trie-based container +@@ -561,7 +561,7 @@ + choices for tree-based container methods, especially, since as + noted just before, they are efficient replacements for erasing + sub-sequences. +-

    + insert +

    + The standard associative containers provide methods of the form +@@ -577,7 +577,7 @@ + similar to constructors taking a range given by a pair of + iterators; the constructors, however, are transactional, whereas + the insert methods are not; this is possibly confusing. +-

    + operator== and operator<= +

    + Associative containers are parametrized by policies allowing to +@@ -597,7 +597,7 @@ + equivalence; also, are two containers considered equivalent if + they store the same values in different order? this is an + arbitrary decision. +-

    ++

    Priority Queues

    Policy Choices

    + Priority queues are containers that allow efficiently inserting + values and accessing the maximal value (in the sense of the + container's comparison functor). Their interface +@@ -606,7 +606,7 @@ + container std::priorityqueue indeed support + these methods, but little else. For algorithmic and + software-engineering purposes, other methods are needed: +-

    1. ++

      1. + Many graph algorithms (see + [biblio.clrs2001]) require increasing a + value in a priority queue (again, in the sense of the +@@ -653,7 +653,7 @@ + ask why do priority queues need to support iterators, since + they are self-organizing containers with a different purpose + than abstracting sequences. There are several reasons: +-

        1. ++

          1. + Iterators (even in self-organizing containers) are + useful for many purposes: cross-referencing + containers, serialization, and debugging code that uses +@@ -674,14 +674,14 @@ + comparing the iterator returned by find to the + iterator returned by end, and not by comparing a + pointer returned by find to NULL. +-

      ++

Underlying Data Structures

+ There are three main implementations of priority queues: the + first employs a binary heap, typically one which uses a + sequence; the second uses a tree (or forest of trees), which is + typically less structured than an associative container's tree; + the third simply uses an associative container. These are + shown in the figure below with labels A1 and A2, B, and C. +-

Figure 22.6. Underlying Priority Queue Data Structures

Underlying Priority Queue Data Structures

++

Figure 22.6. Underlying Priority Queue Data Structures

Underlying Priority Queue Data Structures

+ No single implementation can completely replace any of the + others. Some have better push + and pop amortized performance, some have +@@ -696,7 +696,7 @@ + important for priority queues, since the invalidation guarantees + of one of the most useful data structures - binary heaps - is + markedly different than those of most of the others. +-

++

Binary Heaps

+ Binary heaps are one of the most useful underlying + data structures for priority queues. They are very efficient in + terms of memory (since they don't require per-value structure +@@ -716,7 +716,7 @@ + several reasons why a binary-heap priority queue + may be better implemented as a container instead of a + sequence adapter: +-

  1. ++

    1. + std::priority_queue cannot erase values + from its adapted sequence (irrespective of the sequence + type). This means that the memory use of +@@ -743,7 +743,7 @@ +

    2. + There does not seem to be a systematic way to determine + what exactly can be done with the priority queue. +-

      1. ++

        1. + If p is a priority queue adapting an + std::vector, then it is possible to iterate over + all values by using &p.top() and +@@ -773,10 +773,10 @@ + std::priority_queue, however, this will generally + change the order of growth of the entire sequence of + operations. +-

+ Bibliography +-

[biblio.abrahams97exception] +- ++

[biblio.abrahams97exception] ++ + STL Exception Handling Contract + + . 1997. +@@ -785,7 +785,7 @@ + Abrahams + . + ISO SC22/WG21 +- .

[biblio.alexandrescu01modern] ++ .

[biblio.alexandrescu01modern] + Modern C++ Design: Generic Programming and Design Patterns Applied + . + 2001 +@@ -795,7 +795,7 @@ + Alexandrescu + . + Addison-Wesley Publishing Company +- .

[biblio.andrew04mtf] ++ .

[biblio.andrew04mtf] + MTF, Bit, and COMB: A Guide to Deterministic and Randomized + Algorithms for the List Update Problem + . +@@ -806,7 +806,7 @@ + D. + + Gleich +- .

[biblio.austern00noset] ++ .

[biblio.austern00noset] + Why You Shouldn't Use set - and What You Should Use Instead + . + April, 2000 +@@ -816,8 +816,8 @@ + Austern + . + C++ Report +- .

[biblio.austern01htprop] +- ++ .

[biblio.austern01htprop] ++ + A Proposal to Add Hashtables to the Standard Library + + . +@@ -828,7 +828,7 @@ + Austern + . + ISO SC22/WG21 +- .

[biblio.austern98segmentedit] ++ .

[biblio.austern98segmentedit] + Segmented iterators and hierarchical algorithms + . + April, 1998 +@@ -838,8 +838,8 @@ + Austern + . + Generic Programming +- .

[biblio.dawestimer] +- ++ .

[biblio.dawestimer] ++ + Boost Timer Library + + . +@@ -848,8 +848,8 @@ + Dawes + . + Boost +- .

[biblio.clearypool] +- ++ .

[biblio.clearypool] ++ + Boost Pool Library + + . +@@ -858,8 +858,8 @@ + Cleary + . + Boost +- .

[biblio.maddocktraits] +- ++ .

[biblio.maddocktraits] ++ + Boost Type Traits Library + + . +@@ -872,15 +872,15 @@ + Cleary + . + Boost +- .

[biblio.brodal96priority] +- ++ .

[biblio.brodal96priority] ++ + Worst-case efficient priority queues + + . + Gerth + + Stolting Brodal +- .

[biblio.bulkamayheweff] ++ .

[biblio.bulkamayheweff] + Efficient C++ Programming Techniques + . + 1997 +@@ -894,7 +894,7 @@ + Mayhew + . + Addison-Wesley Publishing Company +- .

[biblio.clrs2001] ++ .

[biblio.clrs2001] + Introduction to Algorithms, 2nd edition + . + 2001 +@@ -916,7 +916,7 @@ + Stein + . + MIT Press +- .

[biblio.dubhashi98neg] ++ .

[biblio.dubhashi98neg] + Balls and bins: A study in negative dependence + . + 1998 +@@ -930,7 +930,7 @@ + Ranjan + . + Random Structures and Algorithms 13 +- .

[biblio.fagin79extendible] ++ .

[biblio.fagin79extendible] + Extendible hashing - a fast access method for dynamic files + . + 1979 +@@ -952,8 +952,8 @@ + Strong + . + ACM Trans. Database Syst. 4 +- .

[biblio.filliatre2000ptset] +- ++ .

[biblio.filliatre2000ptset] ++ + Ptset: Sets of integers implemented as Patricia trees + + . +@@ -962,8 +962,8 @@ + Jean-Christophe + + Filliatre +- .

[biblio.fredman86pairing] +- ++ .

[biblio.fredman86pairing] ++ + The pairing heap: a new form of self-adjusting heap + + . +@@ -984,7 +984,7 @@ + R. E. + + Tarjan +- .

[biblio.gof] ++ .

[biblio.gof] + Design Patterns - Elements of Reusable Object-Oriented Software + . + 1995 +@@ -1006,7 +1006,7 @@ + Vlissides + . + Addison-Wesley Publishing Company +- .

[biblio.garg86order] ++ .

[biblio.garg86order] + Order-preserving key transformations + . + 1986 +@@ -1020,7 +1020,7 @@ + Gotlieb + . + Trans. Database Syst. 11 +- .

[biblio.hyslop02making] ++ .

[biblio.hyslop02making] + Making a real hash of things + . + May 2002 +@@ -1034,7 +1034,7 @@ + Sutter + . + C++ Report +- .

[biblio.jossutis01stl] ++ .

[biblio.jossutis01stl] + The C++ Standard Library - A Tutorial and Reference + . + 2001 +@@ -1044,8 +1044,8 @@ + Jossutis + . + Addison-Wesley Publishing Company +- .

[biblio.kt99fat_heaps] +- ++ .

[biblio.kt99fat_heaps] ++ + New Heap Data Structures + + . +@@ -1058,7 +1058,7 @@ + Robert E. + + Tarjan +- .

[biblio.kleft00sets] ++ .

[biblio.kleft00sets] + Are Set Iterators Mutable or Immutable? + . + October 2000 +@@ -1072,7 +1072,7 @@ + Kleft + . + C/C++ Users Jornal +- .

[biblio.knuth98sorting] ++ .

[biblio.knuth98sorting] + The Art of Computer Programming - Sorting and Searching + . + 1998 +@@ -1082,7 +1082,7 @@ + Knuth + . + Addison-Wesley Publishing Company +- .

[biblio.liskov98data] ++ .

[biblio.liskov98data] + Data abstraction and hierarchy + . + May 1998 +@@ -1092,7 +1092,7 @@ + Liskov + . + SIGPLAN Notices 23 +- .

[biblio.litwin80lh] ++ .

[biblio.litwin80lh] + Linear hashing: A new tool for file and table addressing + . + June 1980 +@@ -1102,8 +1102,8 @@ + Litwin + . + Proceedings of International Conference on Very Large Data Bases +- .

[biblio.maverik_lowerbounds] +- ++ .

[biblio.maverik_lowerbounds] ++ + Deamortization - Part 2: Binomial Heaps + + . +@@ -1112,7 +1112,7 @@ + Maverik + + Woo +- .

[biblio.meyers96more] ++ .

[biblio.meyers96more] + More Effective C++: 35 New Ways to Improve Your Programs and Designs + . + 1996 +@@ -1122,7 +1122,7 @@ + Meyers + . + Addison-Wesley Publishing Company +- .

[biblio.meyers00nonmember] ++ .

[biblio.meyers00nonmember] + How Non-Member Functions Improve Encapsulation + . + 2000 +@@ -1132,7 +1132,7 @@ + Meyers + . + C/C++ Users Journal +- .

[biblio.meyers01stl] ++ .

[biblio.meyers01stl] + Effective STL: 50 Specific Ways to Improve Your Use of the Standard Template Library + . + 2001 +@@ -1142,7 +1142,7 @@ + Meyers + . + Addison-Wesley Publishing Company +- .

[biblio.meyers02both] ++ .

[biblio.meyers02both] + Class Template, Member Template - or Both? + . + 2003 +@@ -1152,7 +1152,7 @@ + Meyers + . + C/C++ Users Journal +- .

[biblio.motwani95random] ++ .

[biblio.motwani95random] + Randomized Algorithms + . + 2003 +@@ -1166,13 +1166,13 @@ + Raghavan + . + Cambridge University Press +- .

[biblio.mscom] +- ++ .

[biblio.mscom] ++ + COM: Component Model Object Technologies + + . + Microsoft +- .

[biblio.musser95rationale] ++ .

[biblio.musser95rationale] + Rationale for Adding Hash Tables to the C++ Standard Template Library + . + 1995 +@@ -1180,7 +1180,7 @@ + David R. + + Musser +- .

[biblio.musser96stltutorial] ++ .

[biblio.musser96stltutorial] + STL Tutorial and Reference Guide + . + 1996 +@@ -1194,8 +1194,8 @@ + Saini + . + Addison-Wesley Publishing Company +- .

[biblio.nelson96stlpq] +- Priority Queues and the STL ++ .

[biblio.nelson96stlpq] ++ Priority Queues and the STL + + . + January 1996 +@@ -1205,7 +1205,7 @@ + Nelson + . + Dr. Dobbs Journal +- .

[biblio.okasaki98mereable] ++ .

[biblio.okasaki98mereable] + Fast mergeable integer maps + . + September 1998 +@@ -1219,8 +1219,8 @@ + Gill + . + In Workshop on ML +- .

[biblio.sgi_stl] +- ++ .

[biblio.sgi_stl] ++ + Standard Template Library Programmer's Guide + + . +@@ -1229,11 +1229,11 @@ + Austern + . + SGI +- .

[biblio.select_man] +- ++ .

[biblio.select_man] ++ + select + +- .

[biblio.sleator84amortized] ++ .

[biblio.sleator84amortized] + Amortized Efficiency of List Update Problems + . + 1984 +@@ -1247,7 +1247,7 @@ + Tarjan + . + ACM Symposium on Theory of Computing +- .

[biblio.sleator85self] ++ .

[biblio.sleator85self] + Self-Adjusting Binary Search Trees + . + 1985 +@@ -1261,7 +1261,7 @@ + Tarjan + . + ACM Symposium on Theory of Computing +- .

[biblio.stepanov94standard] ++ .

[biblio.stepanov94standard] + The Standard Template Library + . + 1984 +@@ -1273,7 +1273,7 @@ + M. + + Lee +- .

[biblio.stroustrup97cpp] ++ .

[biblio.stroustrup97cpp] + The C++ Programming Langugage + . + 1997 +@@ -1283,7 +1283,7 @@ + Stroustrup + . + Addison-Wesley Publishing Company +- .

[biblio.vandevoorde2002cpptemplates] ++ .

[biblio.vandevoorde2002cpptemplates] + C++ Templates: The Complete Guide + . + 2002 +@@ -1297,8 +1297,8 @@ + Josuttis + . + Addison-Wesley Publishing Company +- .

[biblio.wickland96thirty] +- ++ .

[biblio.wickland96thirty] ++ + Thirty Years Among the Dead + + . +@@ -1309,4 +1309,4 @@ + Wickland + . + National Psychological Institute +- .

Prev Up Next
Implementation Home Using
++ .

Prev Up Next
Implementation Home Using
+Index: libstdc++-v3/doc/html/manual/ext_iterators.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/ext_iterators.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/ext_iterators.html (.../branches/gcc-4_7-branch) +@@ -1,14 +1,14 @@ + +- +-Chapter 27. Iterators
Chapter 27. Iterators
Prev Part III.  ++ ++Chapter 27. Iterators
Chapter 27. Iterators
Prev Part III.  + Extensions + +- Next

24.3.2 describes struct iterator, which didn't exist in the ++

 Next

Chapter 27. Iterators

24.3.2 describes struct iterator, which didn't exist in the + original HP STL implementation (the language wasn't rich enough at the + time). For backwards compatibility, base classes are provided which + declare the same nested typedefs: +-

  • input_iterator

  • output_iterator

  • forward_iterator

  • bidirectional_iterator

  • random_access_iterator

24.3.4 describes iterator operation distance, which takes ++

  • input_iterator

  • output_iterator

  • forward_iterator

  • bidirectional_iterator

  • random_access_iterator

24.3.4 describes iterator operation distance, which takes + two iterators and returns a result. It is extended by another signature + which takes two iterators and a reference to a result. The result is + modified, and the function returns nothing. +-

Prev Up Next
Chapter 26. Numerics Home Chapter 28. Input and Output
++

Prev Up Next
Chapter 26. Numerics Home Chapter 28. Input and Output
+Index: libstdc++-v3/doc/html/manual/appendix_contributing.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/appendix_contributing.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/appendix_contributing.html (.../branches/gcc-4_7-branch) +@@ -1,19 +1,19 @@ + +- +-Appendix A.  Contributing
Appendix A.  ++ ++Appendix A.  Contributing
Appendix A.  + Contributing + +-
Prev Part IV.  ++
Prev Part IV.  + Appendices +- Next
 Next

+ Contributing +- ++ +

Table of Contents

Contributor Checklist
Reading
Assignment
Getting Sources
Submitting Patches
Directory Layout and Source Conventions
Coding Style
Bad Identifiers
By Example
Design Notes

+ The GNU C++ Library follows an open development model. Active + contributors are assigned maintainer-ship responsibility, and given + write access to the source repository. First time contributors + should follow this procedure: +-

Assignment

+ Small changes can be accepted without a copyright assignment form on + file. New code and additions to the library need completed copyright + assignment form on file at the FSF. Note: your employer may be required +@@ -66,7 +66,7 @@ + this question would be appreciated. +

+ For more information about getting a copyright assignment, please see +- Legal ++ Legal + Matters. +

+ Please contact Benjamin Kosnik at +@@ -75,14 +75,14 @@ + requesting an assignment form from + , please cc the libstdc++ + maintainer above so that progress can be monitored. +-

+- Getting write access ++

Getting Sources

++ Getting write access + (look for "Write after approval") +-

++

Submitting Patches

+ Every patch must have several pieces of information before it can be + properly evaluated. Ideally (and to ensure the fastest possible + response from the maintainers) it would have all of these pieces: +-

  • ++

    • + A description of the bug and how your patch fixes this + bug. For new features a description of the feature and your + implementation. +@@ -103,7 +103,7 @@ + else, use diff -cp OLD NEW ... If your + version of diff does not support these options, then get the + latest version of GNU +- diff. The SVN ++ diff. The SVN + Tricks wiki page has information on customising the + output of svn diff. +

    • +@@ -111,6 +111,6 @@ + mail message and send it to libstdc++@gcc.gnu.org. All + patches and related discussion should be sent to the + libstdc++ mailing list. +-

Prev Up Next
Part IV.  ++

Prev Up Next
Part IV.  + Appendices +- Home Directory Layout and Source Conventions
++ 		Home Directory Layout and Source Conventions
+Index: libstdc++-v3/doc/html/manual/profile_mode.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/profile_mode.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/profile_mode.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Chapter 19. Profile Mode
Chapter 19. Profile Mode
Prev Part III.  ++ ++Chapter 19. Profile Mode
Chapter 19. Profile Mode
Prev Part III.  + Extensions + +- Next

Table of Contents

Intro
Using the Profile Mode
Tuning the Profile Mode
Design
Wrapper Model
Instrumentation
Run Time Behavior
Analysis and Diagnostics
Cost Model
Reports
Testing
Extensions for Custom Containers
Empirical Cost Model
Implementation Issues
Stack Traces
Symbolization of Instruction Addresses
Concurrency
Using the Standard Library in the Instrumentation Implementation
Malloc Hooks
Construction and Destruction of Global Objects
Developer Information
Big Picture
How To Add A Diagnostic
Diagnostics
Diagnostic Template
Containers
Hashtable Too Small
Hashtable Too Large
Inefficient Hash
Vector Too Small
Vector Too Large
Vector to Hashtable
Hashtable to Vector
Vector to List
List to Vector
List to Forward List (Slist)
Ordered to Unordered Associative Container
Algorithms
Sort Algorithm Performance
Data Locality
Need Software Prefetch
Linked Structure Locality
Multithreaded Data Access
Data Dependence Violations at Container Level
False Sharing
Statistics
Bibliography

++

 Next

Chapter 19. Profile Mode

Table of Contents

Intro
Using the Profile Mode
Tuning the Profile Mode
Design
Wrapper Model
Instrumentation
Run Time Behavior
Analysis and Diagnostics
Cost Model
Reports
Testing
Extensions for Custom Containers
Empirical Cost Model
Implementation Issues
Stack Traces
Symbolization of Instruction Addresses
Concurrency
Using the Standard Library in the Instrumentation Implementation
Malloc Hooks
Construction and Destruction of Global Objects
Developer Information
Big Picture
How To Add A Diagnostic
Diagnostics
Diagnostic Template
Containers
Hashtable Too Small
Hashtable Too Large
Inefficient Hash
Vector Too Small
Vector Too Large
Vector to Hashtable
Hashtable to Vector
Vector to List
List to Vector
List to Forward List (Slist)
Ordered to Unordered Associative Container
Algorithms
Sort Algorithm Performance
Data Locality
Need Software Prefetch
Linked Structure Locality
Multithreaded Data Access
Data Dependence Violations at Container Level
False Sharing
Statistics
Bibliography

Intro

+ Goal: Give performance improvement advice based on + recognition of suboptimal usage patterns of the standard library. +

+@@ -12,11 +12,11 @@ + various components at interesting entry/exit points to/from the standard + library. Process trace, recognize suboptimal patterns, give advice. + For details, see +- paper presented at ++ paper presented at + CGO 2009. +

+ Strengths: +-

  • ++

    • + Unintrusive solution. The application code does not require any + modification. +

    • The advice is call context sensitive, thus capable of +@@ -27,14 +27,14 @@ +

    +

    + Drawbacks: +-

    • ++

      • + You must recompile the application code with custom options. +

      • You must run the application on representative input. + The advice is input dependent. +

      • + The execution time will increase, in some cases by factors. +

      +-

      ++

      Using the Profile Mode

      + This is the anticipated common workflow for program foo.cc: + 

      + $ cat foo.cc
+@@ -54,7 +54,7 @@
+

      +

      + Anatomy of a warning: +-

      • ++

        • + Warning id. This is a short descriptive string for the class + that this warning belongs to. E.g., "vector-to-list". +

        • +@@ -94,11 +94,11 @@ + We believe such warnings can help users understand the performance + behavior of their application better, which can lead to changes + at a higher abstraction level. +-

        Compile time switches and environment variables (see also file ++

        Tuning the Profile Mode

        Compile time switches and environment variables (see also file + profiler.h). Unless specified otherwise, they can be set at compile time + using -D_<name> or by setting variable <name> + in the environment where the program is run, before starting execution. +-

        • ++

          • + _GLIBCXX_PROFILE_NO_<diagnostic>: + disable specific diagnostics. + See section Diagnostics for possible values. +@@ -138,9 +138,9 @@ + call context. + (Environment variable not supported.) +

          +-

        ++

        Bibliography

        + Perflint: A Context Sensitive Performance Advisor for C++ Programs + . Lixia Liu. Silvius Rus. Copyright © 2009 . + Proceedings of the 2009 International Symposium on Code Generation + and Optimization +- .

      Prev Up Next
      Testing Home Design
      ++ .

    Prev Up Next
    Testing Home Design
    +Index: libstdc++-v3/doc/html/manual/stringstreams.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/stringstreams.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/stringstreams.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Memory Based Streams
    Memory Based Streams
    Prev Chapter 13.  ++ ++Memory Based Streams
    Memory Based Streams
    Prev Chapter 13.  + Input and Output + +- Next

    ++

    		 Next

    Memory Based Streams

    Compatibility With strstream

    +

    Stringstreams (defined in the header <sstream>) + are in this author's opinion one of the coolest things since + sliced time. An example of their use is in the Received Wisdom +@@ -34,4 +34,4 @@ + memory yourself. The strstreams have been officially deprecated, + which means that 1) future revisions of the C++ Standard won't + support them, and 2) if you use them, people will laugh at you. +-

    Prev Up Next
    Stream Buffers Home File Based Streams
    ++

Prev Up Next
Stream Buffers Home File Based Streams
+Index: libstdc++-v3/doc/html/manual/traits.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/traits.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/traits.html (.../branches/gcc-4_7-branch) +@@ -1,10 +1,10 @@ + +- +-Traits
Traits
Prev Chapter 6.  ++ ++Traits
Traits
Prev Chapter 6.  + Utilities + +- Next

+-

Prev Up Next
Memory Home Chapter 7.  ++ Next

Traits

++

Prev Up Next
Memory Home Chapter 7.  + Strings + +
+Index: libstdc++-v3/doc/html/manual/bk01pt03ch20s05.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch20s05.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch20s05.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Multiple Thread Example
Multiple Thread Example
Prev Chapter 20. The mt_allocator Next

++ ++Multiple Thread Example

Multiple Thread Example
Prev Chapter 20. The mt_allocator Next

Multiple Thread Example

+ In the ST example we never used the thread_id variable present in each block. + Let's start by explaining the purpose of this in a MT application. +

+@@ -104,4 +104,4 @@ + a threads freelist mentioned above). The "formula" used can probably + be improved to further reduce the risk of blocks being "bounced back + and forth" between freelists. +-

Prev Up Next
Single Thread Example Home Chapter 21. The bitmap_allocator
++

Prev Up Next
Single Thread Example Home Chapter 21. The bitmap_allocator
+Index: libstdc++-v3/doc/html/manual/ext_concurrency.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/ext_concurrency.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/ext_concurrency.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Chapter 30. Concurrency
Chapter 30. Concurrency
Prev Part III.  ++ ++Chapter 30. Concurrency
Chapter 30. Concurrency
Prev Part III.  + Extensions + +- Next

Table of Contents

Design
Interface to Locks and Mutexes
Interface to Atomic Functions
Implementation
Using Builtin Atomic Functions
Thread Abstraction
Use

The file <ext/concurrence.h> ++

 Next

Chapter 30. Concurrency

Table of Contents

Design
Interface to Locks and Mutexes
Interface to Atomic Functions
Implementation
Using Builtin Atomic Functions
Thread Abstraction
Use

Design

Interface to Locks and Mutexes

The file <ext/concurrence.h> + contains all the higher-level + constructs for playing with threads. In contrast to the atomics layer, + the concurrence layer consists largely of types. All types are defined within namespace __gnu_cxx. +@@ -17,7 +17,7 @@ + available locking + policies: _S_single, _S_mutex, + and _S_atomic. +-

  • _S_single

    Indicates single-threaded code that does not need locking. ++

    • _S_single

      Indicates single-threaded code that does not need locking. +

    • _S_mutex

      Indicates multi-threaded code using thread-layer abstractions. +

    • _S_atomic

      Indicates multi-threaded code using atomic operations. +

    The compile-time constant __default_lock_policy is set +@@ -33,7 +33,7 @@ + These types have been superseded in the ISO C++ 2011 standard by the + mutex and lock types defined in the header + <mutex>. +-

++

Interface to Atomic Functions

+ Two functions and one type form the base of atomic support. +

The type _Atomic_word is a signed integral type + supporting atomic operations. +@@ -47,7 +47,7 @@ + __atomic_add_dispatch(volatile _Atomic_word*, int); +

Both of these functions are declared in the header file + <ext/atomicity.h>, and are in namespace __gnu_cxx. +-

  • ++

    • + + __exchange_and_add_dispatch + +@@ -66,7 +66,7 @@ + +

      + Calls through to either of: +-

      • __exchange_and_add ++

        • __exchange_and_add +

          Multi-thread version. Inlined if compiler-generated builtin atomics + can be used, otherwise resolved at link time to a non-builtin code + sequence. +@@ -91,4 +91,4 @@ +

          + Which expand to the appropriate write and read barrier required by the + host hardware and operating system. +-

    Prev Up Next
    Chapter 29. Demangling Home Implementation
    ++

Prev Up Next
Chapter 29. Demangling Home Implementation
+Index: libstdc++-v3/doc/html/manual/associative.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/associative.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/associative.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Associative
Associative
Prev Chapter 9.  ++ ++Associative
Associative
Prev Chapter 9.  + Containers + +- Next

++

 Next

Associative

Insertion Hints

+ Section [23.1.2], Table 69, of the C++ standard lists this + function for all of the associative containers (map, set, etc): + 

+@@ -13,7 +13,7 @@
+      item to insert.  The standard says that “t is
+      inserted as close as possible to the position just prior to
+      p.” (Library DR #233 addresses this topic,
+-     referring to N1780.
++     referring to N1780.
+      Since version 4.2 GCC implements the resolution to DR 233, so
+      that insertions happen as close as possible to the hint. For
+      earlier releases the hint was only used as described below.
+@@ -39,7 +39,7 @@
+      paragraph.  *grin*
+    

+      If the hint parameter ('p' above) is equivalent to:
+-   
  • 
++   
    • 
+ 	  begin(), then the item being inserted should
+ 	  have a key less than all the other keys in the container.
+ 	  The item will be inserted at the beginning of the container,
+@@ -84,7 +84,7 @@
+      the new item would in fact belong there.  If the hint does not
+      point to the correct place, then no further local searching is
+      done; the search begins from scratch in logarithmic time.
+-   
    
++   
    bitset
    Size Variable
    
+ 	No, you cannot write code of the form
+       
    +       #include <bitset>
+@@ -102,7 +102,7 @@
+      There are a couple of ways to handle this kind of thing.  Please
+      consider all of them before passing judgement.  They include, in
+      no chaptericular order:
+-   
    • A very large N in bitset<N>.
    • A container<bool>.
    • Extremely weird solutions.
    
++   
    • A very large N in bitset<N>.
    • A container<bool>.
    • Extremely weird solutions.
    
+      A very large N in
+      bitset<N>.   It has been
+      pointed out a few times in newsgroups that N bits only takes up
+@@ -169,7 +169,7 @@
+    
    
+      Also note that the implementation of bitset used in libstdc++ has
+      some extensions.
+-   
    
++   
    Type String
    
+       
    
+      Bitmasks do not take char* nor const char* arguments in their
+      constructors.  This is something of an accident, but you can read
+@@ -186,7 +186,7 @@
+      instead of
+    
    +       std::bitset<5> b ( “10110” );    // invalid
+-    
    Prev Up Next
    Chapter 9. 
++    
    Prev Up Next
    Chapter 9. 
+   Containers
+   
+- Home Interacting with C
    
++     		Home Interacting with C
    
+Index: libstdc++-v3/doc/html/manual/bk01pt03ch17s02.html
+===================================================================
+--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch17s02.html	(.../tags/gcc_4_7_2_release)
++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch17s02.html	(.../branches/gcc-4_7-branch)
+@@ -1,6 +1,6 @@
+ 
+-
+-Semantics
    Semantics
    Prev Chapter 17. Debug Mode Next
    
++
++Semantics
    Semantics
    Prev Chapter 17. Debug Mode Next
    Semantics
    
+   
    A program that uses the C++ standard library correctly
+   will maintain the same semantics under debug mode as it had with
+   the normal (release) library. All functional and exception-handling
+@@ -36,7 +36,7 @@
+   (N.B. In GCC 3.4.x and 4.0.0, due to a bug,
+   -D_GLIBXX_DEBUG_PEDANTIC was also needed. The problem has
+   been fixed in GCC 4.0.1 and later versions.) 
    The following library components provide extra debugging
+-  capabilities in debug mode:
    • std::basic_string (no safe iterators and see note below)
    • std::bitset
    • std::deque
    • std::list
    • std::map
    • std::multimap
    • std::multiset
    • std::set
    • std::vector
    • std::unordered_map
    • std::unordered_multimap
    • std::unordered_set
    • std::unordered_multiset
    N.B. although there are precondition checks for some string operations,
++  capabilities in debug mode:
    • std::basic_string (no safe iterators and see note below)
    • std::bitset
    • std::deque
    • std::list
    • std::map
    • std::multimap
    • std::multiset
    • std::set
    • std::vector
    • std::unordered_map
    • std::unordered_multimap
    • std::unordered_set
    • std::unordered_multiset
    N.B. although there are precondition checks for some string operations,
+ e.g.  operator[],
+ they will not always be run when using the char and
+ wchar_t specialisations (std::string and
+@@ -52,4 +52,4 @@
+ guaranteed to work.  For full debug-mode support you can use the
+ __gnu_debug::basic_string debugging container directly,
+ which always works correctly.
+-
    Prev Up Next
    Chapter 17. Debug Mode Home Using
    
++
    Prev Up Next
    Chapter 17. Debug Mode Home Using
    
+Index: libstdc++-v3/doc/html/manual/bitmap_allocator.html
+===================================================================
+--- a/src/libstdc++-v3/doc/html/manual/bitmap_allocator.html	(.../tags/gcc_4_7_2_release)
++++ b/src/libstdc++-v3/doc/html/manual/bitmap_allocator.html	(.../branches/gcc-4_7-branch)
+@@ -1,10 +1,10 @@
+ 
+-
+-Chapter 21. The bitmap_allocator
    Chapter 21. The bitmap_allocator
    Prev Part III. 
++
++Chapter 21. The bitmap_allocator
    Chapter 21. The bitmap_allocator
    Prev Part III. 
+   Extensions
+   
+- Next
    Table of Contents
    Design
    Implementation
    Free List Store
    Super Block
    Super Block Data Layout
    Maximum Wasted Percentage
    allocate
    deallocate
    Questions
    1
    2
    3
    Locality
    Overhead and Grow Policy
    
+-
    
++
    		 Next
    Chapter 21. The bitmap_allocator
    Table of Contents
    Design
    Implementation
    Free List Store
    Super Block
    Super Block Data Layout
    Maximum Wasted Percentage
    allocate
    deallocate
    Questions
    1
    2
    3
    Locality
    Overhead and Grow Policy
    
++
    Design
    
+     As this name suggests, this allocator uses a bit-map to keep track
+     of the used and unused memory locations for its book-keeping
+     purposes.
+@@ -30,4 +30,4 @@
+     Mutex Protection around every allocation/deallocation. The state
+     of the macro is picked up automatically from the gthr abstraction
+     layer.
+-  
    Prev Up Next
    Multiple Thread Example Home Implementation
    
++
Prev Up Next
Multiple Thread Example Home Implementation
+Index: libstdc++-v3/doc/html/manual/support.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/support.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/support.html (.../branches/gcc-4_7-branch) +@@ -1,13 +1,13 @@ + +- +-Chapter 4.  Support
Chapter 4.  ++ ++Chapter 4.  Support
Chapter 4.  + Support + +-
Prev Part II.  ++
Prev Part II.  + Standard Contents +-  Next
 Next

Chapter 4.  + Support +- ++ +

Table of Contents

Types
Fundamental Types
Numeric Properties
NULL
Dynamic Memory
Termination
Termination Handlers
Verbose Terminate Handler

+ This part deals with the functions called and objects created + automatically during the course of a program's existence. +@@ -16,9 +16,9 @@ + need to get your own copy from your nation's member body; see our + homepage for help), we can mention a couple of changes in what + kind of support a C++ program gets from the Standard Library. +-

++

Types

Fundamental Types

+ C++ has the following builtin types: +-

  • ++

    • + char +

    • + signed char +@@ -53,12 +53,12 @@ +

      + Specializing parts of the library on these types is prohibited: + instead, use a POD. +-

    ++

    Numeric Properties

    + The header limits defines + traits classes to give access to various implementation + defined-aspects of the fundamental types. The traits classes -- + fourteen in total -- are all specializations of the template class +- numeric_limits, documented here ++ numeric_limits, documented here + and defined as follows: + 

    +    template<typename T>
+@@ -99,7 +99,7 @@
+        static const bool tinyness_before;
+        static const float_round_style round_style;
+      };
+-

    ++

    NULL

    + The only change that might affect people is the type of + NULL: while it is required to be a macro, + the definition of that macro is not allowed +@@ -116,15 +116,15 @@ + overloading won't do what you expect. (This is why + g++ has a magic extension, so that + NULL is always a pointer.) +-

    In his book Effective ++

    In his book Effective + C++, Scott Meyers points out that the best way + to solve this problem is to not overload on pointer-vs-integer + types to begin with. He also offers a way to make your own magic + NULL that will match pointers before it + matches integers. +

    See +- the ++ the + Effective C++ CD example +-

Prev Up Next
Part II.  ++

Prev Up Next
Part II.  + Standard Contents +-  Home Dynamic Memory
++  		Home Dynamic Memory
+Index: libstdc++-v3/doc/html/manual/bk01pt03ch18s02.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch18s02.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch18s02.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Semantics
Semantics
Prev Chapter 18. Parallel Mode Next

The parallel mode STL algorithms are currently not exception-safe, ++ ++Semantics

Semantics
Prev Chapter 18. Parallel Mode Next

Semantics

The parallel mode STL algorithms are currently not exception-safe, + i.e. user-defined functors must not throw exceptions. + Also, the order of execution is not guaranteed for some functions, of course. + Therefore, user-defined functors should not have any concurrent side effects. +@@ -8,4 +8,4 @@ + OpenMP parallel regions in concurrent threads, + it is not possible to call parallel STL algorithm in + concurrent threads, either. +-It might work with other compilers, though.

Prev Up Next
Chapter 18. Parallel Mode Home Using
++It might work with other compilers, though.

Prev Up Next
Chapter 18. Parallel Mode Home Using
+Index: libstdc++-v3/doc/html/manual/bk01pt03ch19s02.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch19s02.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch19s02.html (.../branches/gcc-4_7-branch) +@@ -1,10 +1,10 @@ + +- +-Design
Design
Prev Chapter 19. Profile Mode Next

+-

Table 19.1. Profile Code Location

Code LocationUse
libstdc++-v3/include/std/*Preprocessor code to redirect to profile extension headers.
libstdc++-v3/include/profile/*Profile extension public headers (map, vector, ...).
libstdc++-v3/include/profile/impl/*Profile extension internals. Implementation files are ++ ++Design
Design
Prev Chapter 19. Profile Mode Next

Design

++

Table 19.1. Profile Code Location

Code LocationUse
libstdc++-v3/include/std/*Preprocessor code to redirect to profile extension headers.
libstdc++-v3/include/profile/*Profile extension public headers (map, vector, ...).
libstdc++-v3/include/profile/impl/*Profile extension internals. Implementation files are + only included from impl/profiler.h, which is the only +- file included from the public headers.

+-

++ file included from the public headers.


++

Wrapper Model

+ In order to get our instrumented library version included instead of the + release one, + we use the same wrapper model as the debug mode. +@@ -25,7 +25,7 @@ + Currently, mixing the profile mode with debug and parallel extensions is + not allowed. Mixing them at compile time will result in preprocessor errors. + Mixing them at link time is undefined. +-

++

Instrumentation

+ Instead of instrumenting every public entry and exit point, + we chose to add instrumentation on demand, as needed + by individual diagnostics. +@@ -44,7 +44,7 @@ +

+ All the instrumentation on/off compile time switches live in + include/profile/profiler.h. +-

++

Run Time Behavior

+ For practical reasons, the instrumentation library processes the trace + partially + rather than dumping it to disk in raw form. Each event is processed when +@@ -61,20 +61,20 @@ + call stack of its constructor location. +

+ For details, see +- paper presented at ++ paper presented at + CGO 2009. +-

++

Analysis and Diagnostics

+ Final analysis takes place offline, and it is based entirely on the + generated trace and debugging info in the application binary. + See section Diagnostics for a list of analysis types that we plan to support. +

+ The input to the analysis is a table indexed by profile type and call stack. + The data type for each entry depends on the profile type. +-

++

Cost Model

+ While it is likely that cost models become complex as we get into + more sophisticated analysis, we will try to follow a simple set of rules + at the beginning. +-

  • Relative benefit estimation: ++

    • Relative benefit estimation: + The idea is to estimate or measure the cost of all operations + in the original scenario versus the scenario we advise to switch to. + For instance, when advising to change a vector to a list, an occurrence +@@ -98,7 +98,7 @@ + For instance, when considering switching from set to + unordered_set, if we detect use of operator ++, + we will simply not issue the advice, since this could signal that the use +- care require a sorted container.

++ care require a sorted container.

Reports

+ There are two types of reports. First, if we recognize a pattern for which + we have a substitute that is likely to give better performance, we print + the advice and estimated performance gain. The advice is usually associated +@@ -110,7 +110,7 @@ + which have the worst data locality in actual traversals. + Although this does not offer a solution, + it helps the user focus on the key problems and ignore the uninteresting ones. +-

++

Testing

+ First, we want to make sure we preserve the behavior of the release mode. + You can just type "make check-profile", which + builds and runs the whole test suite in profile mode. +@@ -119,4 +119,4 @@ + We created a profile directory in the test suite. + Each diagnostic must come with at least two tests, one for false positives + and one for false negatives. +-

Prev Up Next
Chapter 19. Profile Mode Home Extensions for Custom Containers
++

Prev Up Next
Chapter 19. Profile Mode Home Extensions for Custom Containers
+Index: libstdc++-v3/doc/html/manual/bk01pt03ch19s06.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch19s06.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch19s06.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Developer Information
Developer Information
Prev Chapter 19. Profile Mode Next

The profile mode headers are included with ++ ++Developer Information

Developer Information
Prev Chapter 19. Profile Mode Next

Developer Information

Big Picture

The profile mode headers are included with + -D_GLIBCXX_PROFILE through preprocessor directives in + include/std/*. +

Instrumented implementations are provided in +@@ -14,7 +14,7 @@ + must ensure (1) that the call is guarded against reentrance and + (2) that the call can be turned off at compile time using a + -D_GLIBCXX_PROFILE_... compiler option. +-

Let's say the diagnostic name is "magic". ++

How To Add A Diagnostic

Let's say the diagnostic name is "magic". +

If you need to instrument a header not already under + include/profile/*, first edit the corresponding header + under include/std/ and add a preprocessor directive such +@@ -42,7 +42,7 @@ + All names of methods in namespace __gnu_profile called from + profiler.h must start with __trace_magic_. +

Add the implementation of the diagnostic. +-

  • ++

    • + Create new file include/profile/impl/profiler_magic.h. +

    • + Define class __magic_info: public __object_info_base. +@@ -65,4 +65,4 @@ + include/profile/impl/profiler_trace.h. Use + __trace_vector_to_list as an example. +

      Add documentation in file doc/xml/manual/profile_mode.xml. +-

Prev Up Next
Implementation Issues Home Diagnostics
++

Prev Up Next
Implementation Issues Home Diagnostics
+Index: libstdc++-v3/doc/html/manual/license.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/license.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/license.html (.../branches/gcc-4_7-branch) +@@ -1,93 +1,93 @@ + +- +-License
License
Prev Chapter 1. Status Next

++ ++License

License
Prev Chapter 1. Status Next

License

+ There are two licenses affecting GNU libstdc++: one for the code, + and one for the documentation. +

+ There is a license section in the FAQ regarding common questions. If you have more +- questions, ask the FSF or the gcc mailing list. +-

++ questions, ask the FSF or the gcc mailing list. ++

The Code: GPL

+ The source code is distributed under the GNU General Public License version 3, + with the addition under section 7 of an exception described in + the “GCC Runtime Library Exception, version 3.1” + as follows (or see the file COPYING.RUNTIME): +-


+-GCC RUNTIME LIBRARY EXCEPTION
+-
+-Version 3.1, 31 March 2009
+-
+-Copyright (C) 2009 Free Software Foundation, Inc.
+-
+-Everyone is permitted to copy and distribute verbatim copies of this
+-license document, but changing it is not allowed.
+-
+-This GCC Runtime Library Exception ("Exception") is an additional
+-permission under section 7 of the GNU General Public License, version
+-3 ("GPLv3"). It applies to a given file (the "Runtime Library") that
+-bears a notice placed by the copyright holder of the file stating that
+-the file is governed by GPLv3 along with this Exception.
+-
+-When you use GCC to compile a program, GCC may combine portions of
+-certain GCC header files and runtime libraries with the compiled
+-program. The purpose of this Exception is to allow compilation of
+-non-GPL (including proprietary) programs to use, in this way, the
+-header files and runtime libraries covered by this Exception.
+-
+-0. Definitions.
+-
+-A file is an "Independent Module" if it either requires the Runtime
+-Library for execution after a Compilation Process, or makes use of an
+-interface provided by the Runtime Library, but is not otherwise based
+-on the Runtime Library.
+-
+-"GCC" means a version of the GNU Compiler Collection, with or without
+-modifications, governed by version 3 (or a specified later version) of
+-the GNU General Public License (GPL) with the option of using any
+-subsequent versions published by the FSF.
+-
+-"GPL-compatible Software" is software whose conditions of propagation,
+-modification and use would permit combination with GCC in accord with
+-the license of GCC.
+-
+-"Target Code" refers to output from any compiler for a real or virtual
+-target processor architecture, in executable form or suitable for
+-input to an assembler, loader, linker and/or execution
+-phase. Notwithstanding that, Target Code does not include data in any
+-format that is used as a compiler intermediate representation, or used
+-for producing a compiler intermediate representation.
+-
+-The "Compilation Process" transforms code entirely represented in
+-non-intermediate languages designed for human-written code, and/or in
+-Java Virtual Machine byte code, into Target Code. Thus, for example,
+-use of source code generators and preprocessors need not be considered
+-part of the Compilation Process, since the Compilation Process can be
+-understood as starting with the output of the generators or
+-preprocessors.
+-
+-A Compilation Process is "Eligible" if it is done using GCC, alone or
+-with other GPL-compatible software, or if it is done without using any
+-work based on GCC. For example, using non-GPL-compatible Software to
+-optimize any GCC intermediate representations would not qualify as an
+-Eligible Compilation Process.
+-
+-1. Grant of Additional Permission.
+-
+-You have permission to propagate a work of Target Code formed by
+-combining the Runtime Library with Independent Modules, even if such
+-propagation would otherwise violate the terms of GPLv3, provided that
+-all Target Code was generated by Eligible Compilation Processes. You
+-may then convey such a combination under terms of your choice,
+-consistent with the licensing of the Independent Modules.
+-
+-2. No Weakening of GCC Copyleft.
+-
+-The availability of this Exception does not imply any general
+-presumption that third-party software is unaffected by the copyleft
+-requirements of the license of GCC.
++


++GCC RUNTIME LIBRARY EXCEPTION
++
++Version 3.1, 31 March 2009
++
++Copyright (C) 2009 Free Software Foundation, Inc.
++
++Everyone is permitted to copy and distribute verbatim copies of this
++license document, but changing it is not allowed.
++
++This GCC Runtime Library Exception ("Exception") is an additional
++permission under section 7 of the GNU General Public License, version
++3 ("GPLv3"). It applies to a given file (the "Runtime Library") that
++bears a notice placed by the copyright holder of the file stating that
++the file is governed by GPLv3 along with this Exception.
++
++When you use GCC to compile a program, GCC may combine portions of
++certain GCC header files and runtime libraries with the compiled
++program. The purpose of this Exception is to allow compilation of
++non-GPL (including proprietary) programs to use, in this way, the
++header files and runtime libraries covered by this Exception.
++
++0. Definitions.
++
++A file is an "Independent Module" if it either requires the Runtime
++Library for execution after a Compilation Process, or makes use of an
++interface provided by the Runtime Library, but is not otherwise based
++on the Runtime Library.
++
++"GCC" means a version of the GNU Compiler Collection, with or without
++modifications, governed by version 3 (or a specified later version) of
++the GNU General Public License (GPL) with the option of using any
++subsequent versions published by the FSF.
++
++"GPL-compatible Software" is software whose conditions of propagation,
++modification and use would permit combination with GCC in accord with
++the license of GCC.
++
++"Target Code" refers to output from any compiler for a real or virtual
++target processor architecture, in executable form or suitable for
++input to an assembler, loader, linker and/or execution
++phase. Notwithstanding that, Target Code does not include data in any
++format that is used as a compiler intermediate representation, or used
++for producing a compiler intermediate representation.
++
++The "Compilation Process" transforms code entirely represented in
++non-intermediate languages designed for human-written code, and/or in
++Java Virtual Machine byte code, into Target Code. Thus, for example,
++use of source code generators and preprocessors need not be considered
++part of the Compilation Process, since the Compilation Process can be
++understood as starting with the output of the generators or
++preprocessors.
++
++A Compilation Process is "Eligible" if it is done using GCC, alone or
++with other GPL-compatible software, or if it is done without using any
++work based on GCC. For example, using non-GPL-compatible Software to
++optimize any GCC intermediate representations would not qualify as an
++Eligible Compilation Process.
++
++1. Grant of Additional Permission.
++
++You have permission to propagate a work of Target Code formed by
++combining the Runtime Library with Independent Modules, even if such
++propagation would otherwise violate the terms of GPLv3, provided that
++all Target Code was generated by Eligible Compilation Processes. You
++may then convey such a combination under terms of your choice,
++consistent with the licensing of the Independent Modules.
++
++2. No Weakening of GCC Copyleft.
++
++The availability of this Exception does not imply any general
++presumption that third-party software is unaffected by the copyleft
++requirements of the license of GCC.
+     

+ Hopefully that text is self-explanatory. If it isn't, you need to speak + to your lawyer, or the Free Software Foundation. +-

++

The Documentation: GPL, FDL

+ The documentation shipped with the library and made available over + the web, excluding the pages generated from source comments, are + copyrighted by the Free Software Foundation, and placed under the +@@ -102,4 +102,4 @@ +

+ If you plan on making copies of the documentation, please let us know. + We can probably offer suggestions. +-

Prev Up Next
Chapter 1. Status Home Bugs
++

Prev Up Next
Chapter 1. Status Home Bugs
+Index: libstdc++-v3/doc/html/manual/numerics.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/numerics.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/numerics.html (.../branches/gcc-4_7-branch) +@@ -1,22 +1,22 @@ + +- +-Chapter 12.  Numerics
Chapter 12.  ++ ++Chapter 12.  Numerics
Chapter 12.  + Numerics + +-
Prev Part II.  ++
Prev Part II.  + Standard Contents +-  Next
 Next

Chapter 12.  + Numerics +- +-

Table of Contents

Complex
complex Processing
Generalized Operations
Interacting with C
Numerics vs. Arrays
C99

+-

++ ++

Table of Contents

Complex
complex Processing
Generalized Operations
Interacting with C
Numerics vs. Arrays
C99

Complex

++

complex Processing

+

Using complex<> becomes even more comple- er, sorry, + complicated, with the not-quite-gratuitously-incompatible + addition of complex types to the C language. David Tribble has + compiled a list of C++98 and C99 conflict points; his description of + C's new type versus those of C++ and how to get them playing together + nicely is +-here. ++here. +

complex<> is intended to be instantiated with a + floating-point type. As long as you meet that and some other basic + requirements, then the resulting instantiation has all of the usual +@@ -24,7 +24,7 @@ + and op>> that work with iostreams: op<< + prints (u,v) and op>> can read u, + (u), and (u,v). +-

Prev Up Next
Chapter 11.  ++

Prev Up Next
Chapter 11.  + Algorithms + +- Home Generalized Operations
++ 		Home Generalized Operations
+Index: libstdc++-v3/doc/html/manual/using_exceptions.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/using_exceptions.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/using_exceptions.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Exceptions
Exceptions
Prev Chapter 3. Using Next

++ ++Exceptions

Exceptions
Prev Chapter 3. Using Next

Exceptions

+ The C++ language provides language support for stack unwinding + with try and catch blocks and + the throw keyword. +@@ -12,7 +12,7 @@ +

+ Two general topics of discussion follow: + exception neutrality and exception safety. +-

++

Exception Safety

+ What is exception-safe code? +

+ Will define this as reasonable and well-defined behavior by classes +@@ -27,7 +27,7 @@ + Using the layered approach from Abrahams, can classify library + components as providing set levels of safety. These will be called + exception guarantees, and can be divided into three categories. +-

  • ++

    • + One. Don't throw. +

      + As specified in 23.2.1 general container requirements. Applicable +@@ -51,7 +51,7 @@ + Member functions insert of a single + element, push_back, push_front, + and rehash. +-

++

Exception Neutrality

+ Simply put, once thrown an exception object should continue in + flight unless handled explicitly. In practice, this means + propagating exceptions should not be swallowed in +@@ -75,7 +75,7 @@ + Unfortunately, this tends to be more of a guideline than a strict + rule as applied to the standard library. As such, the following is + a list of known problem areas where exceptions are not propagated. +-

  • ++

    • + Input/Output +

      + The destructor ios_base::Init::~Init() +@@ -101,7 +101,7 @@ + The constructors of thread that take a + callable function argument swallow all exceptions resulting from + executing the function argument. +-

++

Doing without

+ C++ is a language that strives to be as efficient as is possible + in delivering features. As such, considerable care is used by both + language implementer and designers to make sure unused features +@@ -113,7 +113,7 @@ + support try and catch blocks + and thrown objects. (Language support + for -fno-exceptions is documented in the GNU +- GCC manual.) ++ GCC manual.) +

Before detailing the library support + for -fno-exceptions, first a passing note on + the things lost when this flag is used: it will break exceptions +@@ -220,7 +220,7 @@ + substitution of the C language keyword + const with the uglified + doppelganger __const. +-

++

Compatibility

With C

+ C language code that is expecting to interoperate with C++ should be + compiled with -fexceptions. This will make + debugging a C language function called as part of C++-induced stack +@@ -235,7 +235,7 @@ + getting these details right. For GNU systems, all appropriate parts + of the GNU C library are already compiled + with -fexceptions. +-

++

With POSIX thread cancellation

+ GNU systems re-use some of the exception handling mechanisms to + track control flow for POSIX thread cancellation. +

+@@ -266,8 +266,8 @@ + } + catch(...) + { this->_M_setstate(ios_base::badbit); } +-

+- ++

Bibliography

++ + System Interface Definitions, Issue 7 (IEEE Std. 1003.1-2008) + + . +@@ -275,40 +275,40 @@ + . Copyright © 2008 + The Open Group/The Institute of Electrical and Electronics + Engineers, Inc. +- .

+- ++ .

++ + Error and Exception Handling + + . David Abrahams . + Boost +- .

+- ++ .

++ + Exception-Safety in Generic Components + + . David Abrahams. + Boost +- .

+- ++ .

++ + Standard Library Exception Policy + + . Matt Austern. + WG21 N1077 +- .

+- ++ .

++ + ia64 c++ abi exception handling + + . Richard Henderson. + GNU +- .

+- ++ .

++ + Appendix E: Standard-Library Exception Safety + +- . Bjarne Stroustrup.

++ . Bjarne Stroustrup.

+ Exceptional C++ + . + Exception-Safety Issues and Techniques +- . Herb Sutter.

+- ++ . Herb Sutter.

++ + GCC Bug 25191: exception_defines.h #defines try/catch + +- .

Prev Up Next
Concurrency Home Debugging Support
++ .

Prev Up Next
Concurrency Home Debugging Support
+Index: libstdc++-v3/doc/html/manual/policy_based_data_structures_test.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/policy_based_data_structures_test.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/policy_based_data_structures_test.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Testing
Testing
Prev Chapter 22. Policy-Based Data Structures Next

The library contains a single comprehensive regression test. ++ ++Testing

Testing
Prev Chapter 22. Policy-Based Data Structures Next

Testing

Regression

The library contains a single comprehensive regression test. + For a given container type in this library, the test creates + an object of the container type and an object of the + corresponding standard type (e.g., std::set). It +@@ -22,9 +22,9 @@ + this library's containers and the containers' value-types are + configured to use this allocator.

For granularity, the test is split into the + several sources, each checking only some containers.

For more details, consult the files in +- testsuite/ext/pb_ds/regression.

Performance

Hash-Based

+ Text find +-

+ Description +

+ This test inserts a number of values with keys from an +@@ -44,110 +44,110 @@ + +

The test checks the effect of different range-hashing + functions, trigger policies, and cache-hashing policies. +-

+ Results +

The graphic below show the results for the native + and collision-chaining hash types the the function + applied being a text find timing test using + find. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetails
+ n_hash_map_ncah +-
++
+ std::tr1::unordered_map +- ++ + cache_hash_code +- ++ + false +-  
++  
+ cc_hash_mod_prime_1div1_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/1 +-
++
+ cc_hash_mask_exp_1div2_sth_map +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
++
+ cc_hash_mask_exp_1div1_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/1 +-
++
+ cc_hash_mask_exp_1div2_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

In this setting, the range-hashing scheme affects performance + more than other policies. As the results show, containers using +@@ -162,9 +162,9 @@ + library's implementation. (Unfortunately, it was not possible to run + the tests with std::tr1::unordered_map 's + cache_hash_code = true , as it appeared to +- malfuntion.)

+ Integer find +-

+ Description +

This test inserts a number of values with uniform + integer keys into a container, then performs a series of finds +@@ -177,7 +177,7 @@ + +

The test checks the effect of different underlying + hash-tables, +- range-hashing functions, and trigger policies.

+ Results +

+ There are two sets of results for this type, one for +@@ -185,101 +185,101 @@ +

The first graphic below shows the results for the native and + collision-chaining hash types. The function applied being a random + integer timing test using find. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetails
+ n_hash_map_ncah +-
++
+ std::tr1::unordered_map +- ++ + cache_hash_code +- ++ + false +-  
++  
+ cc_hash_mod_prime_1div1_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/1 +-
++
+ cc_hash_mod_prime_1div2_nsth_map +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
++
+ cc_hash_mask_exp_1div1_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/1 +-
++
+ cc_hash_mask_exp_1div2_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +

+@@ -287,70 +287,70 @@ +

And the second graphic shows the results for the native and + general-probe hash types. The function applied being a random + integer timing test using find. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetails
+ n_hash_map_ncah +-
++
+ std::tr1::unordered_map +- ++ + cache_hash_code +- ++ + false +-  
++  
+ gp_hash_mod_quadp_prime_1div2_nsth_map +-
++
+ gp_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Probe_Fn +- ++ + quadratic_probe_fn +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
++
+ gp_hash_mask_linp_exp_1div2_nsth_map +-
++
+ + gp_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Probe_Fn +- ++ + linear_probe_fn +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

In this setting, the choice of underlying hash-table affects + performance most, then the range-hashing scheme and, only finally, +@@ -366,9 +366,9 @@ + above graphics should be noted that + std::tr1::unordered_map are hard-wired + currently to mod-based schemes. +-

+ Integer Subscript find +-

+ Description +

This test inserts a number of values with uniform + integer keys into a container, then performs a series of finds +@@ -380,7 +380,7 @@ + performance/ext/pb_ds/random_int_subscript_find_timing.cc + +

The test checks the effect of different underlying +- hash-tables, range-hashing functions, and trigger policies.

+ Results +

+ There are two sets of results for this type, one for +@@ -389,99 +389,99 @@ + and collision-chaining hash types, using as the function + applied an integer subscript timing test with + find. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetails
+ n_hash_map_ncah +-
++
+ std::tr1::unordered_map +- ++ + cache_hash_code +- ++ + false +-  
++  
+ cc_hash_mod_prime_1div1_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/1 +-
++
+ cc_hash_mod_prime_1div2_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
++
+ cc_hash_mask_exp_1div1_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/1 +-
++
+ cc_hash_mask_exp_1div2_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +

+@@ -489,75 +489,75 @@ +

And the second graphic shows the results for the native and + general-probe hash types. The function applied being a random + integer timing test using find. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetails
+ n_hash_map_ncah +-
++
+ std::tr1::unordered_map +- ++ + cache_hash_code +- ++ + false +-  
++  
+ gp_hash_mod_quadp_prime_1div2_nsth_map +-
++
+ gp_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Probe_Fn +- ++ + quadratic_probe_fn +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
++
+ gp_hash_mask_linp_exp_1div2_nsth_map +-
++
+ + gp_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Probe_Fn +- ++ + linear_probe_fn +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

This test shows similar results to Hash-Based +- Integer find Find Timing test.

+ Integer Subscript insert +-

+ Description +

This test inserts a number of values with uniform i.i.d. + integer keys into a container, using +@@ -569,7 +569,7 @@ + performance/ext/pb_ds/random_int_subscript_insert_timing.cc + +

The test checks the effect of different underlying +- hash-tables.

+ Results +

+ There are two sets of results for this type, one for +@@ -578,99 +578,99 @@ + and collision-chaining hash types, using as the function + applied an integer subscript timing test with + insert. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetails
+ n_hash_map_ncah +-
++
+ std::tr1::unordered_map +- ++ + cache_hash_code +- ++ + false +-  
++  
+ cc_hash_mod_prime_1div1_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/1 +-
++
+ cc_hash_mod_prime_1div2_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
++
+ cc_hash_mask_exp_1div1_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/1 +-
++
+ cc_hash_mask_exp_1div2_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +

+@@ -678,77 +678,77 @@ +

And the second graphic shows the results for the native and + general-probe hash types. The function applied being a random + integer timing test using find. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetails
+ n_hash_map_ncah +-
++
+ std::tr1::unordered_map +- ++ + cache_hash_code +- ++ + false +-  
++  
+ gp_hash_mod_quadp_prime_1div2_nsth_map +-
++
+ gp_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Probe_Fn +- ++ + quadratic_probe_fn +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
++
+ gp_hash_mask_linp_exp_1div2_nsth_map +-
++
+ + gp_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Probe_Fn +- ++ + linear_probe_fn +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

In this setting, as in Hash-Based Text + find Find Timing test and Hash-Based + Integer find Find Timing test , the choice + of underlying hash-table underlying hash-table affects performance + most, then the range-hashing scheme, and +- finally any other policies.

There are some differences, however:

  1. In this setting, probing tables function sometimes more ++ finally any other policies.

    There are some differences, however:

    1. In this setting, probing tables function sometimes more + efficiently than collision-chaining tables. + This is explained shortly.

    2. The performance graphs have a "saw-tooth" shape. The + average insert time rises and falls. As values are inserted +@@ -770,9 +770,9 @@ + find Find Timing Test and Hash-Based + Integer find Find Timing Test. + Unsurprisingly, however, containers with lower αmax perform worse in this case, +- since more re-hashes are performed.

+ Integer find with Skewed-Distribution +-

+ Description +

This test inserts a number of values with a markedly + non-uniform integer keys into a container, then performs +@@ -785,90 +785,90 @@ + performance/ext/pb_ds/hash_zlob_random_int_find_timing.cc + +

The test checks the effect of different range-hashing +- functions and trigger policies.

+ Results +

The graphic below show the results for the native, collision-chaining, and general-probing hash types. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetails
+ n_hash_map_ncah +-
++
+ std::tr1::unordered_map +- ++ + cache_hash_code +- ++ + false +-  
++  
+ cc_hash_mod_prime_1div1_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/1 +-
++
+ cc_hash_mask_exp_1div1_nsth_map +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/1 +-
++
+ gp_hash_mod_quadp_prime_1div2_nsth_map +-
++
+ gp_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Probe_Fn +- ++ + quadratic_probe_fn +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

In this setting, the distribution of keys is so skewed that + the underlying hash-table type affects performance marginally. +@@ -895,9 +895,9 @@ + performance is bad, a χ2 test can be used + to check how to transform it into a more uniform + distribution.

For this reason, this library's default range-hashing +- function is mask-based.

+ Erase Memory Use +-

+ Description +

This test inserts a number of uniform integer keys + into a container, then erases all keys except one. It measures +@@ -907,90 +907,90 @@ + performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc + +

The test checks how containers adjust internally as their +- logical size decreases.

+ Results +

The graphic below show the results for the native, collision-chaining, and general-probing hash types. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetails
+ n_hash_map_ncah +-
++
+ std::tr1::unordered_map +- ++ + cache_hash_code +- ++ + false +-  
++  
+ cc_hash_mod_prime_1div1_nsth_map +-
++
+ cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mod_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_prime_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/1 +-
++
+ cc_hash_mask_exp_1div2_nsth_map +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
++
+ gp_hash_mask_linp_exp_1div2_nsth_set +-
++
+ gp_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Probe_Fn +- ++ + linear_probe_fn +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

The standard's hash-based containers act very differently than trees in + this respect. When erasing numerous keys from an standard +@@ -998,9 +998,9 @@ + depending on whether the container is tree-based or hash-based. + This is a fundamental consequence of the standard's interface for + associative containers, and it is not due to a specific +- implementation.

Branch-Based

+ Text insert +-

+ Description +

This test inserts a number of values with keys from an arbitrary + text ([ wickland96thirty ]) into a container +@@ -1012,7 +1012,7 @@ + + performance/ext/pb_ds/tree_text_insert_timing.cc + +-

+ Results +

The three graphics below show the results for the native + tree and this library's node-based trees, the native tree and +@@ -1020,80 +1020,80 @@ + and this library's PATRICIA-trie, respectively. +

The graphic immediately below shows the results for the + native tree type and several node-based tree types. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_map +-
++
+ std::map +-  
++  
+ splay_tree_map +-
++
+ tree +- ++ + Tag +- ++ + splay_tree_tag +-
++
+ Node_update +- ++ + null_node_update +-
++
+ rb_tree_map +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-
++
+ Node_update +- ++ + null_node_update +

The graphic below shows the results for the + native tree type and a vector-based tree type. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_map +-
++
+ std::map +-  
++  
+ ov_tree_map +-
++
+ tree +- ++ + Tag +- ++ + ov_tree_tag +-
++
+ Node_update +- ++ + null_node_update +

The graphic below shows the results for the + native tree type and a PATRICIA trie type. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_map +-
++
+ std::map +-  
++  
+ pat_trie_map +-
++
+ tree +- ++ + Tag +- ++ + pat_trie_tag +-
++
+ Node_update +- ++ + null_node_update +-
+ Observations +

Observing the first graphic implies that for this setting, a splay tree + (tree with Tag +@@ -1113,9 +1113,9 @@ + encountered, a new "hash-table" is built A large fan-out PATRICIA + trie, however, doe does well in look-ups (see Branch-Based + Text find Find Timing Test). It may be +- beneficial in semi-static settings.

+ Text find +-

+ Description +

This test inserts a number of values with keys from an + arbitrary text ([wickland96thirty]) into +@@ -1128,71 +1128,71 @@ + performance/ext/pb_ds/text_find_timing.cc + +

The test checks the effect of different underlying +- data structures.

+ Results +

The graphic immediately below shows the results for the + native tree type and several other tree types. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_map +-
++
+ std::map +-  
++  
+ splay_tree_map +-
++
+ tree +- ++ + Tag +- ++ + splay_tree_tag +-
++
+ Node_Update +- ++ + null_node_update +-
++
+ rb_tree_map +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-
++
+ Node_Update +- ++ + null_node_update +-
++
+ ov_tree_map +-
++
+ tree +- ++ + Tag +- ++ + ov_tree_tag +-
++
+ Node_Update +- ++ + null_node_update +-
++
+ pat_trie_map +-
++
+ tree +- ++ + Tag +- ++ + pat_trie_tag +-
++
+ Node_Update +- ++ + null_node_update +-
+ Observations +

For this setting, a splay tree (tree + with Tag + = splay_tree_tag) does not do +- well. This is possibly due to two reasons:

  1. A splay tree is not guaranteed to be balanced [motwani95random]. If a ++ well. This is possibly due to two reasons:

    1. A splay tree is not guaranteed to be balanced [motwani95random]. If a + splay tree contains n nodes, its average root-leaf + path can be m >> log(n).

    2. Assume a specific root-leaf search path has length + m, and the search-target node has distance m' +@@ -1220,9 +1220,9 @@ + by a sub-trie. A large-fan-out PATRICIA trie does not do well on + modifications (see Tree-Based and Trie-Based + Text Insert Timing Test). Therefore, it is possibly beneficial in +- semi-static settings.

+ Text find with Locality-of-Reference +-

+ Description +

This test inserts a number of values with keys from an + arbitrary text ([ wickland96thirty ]) into +@@ -1238,66 +1238,66 @@ + performance/ext/pb_ds/tree_text_lor_find_timing.cc + +

The test checks the effect of different underlying +- data structures in a locality-of-reference setting.

+ Results +

The graphic immediately below shows the results for the + native tree type and several other tree types. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_map +-
++
+ std::map +-  
++  
+ splay_tree_map +-
++
+ tree +- ++ + Tag +- ++ + splay_tree_tag +-
++
+ Node_Update +- ++ + null_node_update +-
++
+ rb_tree_map +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-
++
+ Node_Update +- ++ + null_node_update +-
++
+ ov_tree_map +-
++
+ tree +- ++ + Tag +- ++ + ov_tree_tag +-
++
+ Node_Update +- ++ + null_node_update +-
++
+ pat_trie_map +-
++
+ tree +- ++ + Tag +- ++ + pat_trie_tag +-
++
+ Node_Update +- ++ + null_node_update +-
+ Observations +

For this setting, an ordered-vector tree + (tree with Tag +@@ -1307,9 +1307,9 @@ + tree all share approximately the same performance.

A splay tree (tree + with Tag = splay_tree_tag) does + much better, since each (successful) find "bubbles" the +- corresponding node to the root of the tree.

+ split and join +-

+ Description +

This test a container, inserts into a number of values, splits + the container at the median, and joins the two containers. (If the +@@ -1328,66 +1328,66 @@ + implication, this test checks the most efficient way to erase a + sub-sequence from a tree-like-based container, since this can + always be performed by a small sequence of splits and joins. +-

+ Results +

The graphic immediately below shows the results for the + native tree type and several other tree types. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_set +-
++
+ std::set +-  
++  
+ splay_tree_set +-
++
+ tree +- ++ + Tag +- ++ + splay_tree_tag +-
++
+ Node_Update +- ++ + null_node_update +-
++
+ rb_tree_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-
++
+ Node_Update +- ++ + null_node_update +-
++
+ ov_tree_set +-
++
+ tree +- ++ + Tag +- ++ + ov_tree_tag +-
++
+ Node_Update +- ++ + null_node_update +-
++
+ pat_trie_map +-
++
+ tree +- ++ + Tag +- ++ + pat_trie_tag +-
++
+ Node_Update +- ++ + null_node_update +-
+ Observations +

In this test, the native red-black trees must be split and + joined externally, through a sequence of erase and +@@ -1414,9 +1414,9 @@ + via container_traits).

It is important to note that split and + join are not esoteric methods - they are the most + efficient means of erasing a contiguous range of values from a +- tree based container.

+ Order-Statistics +-

+ Description +

This test creates a container, inserts random integers into the + the container, and then checks the order-statistics of the +@@ -1433,42 +1433,42 @@ + performance/ext/pb_ds/tree_order_statistics_timing.cc + +

The test checks the performance difference of policies based +- on node-invariant as opposed to a external functions.

+ Results +

The graphic immediately below shows the results for the + native tree type and several other tree types. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_set +-
++
+ std::set +-  
++  
+ splay_tree_ost_set +-
++
+ tree +- ++ + Tag +- ++ + splay_tree_tag +-
++
+ Node_Update +- ++ + tree_order_statistics_node_update +-
++
+ rb_tree_ost_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-
++
+ Node_Update +- ++ + tree_order_statistics_node_update +-
+ Observations +

In this test, the native red-black tree can support + order-statistics queries only externally, by performing a +@@ -1485,9 +1485,9 @@ + tree (tree + with Tag = rb_tree_tag ) is + logarithmic in the number of elements. Consequently, the splay +- tree has worse performance than the red-black tree.

Multimap

+ Text find with Small Secondary-to-Primary Key Ratios +-

+ Description +

This test inserts a number of pairs into a container. The + first item of each pair is a string from an arbitrary text +@@ -1508,160 +1508,160 @@ + performance/ext/pb_ds/multimap_text_find_timing_small.cc + +

The test checks the find-time scalability of different +- "multimap" designs.

+ Results +

The graphic below show the results for "multimaps" which + use a tree-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_mmap +-
++
+ std::multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +

The graphic below show the results for "multimaps" which + use a hash-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_hash_mmap +-
++
+ std::tr1::unordered_multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

See Observations::Mapping-Semantics +- Considerations.

+ Text find with Large Secondary-to-Primary Key Ratios +-

+ Description +

This test inserts a number of pairs into a container. The + first item of each pair is a string from an arbitrary text +@@ -1681,161 +1681,161 @@ + performance/ext/pb_ds/multimap_text_find_timing_large.cc + +

The test checks the find-time scalability of different +- "multimap" designs.

+ Results +

The graphic below show the results for "multimaps" which + use a tree-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_mmap +-
++
+ std::multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +

The graphic below show the results for "multimaps" which + use a hash-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_hash_mmap +-
++
+ std::tr1::unordered_multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

See Observations::Mapping-Semantics +- Considerations.

+ Text insert with Small + Secondary-to-Primary Key Ratios +-

+ Description +

This test inserts a number of pairs into a container. The + first item of each pair is a string from an arbitrary text +@@ -1857,161 +1857,161 @@ + performance/ext/pb_ds/multimap_text_insert_timing_small.cc + +

The test checks the insert-time scalability of different +- "multimap" designs.

+ Results +

The graphic below show the results for "multimaps" which + use a tree-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_mmap +-
++
+ std::multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +

The graphic below show the results for "multimaps" which + use a hash-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_hash_mmap +-
++
+ std::tr1::unordered_multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

See Observations::Mapping-Semantics +- Considerations.

+ Text insert with Small + Secondary-to-Primary Key Ratios +-

+ Description +

This test inserts a number of pairs into a container. The + first item of each pair is a string from an arbitrary text +@@ -2033,161 +2033,161 @@ + performance/ext/pb_ds/multimap_text_insert_timing_large.cc + +

The test checks the insert-time scalability of different +- "multimap" designs.

+ Results +

The graphic below show the results for "multimaps" which + use a tree-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_mmap +-
++
+ std::multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +

The graphic below show the results for "multimaps" which + use a hash-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_hash_mmap +-
++
+ std::tr1::unordered_multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

See Observations::Mapping-Semantics +- Considerations.

+ Text insert with Small + Secondary-to-Primary Key Ratios Memory Use +-

+ Description +

This test inserts a number of pairs into a container. The + first item of each pair is a string from an arbitrary text +@@ -2204,161 +2204,161 @@ + performance/ext/pb_ds/multimap_text_insert_mem_usage_small.cc + +

The test checks the memory scalability of different +- "multimap" designs.

+ Results +

The graphic below show the results for "multimaps" which + use a tree-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_mmap +-
++
+ std::multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +

The graphic below show the results for "multimaps" which + use a hash-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_hash_mmap +-
++
+ std::tr1::unordered_multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

See Observations::Mapping-Semantics +- Considerations.

+ Text insert with Small + Secondary-to-Primary Key Ratios Memory Use +-

+ Description +

This test inserts a number of pairs into a container. The + first item of each pair is a string from an arbitrary text +@@ -2375,160 +2375,160 @@ + performance/ext/pb_ds/multimap_text_insert_mem_usage_large.cc + +

The test checks the memory scalability of different +- "multimap" designs.

+ Results +

The graphic below show the results for "multimaps" which + use a tree-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_mmap +-
++
+ std::multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ tree +- ++ + Tag +- ++ + rb_tree_tag +-  
++  
+ Node_Update +- ++ + null_node_update +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +

The graphic below show the results for "multimaps" which + use a hash-based container for primary keys. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
++

Name/Instantiating TypeParameterDetailsParameterDetailsParameterDetails
+ n_hash_mmap +-
++
+ std::tr1::unordered_multimap +-  
++  
+ rb_tree_mmap_lu_mtf_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + list_update +- ++ + Update_Policy +- ++ + lu_move_to_front_policy +-  
++  
+ rb_tree_mmap_cc_hash_mask_exp_1div2_nsth_set +-
++
+ + cc_hash_table + +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-  
++  
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-  
++  
+ Mapped +- ++ + cc_hash_table +- ++ + Comb_Hash_Fn +- ++ + direct_mask_range_hashing +-  
++  
+ Resize_Policy +- ++ + hash_standard_resize_policy +- ++ + Size_Policy +- ++ + hash_exponential_size_policy +-
++
+ Trigger_Policy +- ++ + hash_load_check_resize_trigger with + αmin = 1/8 and αmax = 1/2 +-
+ Observations +

See Observations::Mapping-Semantics +- Considerations.

Priority Queue

+ Text push +-

+ Description +

This test inserts a number of values with keys from an + arbitrary text ([ wickland96thirty ]) into +@@ -2541,7 +2541,7 @@ + +

The test checks the effect of different underlying data + structures. +-

+ Results +

The two graphics below show the results for the native + priority_queues and this library's priority_queues. +@@ -2549,104 +2549,104 @@ + native priority_queue type instantiated with different underlying + container types versus several different versions of library's + priority_queues. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_pq_vector +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::vector +-
++
+ n_pq_deque +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::deque +-
++
+ binary_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binary_heap_tag +-
++
+ binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binomial_heap_tag +-
++
+ rc_binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + rc_binomial_heap_tag +-
++
+ thin_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + thin_heap_tag +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +

The graphic below shows the results for the binary-heap + based native priority queues and this library's pairing-heap + priority_queue data structures. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_pq_vector +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::vector +-
++
+ n_pq_deque +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::deque +-
++
+ thin_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + thin_heap_tag +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +-
+ Observations +

Pairing heaps (priority_queue with + Tag = pairing_heap_tag) +@@ -2664,9 +2664,9 @@ + operation, and the deque implementation is possibly hampered by + its need to manipulate a relatively-complex type (deques + support a O(1) push_front, even though it is +- not used by std::priority_queue.)

+ Text push and pop +-

+ Description +

This test inserts a number of values with keys from an + arbitrary text ([ wickland96thirty ]) into +@@ -2679,7 +2679,7 @@ + +

The test checks the effect of different underlying data + structures. +-

+ Results +

The two graphics below show the results for the native + priority_queues and this library's priority_queues. +@@ -2687,96 +2687,96 @@ + native priority_queue type instantiated with different underlying + container types versus several different versions of library's + priority_queues. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_pq_vector +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::vector +-
++
+ n_pq_deque +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::deque +-
++
+ binary_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binary_heap_tag +-
++
+ binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binomial_heap_tag +-
++
+ rc_binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + rc_binomial_heap_tag +-
++
+ thin_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + thin_heap_tag +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +

The graphic below shows the results for the native priority + queues and this library's pairing-heap priority_queue data + structures. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_pq_vector +-
++
+ std::priority_queue adapting std::vector +- ++ + Sequence +- ++ + std::vector +-
++
+ n_pq_deque +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::deque +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +-
+ Observations +

These results are very similar to Priority Queue Text + push Timing Test. As stated there, pairing heaps +@@ -2796,9 +2796,9 @@ + of push operations, pairing heaps are better + in this case. See Priority Queue Random + Integer push and pop +- Timing Test for a case which is different.

+ Integer push +-

+ Description +

This test inserts a number of values with integer keys + into a container using push. It +@@ -2810,7 +2810,7 @@ + +

The test checks the effect of different underlying data + structures. +-

+ Results +

The two graphics below show the results for the native + priority_queues and this library's priority_queues. +@@ -2818,96 +2818,96 @@ + native priority_queue type instantiated with different underlying + container types versus several different versions of library's + priority_queues. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_pq_vector +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::vector +-
++
+ n_pq_deque +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::deque +-
++
+ binary_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binary_heap_tag +-
++
+ binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binomial_heap_tag +-
++
+ rc_binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + rc_binomial_heap_tag +-
++
+ thin_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + thin_heap_tag +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +

The graphic below shows the results for the binary-heap + based native priority queues and this library's + priority_queue data structures. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_pq_vector +-
++
+ std::priority_queue adapting std::vector +- ++ + Sequence +- ++ + std::vector +-
++
+ n_pq_deque +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::deque +-
++
+ binary_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binary_heap_tag +-
+ Observations +

Binary heaps are the most suited for sequences of + push and pop operations of primitive types +@@ -2916,9 +2916,9 @@ + such types in arrays, they outperform even pairing heaps. (See + Priority + Queue Text push Timing Test for the case of +- non-primitive types.)

+ Integer push +-

+ Description +

This test inserts a number of values with integer keys + into a container using push , then removes them +@@ -2931,72 +2931,72 @@ + +

The test checks the effect of different underlying data + structures. +-

+ Results +

The graphic immediately below shows the results for the + native priority_queue type instantiated with different underlying + container types versus several different versions of library's + priority_queues. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_pq_vector +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::vector +-
++
+ n_pq_deque +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::deque +-
++
+ binary_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binary_heap_tag +-
++
+ binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binomial_heap_tag +-
++
+ rc_binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + rc_binomial_heap_tag +-
++
+ thin_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + thin_heap_tag +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +-
+ Observations +

Binary heaps are the most suited for sequences of + push and pop operations of primitive types +@@ -3007,7 +3007,7 @@ + types.)

At first glance it seems that the standard's vector-based + priority queue is approximately on par with this + library's corresponding priority queue. There are two +- differences however:

  1. The standard's priority queue does not downsize the underlying ++ differences however:

    1. The standard's priority queue does not downsize the underlying + vector (or deque) as the priority queue becomes smaller + (see Priority Queue + Text pop Memory Use Test). It is therefore +@@ -3018,9 +3018,9 @@ + the number of + pop operations is at most that of push + operations, the test here is the "best" for the standard's +- priority queue.

+ Text pop Memory Use +-

+ Description +

This test inserts a number of values with keys from an + arbitrary text ([ wickland96thirty ]) into +@@ -3033,72 +3033,72 @@ + +

The test checks the effect of different underlying data + structures. +-

+ Results +

The graphic immediately below shows the results for the + native priority_queue type instantiated with different underlying + container types versus several different versions of library's + priority_queues. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_pq_vector +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::vector +-
++
+ n_pq_deque +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::deque +-
++
+ binary_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binary_heap_tag +-
++
+ binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binomial_heap_tag +-
++
+ rc_binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + rc_binomial_heap_tag +-
++
+ thin_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + thin_heap_tag +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +-
+ Observations +

The priority queue implementations (excluding the standard's) use + memory proportionally to the number of values they hold: +@@ -3111,9 +3111,9 @@ + impede performance compared to the standard's priority + queues.

See Hash-Based Erase + Memory Use Test for a similar phenomenon regarding priority +- queues.

+ Text join +-

+ Description +

This test inserts a number of values with keys from an + arbitrary text ([ wickland96thirty ]) into +@@ -3128,72 +3128,72 @@ + +

The test checks the effect of different underlying data + structures. +-

+ Results +

The graphic immediately below shows the results for the + native priority_queue type instantiated with different underlying + container types versus several different versions of library's + priority_queues. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_pq_vector +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::vector +-
++
+ n_pq_deque +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::deque +-
++
+ binary_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binary_heap_tag +-
++
+ binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binomial_heap_tag +-
++
+ rc_binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + rc_binomial_heap_tag +-
++
+ thin_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + thin_heap_tag +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +-
+ Observations +

In this test the node-based heaps perform join in + either logarithmic or constant time. The binary heap requires +@@ -3205,9 +3205,9 @@ + and size() (since they are enough to expose + the underlying array), but this is impossible for + a std::deque-based standard priority queue. +- Without heapify, the cost is super-linear.

+ Text modify Up +-

+ Description +

This test inserts a number of values with keys from an + arbitrary text ([ wickland96thirty ]) into +@@ -3227,7 +3227,7 @@ + arbitrary value larger (in the sense of the priority queue's + comparison functor) corresponds to decrease-key in standard graph + algorithms [clrs2001]. +-

+ Results +

The two graphics below show the results for the native + priority_queues and this library's priority_queues. +@@ -3235,88 +3235,88 @@ + native priority_queue type instantiated with different underlying + container types versus several different versions of library's + priority_queues. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_pq_vector +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::vector +-
++
+ n_pq_deque +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::deque +-
++
+ binary_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binary_heap_tag +-
++
+ binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binomial_heap_tag +-
++
+ rc_binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + rc_binomial_heap_tag +-
++
+ thin_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + thin_heap_tag +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +

The graphic below shows the results for the + native priority queues and this library's pairing and thin heap + priority_queue data structures. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ thin_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + thin_heap_tag +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +-
+ Observations +

As noted above, increasing an arbitrary value (in the sense of + the priority queue's comparison functor) is very common in +@@ -3344,9 +3344,9 @@ + finding the appropriate value, then use the range-type iterator + for the modify operation.

The explanation for the standard's priority queues' performance + is similar to that in Priority Queue Text +- join Timing Test.

+ Text modify Down +-

+ Description +

This test inserts a number of values with keys from an + arbitrary text ([ wickland96thirty ]) into +@@ -3362,7 +3362,7 @@ + performance/ext/pb_ds/priority_queue_text_modify_down_timing.cc + +

The main purpose of this test is to contrast Priority Queue +- Text modify Up Timing Test.

+ Results +

The two graphics below show the results for the native + priority_queues and this library's priority_queues. +@@ -3370,88 +3370,88 @@ + native priority_queue type instantiated with different underlying + container types versus several different versions of library's + priority_queues. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ n_pq_vector +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::vector +-
++
+ n_pq_deque +-
++
+ std::priority_queue +- ++ + Sequence +- ++ + std::deque +-
++
+ binary_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binary_heap_tag +-
++
+ binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + binomial_heap_tag +-
++
+ rc_binomial_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + rc_binomial_heap_tag +-
++
+ thin_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + thin_heap_tag +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +

The graphic below shows the results for the + native priority queues and this library's pairing and thin heap + priority_queue data structures. +-

++

+ The abbreviated names in the legend of the graphic above are + instantiated with the types in the following table. +-

Name/Instantiating TypeParameterDetails
++

Name/Instantiating TypeParameterDetails
+ thin_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + thin_heap_tag +-
++
+ pairing_heap +-
++
+ priority_queue +- ++ + Tag +- ++ + pairing_heap_tag +-
+ Observations +

Most points in these results are similar to Priority Queue + Text modify Up Timing Test.

It is interesting to note, however, that as opposed to that +@@ -3466,7 +3466,7 @@ + (in the sense of the priority queue's comparison functor), and + so Priority Queue + Text modify Up Timing Test - is more interesting +- than this test.

Observations

Associative
+ Underlying Data-Structure Families +

In general, hash-based containers have better timing performance + than containers based on different underlying-data structures. The +@@ -3475,7 +3475,7 @@ + order-preservation, or the ability to utilize node invariants. If + memory-use is the major factor, an ordered-vector tree gives + optimal results (albeit with high modificiation costs), and a +- list-based container gives reasonable results.

+ Hash-Based Containers +

Hash-based containers are typically either collision + chaining or probing. Collision-chaining +@@ -3490,7 +3490,7 @@ + useful also in multithreaded applications where each thread + manipulates a hash-based container: in the standard, allocators have + class-wise semantics (see [meyers96more] - Item 10); a +- probing container might incur less contention in this case.

+ Hash Policies +

In hash-based containers, the range-hashing scheme seems to + affect performance more than other considerations. In most +@@ -3509,7 +3509,7 @@ + function.

An orthogonal consideration is the trigger policy. This + presents difficult tradeoffs. E.g., different load + factors in a load-check trigger policy yield a +- space/amortized-cost tradeoff.

+ Branch-Based Containers +

In general, there are several families of tree-based + underlying data structures: balanced node-based trees +@@ -3556,14 +3556,14 @@ + maintaining such trees is higher than that of balanced trees. + Moderate-fan-out trees might be useful for sequences where each + element has a limited number of choices, e.g., DNA +- strings.

+ Mapping-Semantics +

Different mapping semantics were discussed in the introduction and design sections.Here + the focus will be on the case where a keys can be composed into + primary keys and secondary keys. (In the case where some keys + are completely identical, it is trivial that one should use an + associative container mapping values to size types.) In this +- case there are (at least) five possibilities:

  1. Use an associative container that allows equivalent-key ++ case there are (at least) five possibilities:

    1. Use an associative container that allows equivalent-key + values (such as std::multimap)

    2. Use a unique-key value associative container that maps + each primary key to some complex associative container of + secondary keys, say a tree-based or hash-based container. +@@ -3636,105 +3636,105 @@ + but with very high constants; using 1 with a tree-based + container, the cost is Θ(nlog(mn)). Using 2, 3, + and 4, the expected cost is Θ(n), but typically +- with far lower costs than 1. 5 is similar to 1.

The following table shows the complexities of the different ++ with far lower costs than 1. 5 is similar to 1.

Priority_Queue
Complexity

The following table shows the complexities of the different + underlying data structures in terms of orders of growth. It is + interesting to note that this table implies something about the + constants of the operations as well (see Amortized push +- and pop operations).

 pushpopmodifyerasejoin
++ and pop operations).

 pushpopmodifyerasejoin
+ std::priority_queue +- ++ + Θ(n) worst + Θ(log(n)) amortized +- ++ + Θ(log(n)) Worst +- ++ + Θ(n log(n)) Worst + [std note 1] +- ++ + Θ(n log(n)) + [std note 2] +- ++ + Θ(n log(n)) + [std note 1] +-
++
+ priority_queue + <Tag = + pairing_heap_tag> +- ++ + O(1) +- ++ + Θ(n) worst + Θ(log(n)) amortized +- ++ + Θ(n) worst + Θ(log(n)) amortized +- ++ + Θ(n) worst + Θ(log(n)) amortized +- ++ + O(1) +-
++
+ priority_queue + <Tag = + binary_heap_tag> +- ++ + Θ(n) worst + Θ(log(n)) amortized +- ++ + Θ(n) worst + Θ(log(n)) amortized +- ++ + Θ(n) +- ++ + Θ(n) +- ++ + Θ(n) +-
++
+ priority_queue + <Tag = + binomial_heap_tag> +- ++ + Θ(log(n)) worst + O(1) amortized +- ++ + Θ(log(n)) +- ++ + Θ(log(n)) +- ++ + Θ(log(n)) +- ++ + Θ(log(n)) +-
++
+ priority_queue + <Tag = + rc_binomial_heap_tag> +- ++ + O(1) +- ++ + Θ(log(n)) +- ++ + Θ(log(n)) +- ++ + Θ(log(n)) +- ++ + Θ(log(n)) +-
++
+ priority_queue<Tag = + thin_heap_tag> +- ++ + O(1) +- ++ + Θ(n) worst + Θ(log(n)) amortized +- ++ + Θ(log(n)) worst + O(1) amortized, + or Θ(log(n)) amortized + [thin_heap_note] +- ++ + Θ(n) worst + Θ(log(n)) amortized +- ++ + Θ(n) +

[std note 1] This + is not a property of the algorithm, but rather due to the fact +@@ -3760,7 +3760,7 @@ + of the priority queue's comparison functor), then the amortized + time is O(1), but if II) it decreases it, then the + amortized time is the same as the worst case time. Note that +- for most algorithms, I) is important and II) is not.

+ Amortized push + and pop operations +

In many cases, a priority queue is needed primarily for +@@ -3780,7 +3780,7 @@ + terms of constants.

As the table shows, the "least constrained" underlying + data structures are binary heaps and pairing heaps. + Consequently, it is not surprising that they perform best in +- terms of amortized constants.

  1. Pairing heaps seem to perform best for non-primitive ++ terms of amortized constants.

    1. Pairing heaps seem to perform best for non-primitive + types (e.g., std::strings), as shown by + Priority + Queue Text push Timing Test and Priority +@@ -3790,7 +3790,7 @@ + Queue Random Integer push Timing Test and + Priority + Queue Random Integer push and pop Timing +- Test.

+ Graph Algorithms +

In some graph algorithms, a decrease-key operation is + required [clrs2001]; +@@ -3810,4 +3810,4 @@ + as well. It is difficult to find an a-priori characterization of + graphs in which the actual number of modify + operations will dwarf the number of push and +- pop operations.

Prev Up Next
Design Home Acknowledgments
++ pop operations.

Prev Up Next
Design Home Acknowledgments
+Index: libstdc++-v3/doc/html/manual/abi.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/abi.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/abi.html (.../branches/gcc-4_7-branch) +@@ -1,10 +1,10 @@ + +- +-ABI Policy and Guidelines
ABI Policy and Guidelines
Prev Appendix B.  ++ ++ABI Policy and Guidelines
ABI Policy and Guidelines
Prev Appendix B.  + Porting and Maintenance + +- Next

+-

++

 Next

ABI Policy and Guidelines

++

The C++ Interface

+ C++ applications often depend on specific language support + routines, say for throwing exceptions, or catching exceptions, and + perhaps also depend on features in the C++ Standard Library. +@@ -21,7 +21,7 @@ + virtual functions, etc. These details are defined as the compiler + Application Binary Interface, or ABI. The GNU C++ compiler uses an + industry-standard C++ ABI starting with version 3. Details can be +- found in the ABI ++ found in the ABI + specification. +

+ The GNU C++ compiler, g++, has a compiler command line option to +@@ -30,7 +30,7 @@ + g++ command line options may change the ABI as a side-effect of + use. Such flags include -fpack-struct and + -fno-exceptions, but include others: see the complete +- list in the GCC manual under the heading Options ++ list in the GCC manual under the heading Options + for Code Generation Conventions. +

+ The configure options used when building a specific libstdc++ +@@ -58,10 +58,10 @@ + To use a specific version of the C++ ABI, one must use a + corresponding GNU C++ toolchain (i.e., g++ and libstdc++) that + implements the C++ ABI in question. +-

The C++ interface has evolved throughout the history of the GNU ++

Versioning

The C++ interface has evolved throughout the history of the GNU + C++ toolchain. With each release, various details have been changed so + as to give distinct versions to the C++ interface. +-

Extending existing, stable ABIs. Versioning gives subsequent ++

Goals

Extending existing, stable ABIs. Versioning gives subsequent + releases of library binaries the ability to add new symbols and add + functionality, all the while retaining compatibility with the previous + releases in the series. Thus, program binaries linked with the initial +@@ -75,7 +75,7 @@ + in the initial release of the library binary, and remain link + compatible. +

Allows multiple, incompatible ABIs to coexist at the same time. +-

++

History

+ How can this complexity be managed? What does C++ versioning mean? + Because library and compiler changes often make binaries compiled + with one version of the GNU tools incompatible with binaries +@@ -84,12 +84,12 @@ + easier. +

+ The following techniques are used: +-

  1. Release versioning on the libgcc_s.so binary.

    This is implemented via file names and the ELF ++

    1. Release versioning on the libgcc_s.so binary.

      This is implemented via file names and the ELF + DT_SONAME mechanism (at least on ELF + systems). It is versioned as follows: +-

      • GCC 3.x: libgcc_s.so.1

      • GCC 4.x: libgcc_s.so.1

      For m68k-linux the versions differ as follows:

      • GCC 3.4, GCC 4.x: libgcc_s.so.1 ++

        • GCC 3.x: libgcc_s.so.1

        • GCC 4.x: libgcc_s.so.1

        For m68k-linux the versions differ as follows:

        • GCC 3.4, GCC 4.x: libgcc_s.so.1 + when configuring --with-sjlj-exceptions, or +- libgcc_s.so.2

        For hppa-linux the versions differ as follows:

        • GCC 3.4, GCC 4.[0-1]: either libgcc_s.so.1 ++ libgcc_s.so.2

        For hppa-linux the versions differ as follows:

        • GCC 3.4, GCC 4.[0-1]: either libgcc_s.so.1 + when configuring --with-sjlj-exceptions, or + libgcc_s.so.2

        • GCC 4.[2-7]: either libgcc_s.so.3 when configuring + --with-sjlj-exceptions) or libgcc_s.so.4 +@@ -97,7 +97,7 @@ + definitions, where the version definition is the maximum for a + particular release. Labels are cumulative. If a particular release + is not listed, it has the same version labels as the preceding +- release.

          This corresponds to the mapfile: gcc/libgcc-std.ver

          • GCC 3.0.0: GCC_3.0

          • GCC 3.3.0: GCC_3.3

          • GCC 3.3.1: GCC_3.3.1

          • GCC 3.3.2: GCC_3.3.2

          • GCC 3.3.4: GCC_3.3.4

          • GCC 3.4.0: GCC_3.4

          • GCC 3.4.2: GCC_3.4.2

          • GCC 3.4.4: GCC_3.4.4

          • GCC 4.0.0: GCC_4.0.0

          • GCC 4.1.0: GCC_4.1.0

          • GCC 4.2.0: GCC_4.2.0

          • GCC 4.3.0: GCC_4.3.0

          • GCC 4.4.0: GCC_4.4.0

          • GCC 4.5.0: GCC_4.5.0

          • GCC 4.6.0: GCC_4.6.0

          • GCC 4.7.0: GCC_4.7.0

        • ++ release.

          This corresponds to the mapfile: gcc/libgcc-std.ver

          • GCC 3.0.0: GCC_3.0

          • GCC 3.3.0: GCC_3.3

          • GCC 3.3.1: GCC_3.3.1

          • GCC 3.3.2: GCC_3.3.2

          • GCC 3.3.4: GCC_3.3.4

          • GCC 3.4.0: GCC_3.4

          • GCC 3.4.2: GCC_3.4.2

          • GCC 3.4.4: GCC_3.4.4

          • GCC 4.0.0: GCC_4.0.0

          • GCC 4.1.0: GCC_4.1.0

          • GCC 4.2.0: GCC_4.2.0

          • GCC 4.3.0: GCC_4.3.0

          • GCC 4.4.0: GCC_4.4.0

          • GCC 4.5.0: GCC_4.5.0

          • GCC 4.6.0: GCC_4.6.0

          • GCC 4.7.0: GCC_4.7.0

        • + Release versioning on the libstdc++.so binary, implemented in + the same way as the libgcc_s.so binary above. Listed is the + filename: DT_SONAME can be deduced from +@@ -112,13 +112,13 @@ + has the same filename and DT_SONAME as the + preceding release. +

          It is versioned as follows: +-

          • GCC 3.0.0: libstdc++.so.3.0.0

          • GCC 3.0.1: libstdc++.so.3.0.1

          • GCC 3.0.2: libstdc++.so.3.0.2

          • GCC 3.0.3: libstdc++.so.3.0.2 (See Note 1)

          • GCC 3.0.4: libstdc++.so.3.0.4

          • GCC 3.1.0: libstdc++.so.4.0.0 (Incompatible with previous)

          • GCC 3.1.1: libstdc++.so.4.0.1

          • GCC 3.2.0: libstdc++.so.5.0.0 (Incompatible with previous)

          • GCC 3.2.1: libstdc++.so.5.0.1

          • GCC 3.2.2: libstdc++.so.5.0.2

          • GCC 3.2.3: libstdc++.so.5.0.3 (See Note 2)

          • GCC 3.3.0: libstdc++.so.5.0.4

          • GCC 3.3.1: libstdc++.so.5.0.5

          • GCC 3.4.0: libstdc++.so.6.0.0 (Incompatible with previous)

          • GCC 3.4.1: libstdc++.so.6.0.1

          • GCC 3.4.2: libstdc++.so.6.0.2

          • GCC 3.4.3: libstdc++.so.6.0.3

          • GCC 4.0.0: libstdc++.so.6.0.4

          • GCC 4.0.1: libstdc++.so.6.0.5

          • GCC 4.0.2: libstdc++.so.6.0.6

          • GCC 4.0.3: libstdc++.so.6.0.7

          • GCC 4.1.0: libstdc++.so.6.0.7

          • GCC 4.1.1: libstdc++.so.6.0.8

          • GCC 4.2.0: libstdc++.so.6.0.9

          • GCC 4.2.1: libstdc++.so.6.0.9 (See Note 3)

          • GCC 4.2.2: libstdc++.so.6.0.9

          • GCC 4.3.0: libstdc++.so.6.0.10

          • GCC 4.4.0: libstdc++.so.6.0.11

          • GCC 4.4.1: libstdc++.so.6.0.12

          • GCC 4.4.2: libstdc++.so.6.0.13

          • GCC 4.5.0: libstdc++.so.6.0.14

          • GCC 4.6.0: libstdc++.so.6.0.15

          • GCC 4.6.1: libstdc++.so.6.0.16

          ++

          • GCC 3.0.0: libstdc++.so.3.0.0

          • GCC 3.0.1: libstdc++.so.3.0.1

          • GCC 3.0.2: libstdc++.so.3.0.2

          • GCC 3.0.3: libstdc++.so.3.0.2 (See Note 1)

          • GCC 3.0.4: libstdc++.so.3.0.4

          • GCC 3.1.0: libstdc++.so.4.0.0 (Incompatible with previous)

          • GCC 3.1.1: libstdc++.so.4.0.1

          • GCC 3.2.0: libstdc++.so.5.0.0 (Incompatible with previous)

          • GCC 3.2.1: libstdc++.so.5.0.1

          • GCC 3.2.2: libstdc++.so.5.0.2

          • GCC 3.2.3: libstdc++.so.5.0.3 (See Note 2)

          • GCC 3.3.0: libstdc++.so.5.0.4

          • GCC 3.3.1: libstdc++.so.5.0.5

          • GCC 3.4.0: libstdc++.so.6.0.0 (Incompatible with previous)

          • GCC 3.4.1: libstdc++.so.6.0.1

          • GCC 3.4.2: libstdc++.so.6.0.2

          • GCC 3.4.3: libstdc++.so.6.0.3

          • GCC 4.0.0: libstdc++.so.6.0.4

          • GCC 4.0.1: libstdc++.so.6.0.5

          • GCC 4.0.2: libstdc++.so.6.0.6

          • GCC 4.0.3: libstdc++.so.6.0.7

          • GCC 4.1.0: libstdc++.so.6.0.7

          • GCC 4.1.1: libstdc++.so.6.0.8

          • GCC 4.2.0: libstdc++.so.6.0.9

          • GCC 4.2.1: libstdc++.so.6.0.9 (See Note 3)

          • GCC 4.2.2: libstdc++.so.6.0.9

          • GCC 4.3.0: libstdc++.so.6.0.10

          • GCC 4.4.0: libstdc++.so.6.0.11

          • GCC 4.4.1: libstdc++.so.6.0.12

          • GCC 4.4.2: libstdc++.so.6.0.13

          • GCC 4.5.0: libstdc++.so.6.0.14

          • GCC 4.6.0: libstdc++.so.6.0.15

          • GCC 4.6.1: libstdc++.so.6.0.16

          + Note 1: Error should be libstdc++.so.3.0.3. +

          + Note 2: Not strictly required. +

          + Note 3: This release (but not previous or subsequent) has one +- known incompatibility, see 33678 ++ known incompatibility, see 33678 + in the GCC bug database. +

        • Symbol versioning on the libstdc++.so binary.

          mapfile: libstdc++-v3/config/abi/pre/gnu.ver

          It is versioned with the following labels and version + definitions, where the version definition is the maximum for a +@@ -130,7 +130,7 @@ + GLIBCPP_3.2 for symbols that were introduced in the GCC 3.2.0 + release.) If a particular release is not listed, it has the same + version labels as the preceding release. +-

          • GCC 3.0.0: (Error, not versioned)

          • GCC 3.0.1: (Error, not versioned)

          • GCC 3.0.2: (Error, not versioned)

          • GCC 3.0.3: (Error, not versioned)

          • GCC 3.0.4: (Error, not versioned)

          • GCC 3.1.0: GLIBCPP_3.1, CXXABI_1

          • GCC 3.1.1: GLIBCPP_3.1, CXXABI_1

          • GCC 3.2.0: GLIBCPP_3.2, CXXABI_1.2

          • GCC 3.2.1: GLIBCPP_3.2.1, CXXABI_1.2

          • GCC 3.2.2: GLIBCPP_3.2.2, CXXABI_1.2

          • GCC 3.2.3: GLIBCPP_3.2.2, CXXABI_1.2

          • GCC 3.3.0: GLIBCPP_3.2.2, CXXABI_1.2.1

          • GCC 3.3.1: GLIBCPP_3.2.3, CXXABI_1.2.1

          • GCC 3.3.2: GLIBCPP_3.2.3, CXXABI_1.2.1

          • GCC 3.3.3: GLIBCPP_3.2.3, CXXABI_1.2.1

          • GCC 3.4.0: GLIBCXX_3.4, CXXABI_1.3

          • GCC 3.4.1: GLIBCXX_3.4.1, CXXABI_1.3

          • GCC 3.4.2: GLIBCXX_3.4.2

          • GCC 3.4.3: GLIBCXX_3.4.3

          • GCC 4.0.0: GLIBCXX_3.4.4, CXXABI_1.3.1

          • GCC 4.0.1: GLIBCXX_3.4.5

          • GCC 4.0.2: GLIBCXX_3.4.6

          • GCC 4.0.3: GLIBCXX_3.4.7

          • GCC 4.1.1: GLIBCXX_3.4.8

          • GCC 4.2.0: GLIBCXX_3.4.9

          • GCC 4.3.0: GLIBCXX_3.4.10, CXXABI_1.3.2

          • GCC 4.4.0: GLIBCXX_3.4.11, CXXABI_1.3.3

          • GCC 4.4.1: GLIBCXX_3.4.12, CXXABI_1.3.3

          • GCC 4.4.2: GLIBCXX_3.4.13, CXXABI_1.3.3

          • GCC 4.5.0: GLIBCXX_3.4.14, CXXABI_1.3.4

          • GCC 4.6.0: GLIBCXX_3.4.15, CXXABI_1.3.5

          • GCC 4.6.1: GLIBCXX_3.4.16, CXXABI_1.3.5

        • Incremental bumping of a compiler pre-defined macro, ++

          • GCC 3.0.0: (Error, not versioned)

          • GCC 3.0.1: (Error, not versioned)

          • GCC 3.0.2: (Error, not versioned)

          • GCC 3.0.3: (Error, not versioned)

          • GCC 3.0.4: (Error, not versioned)

          • GCC 3.1.0: GLIBCPP_3.1, CXXABI_1

          • GCC 3.1.1: GLIBCPP_3.1, CXXABI_1

          • GCC 3.2.0: GLIBCPP_3.2, CXXABI_1.2

          • GCC 3.2.1: GLIBCPP_3.2.1, CXXABI_1.2

          • GCC 3.2.2: GLIBCPP_3.2.2, CXXABI_1.2

          • GCC 3.2.3: GLIBCPP_3.2.2, CXXABI_1.2

          • GCC 3.3.0: GLIBCPP_3.2.2, CXXABI_1.2.1

          • GCC 3.3.1: GLIBCPP_3.2.3, CXXABI_1.2.1

          • GCC 3.3.2: GLIBCPP_3.2.3, CXXABI_1.2.1

          • GCC 3.3.3: GLIBCPP_3.2.3, CXXABI_1.2.1

          • GCC 3.4.0: GLIBCXX_3.4, CXXABI_1.3

          • GCC 3.4.1: GLIBCXX_3.4.1, CXXABI_1.3

          • GCC 3.4.2: GLIBCXX_3.4.2

          • GCC 3.4.3: GLIBCXX_3.4.3

          • GCC 4.0.0: GLIBCXX_3.4.4, CXXABI_1.3.1

          • GCC 4.0.1: GLIBCXX_3.4.5

          • GCC 4.0.2: GLIBCXX_3.4.6

          • GCC 4.0.3: GLIBCXX_3.4.7

          • GCC 4.1.1: GLIBCXX_3.4.8

          • GCC 4.2.0: GLIBCXX_3.4.9

          • GCC 4.3.0: GLIBCXX_3.4.10, CXXABI_1.3.2

          • GCC 4.4.0: GLIBCXX_3.4.11, CXXABI_1.3.3

          • GCC 4.4.1: GLIBCXX_3.4.12, CXXABI_1.3.3

          • GCC 4.4.2: GLIBCXX_3.4.13, CXXABI_1.3.3

          • GCC 4.5.0: GLIBCXX_3.4.14, CXXABI_1.3.4

          • GCC 4.6.0: GLIBCXX_3.4.15, CXXABI_1.3.5

          • GCC 4.6.1: GLIBCXX_3.4.16, CXXABI_1.3.5

        • Incremental bumping of a compiler pre-defined macro, + __GXX_ABI_VERSION. This macro is defined as the version of the + compiler v3 ABI, with g++ 3.0 being version 100. This macro will + be automatically defined whenever g++ is used (the curious can +@@ -142,11 +142,11 @@ + '-fabi-version' command line option. +

          + It is versioned as follows, where 'n' is given by '-fabi-version=n': +-

          • GCC 3.0: 100

          • GCC 3.1: 100 (Error, should be 101)

          • GCC 3.2: 102

          • GCC 3.3: 102

          • GCC 3.4, GCC 4.x: 102 (when n=1)

          • GCC 3.4, GCC 4.x: 1000 + n (when n>1)

          • GCC 3.4, GCC 4.x: 999999 (when n=0)

        • Changes to the default compiler option for ++

          • GCC 3.0: 100

          • GCC 3.1: 100 (Error, should be 101)

          • GCC 3.2: 102

          • GCC 3.3: 102

          • GCC 3.4, GCC 4.x: 102 (when n=1)

          • GCC 3.4, GCC 4.x: 1000 + n (when n>1)

          • GCC 3.4, GCC 4.x: 999999 (when n=0)

        • Changes to the default compiler option for + -fabi-version. +

          + It is versioned as follows: +-

          • GCC 3.0: (Error, not versioned)

          • GCC 3.1: (Error, not versioned)

          • GCC 3.2: -fabi-version=1

          • GCC 3.3: -fabi-version=1

          • GCC 3.4, GCC 4.x: -fabi-version=2 (Incompatible with previous)

        • Incremental bumping of a library pre-defined macro. For releases ++

          • GCC 3.0: (Error, not versioned)

          • GCC 3.1: (Error, not versioned)

          • GCC 3.2: -fabi-version=1

          • GCC 3.3: -fabi-version=1

          • GCC 3.4, GCC 4.x: -fabi-version=2 (Incompatible with previous)

        • Incremental bumping of a library pre-defined macro. For releases + before 3.4.0, the macro is __GLIBCPP__. For later releases, it's + __GLIBCXX__. (The libstdc++ project generously changed from CPP to + CXX throughout its source to allow the "C" pre-processor the CPP +@@ -159,7 +159,7 @@ + the same value as gcc/DATESTAMP.) +

          + It is versioned as follows: +-

          • GCC 3.0.0: 20010615

          • GCC 3.0.1: 20010819

          • GCC 3.0.2: 20011023

          • GCC 3.0.3: 20011220

          • GCC 3.0.4: 20020220

          • GCC 3.1.0: 20020514

          • GCC 3.1.1: 20020725

          • GCC 3.2.0: 20020814

          • GCC 3.2.1: 20021119

          • GCC 3.2.2: 20030205

          • GCC 3.2.3: 20030422

          • GCC 3.3.0: 20030513

          • GCC 3.3.1: 20030804

          • GCC 3.3.2: 20031016

          • GCC 3.3.3: 20040214

          • GCC 3.4.0: 20040419

          • GCC 3.4.1: 20040701

          • GCC 3.4.2: 20040906

          • GCC 3.4.3: 20041105

          • GCC 3.4.4: 20050519

          • GCC 3.4.5: 20051201

          • GCC 3.4.6: 20060306

          • GCC 4.0.0: 20050421

          • GCC 4.0.1: 20050707

          • GCC 4.0.2: 20050921

          • GCC 4.0.3: 20060309

          • GCC 4.1.0: 20060228

          • GCC 4.1.1: 20060524

          • GCC 4.1.2: 20070214

          • GCC 4.2.0: 20070514

          • GCC 4.2.1: 20070719

          • GCC 4.2.2: 20071007

          • GCC 4.2.3: 20080201

          • GCC 4.2.4: 20080519

          • GCC 4.3.0: 20080306

          • GCC 4.3.1: 20080606

          • GCC 4.3.2: 20080827

          • GCC 4.3.3: 20090124

          • GCC 4.3.4: 20090804

          • GCC 4.3.5: 20100522

          • GCC 4.3.6: 20110627

          • GCC 4.4.0: 20090421

          • GCC 4.4.1: 20090722

          • GCC 4.4.2: 20091015

          • GCC 4.4.3: 20100121

          • GCC 4.4.4: 20100429

          • GCC 4.4.5: 20101001

          • GCC 4.4.6: 20110416

          • GCC 4.5.0: 20100414

          • GCC 4.5.1: 20100731

          • GCC 4.5.2: 20101216

          • GCC 4.5.3: 20110428

          • GCC 4.6.0: 20110325

          • GCC 4.6.1: 20110627

          • GCC 4.6.2: 20111026

        • ++

          • GCC 3.0.0: 20010615

          • GCC 3.0.1: 20010819

          • GCC 3.0.2: 20011023

          • GCC 3.0.3: 20011220

          • GCC 3.0.4: 20020220

          • GCC 3.1.0: 20020514

          • GCC 3.1.1: 20020725

          • GCC 3.2.0: 20020814

          • GCC 3.2.1: 20021119

          • GCC 3.2.2: 20030205

          • GCC 3.2.3: 20030422

          • GCC 3.3.0: 20030513

          • GCC 3.3.1: 20030804

          • GCC 3.3.2: 20031016

          • GCC 3.3.3: 20040214

          • GCC 3.4.0: 20040419

          • GCC 3.4.1: 20040701

          • GCC 3.4.2: 20040906

          • GCC 3.4.3: 20041105

          • GCC 3.4.4: 20050519

          • GCC 3.4.5: 20051201

          • GCC 3.4.6: 20060306

          • GCC 4.0.0: 20050421

          • GCC 4.0.1: 20050707

          • GCC 4.0.2: 20050921

          • GCC 4.0.3: 20060309

          • GCC 4.1.0: 20060228

          • GCC 4.1.1: 20060524

          • GCC 4.1.2: 20070214

          • GCC 4.2.0: 20070514

          • GCC 4.2.1: 20070719

          • GCC 4.2.2: 20071007

          • GCC 4.2.3: 20080201

          • GCC 4.2.4: 20080519

          • GCC 4.3.0: 20080306

          • GCC 4.3.1: 20080606

          • GCC 4.3.2: 20080827

          • GCC 4.3.3: 20090124

          • GCC 4.3.4: 20090804

          • GCC 4.3.5: 20100522

          • GCC 4.3.6: 20110627

          • GCC 4.4.0: 20090421

          • GCC 4.4.1: 20090722

          • GCC 4.4.2: 20091015

          • GCC 4.4.3: 20100121

          • GCC 4.4.4: 20100429

          • GCC 4.4.5: 20101001

          • GCC 4.4.6: 20110416

          • GCC 4.5.0: 20100414

          • GCC 4.5.1: 20100731

          • GCC 4.5.2: 20101216

          • GCC 4.5.3: 20110428

          • GCC 4.6.0: 20110325

          • GCC 4.6.1: 20110627

          • GCC 4.6.2: 20111026

        • + Incremental bumping of a library pre-defined macro, + _GLIBCPP_VERSION. This macro is defined as the released version of + the library, as a string literal. This is only implemented in +@@ -172,7 +172,7 @@ + of config.h. +

          + It is versioned as follows: +-

          • GCC 3.0.0: "3.0.0"

          • GCC 3.0.1: "3.0.0" (Error, should be "3.0.1")

          • GCC 3.0.2: "3.0.0" (Error, should be "3.0.2")

          • GCC 3.0.3: "3.0.0" (Error, should be "3.0.3")

          • GCC 3.0.4: "3.0.0" (Error, should be "3.0.4")

          • GCC 3.1.0: "3.1.0"

          • GCC 3.1.1: "3.1.1"

          • GCC 3.2.0: "3.2"

          • GCC 3.2.1: "3.2.1"

          • GCC 3.2.2: "3.2.2"

          • GCC 3.2.3: "3.2.3"

          • GCC 3.3.0: "3.3"

          • GCC 3.3.1: "3.3.1"

          • GCC 3.3.2: "3.3.2"

          • GCC 3.3.3: "3.3.3"

          • GCC 3.4: "version-unused"

          • GCC 4.x: "version-unused"

        • ++

          • GCC 3.0.0: "3.0.0"

          • GCC 3.0.1: "3.0.0" (Error, should be "3.0.1")

          • GCC 3.0.2: "3.0.0" (Error, should be "3.0.2")

          • GCC 3.0.3: "3.0.0" (Error, should be "3.0.3")

          • GCC 3.0.4: "3.0.0" (Error, should be "3.0.4")

          • GCC 3.1.0: "3.1.0"

          • GCC 3.1.1: "3.1.1"

          • GCC 3.2.0: "3.2"

          • GCC 3.2.1: "3.2.1"

          • GCC 3.2.2: "3.2.2"

          • GCC 3.2.3: "3.2.3"

          • GCC 3.3.0: "3.3"

          • GCC 3.3.1: "3.3.1"

          • GCC 3.3.2: "3.3.2"

          • GCC 3.3.3: "3.3.3"

          • GCC 3.4: "version-unused"

          • GCC 4.x: "version-unused"

        • + Matching each specific C++ compiler release to a specific set of + C++ include files. This is only implemented in GCC 3.1.1 releases + and higher. +@@ -185,13 +185,13 @@ + file's macro GLIBCXX_CONFIGURE (GLIBCPP_CONFIGURE before GCC 3.4.0). +

          + C++ includes are versioned as follows: +-

          • GCC 3.0.0: include/g++-v3

          • GCC 3.0.1: include/g++-v3

          • GCC 3.0.2: include/g++-v3

          • GCC 3.0.3: include/g++-v3

          • GCC 3.0.4: include/g++-v3

          • GCC 3.1.0: include/g++-v3

          • GCC 3.1.1: include/c++/3.1.1

          • GCC 3.2.0: include/c++/3.2

          • GCC 3.2.1: include/c++/3.2.1

          • GCC 3.2.2: include/c++/3.2.2

          • GCC 3.2.3: include/c++/3.2.3

          • GCC 3.3.0: include/c++/3.3

          • GCC 3.3.1: include/c++/3.3.1

          • GCC 3.3.2: include/c++/3.3.2

          • GCC 3.3.3: include/c++/3.3.3

          • GCC 3.4.x: include/c++/3.4.x

          • GCC 4.x.y: include/c++/4.x.y

    ++

    • GCC 3.0.0: include/g++-v3

    • GCC 3.0.1: include/g++-v3

    • GCC 3.0.2: include/g++-v3

    • GCC 3.0.3: include/g++-v3

    • GCC 3.0.4: include/g++-v3

    • GCC 3.1.0: include/g++-v3

    • GCC 3.1.1: include/c++/3.1.1

    • GCC 3.2.0: include/c++/3.2

    • GCC 3.2.1: include/c++/3.2.1

    • GCC 3.2.2: include/c++/3.2.2

    • GCC 3.2.3: include/c++/3.2.3

    • GCC 3.3.0: include/c++/3.3

    • GCC 3.3.1: include/c++/3.3.1

    • GCC 3.3.2: include/c++/3.3.2

    • GCC 3.3.3: include/c++/3.3.3

    • GCC 3.4.x: include/c++/3.4.x

    • GCC 4.x.y: include/c++/4.x.y

+ Taken together, these techniques can accurately specify interface + and implementation changes in the GNU C++ tools themselves. Used + properly, they allow both the GNU C++ tools implementation, and + programs using them, an evolving yet controlled development that + maintains backward compatibility. +-

++

Prerequisites

+ Minimum environment that supports a versioned ABI: A supported + dynamic linker, a GNU linker of sufficient vintage to understand + demangled C++ name globbing (ld) or the Sun linker, a shared +@@ -206,7 +206,7 @@ + Most modern GNU/Linux and BSD versions, particularly ones using + GCC 3.1 and later, will meet the + requirements above, as does Solaris 2.5 and up. +-

++

Configuring

+ It turns out that most of the configure options that change + default behavior will impact the mangled names of exported + symbols, and thus impact versioning and compatibility. +@@ -224,7 +224,7 @@ + attempts to make sure that all the requirement for symbol + versioning are in place. For more information, please consult + acinclude.m4. +-

++

Checking Active

+ When the GNU C++ library is being built with symbol versioning + on, you should see the following at configure time for + libstdc++: +@@ -272,16 +272,16 @@ + libc.so.1 (SUNWprivate_1.1, SYSVABI_1.3); +

+ ldd -v works too, but is very verbose. +-

++

Allowed Changes

+ The following will cause the library minor version number to + increase, say from "libstdc++.so.3.0.4" to "libstdc++.so.3.0.5". +-

  1. Adding an exported global or static data member

  2. Adding an exported function, static or non-virtual member function

  3. Adding an exported symbol or symbols by additional instantiations

++

  1. Adding an exported global or static data member

  2. Adding an exported function, static or non-virtual member function

  3. Adding an exported symbol or symbols by additional instantiations

+ Other allowed changes are possible. +-

++

Prohibited Changes

+ The following non-exhaustive list will cause the library major version + number to increase, say from "libstdc++.so.3.0.4" to + "libstdc++.so.4.0.0". +-

  1. Changes in the gcc/g++ compiler ABI

  2. Changing size of an exported symbol

  3. Changing alignment of an exported symbol

  4. Changing the layout of an exported symbol

  5. Changing mangling on an exported symbol

  6. Deleting an exported symbol

  7. Changing the inheritance properties of a type by adding or removing ++

    1. Changes in the gcc/g++ compiler ABI

    2. Changing size of an exported symbol

    3. Changing alignment of an exported symbol

    4. Changing the layout of an exported symbol

    5. Changing mangling on an exported symbol

    6. Deleting an exported symbol

    7. Changing the inheritance properties of a type by adding or removing + base classes

    8. + Changing the size, alignment, or layout of types + specified in the C++ standard. These may not necessarily be +@@ -293,10 +293,10 @@ + the way the compiler deals with this class in by-value return + statements or parameters: instead of passing instances of this + class in registers, the compiler will be forced to use memory. See the +-section on Function ++section on Function + Calling Conventions and APIs + of the C++ ABI documentation for further details. +-

  1. ++

Implementation

  1. + Separation of interface and implementation +

    + This is accomplished by two techniques that separate the API from +@@ -344,7 +344,7 @@ + CXXABI, select items are allowed to be visible.

+

  • Freezing the API

    Disallowed changes, as above, are not made on a stable release + branch. Enforcement tends to be less strict with GNU extensions that +-standard includes.

    • ++standard includes.

    Testing

    Single ABI Testing

    + Testing for GNU C++ ABI changes is composed of two distinct + areas: testing the C++ compiler (g++) for compiler changes, and + testing the C++ library (libstdc++) for library changes. +@@ -410,7 +410,7 @@ +

    + Perhaps there are other C++ ABI checkers. If so, please notify + us. We'd like to know about them! +-

    ++

    Multiple ABI Testing

    + A "C" application, dynamically linked to two shared libraries, liba, + libb. The dependent library liba is a C++ shared library compiled with + GCC 3.3, and uses io, exceptions, locale, etc. The dependent library +@@ -473,7 +473,7 @@ + This resulting binary, when executed, will be able to safely use + code from both liba, and the dependent libstdc++.so.6, and libb, + with the dependent libstdc++.so.5. +-

    ++

    Outstanding Issues

    + Some features in the C++ language make versioning especially + difficult. In particular, compiler generated constructs such as + implicit instantiations for templates, typeinfo information, and +@@ -483,54 +483,54 @@ +

    + For more background on this issue, see these bugzilla entries: +

    +-24660: versioning weak symbols in libstdc++ ++24660: versioning weak symbols in libstdc++ +

    +-19664: libstdc++ headers should have pop/push of the visibility around the declarations +-

    [biblio.abicheck] +- ++19664: libstdc++ headers should have pop/push of the visibility around the declarations ++

    Bibliography

    [biblio.abicheck] ++ + ABIcheck + +- .

    [biblio.cxxabi] +- ++ .

    [biblio.cxxabi] ++ + C++ ABI Summary + +- .

    +- ++ .

    ++ + Intel Compilers for Linux Compatibility with the GNU Compilers + +- .

    +- ++ .

    ++ + Linker and Libraries Guide (document 819-0690) + +- .

    +- ++ .

    ++ + Sun Studio 11: C++ Migration Guide (document 819-3689) + +- .

    +- ++ .

    ++ + How to Write Shared Libraries + +- . Ulrich Drepper.

    +- ++ . Ulrich Drepper.

    ++ + C++ ABI for the ARM Architecture + +- .

    +- ++ .

    ++ + Dynamic Shared Objects: Survey and Issues + + . + ISO C++ J16/06-0046 +- . Benjamin Kosnik.

    +- ++ . Benjamin Kosnik.

    ++ + Versioning With Namespaces + + . + ISO C++ J16/06-0083 +- . Benjamin Kosnik.

    +- ++ . Benjamin Kosnik.

    ++ + Binary Compatibility of Shared Libraries Implemented in C++ + on GNU/Linux Systems + + . + SYRCoSE 2009 +- . Pavel Shved. Denis Silakov.

    Prev Up Next
    Test Home API Evolution and Deprecation History
    ++ . Pavel Shved. Denis Silakov.

    Prev Up Next
    Test Home API Evolution and Deprecation History
    +Index: libstdc++-v3/doc/html/manual/intro.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/intro.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/intro.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Part I.  Introduction
    Part I.  ++ ++Part I.  Introduction
    Part I.  + Introduction + +-
    Prev The GNU C++ Library Manual Next
    Prev The GNU C++ Library Manual Next

    Part I.  + Introduction +- +-

    Table of Contents

    1. Status
    Implementation Status
    C++ 1998/2003
    Implementation Status
    Implementation Specific Behavior
    C++ 2011
    Implementation Specific Behavior
    C++ TR1
    Implementation Specific Behavior
    C++ TR 24733
    License
    The Code: GPL
    The Documentation: GPL, FDL
    Bugs
    Implementation Bugs
    Standard Bugs
    2. Setup
    Prerequisites
    Configure
    Make
    3. Using
    Command Options
    Headers
    Header Files
    Mixing Headers
    The C Headers and namespace std
    Precompiled Headers
    Macros
    Namespaces
    Available Namespaces
    namespace std
    Using Namespace Composition
    Linking
    Almost Nothing
    Finding Dynamic or Shared Libraries
    Concurrency
    Prerequisites
    Thread Safety
    Atomics
    IO
    Structure
    Defaults
    Future
    Alternatives
    Containers
    Exceptions
    Exception Safety
    Exception Neutrality
    Doing without
    Compatibility
    With C
    With POSIX thread cancellation
    Debugging Support
    Using g++
    Debug Versions of Library Binary Files
    Memory Leak Hunting
    Data Race Hunting
    Using gdb
    Tracking uncaught exceptions
    Debug Mode
    Compile Time Checking
    Profile-based Performance Analysis
    Prev Up Next
    The GNU C++ Library Manual Home Chapter 1. Status
    ++ ++

    Table of Contents

    1. Status
    Implementation Status
    C++ 1998/2003
    Implementation Status
    Implementation Specific Behavior
    C++ 2011
    Implementation Specific Behavior
    C++ TR1
    Implementation Specific Behavior
    C++ TR 24733
    License
    The Code: GPL
    The Documentation: GPL, FDL
    Bugs
    Implementation Bugs
    Standard Bugs
    2. Setup
    Prerequisites
    Configure
    Make
    3. Using
    Command Options
    Headers
    Header Files
    Mixing Headers
    The C Headers and namespace std
    Precompiled Headers
    Macros
    Namespaces
    Available Namespaces
    namespace std
    Using Namespace Composition
    Linking
    Almost Nothing
    Finding Dynamic or Shared Libraries
    Concurrency
    Prerequisites
    Thread Safety
    Atomics
    IO
    Structure
    Defaults
    Future
    Alternatives
    Containers
    Exceptions
    Exception Safety
    Exception Neutrality
    Doing without
    Compatibility
    With C
    With POSIX thread cancellation
    Debugging Support
    Using g++
    Debug Versions of Library Binary Files
    Memory Leak Hunting
    Data Race Hunting
    Using gdb
    Tracking uncaught exceptions
    Debug Mode
    Compile Time Checking
    Profile-based Performance Analysis
    Prev Up Next
    The GNU C++ Library Manual Home Chapter 1. Status
    +Index: libstdc++-v3/doc/html/manual/atomics.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/atomics.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/atomics.html (.../branches/gcc-4_7-branch) +@@ -1,16 +1,16 @@ + +- +-Chapter 14.  Atomics
    Chapter 14.  ++ ++Chapter 14.  Atomics
    Chapter 14.  + Atomics + +-
    Prev Part II.  ++
    Prev Part II.  + Standard Contents +-  Next
    		 Next

    Chapter 14.  + Atomics +- ++ +

    Table of Contents

    API Reference

    + Facilities for atomic operations. +-

    ++

    API Reference

    + All items are declared in the standard header + file atomic. +

    +@@ -25,7 +25,7 @@ + atomic<int>. +

    + Full API details. +-

    Prev Up Next
    Interacting with C Home Chapter 15.  ++

    Prev Up Next
    Interacting with C Home Chapter 15.  + Concurrency + +
    +Index: libstdc++-v3/doc/html/manual/internals.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/internals.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/internals.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Porting to New Hardware or Operating Systems
    Porting to New Hardware or Operating Systems
    Prev Appendix B.  ++ ++Porting to New Hardware or Operating Systems
    Porting to New Hardware or Operating Systems
    Prev Appendix B.  + Porting and Maintenance + +- Next

    ++

    		 Next

    Porting to New Hardware or Operating Systems

    +

    This document explains how to port libstdc++ (the GNU C++ library) to + a new target. +

    In order to make the GNU C++ library (libstdc++) work with a new +@@ -20,7 +20,7 @@ + library, but you should at least try some minimal test cases. +

    (Note that what we think of as a "target," the library refers to as + a "host." The comment at the top of configure.ac explains why.) +-

    If you are porting to a new operating system (as opposed to a new chip ++

    Operating System

    If you are porting to a new operating system (as opposed to a new chip + using an existing operating system), you will need to create a new + directory in the config/os hierarchy. For example, the IRIX + configuration files are all in config/os/irix. There is no set +@@ -99,7 +99,7 @@ + #endif +

    We recommend copying an existing os_defines.h to use as a + starting point. +-

    If you are porting to a new chip (as opposed to a new operating system ++

    CPU

    If you are porting to a new chip (as opposed to a new operating system + running on an existing chip), you will need to create a new directory in the + config/cpu hierarchy. Much like the Operating system setup, + there are no strict rules on how to organize the CPU configuration +@@ -117,7 +117,7 @@ +

    The cpu_include_dir sets default locations for the files controlling + Thread safety and Numeric limits, if the defaults are not + appropriate for your chip. +-

    The library requires that you provide three header files to implement ++

    Character Types

    The library requires that you provide three header files to implement + character classification, analogous to that provided by the C libraries + <ctype.h> header. You can model these on the files provided in + config/os/generic. However, these files will almost +@@ -276,7 +276,7 @@ + ++__low; + return __low; + } +-

    The C++ library string functionality requires a couple of atomic ++

    Thread Safety

    The C++ library string functionality requires a couple of atomic + operations to provide thread-safety. If you don't take any special + action, the library will use stub versions of these functions that are + not thread-safe. They will work fine, unless your applications are +@@ -331,7 +331,7 @@ + { + *__mem += __val; + } +-

    The C++ library requires information about the fundamental data types, ++

    Numeric Limits

    The C++ library requires information about the fundamental data types, + such as the minimum and maximum representable values of each type. + You can define each of these values individually, but it is usually + easiest just to indicate how many bits are used in each of the data +@@ -343,7 +343,7 @@ + do not have to provide the same definitions for each operating system. + To take that approach, create a new file called cpu_limits.h in + your CPU configuration directory (see CPU). +-

    The C++ library is compiled, archived and linked with libtool. ++

    Libtool

    The C++ library is compiled, archived and linked with libtool. + Explaining the full workings of libtool is beyond the scope of this + document, but there are a few, particular bits that are necessary for + porting. +@@ -365,4 +365,4 @@ + ltcf-c.sh in the top-level directory. Find the switch statement + that sets archive_cmds. Here, adjust the setting for your + operating system. +-

    Prev Up Next
    Writing and Generating Documentation Home Test
    ++

    Prev Up Next
    Writing and Generating Documentation Home Test
    +Index: libstdc++-v3/doc/html/manual/policy_data_structures_using.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/policy_data_structures_using.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/policy_data_structures_using.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Using
    Using
    Prev Chapter 22. Policy-Based Data Structures Next

    The library contains only header files, and does not require any ++ ++Using

    Using
    Prev Chapter 22. Policy-Based Data Structures Next

    Using

    Prerequisites

    The library contains only header files, and does not require any + other libraries except the standard C++ library . All classes are + defined in namespace __gnu_pbds. The library internally + uses macros beginning with PB_DS, but +@@ -11,11 +11,11 @@ + Further dependencies are necessary to create the visual output + for the performance tests. To create these graphs, an + additional package is needed: pychart. +-

    ++

    Organization

    + The various data structures are organized as follows. +-

    • ++

      • + Branch-Based +-

        • ++

          • + basic_branch + is an abstract base class for branched-based + associative-containers +@@ -29,7 +29,7 @@ + associative-containers +

        • + Hash-Based +-

          • ++

            • + basic_hash_table + is an abstract base class for hash-based + associative-containers +@@ -43,12 +43,12 @@ + associative-containers +

          • + List-Based +-

            • ++

              • + list_update + list-based update-policy associative container +

            • + Heap-Based +-

              • ++

                • + priority_queue + A priority queue. +

              +@@ -62,7 +62,7 @@ + In addition, there are the following diagnostics classes, + used to report errors specific to this library's data + structures. +-

              Figure 22.7. Exception Hierarchy

              Exception Hierarchy

            ++

            Figure 22.7. Exception Hierarchy

            Exception Hierarchy

            Tutorial

            Basic Use

            + For the most part, the policy-based containers containers in + namespace __gnu_pbds have the same interface as + the equivalent containers in the standard C++ library, except for +@@ -186,7 +186,7 @@ +

            + so all hash-based associative containers inherit the same + hash-functor accessor methods. +-

            + Configuring via Template Parameters +

            + In general, each of this library's containers is +@@ -240,9 +240,9 @@ + by one of them.

            Note that as opposed to the + std::priority_queue, + __gnu_pbds::priority_queue is not a +- sequence-adapter; it is a regular container.

            + Querying Container Attributes +-

            A containers underlying data structure ++

            A containers underlying data structure + affect their performance; Unfortunately, they can also affect + their interface. When manipulating generically associative + containers, it is often useful to be able to statically +@@ -278,9 +278,9 @@ +

            is the container's invalidation guarantee. Invalidation + guarantees are especially important regarding priority queues, + since in this library's design, iterators are practically the +- only way to manipulate them.

            + Point and Range Iteration +-

            This library differentiates between two types of methods ++

            This library differentiates between two types of methods + and iterators: point-type, and range-type. For example, + find and insert are point-type methods, since + they each deal with a specific element; their returned +@@ -377,11 +377,11 @@ +

            + gives one of three pre-determined types that answer this + query. +-

            ++

            Examples

            + Additional code examples are provided in the source + distribution, as part of the regression and performance + testsuite. +-

            • ++

              Intermediate Use

              • + Basic use of maps: + basic_map.cc +

              • +@@ -405,7 +405,7 @@ +

              • + Conditionally erasing values from a priority queue: + priority_queue_erase_if.cc +-

              Querying with container_traits

              • + Using container_traits to query + about underlying data structure behavior: + assoc_container_traits.cc +@@ -416,7 +416,7 @@ + Using container_traits + to query about underlying data structure behavior: + priority_queue_container_traits.cc +-

              By Container Method

              Hash-Based
              size Related

              • + Setting the initial size of a hash-based container + object: + hash_initial_size.cc +@@ -434,7 +434,7 @@ +

              • + Changing the load factors of a hash-based container + object: hash_load_set_change.cc +-

              Hashing Function Related

              • + Using a modulo range-hashing function for the case of an + unknown skewed key distribution: + hash_mod.cc +@@ -448,7 +448,7 @@ +

              • + Writing a ranged-hash functor: + ranged_hash.cc +-

              Branch-Based
              split or join Related

              • + Joining two tree-based container objects: + tree_join.cc +

              • +@@ -458,21 +458,21 @@ + Order statistics while joining two tree-based container + objects: + tree_order_statistics_join.cc +-

              Node Invariants

              • + Using trees for order statistics: + tree_order_statistics.cc +

              • + Augmenting trees to support operations on line + intervals: + tree_intervals.cc +-

              trie

              • + Using a PATRICIA trie for DNA strings: + trie_dna.cc +

              • + Using a PATRICIA + trie for finding all entries whose key matches a given prefix: + trie_prefix_search.cc +-

              Priority Queues

              • + Cross referencing an associative container and a priority + queue: priority_queue_xref.cc +

              • +@@ -480,4 +480,4 @@ + very simple version of Dijkstra's shortest path + algorithm: + priority_queue_dijkstra.cc +-

            Prev Up Next
            Chapter 22. Policy-Based Data Structures Home Design
            ++

    Prev Up Next
    Chapter 22. Policy-Based Data Structures Home Design
    +Index: libstdc++-v3/doc/html/manual/bugs.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bugs.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bugs.html (.../branches/gcc-4_7-branch) +@@ -1,10 +1,10 @@ + +- +-Bugs
    Bugs
    Prev Chapter 1. Status Next

    ++ ++Bugs

    Bugs
    Prev Chapter 1. Status Next

    Bugs

    Implementation Bugs

    + Information on known bugs, details on efforts to fix them, and +- fixed bugs are all available as part of the GCC bug tracking system, ++ fixed bugs are all available as part of the GCC bug tracking system, + with the category set to libstdc++. +-

    ++

    Standard Bugs

    + Everybody's got issues. Even the C++ Standard Library. +

    + The Library Working Group, or LWG, is the ISO subcommittee responsible +@@ -15,9 +15,9 @@ + Here are the issues which have resulted in code changes to the library. + The links are to the specific defect reports from a partial + copy of the Issues List. You can read the full version online +- at the ISO C++ ++ at the ISO C++ + Committee homepage, linked to on the +- GCC "Readings" ++ GCC "Readings" + page. If + you spend a lot of time reading the issues, we recommend downloading + the ZIP file and reading them locally. +@@ -34,319 +34,319 @@ + and src directories for appearances of + _GLIBCXX_RESOLVE_LIB_DEFECTS for examples + of style. Note that we usually do not make changes to the +- code until an issue has reached DR status. +-

    5: ++ code until an issue has reached DR status. ++

    5: + string::compare specification questionable +

    This should be two overloaded functions rather than a single function. +-

    17: ++

    17: + Bad bool parsing +

    Apparently extracting Boolean values was messed up... +-

    19: ++

    19: + "Noconv" definition too vague +

    If codecvt::do_in returns noconv there are + no changes to the values in [to, to_limit). +-

    22: ++

    22: + Member open vs flags +

    Re-opening a file stream does not clear the state flags. +-

    23: ++

    23: + Num_get overflow result +

    Implement the proposed resolution. +-

    25: ++

    25: + String operator<< uses width() value wrong +

    Padding issues. +-

    48: ++

    48: + Use of non-existent exception constructor +

    An instance of ios_base::failure is constructed instead. +-

    49: ++

    49: + Underspecification of ios_base::sync_with_stdio +

    The return type is the previous state of synchronization. +-

    50: ++

    50: + Copy constructor and assignment operator of ios_base +

    These members functions are declared private and are + thus inaccessible. Specifying the correct semantics of + "copying stream state" was deemed too complicated. +-

    60: ++

    60: + What is a formatted input function? +

    This DR made many widespread changes to basic_istream + and basic_ostream all of which have been implemented. +-

    63: ++

    63: + Exception-handling policy for unformatted output +

    Make the policy consistent with that of formatted input, unformatted + input, and formatted output. +-

    68: ++

    68: + Extractors for char* should store null at end +

    And they do now. An editing glitch in the last item in the list of + [27.6.1.2.3]/7. +-

    74: ++

    74: + Garbled text for codecvt::do_max_length +

    The text of the standard was gibberish. Typos gone rampant. +-

    75: ++

    75: + Contradiction in codecvt::length's argument types +

    Change the first parameter to stateT& and implement + the new effects paragraph. +-

    83: ++

    83: + string::npos vs. string::max_size() +

    Safety checks on the size of the string should test against + max_size() rather than npos. +-

    90: ++

    90: + Incorrect description of operator>> for strings +

    The effect contain isspace(c,getloc()) which must be + replaced by isspace(c,is.getloc()). +-

    91: ++

    91: + Description of operator>> and getline() for string<> + might cause endless loop +

    They behave as a formatted input function and as an unformatted + input function, respectively (except that getline is + not required to set gcount). +-

    103: ++

    103: + set::iterator is required to be modifiable, but this allows + modification of keys. +

    For associative containers where the value type is the same as + the key type, both iterator and const_iterator + are constant iterators. +-

    109: ++

    109: + Missing binders for non-const sequence elements +

    The binder1st and binder2nd didn't have an + operator() taking a non-const parameter. +-

    110: ++

    110: + istreambuf_iterator::equal not const +

    This was not a const member function. Note that the DR says to + replace the function with a const one; we have instead provided an + overloaded version with identical contents. +-

    117: ++

    117: + basic_ostream uses nonexistent num_put member functions +

    num_put::put() was overloaded on the wrong types. +-

    118: ++

    118: + basic_istream uses nonexistent num_get member functions +

    Same as 117, but for num_get::get(). +-

    129: ++

    129: + Need error indication from seekp() and seekg() +

    These functions set failbit on error now. +-

    130: ++

    130: + Return type of container::erase(iterator) differs for associative containers +

    Make member erase return iterator for set, multiset, map, multimap. +-

    136: ++

    136: + seekp, seekg setting wrong streams? +

    seekp should only set the output stream, and + seekg should only set the input stream. +-

    167: ++

    167: + Improper use of traits_type::length() +

    op<< with a const char* was + calculating an incorrect number of characters to write. +-

    169: ++

    169: + Bad efficiency of overflow() mandated +

    Grow efficiently the internal array object. +-

    171: ++

    171: + Strange seekpos() semantics due to joint position +

    Quite complex to summarize... +-

    181: ++

    181: + make_pair() unintended behavior +

    This function used to take its arguments as reference-to-const, now + it copies them (pass by value). +-

    195: ++

    195: + Should basic_istream::sentry's constructor ever set eofbit? +

    Yes, it can, specifically if EOF is reached while skipping whitespace. +-

    211: ++

    211: + operator>>(istream&, string&) doesn't set failbit +

    If nothing is extracted into the string, op>> now + sets failbit (which can cause an exception, etc., etc.). +-

    214: ++

    214: + set::find() missing const overload +

    Both set and multiset were missing + overloaded find, lower_bound, upper_bound, and equal_range functions + for const instances. +-

    231: ++

    231: + Precision in iostream? +

    For conversion from a floating-point type, str.precision() + is specified in the conversion specification. +-

    233: ++

    233: + Insertion hints in associative containers +

    Implement N1780, first check before then check after, insert as close + to hint as possible. +-

    235: ++

    235: + No specification of default ctor for reverse_iterator +

    The declaration of reverse_iterator lists a default constructor. + However, no specification is given what this constructor should do. +-

    241: ++

    241: + Does unique_copy() require CopyConstructible and Assignable? +

    Add a helper for forward_iterator/output_iterator, fix the existing + one for input_iterator/output_iterator to not rely on Assignability. +-

    243: ++

    243: + get and getline when sentry reports failure +

    Store a null character only if the character array has a non-zero size. +-

    251: ++

    251: + basic_stringbuf missing allocator_type +

    This nested typedef was originally not specified. +-

    253: ++

    253: + valarray helper functions are almost entirely useless +

    Make the copy constructor and copy-assignment operator declarations + public in gslice_array, indirect_array, mask_array, slice_array; provide + definitions. +-

    265: ++

    265: + std::pair::pair() effects overly restrictive +

    The default ctor would build its members from copies of temporaries; + now it simply uses their respective default ctors. +-

    266: ++

    266: + bad_exception::~bad_exception() missing Effects clause +

    The bad_* classes no longer have destructors (they + are trivial), since no description of them was ever given. +-

    271: ++

    271: + basic_iostream missing typedefs +

    The typedefs it inherits from its base classes can't be used, since + (for example) basic_iostream<T>::traits_type is ambiguous. +-

    275: ++

    275: + Wrong type in num_get::get() overloads +

    Similar to 118. +-

    280: ++

    280: + Comparison of reverse_iterator to const reverse_iterator +

    Add global functions with two template parameters. + (NB: not added for now a templated assignment operator) +-

    292: ++

    292: + Effects of a.copyfmt (a) +

    If (this == &rhs) do nothing. +-

    300: ++

    300: + List::merge() specification incomplete +

    If (this == &x) do nothing. +-

    303: ++

    303: + Bitset input operator underspecified +

    Basically, compare the input character to + is.widen(0) and is.widen(1). +-

    305: ++

    305: + Default behavior of codecvt<wchar_t, char, + mbstate_t>::length() +

    Do not specify what codecvt<wchar_t, char, + mbstate_t>::do_length must return. +-

    328: ++

    328: + Bad sprintf format modifier in + money_put<>::do_put() +

    Change the format string to "%.0Lf". +-

    365: ++

    365: + Lack of const-qualification in clause 27 +

    Add const overloads of is_open. +-

    387: ++

    387: + std::complex over-encapsulated +

    Add the real(T) and imag(T) + members; in C++11 mode, also adjust the existing + real() and imag() members and + free functions. +-

    389: ++

    389: + Const overload of valarray::operator[] returns + by value +

    Change it to return a const T&. +-

    396: ++

    396: + what are characters zero and one +

    Implement the proposed resolution. +-

    402: ++

    402: + Wrong new expression in [some_]allocator::construct +

    Replace "new" with "::new". +-

    408: ++

    408: + + Is vector<reverse_iterator<char*> > forbidden? + +

    Tweak the debug-mode checks in _Safe_iterator. +-

    409: ++

    409: + Closing an fstream should clear the error state +

    Have open clear the error flags. +-

    431: ++

    431: + Swapping containers with unequal allocators +

    Implement Option 3, as per N1599. +-

    432: ++

    432: + stringbuf::overflow() makes only one write position + available +

    Implement the resolution, beyond DR 169. +-

    434: ++

    434: + bitset::to_string() hard to use +

    Add three overloads, taking fewer template arguments. +-

    438: ++

    438: + Ambiguity in the "do the right thing" clause +

    Implement the resolution, basically cast less. +-

    453: ++

    453: + basic_stringbuf::seekoff need not always fail for an empty stream +

    Don't fail if the next pointer is null and newoff is zero. +-

    455: ++

    455: + cerr::tie() and wcerr::tie() are overspecified +

    Initialize cerr tied to cout and wcerr tied to wcout. +-

    464: ++

    464: + Suggestion for new member functions in standard containers +

    Add data() to std::vector and + at(const key_type&) to std::map. +-

    508: ++

    508: + Bad parameters for ranlux64_base_01 +

    Fix the parameters. +-

    512: ++

    512: + Seeding subtract_with_carry_01 from a single unsigned long +

    Construct a linear_congruential engine and seed with it. +-

    526: ++

    526: + Is it undefined if a function in the standard changes in + parameters? +

    Use &value. +-

    538: ++

    538: + 241 again: Does unique_copy() require CopyConstructible + and Assignable? +

    In case of input_iterator/output_iterator rely on Assignability of + input_iterator' value_type. +-

    539: ++

    539: + partial_sum and adjacent_difference should mention + requirements +

    We were almost doing the right thing, just use std::move + in adjacent_difference. +-

    541: ++

    541: + shared_ptr template assignment and void +

    Add an auto_ptr<void> specialization. +-

    543: ++

    543: + valarray slice default constructor +

    Follow the straightforward proposed resolution. +-

    550: ++

    550: + What should the return type of pow(float,int) be? +

    In C++11 mode, remove the pow(float,int), etc., signatures. +-

    586: ++

    586: + string inserter not a formatted function +

    Change it to be a formatted output function (i.e. catch exceptions). +-

    596: ++

    596: + 27.8.1.3 Table 112 omits "a+" and "a+b" modes +

    Add the missing modes to fopen_mode. +-

    630: ++

    630: + arrays of valarray +

    Implement the simple resolution. +-

    660: ++

    660: + Missing bitwise operations +

    Add the missing operations. +-

    691: ++

    691: + const_local_iterator cbegin, cend missing from TR1 +

    In C++11 mode add cbegin(size_type) and cend(size_type) + to the unordered containers. +-

    693: ++

    693: + std::bitset::all() missing +

    Add it, consistently with the discussion. +-

    695: ++

    695: + ctype<char>::classic_table() not accessible +

    Make the member functions table and classic_table public. +-

    696: ++

    696: + istream::operator>>(int&) broken +

    Implement the straightforward resolution. +-

    761: ++

    761: + unordered_map needs an at() member function +

    In C++11 mode, add at() and at() const. +-

    775: ++

    775: + Tuple indexing should be unsigned? +

    Implement the int -> size_t replacements. +-

    776: ++

    776: + Undescribed assign function of std::array +

    In C++11 mode, remove assign, add fill. +-

    781: ++

    781: + std::complex should add missing C99 functions +

    In C++11 mode, add std::proj. +-

    809: ++

    809: + std::swap should be overloaded for array types +

    Add the overload. +-

    844: ++

    844: + complex pow return type is ambiguous +

    In C++11 mode, remove the pow(complex<T>, int) signature. +-

    853: ++

    853: + to_string needs updating with zero and one +

    Update / add the signatures. +-

    865: ++

    865: + More algorithms that throw away information +

    The traditional HP / SGI return type and value is blessed + by the resolution of the DR. +-

    Prev Up Next
    License Home Chapter 2. Setup
    ++

    Prev Up Next
    License Home Chapter 2. Setup
    +Index: libstdc++-v3/doc/html/manual/bk01pt04.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt04.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt04.html (.../branches/gcc-4_7-branch) +@@ -1,8 +1,8 @@ + +- +-Part IV.  Appendices
    Part IV.  ++ ++Part IV.  Appendices
    Part IV.  + Appendices +-
    Prev The GNU C++ Library Manual Next
    Prev The GNU C++ Library Manual Next

    Part IV.  + Appendices +

    Table of Contents

    A. + Contributing +@@ -37,7 +37,7 @@ + +
    D. + GNU General Public License version 3 +-
    E. GNU Free Documentation License
    Prev Up Next
    Use Home Appendix A.  ++
    E. GNU Free Documentation License
    Prev Up Next
    Use Home Appendix A.  + Contributing + +
    +Index: libstdc++-v3/doc/html/manual/ext_numerics.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/ext_numerics.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/ext_numerics.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Chapter 26. Numerics
    Chapter 26. Numerics
    Prev Part III.  ++ ++Chapter 26. Numerics
    Chapter 26. Numerics
    Prev Part III.  + Extensions + +- Next

    26.4, the generalized numeric operations such as accumulate, ++

    		 Next

    Chapter 26. Numerics

    26.4, the generalized numeric operations such as accumulate, + are extended with the following functions: + 

    +    power (x, n);
+@@ -15,10 +15,10 @@
+    The operation functor must be associative.
+ 
    The iota function wins the award for Extension With the
+    Coolest Name (the name comes from Ken Iverson's APL language.)  As
+-   described in the SGI
++   described in the SGI
+    documentation, it "assigns sequentially increasing values to a range.
+    That is, it assigns value to *first,
+    value + 1 to *(first + 1) and so on."
+ 
    +    void iota(_ForwardIter first, _ForwardIter last, _Tp value);
    The iota function is included in the ISO C++ 2011 standard.
+-
    Prev Up Next
    Chapter 25. Algorithms Home Chapter 27. Iterators
    ++

    Prev Up Next
    Chapter 25. Algorithms Home Chapter 27. Iterators
    +Index: libstdc++-v3/doc/html/manual/bk01pt03ch20s02.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch20s02.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch20s02.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Design Issues
    Design Issues
    Prev Chapter 20. The mt_allocator Next

    There are three general components to the allocator: a datum ++ ++Design Issues

    Design Issues
    Prev Chapter 20. The mt_allocator Next

    Design Issues

    Overview

    There are three general components to the allocator: a datum + describing the characteristics of the memory pool, a policy class + containing this pool that links instantiation types to common or + individual pools, and a class inheriting from the policy class that is +@@ -36,4 +36,4 @@ +

    This class has the interface required for standard library allocator + classes, namely member functions allocate and + deallocate, plus others. +-

    Prev Up Next
    Chapter 20. The mt_allocator Home Implementation
    ++

    Prev Up Next
    Chapter 20. The mt_allocator Home Implementation
    +Index: libstdc++-v3/doc/html/manual/bk01pt03ch21s02.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch21s02.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch21s02.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Implementation
    Implementation
    Prev Chapter 21. The bitmap_allocator Next

    ++ ++Implementation

    Implementation
    Prev Chapter 21. The bitmap_allocator Next

    Implementation

    Free List Store

    + The Free List Store (referred to as FLS for the remaining part of this + document) is the Global memory pool that is shared by all instances of + the bitmapped allocator instantiated for any type. This maintains a +@@ -38,7 +38,7 @@ + this internal fragmentation has to be decided by this function. I + can see 3 possibilities right now. Please add more as and when you + find better strategies. +-

    1. Equal size check. Return true only when the 2 blocks are of equal ++

      1. Equal size check. Return true only when the 2 blocks are of equal + size.

      2. Difference Threshold: Return true only when the _block_size is + greater than or equal to the _required_size, and if the _BS is > _RS + by a difference of less than some THRESHOLD value, then return true, +@@ -48,7 +48,7 @@ + else return false.

      + Currently, (3) is being used with a value of 36% Maximum wastage per + Super Block. +-

    ++

    Super Block

    + A super block is the block of memory acquired from the FLS from + which the bitmap allocator carves out memory for single objects + and satisfies the user's requests. These super blocks come in +@@ -63,7 +63,7 @@ + The super block is contained in the FLS, and the FLS is responsible for + getting / returning Super Bocks to and from the OS using operator new + as defined by the C++ standard. +-

    ++

    Super Block Data Layout

    + Each Super Block will be of some size that is a multiple of the + number of Bits Per Block. Typically, this value is chosen as + Bits_Per_Byte x sizeof(size_t). On an x86 system, this gives the +@@ -76,7 +76,7 @@ +

    + Consider a block of size 64 ints. In memory, it would look like this: + (assume a 32-bit system where, size_t is a 32-bit entity). +-

    Table 21.1. Bitmap Allocator Memory Map

    268042949672954294967295Data -> Space for 64 ints

    ++

    Table 21.1. Bitmap Allocator Memory Map

    268042949672954294967295Data -> Space for 64 ints

    + The first Column(268) represents the size of the Block in bytes as + seen by the Bitmap Allocator. Internally, a global free list is + used to keep track of the free blocks used and given back by the +@@ -103,7 +103,7 @@ + The 3rd 4x2 is size of the bitmap itself, which is the size of 32-bits + x 2, + which is 8-bytes, or 2 x sizeof(size_t). +-

    ++

    Maximum Wasted Percentage

    + This has nothing to do with the algorithm per-se, + only with some vales that must be chosen correctly to ensure that the + allocator performs well in a real word scenario, and maintains a good +@@ -128,14 +128,14 @@ +

    + Thus, knowing these values, and based on the sizeof(value_type), we may + create a function that returns the Max_Wastage_Percentage for us to use. +-

    ++

    allocate

    + The allocate function is specialized for single object allocation + ONLY. Thus, ONLY if n == 1, will the bitmap_allocator's + specialized algorithm be used. Otherwise, the request is satisfied + directly by calling operator new. +

    + Suppose n == 1, then the allocator does the following: +-

    1. ++

      1. + Checks to see whether a free block exists somewhere in a region + of memory close to the last satisfied request. If so, then that + block is marked as allocated in the bit map and given to the +@@ -148,7 +148,7 @@ +

      2. + Is there any block in whatever region of memory that we own + free? This is done by checking +-

        • ++

          • + The use count for each super block, and if that fails then +

          • + The individual bit-maps for each super block. +@@ -163,7 +163,7 @@ + This process involves Refilling the internal exponentially + growing memory pool. The said effect is achieved by calling + _S_refill_pool which does the following: +-

            • ++

              • + Gets more memory from the Global Free List of the Required + size. +

              • +@@ -183,13 +183,13 @@ + Thus, you can clearly see that the allocate function is nothing but a + combination of the next-fit and first-fit algorithm optimized ONLY for + single object allocations. +-

              ++

              deallocate

              + The deallocate function again is specialized for single objects ONLY. + For all n belonging to > 1, the operator delete is called without + further ado, and the deallocate function returns. +

              + However for n == 1, a series of steps are performed: +-

              1. ++

                1. + We first need to locate that super-block which holds the memory + location given to us by the user. For that purpose, we maintain + a static variable _S_last_dealloc_index, which holds the index +@@ -214,7 +214,7 @@ + the vector. While doing this, we also make sure that the basic + invariant is maintained by making sure that _S_last_request and + _S_last_dealloc_index point to valid locations within the vector. +-

                ++

                Questions

                1

                + Q1) The "Data Layout" section is + cryptic. I have no idea of what you are trying to say. Layout of what? + The free-list? Each bitmap? The Super Block? +@@ -224,7 +224,7 @@ + general formula for calculating the size of a super block is + 32 x sizeof(value_type) x 2^n, where n ranges from 0 to 32 for 32-bit + systems. +-

                ++

                2

                + And since I just mentioned the + term `each bitmap', what in the world is meant by it? What does each + bitmap manage? How does it relate to the super block? Is the Super +@@ -241,7 +241,7 @@ + blocks' status. Each bit-map is made up of a number of size_t, + whose exact number for a super-block of a given size I have just + mentioned. +-

                ++

                3

                + How do the allocate and deallocate functions work in regard to + bitmaps? +

                +@@ -270,13 +270,13 @@ +

                + The bit-map now looks like this: + 1111111111111111111111111111111111111111111111111111111111111110 +-

                ++

                Locality

                + Another issue would be whether to keep the all bitmaps in a + separate area in memory, or to keep them near the actual blocks + that will be given out or allocated for the client. After some + testing, I've decided to keep these bitmaps close to the actual + blocks. This will help in 2 ways. +-

                1. Constant time access for the bitmap themselves, since no kind of ++

                  1. Constant time access for the bitmap themselves, since no kind of + look up will be needed to find the correct bitmap list or its + equivalent.

                  2. And also this would preserve the cache as far as possible.

                  + So in effect, this kind of an allocator might prove beneficial from a +@@ -287,7 +287,7 @@ + new_allocator's book keeping overhead is too much for small objects and + single object allocations, though it preserves the locality of blocks + very well when they are returned back to the allocator. +-

                ++

                Overhead and Grow Policy

                + Expected overhead per block would be 1 bit in memory. Also, once + the address of the free list has been found, the cost for + allocation/deallocation would be negligible, and is supposed to be +@@ -310,4 +310,4 @@ + sizeof(size_t) x 8 which is the number of bits in an integer, + which can fit exactly in a CPU register. Hence, the term given is + exponential growth of the internal pool. +-

                Prev Up Next
                Chapter 21. The bitmap_allocator Home Chapter 22. Policy-Based Data Structures
                ++

              Prev Up Next
              Chapter 21. The bitmap_allocator Home Chapter 22. Policy-Based Data Structures
              +Index: libstdc++-v3/doc/html/manual/bk01pt03pr01.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03pr01.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03pr01.html (.../branches/gcc-4_7-branch) +@@ -1,16 +1,16 @@ + +- +-<meta name="generator" content="DocBook XSL-NS Stylesheets V1.76.1"/><meta name="keywords" content=" ISO C++ , library "/><meta name="keywords" content=" ISO C++ , runtime , library "/><link rel="home" href="../index.html" title="The GNU C++ Library"/><link rel="up" href="extensions.html" title="Part III.  Extensions"/><link rel="prev" href="extensions.html" title="Part III.  Extensions"/><link rel="next" href="ext_compile_checks.html" title="Chapter 16. Compile Time Checks"/></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center"/></tr><tr><td align="left"><a accesskey="p" href="extensions.html">Prev</a> </td><th width="60%" align="center">Part III.  ++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ++<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>
              Prev Part III.  + Extensions + +- Next

              ++

    		 Next

    + Here we will make an attempt at describing the non-Standard + extensions to the library. Some of these are from older versions of + standard library components, namely SGI's STL, and some of these are + GNU's. +

    Before you leap in and use any of these + extensions, be aware of two things: +-

    1. ++

      1. + Non-Standard means exactly that. +

        + The behavior, and the very +@@ -21,7 +21,7 @@ + treat them differently, or... +

      2. + You should know how to access these headers properly. +-

    Prev Up Next
    Part III.  ++

    Prev Up Next
    Part III.  + Extensions + +- Home Chapter 16. Compile Time Checks
    ++     		Home Chapter 16. Compile Time Checks
    +Index: libstdc++-v3/doc/html/manual/memory.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/memory.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/memory.html (.../branches/gcc-4_7-branch) +@@ -1,15 +1,15 @@ + +- +-Memory
    Memory
    Prev Chapter 6.  ++ ++Memory
    Memory
    Prev Chapter 6.  + Utilities + +- Next

    ++

    		 Next

    Memory

    + Memory contains three general areas. First, function and operator + calls via new and delete + operator or member function calls. Second, allocation via + allocator. And finally, smart pointer and + intelligent pointer abstractions. +-

    ++

    Allocators

    + Memory management for Standard Library entities is encapsulated in a + class template called allocator. The + allocator abstraction is used throughout the +@@ -17,9 +17,9 @@ + algorithms, and parts of iostreams. This class, and base classes of + it, are the superset of available free store (“heap”) + management classes. +-

    ++

    Requirements

    + The C++ standard only gives a few directives in this area: +-

    • ++

      • + When you add elements to a container, and the container must + allocate more memory to hold them, the container makes the + request via its Allocator template +@@ -54,11 +54,11 @@ +

      + Complete details can be found in the C++ standard, look in + [20.4 Memory]. +-

    ++

    Design Issues

    + The easiest way of fulfilling the requirements is to call + operator new each time a container needs + memory, and to call operator delete each time +- the container releases memory. This method may be slower ++ the container releases memory. This method may be slower + than caching the allocations and re-using previously-allocated + memory, but has the advantage of working correctly across a wide + variety of hardware and operating systems, including large +@@ -93,7 +93,7 @@ + or loading and unloading shared objects in memory. As such, using + caching allocators on systems that do not support + abi::__cxa_atexit is not recommended. +-

    ++

    Implementation

    Interface Design

    + The only allocator interface that + is supported is the standard C++ interface. As such, all STL + containers have been adjusted, and all external allocators have +@@ -106,7 +106,7 @@ +

    + The base class that allocator is derived from + may not be user-configurable. +-

    ++

    Selecting Default Allocation Policy

    + It's difficult to pick an allocation strategy that will provide + maximum utility, without excessively penalizing some behavior. In + fact, it's difficult just deciding which typical actions to measure +@@ -114,14 +114,14 @@ +

    + Three synthetic benchmarks have been created that provide data + that is used to compare different C++ allocators. These tests are: +-

    1. ++

      1. + Insertion. +

        + Over multiple iterations, various STL container + objects have elements inserted to some maximum amount. A variety + of allocators are tested. +- Test source for sequence +- and associative ++ Test source for sequence ++ and associative + containers. +

      2. + Insertion and erasure in a multi-threaded environment. +@@ -130,20 +130,20 @@ + on a per-thread basis, as well as measuring thread contention + for memory resources. + Test source +- here. ++ here. +

      3. + A threaded producer/consumer model. +

        + Test source for +- sequence ++ sequence + and +- associative ++ associative + containers. +

      + The current default choice for + allocator is + __gnu_cxx::new_allocator. +-

    ++

    Disabling Memory Caching

    + In use, allocator may allocate and + deallocate using implementation-specified strategies and + heuristics. Because of this, every call to an allocator object's +@@ -179,7 +179,7 @@ + environment, it likely means that you linked against objects + built against the older library (objects which might still using the + cached allocations...). +-

    ++

    Using a Specific Allocator

    + You can specify different memory management schemes on a + per-container basis, by overriding the default + Allocator template parameter. For example, an easy +@@ -190,7 +190,7 @@ + Likewise, a debugging form of whichever allocator is currently in use: + 

    +     std::deque <int, __gnu_cxx::debug_allocator<std::allocator<int> > >  debug_deque;
+-

    ++

    Custom Allocators

    + Writing a portable C++ allocator would dictate that the interface + would look much like the one specified for + allocator. Additional member functions, but +@@ -199,7 +199,7 @@ + Probably the best place to start would be to copy one of the + extension allocators: say a simple one like + new_allocator. +-

    ++

    Extension Allocators

    + Several other allocators are provided as part of this + implementation. The location of the extension allocators and their + names have changed, but in all cases, functionality is +@@ -209,7 +209,7 @@ + chart to track the changes. +

    + More details on each of these extension allocators follows. +-

    1. ++

      1. + new_allocator +

        + Simply wraps ::operator new +@@ -308,33 +308,33 @@ + A high-performance allocator that uses a bit-map to keep track + of the used and unused memory locations. It has its own + documentation, found here. +-

    ++

    Bibliography

    + ISO/IEC 14882:1998 Programming languages - C++ + . + isoc++_1998 +- 20.4 Memory.

    +- ++ 20.4 Memory.

    ++ + The Standard Librarian: What Are Allocators Good For? + + . Matt Austern. + C/C++ Users Journal +- .

    +- ++ .

    ++ + The Hoard Memory Allocator + +- . Emery Berger.

    +- ++ . Emery Berger.

    ++ + Reconsidering Custom Memory Allocation + +- . Emery Berger. Ben Zorn. Kathryn McKinley. Copyright © 2002 OOPSLA.

    +- ++ . Emery Berger. Ben Zorn. Kathryn McKinley. Copyright © 2002 OOPSLA.

    ++ + Allocator Types + + . Klaus Kreft. Angelika Langer. + C/C++ Users Journal +- .

    The C++ Programming Language. Bjarne Stroustrup. Copyright © 2000 . 19.4 Allocators. ++ .

    The C++ Programming Language. Bjarne Stroustrup. Copyright © 2000 . 19.4 Allocators. + Addison Wesley +- .

    Yalloc: A Recycling C++ Allocator. Felix Yen.

    Explaining all of the fun and delicious things that can ++ .

    Yalloc: A Recycling C++ Allocator. Felix Yen.

    auto_ptr

    Limitations

    Explaining all of the fun and delicious things that can + happen with misuse of the auto_ptr class + template (called AP here) would take some + time. Suffice it to say that the use of AP +@@ -385,7 +385,7 @@ + to die. AP is trivial to write, however, so you could write your + own auto_array_ptr for that situation (in fact, this has + been done many times; check the mailing lists, Usenet, Boost, etc). +-

    ++

    Use in Containers

    +

    All of the containers + described in the standard library require their contained types + to have, among other things, a copy constructor like this: +@@ -421,16 +421,16 @@ + } +

    + Should you try this with the checks enabled, you will see an error. +-

    ++

    shared_ptr

    + The shared_ptr class template stores a pointer, usually obtained via new, + and implements shared ownership semantics. +-

    ++

    Requirements

    +

    + The standard deliberately doesn't require a reference-counted + implementation, allowing other techniques such as a + circular-linked-list. +

    +-

    ++

    Design Issues

    + The shared_ptr code is kindly donated to GCC by the Boost + project and the original authors of the code. The basic design and + algorithms are from Boost, the notes below describe details specific to +@@ -444,7 +444,7 @@ + Derived classes override those functions to destroy resources in a context + where the correct dynamic type is known. This is an application of the + technique known as type erasure. +-

    ++

    Implementation

    Class Hierarchy

    + A shared_ptr<T> contains a pointer of + type T* and an object of type + __shared_count. The shared_count contains a +@@ -491,9 +491,9 @@ + aliasing constructor, make_shared & allocate_shared. Additionally, + the constructors taking auto_ptr parameters are + deprecated in C++11 mode. +-

    ++

    Thread Safety

    + The +-Thread ++Thread + Safety section of the Boost shared_ptr documentation says "shared_ptr + objects offer the same level of thread safety as built-in types." + The implementation must ensure that concurrent updates to separate shared_ptr +@@ -536,7 +536,7 @@ + shared_ptr in libstdc++ the compiler and library are fixed, which + makes things much simpler: we have an atomic CAS or we don't, see Lock + Policy below for details. +-

    ++

    Selecting Lock Policy

    +

    + There is a single _Sp_counted_base class, + which is a template parameterized on the enum +@@ -552,11 +552,11 @@ + not be conforming for shared_ptr to have an + extra template parameter, even if it had a default value. The + available policies are: +-

    1. ++

      1. + _S_Atomic +

        + Selected when GCC supports a builtin atomic compare-and-swap operation +-on the target processor (see Atomic ++on the target processor (see Atomic + Builtins.) The reference counts are maintained using a lock-free + algorithm and GCC's atomic builtins, which provide the required memory + synchronisation. +@@ -577,7 +577,7 @@ + ext/atomicity.h, which detect if the program + is multi-threaded. If only one thread of execution exists in + the program then less expensive non-atomic operations are used. +-

      dynamic_pointer_cast, static_pointer_cast, ++

      Related functions and classes
      dynamic_pointer_cast, static_pointer_cast, + const_pointer_cast

      + As noted in N2351, these functions can be implemented non-intrusively using + the alias constructor. However the aliasing constructor is only available +@@ -610,13 +610,13 @@ + As well as the extra constructors, this implementation also needs some + members of _Sp_counted_deleter to be protected where they could otherwise + be private. +-

      ++

    Use

    Examples

    + Examples of use can be found in the testsuite, under + testsuite/tr1/2_general_utilities/shared_ptr, + testsuite/20_util/shared_ptr + and + testsuite/20_util/weak_ptr. +-

    ++

    Unresolved Issues

    + The shared_ptr atomic access + clause in the C++11 standard is not implemented in GCC. +

    +@@ -652,33 +652,33 @@ +

    + tr1::_Sp_deleter could be a private member of tr1::__shared_count but it + would alter the ABI. +-

    ++

    Acknowledgments

    + The original authors of the Boost shared_ptr, which is really nice + code to work with, Peter Dimov in particular for his help and + invaluable advice on thread safety. Phillip Jordan and Paolo + Carlini for the lock policy implementation. +-

    +- ++

    Bibliography

    ++ + Improving shared_ptr for C++0x, Revision 2 + + . + N2351 +- .

    +- ++ .

    ++ + C++ Standard Library Active Issues List + + . + N2456 +- .

    +- ++ .

    ++ + Working Draft, Standard for Programming Language C++ + + . + N2461 +- .

    +- ++ .

    ++ + Boost C++ Libraries documentation, shared_ptr + + . + N2461 +- .

    Prev Up Next
    Pairs Home Traits
    ++ .

    Prev Up Next
    Pairs Home Traits
    +Index: libstdc++-v3/doc/html/manual/api.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/api.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/api.html (.../branches/gcc-4_7-branch) +@@ -1,11 +1,11 @@ + +- +-API Evolution and Deprecation History
    API Evolution and Deprecation History
    Prev Appendix B.  ++ ++API Evolution and Deprecation History
    API Evolution and Deprecation History
    Prev Appendix B.  + Porting and Maintenance + +- Next

    ++

    		 Next

    API Evolution and Deprecation History

    + A list of user-visible changes, in chronological order +-

    ++

    3.0

    + Extensions moved to include/ext. +

    + Include files from the SGI/HP sources that pre-date the ISO standard +@@ -14,7 +14,7 @@ + is added that notifies on inclusion (-Wno-deprecated + deactivates the warning.) +

    Deprecated include backward/strstream added.

    Removal of include builtinbuf.h, indstream.h, parsestream.h, PlotFile.h, SFile.h, stdiostream.h, and stream.h. +-

    ++

    3.1

    +

    + Extensions from SGI/HP moved from namespace std + to namespace __gnu_cxx. As part of this, the following +@@ -26,15 +26,15 @@ + Extensions to tree data structures added in ext/rb_tree. +

    + Removal of ext/tree, moved to backward/tree.h. +-

    ++

    3.2

    +

    Symbol versioning introduced for shared library.

    Removal of include backward/strstream.h.

    Allocator changes. Change __malloc_alloc to malloc_allocator and __new_alloc to new_allocator.

    For GCC releases from 2.95 through the 3.1 series, defining + __USE_MALLOC on the gcc command line would change the + default allocation strategy to instead use malloc and + free. (This same functionality is now spelled _GLIBCXX_FORCE_NEW, see + this page + for details. +-

    Error handling in iostreams cleaned up, made consistent.

    +-

    ++

    Error handling in iostreams cleaned up, made consistent.

    3.3

    ++

    3.4

    +

    + Large file support. +

    Extensions for generic characters and char_traits added in ext/pod_char_traits.h. +@@ -75,11 +75,11 @@ + __alloc to select an underlying allocator that + satisfied memory allocation requests. The selection of this + underlying allocator was not user-configurable. +-

    Table B.6. Extension Allocators

    Allocator (3.4)Header (3.4)Allocator (3.[0-3])Header (3.[0-3])
    __gnu_cxx::new_allocator<T>ext/new_allocator.hstd::__new_allocmemory
    __gnu_cxx::malloc_allocator<T>ext/malloc_allocator.hstd::__malloc_alloc_template<int>memory
    __gnu_cxx::debug_allocator<T>ext/debug_allocator.hstd::debug_alloc<T>memory
    __gnu_cxx::__pool_alloc<T>ext/pool_allocator.hstd::__default_alloc_template<bool,int>memory
    __gnu_cxx::__mt_alloc<T>ext/mt_allocator.h
    __gnu_cxx::bitmap_allocator<T>ext/bitmap_allocator.h

    Releases after gcc-3.4 have continued to add to the collection ++

    Table B.6. Extension Allocators

    Allocator (3.4)Header (3.4)Allocator (3.[0-3])Header (3.[0-3])
    __gnu_cxx::new_allocator<T>ext/new_allocator.hstd::__new_allocmemory
    __gnu_cxx::malloc_allocator<T>ext/malloc_allocator.hstd::__malloc_alloc_template<int>memory
    __gnu_cxx::debug_allocator<T>ext/debug_allocator.hstd::debug_alloc<T>memory
    __gnu_cxx::__pool_alloc<T>ext/pool_allocator.hstd::__default_alloc_template<bool,int>memory
    __gnu_cxx::__mt_alloc<T>ext/mt_allocator.h
    __gnu_cxx::bitmap_allocator<T>ext/bitmap_allocator.h

    Releases after gcc-3.4 have continued to add to the collection + of available allocators. All of these new allocators are + standard-style. The following table includes details, along with + the first released version of GCC that included the extension allocator. +-

    Table B.7. Extension Allocators Continued

    AllocatorIncludeVersion
    __gnu_cxx::array_allocator<T>ext/array_allocator.h4.0.0
    __gnu_cxx::throw_allocator<T>ext/throw_allocator.h4.2.0

    ++

    Table B.7. Extension Allocators Continued

    AllocatorIncludeVersion
    __gnu_cxx::array_allocator<T>ext/array_allocator.h4.0.0
    __gnu_cxx::throw_allocator<T>ext/throw_allocator.h4.2.0

    + Debug mode first appears. +

    + Precompiled header support PCH support. +@@ -89,7 +89,7 @@ + Extension ext/stdio_sync_filebuf.h added. +

    + Extension ext/demangle.h added. +-

    ++

    4.0

    +

    + TR1 features first appear. +

    +@@ -98,14 +98,14 @@ + Extension codecvt specializations moved to ext/codecvt_specializations.h. +

    + Removal of ext/demangle.h. +-

    ++

    4.1

    +

    + Removal of cassert from all standard headers: now has to be explicitly included for std::assert calls. +

    Extensions for policy-based data structures first added. New includes, + types, namespace pb_assoc. +

    Extensions for typelists added in ext/typelist.h. +

    Extension for policy-based basic_string first added: __gnu_cxx::__versa_string in ext/vstring.h. +-

    ++

    4.2

    +

    Default visibility attributes applied to namespace std. Support for -fvisibility. +

    TR1 random, complex, and C compatibility headers added.

    Extensions for concurrent programming consolidated + into ext/concurrence.h and ext/atomicity.h, +@@ -120,13 +120,13 @@ + std::__debug and extensions in namespace + __gnu_cxx::__debug.

    Extensions added: ext/typelist.h + and ext/throw_allocator.h. +-

    ++

    4.3

    +

    + C++0X features first appear. +

    TR1 regex and cmath's mathematical special function added. +

    + Backward include edit. +-

    • Removed

      ++

      • Removed

        + algobase.h algo.h alloc.h bvector.h complex.h + defalloc.h deque.h fstream.h function.h hash_map.h hash_set.h + hashtable.h heap.h iomanip.h iostream.h istream.h iterator.h +@@ -138,7 +138,7 @@ + auto_ptr.h and binders.h +

      + Header dependency streamlining. +-

      • algorithm no longer includes climits, cstring, or iosfwd

      • bitset no longer includes istream or ostream, adds iosfwd

      • functional no longer includes cstddef

      • iomanip no longer includes istream, istream, or functional, adds ioswd

      • numeric no longer includes iterator

      • string no longer includes algorithm or memory

      • valarray no longer includes numeric or cstdlib

      • tr1/hashtable no longer includes memory or functional

      • tr1/memory no longer includes algorithm

      • tr1/random no longer includes algorithm or fstream

      ++

      • algorithm no longer includes climits, cstring, or iosfwd

      • bitset no longer includes istream or ostream, adds iosfwd

      • functional no longer includes cstddef

      • iomanip no longer includes istream, istream, or functional, adds ioswd

      • numeric no longer includes iterator

      • string no longer includes algorithm or memory

      • valarray no longer includes numeric or cstdlib

      • tr1/hashtable no longer includes memory or functional

      • tr1/memory no longer includes algorithm

      • tr1/random no longer includes algorithm or fstream

      + Debug mode for unordered_map and unordered_set. +

      + Parallel mode first appears. +@@ -152,10 +152,10 @@ + PCH binary files no longer installed. Instead, the source files are installed. +

      + Namespace pb_ds moved to __gnu_pb_ds. +-

    ++

    4.4

    +

    + C++0X features. +-

    • ++

      • + Added. +

        + atomic, +@@ -207,10 +207,10 @@ + for non-standard pointer types has been added + to vector + and forward_list. +-

      ++

      4.5

      +

      + C++0X features. +-

      • ++

        • + Added. +

          + functional, +@@ -237,4 +237,4 @@ + in typeinfo, __GXX_MERGED_TYPEINFO_NAMES + now defaults to zero. +

          Extensions modified: ext/throw_allocator.h. +-

      Prev Up Next
      ABI Policy and Guidelines Home Backwards Compatibility
      ++

    Prev Up Next
    ABI Policy and Guidelines Home Backwards Compatibility
    +Index: libstdc++-v3/doc/html/manual/bk01pt03ch23s02.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch23s02.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch23s02.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Deprecated
    Deprecated
    Prev Chapter 23. HP/SGI Extensions Next

    ++ ++Deprecated

    Deprecated
    Prev Chapter 23. HP/SGI Extensions Next

    Deprecated

    + The SGI hashing classes hash_set and + hash_set have been deprecated by the + unordered_set, unordered_multiset, unordered_map, +@@ -29,12 +29,12 @@ + and sets. +

    Each of the associative containers map, multimap, set, and multiset + have a counterpart which uses a +- hashing ++ hashing + function to do the arranging, instead of a strict weak ordering + function. The classes take as one of their template parameters a + function object that will return the hash value; by default, an + instantiation of +- hash. ++ hash. + You should specialize this functor for your class, or define your own, + before trying to use one of the hashing classes. +

    The hashing classes support all the usual associative container +@@ -56,4 +56,4 @@ + associative containers defined in the ISO C++ 2011 standard in the + headers <unordered_map> + and <unordered_set>. +-

    Prev Up Next
    Chapter 23. HP/SGI Extensions Home Chapter 24. Utilities
    ++

    Prev Up Next
    Chapter 23. HP/SGI Extensions Home Chapter 24. Utilities
    +Index: libstdc++-v3/doc/html/manual/policy_data_structures_biblio.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/policy_data_structures_biblio.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/policy_data_structures_biblio.html (.../branches/gcc-4_7-branch) +@@ -1,17 +1,17 @@ + +- +-Acknowledgments
    Acknowledgments
    Prev Chapter 22. Policy-Based Data Structures Next

    ++ ++Acknowledgments

    Acknowledgments
    Prev Chapter 22. Policy-Based Data Structures Next

    Acknowledgments

    + Written by Ami Tavory and Vladimir Dreizin (IBM Haifa Research + Laboratories), and Benjamin Kosnik (Red Hat). +

    + This library was partially written at +- IBM's Haifa Research Labs. ++ IBM's Haifa Research Labs. + It is based heavily on policy-based design and uses many useful + techniques from Modern C++ Design: Generic Programming and Design + Patterns Applied by Andrei Alexandrescu. +

    + Two ideas are borrowed from the SGI-STL implementation: +-

    1. ++

      1. + The prime-based resize policies use a list of primes taken from + the SGI-STL implementation. +

      2. +@@ -20,10 +20,10 @@ + reverse iteration can be performed efficiently. +

      + Some test utilities borrow ideas from +- boost::timer. ++ boost::timer. +

      + We would like to thank Scott Meyers for useful comments (without + attributing to him any flaws in the design or implementation of the + library). +

      We would like to thank Matt Austern for the suggestion to +- include tries.

    Prev Up Next
    Testing Home Chapter 23. HP/SGI Extensions
    ++ include tries.

    Prev Up Next
    Testing Home Chapter 23. HP/SGI Extensions
    +Index: libstdc++-v3/doc/html/manual/bk01pt03ch17s03.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch17s03.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch17s03.html (.../branches/gcc-4_7-branch) +@@ -1,7 +1,7 @@ + +- +-Using
    Using
    Prev Chapter 17. Debug Mode Next

    +-

    To use the libstdc++ debug mode, compile your application with the ++ ++Using

    Using
    Prev Chapter 17. Debug Mode Next

    Using

    ++

    Using the Debug Mode

    To use the libstdc++ debug mode, compile your application with the + compiler flag -D_GLIBCXX_DEBUG. Note that this flag + changes the sizes and behavior of standard class templates such + as std::vector, and therefore you can only link code +@@ -10,7 +10,7 @@ + units.

    By default, error messages are formatted to fit on lines of about + 78 characters. The environment variable + GLIBCXX_DEBUG_MESSAGE_LENGTH can be used to request a +- different length.

    When it is not feasible to recompile your entire application, or ++ different length.

    Using a Specific Debug Container

    When it is not feasible to recompile your entire application, or + only specific containers need checking, debugging containers are + available as GNU extensions. These debugging containers are + functionally equivalent to the standard drop-in containers used in +@@ -19,6 +19,6 @@ + mode or with debug mode. The + following table provides the names and headers of the debugging + containers: +-

    Table 17.1. Debugging Containers

    ContainerHeaderDebug containerDebug header
    std::bitsetbitset__gnu_debug::bitset<debug/bitset>
    std::dequedeque__gnu_debug::deque<debug/deque>
    std::listlist__gnu_debug::list<debug/list>
    std::mapmap__gnu_debug::map<debug/map>
    std::multimapmap__gnu_debug::multimap<debug/map>
    std::multisetset__gnu_debug::multiset<debug/set>
    std::setset__gnu_debug::set<debug/set>
    std::stringstring__gnu_debug::string<debug/string>
    std::wstringstring__gnu_debug::wstring<debug/string>
    std::basic_stringstring__gnu_debug::basic_string<debug/string>
    std::vectorvector__gnu_debug::vector<debug/vector>

    In addition, when compiling in C++11 mode, these additional ++

    Table 17.1. Debugging Containers

    ContainerHeaderDebug containerDebug header
    std::bitsetbitset__gnu_debug::bitset<debug/bitset>
    std::dequedeque__gnu_debug::deque<debug/deque>
    std::listlist__gnu_debug::list<debug/list>
    std::mapmap__gnu_debug::map<debug/map>
    std::multimapmap__gnu_debug::multimap<debug/map>
    std::multisetset__gnu_debug::multiset<debug/set>
    std::setset__gnu_debug::set<debug/set>
    std::stringstring__gnu_debug::string<debug/string>
    std::wstringstring__gnu_debug::wstring<debug/string>
    std::basic_stringstring__gnu_debug::basic_string<debug/string>
    std::vectorvector__gnu_debug::vector<debug/vector>

    In addition, when compiling in C++11 mode, these additional + containers have additional debug capability. +-

    Table 17.2. Debugging Containers C++11

    ContainerHeaderDebug containerDebug header
    std::unordered_mapunordered_map__gnu_debug::unordered_map<debug/unordered_map>
    std::unordered_multimapunordered_map__gnu_debug::unordered_multimap<debug/unordered_map>
    std::unordered_setunordered_set__gnu_debug::unordered_set<debug/unordered_set>
    std::unordered_multisetunordered_set__gnu_debug::unordered_multiset<debug/unordered_set>

    Prev Up Next
    Semantics Home Design
    ++

    Table 17.2. Debugging Containers C++11

    ContainerHeaderDebug containerDebug header
    std::unordered_mapunordered_map__gnu_debug::unordered_map<debug/unordered_map>
    std::unordered_multimapunordered_map__gnu_debug::unordered_multimap<debug/unordered_map>
    std::unordered_setunordered_set__gnu_debug::unordered_set<debug/unordered_set>
    std::unordered_multisetunordered_set__gnu_debug::unordered_multiset<debug/unordered_set>

    Prev Up Next
    Semantics Home Design
    +Index: libstdc++-v3/doc/html/manual/bk01pt03ch18s03.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch18s03.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch18s03.html (.../branches/gcc-4_7-branch) +@@ -1,12 +1,12 @@ + +- +-Using
    Using
    Prev Chapter 18. Parallel Mode Next

    ++ ++Using

    Using
    Prev Chapter 18. Parallel Mode Next

    Using

    Prerequisite Compiler Flags

    + Any use of parallel functionality requires additional compiler + and runtime support, in particular support for OpenMP. Adding this support is + not difficult: just compile your application with the compiler + flag -fopenmp. This will link + in libgomp, the +- OpenMP GNU implementation, ++ OpenMP GNU implementation, + whose presence is mandatory. +

    + In addition, hardware that supports atomic operations and a compiler +@@ -17,7 +17,7 @@ + as -march=i686, + -march=native or -mcpu=v9. See + the GCC manual for more information. +-

    ++

    Using Parallel Mode

    + To use the libstdc++ parallel mode, compile your application with + the prerequisite flags as detailed above, and in addition + add -D_GLIBCXX_PARALLEL. This will convert all +@@ -34,7 +34,7 @@ + if no instantiation of a container is passed between the two + translation units. Parallel mode functionality has distinct linkage, + and cannot be confused with normal mode symbols. +-

    When it is not feasible to recompile your entire application, or ++

    Using Specific Parallel Components

    When it is not feasible to recompile your entire application, or + only specific algorithms need to be parallel-aware, individual + parallel algorithms can be made available explicitly. These + parallel algorithms are functionally equivalent to the standard +@@ -63,4 +63,4 @@ + flags for atomic operations.) +

    The following table provides the names and headers of all the + parallel algorithms that can be used in a similar manner: +-

    Table 18.1. Parallel Algorithms

    AlgorithmHeaderParallel algorithmParallel header
    std::accumulatenumeric__gnu_parallel::accumulateparallel/numeric
    std::adjacent_differencenumeric__gnu_parallel::adjacent_differenceparallel/numeric
    std::inner_productnumeric__gnu_parallel::inner_productparallel/numeric
    std::partial_sumnumeric__gnu_parallel::partial_sumparallel/numeric
    std::adjacent_findalgorithm__gnu_parallel::adjacent_findparallel/algorithm
    std::countalgorithm__gnu_parallel::countparallel/algorithm
    std::count_ifalgorithm__gnu_parallel::count_ifparallel/algorithm
    std::equalalgorithm__gnu_parallel::equalparallel/algorithm
    std::findalgorithm__gnu_parallel::findparallel/algorithm
    std::find_ifalgorithm__gnu_parallel::find_ifparallel/algorithm
    std::find_first_ofalgorithm__gnu_parallel::find_first_ofparallel/algorithm
    std::for_eachalgorithm__gnu_parallel::for_eachparallel/algorithm
    std::generatealgorithm__gnu_parallel::generateparallel/algorithm
    std::generate_nalgorithm__gnu_parallel::generate_nparallel/algorithm
    std::lexicographical_comparealgorithm__gnu_parallel::lexicographical_compareparallel/algorithm
    std::mismatchalgorithm__gnu_parallel::mismatchparallel/algorithm
    std::searchalgorithm__gnu_parallel::searchparallel/algorithm
    std::search_nalgorithm__gnu_parallel::search_nparallel/algorithm
    std::transformalgorithm__gnu_parallel::transformparallel/algorithm
    std::replacealgorithm__gnu_parallel::replaceparallel/algorithm
    std::replace_ifalgorithm__gnu_parallel::replace_ifparallel/algorithm
    std::max_elementalgorithm__gnu_parallel::max_elementparallel/algorithm
    std::mergealgorithm__gnu_parallel::mergeparallel/algorithm
    std::min_elementalgorithm__gnu_parallel::min_elementparallel/algorithm
    std::nth_elementalgorithm__gnu_parallel::nth_elementparallel/algorithm
    std::partial_sortalgorithm__gnu_parallel::partial_sortparallel/algorithm
    std::partitionalgorithm__gnu_parallel::partitionparallel/algorithm
    std::random_shufflealgorithm__gnu_parallel::random_shuffleparallel/algorithm
    std::set_unionalgorithm__gnu_parallel::set_unionparallel/algorithm
    std::set_intersectionalgorithm__gnu_parallel::set_intersectionparallel/algorithm
    std::set_symmetric_differencealgorithm__gnu_parallel::set_symmetric_differenceparallel/algorithm
    std::set_differencealgorithm__gnu_parallel::set_differenceparallel/algorithm
    std::sortalgorithm__gnu_parallel::sortparallel/algorithm
    std::stable_sortalgorithm__gnu_parallel::stable_sortparallel/algorithm
    std::unique_copyalgorithm__gnu_parallel::unique_copyparallel/algorithm

    Prev Up Next
    Semantics Home Design
    ++

    Table 18.1. Parallel Algorithms

    AlgorithmHeaderParallel algorithmParallel header
    std::accumulatenumeric__gnu_parallel::accumulateparallel/numeric
    std::adjacent_differencenumeric__gnu_parallel::adjacent_differenceparallel/numeric
    std::inner_productnumeric__gnu_parallel::inner_productparallel/numeric
    std::partial_sumnumeric__gnu_parallel::partial_sumparallel/numeric
    std::adjacent_findalgorithm__gnu_parallel::adjacent_findparallel/algorithm
    std::countalgorithm__gnu_parallel::countparallel/algorithm
    std::count_ifalgorithm__gnu_parallel::count_ifparallel/algorithm
    std::equalalgorithm__gnu_parallel::equalparallel/algorithm
    std::findalgorithm__gnu_parallel::findparallel/algorithm
    std::find_ifalgorithm__gnu_parallel::find_ifparallel/algorithm
    std::find_first_ofalgorithm__gnu_parallel::find_first_ofparallel/algorithm
    std::for_eachalgorithm__gnu_parallel::for_eachparallel/algorithm
    std::generatealgorithm__gnu_parallel::generateparallel/algorithm
    std::generate_nalgorithm__gnu_parallel::generate_nparallel/algorithm
    std::lexicographical_comparealgorithm__gnu_parallel::lexicographical_compareparallel/algorithm
    std::mismatchalgorithm__gnu_parallel::mismatchparallel/algorithm
    std::searchalgorithm__gnu_parallel::searchparallel/algorithm
    std::search_nalgorithm__gnu_parallel::search_nparallel/algorithm
    std::transformalgorithm__gnu_parallel::transformparallel/algorithm
    std::replacealgorithm__gnu_parallel::replaceparallel/algorithm
    std::replace_ifalgorithm__gnu_parallel::replace_ifparallel/algorithm
    std::max_elementalgorithm__gnu_parallel::max_elementparallel/algorithm
    std::mergealgorithm__gnu_parallel::mergeparallel/algorithm
    std::min_elementalgorithm__gnu_parallel::min_elementparallel/algorithm
    std::nth_elementalgorithm__gnu_parallel::nth_elementparallel/algorithm
    std::partial_sortalgorithm__gnu_parallel::partial_sortparallel/algorithm
    std::partitionalgorithm__gnu_parallel::partitionparallel/algorithm
    std::random_shufflealgorithm__gnu_parallel::random_shuffleparallel/algorithm
    std::set_unionalgorithm__gnu_parallel::set_unionparallel/algorithm
    std::set_intersectionalgorithm__gnu_parallel::set_intersectionparallel/algorithm
    std::set_symmetric_differencealgorithm__gnu_parallel::set_symmetric_differenceparallel/algorithm
    std::set_differencealgorithm__gnu_parallel::set_differenceparallel/algorithm
    std::sortalgorithm__gnu_parallel::sortparallel/algorithm
    std::stable_sortalgorithm__gnu_parallel::stable_sortparallel/algorithm
    std::unique_copyalgorithm__gnu_parallel::unique_copyparallel/algorithm

    Prev Up Next
    Semantics Home Design
    +Index: libstdc++-v3/doc/html/manual/bk01pt03ch19s03.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch19s03.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch19s03.html (.../branches/gcc-4_7-branch) +@@ -1,10 +1,10 @@ + +- +-Extensions for Custom Containers
    Extensions for Custom Containers
    Prev Chapter 19. Profile Mode Next

    ++ ++Extensions for Custom Containers

    Extensions for Custom Containers
    Prev Chapter 19. Profile Mode Next

    Extensions for Custom Containers

    + Many large projects use their own data structures instead of the ones in the + standard library. If these data structures are similar in functionality + to the standard library, they can be instrumented with the same hooks + that are used to instrument the standard library. + The instrumentation API is exposed in file + profiler.h (look for "Instrumentation hooks"). +-

    Prev Up Next
    Design Home Empirical Cost Model
    ++

    Prev Up Next
    Design Home Empirical Cost Model
    +Index: libstdc++-v3/doc/html/manual/bk01pt03ch19s07.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch19s07.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch19s07.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Diagnostics
    Diagnostics
    Prev Chapter 19. Profile Mode Next

    ++ ++Diagnostics

    Diagnostics
    Prev Chapter 19. Profile Mode Next

    Diagnostics

    + The table below presents all the diagnostics we intend to implement. + Each diagnostic has a corresponding compile time switch + -D_GLIBCXX_PROFILE_<diagnostic>. +@@ -18,24 +18,24 @@ + A high accuracy means that the diagnostic is unlikely to be wrong. + These grades are not perfect. They are just meant to guide users with + specific needs or time budgets. +-

    Table 19.2. Profile Diagnostics

    GroupFlagBenefitCostFreq.Implemented 
    +- CONTAINERS +- HASHTABLE_TOO_SMALL101 10yes
      +- HASHTABLE_TOO_LARGE51 10yes
      +- INEFFICIENT_HASH73 10yes
      +- VECTOR_TOO_SMALL81 10yes
      +- VECTOR_TOO_LARGE51 10yes
      +- VECTOR_TO_HASHTABLE77 10no
      +- HASHTABLE_TO_VECTOR77 10no
      +- VECTOR_TO_LIST85 10yes
      +- LIST_TO_VECTOR105 10no
      +- ORDERED_TO_UNORDERED105 10only map/unordered_map
    +- ALGORITHMS +- SORT78 7no
    +- LOCALITY +- SOFTWARE_PREFETCH88 5no
      +- RBTREE_LOCALITY48 5no
      +- FALSE_SHARING810 10no

    Containers

    + Switch: + _GLIBCXX_PROFILE_CONTAINERS. +-

    • Switch: ++

      Hashtable Too Small

      • Switch: + _GLIBCXX_PROFILE_HASHTABLE_TOO_SMALL. +

      • Goal: Detect hashtables with many + rehash operations, small construction size and large destruction size. +@@ -81,7 +81,7 @@ + + foo.cc:1: advice: Changing initial unordered_set size from 10 to 1000000 saves 1025530 rehash operations. +

        +-

      Hashtable Too Large

      • Switch: + _GLIBCXX_PROFILE_HASHTABLE_TOO_LARGE. +

      • Goal: Detect hashtables which are + never filled up because fewer elements than reserved are ever +@@ -110,7 +110,7 @@ + foo.cc:1: advice: Changing initial unordered_set size from 100 to 10 saves N + bytes of memory and M iteration steps. +

        +-

      Inefficient Hash

      • Switch: + _GLIBCXX_PROFILE_INEFFICIENT_HASH. +

      • Goal: Detect hashtables with polarized + distribution. +@@ -141,7 +141,7 @@ + hs.find(i); + } +

        +-

      Vector Too Small

      • Switch: + _GLIBCXX_PROFILE_VECTOR_TOO_SMALL. +

      • Goal:Detect vectors with many + resize operations, small construction size and large destruction size.. +@@ -166,7 +166,7 @@ + foo.cc:1: advice: Changing initial vector size from 10 to 1000000 saves + copying 4000000 bytes and 20 memory allocations and deallocations. +

        +-

      Vector Too Large

      • Switch: + _GLIBCXX_PROFILE_VECTOR_TOO_LARGE +

      • Goal:Detect vectors which are + never filled up because fewer elements than reserved are ever +@@ -192,7 +192,7 @@ + foo.cc:1: advice: Changing initial vector size from 100 to 10 saves N + bytes of memory and may reduce the number of cache and TLB misses. +

        +-

      Vector to Hashtable

      • Switch: + _GLIBCXX_PROFILE_VECTOR_TO_HASHTABLE. +

      • Goal: Detect uses of + vector that can be substituted with unordered_set +@@ -223,7 +223,7 @@ + foo.cc:1: advice: Changing "vector" to "unordered_set" will save about 500,000 + comparisons. +

        +-

      Hashtable to Vector

      • Switch: + _GLIBCXX_PROFILE_HASHTABLE_TO_VECTOR. +

      • Goal: Detect uses of + unordered_set that can be substituted with vector +@@ -252,7 +252,7 @@ + foo.cc:1: advice: Changing "unordered_set" to "vector" will save about N + indirections and may achieve better data locality. +

        +-

      Vector to List

      • Switch: + _GLIBCXX_PROFILE_VECTOR_TO_LIST. +

      • Goal: Detect cases where + vector could be substituted with list for +@@ -282,7 +282,7 @@ + foo.cc:1: advice: Changing "vector" to "list" will save about 5,000,000 + operations. +

        +-

      List to Vector

      • Switch: + _GLIBCXX_PROFILE_LIST_TO_VECTOR. +

      • Goal: Detect cases where + list could be substituted with vector for +@@ -309,7 +309,7 @@ + foo.cc:1: advice: Changing "list" to "vector" will save about 1000000 indirect + memory references. +

        +-

      List to Forward List (Slist)

      • Switch: + _GLIBCXX_PROFILE_LIST_TO_SLIST. +

      • Goal: Detect cases where + list could be substituted with forward_list for +@@ -339,7 +339,7 @@ + + foo.cc:1: advice: Change "list" to "forward_list". +

        +-

      Ordered to Unordered Associative Container

      • Switch: + _GLIBCXX_PROFILE_ORDERED_TO_UNORDERED. +

      • Goal: Detect cases where ordered + associative containers can be replaced with unordered ones. +@@ -366,18 +366,18 @@ + 7 sum += *s.find(i); + 8 } +

        +-

    Switch: ++

    Algorithms

    Switch: + _GLIBCXX_PROFILE_ALGORITHMS. +-

    Switch: ++

    Data Locality

    Switch: + _GLIBCXX_PROFILE_LOCALITY. +-

    • Switch: ++

      Need Software Prefetch

      • Switch: + _GLIBCXX_PROFILE_SOFTWARE_PREFETCH. +

      • Goal: Discover sequences of indirect + memory accesses that are not regular, thus cannot be predicted by +@@ -434,7 +434,7 @@ + + foo.cc:7: advice: Insert prefetch instruction. +

        +-

      Linked Structure Locality

      • Switch: + _GLIBCXX_PROFILE_RBTREE_LOCALITY. +

      • Goal: Give measure of locality of + objects stored in linked structures (lists, red-black trees and hashtables) +@@ -442,7 +442,7 @@ +

      • Fundamentals:Allocation can be tuned + to a specific traversal pattern, to result in better data locality. + See paper: +- ++ + Custom Memory Allocation for Free. +

      • Sample runtime reduction:30%. +

      • Recommendation: +@@ -479,13 +479,13 @@ + foo.cc:5: advice: High scatter score NNN for set built here. Consider changing + the allocation sequence or switching to a structure conscious allocator. +

        +-

    ++

    Multithreaded Data Access

    + The diagnostics in this group are not meant to be implemented short term. + They require compiler support to know when container elements are written + to. Instrumentation can only tell us when elements are referenced. +

    Switch: + _GLIBCXX_PROFILE_MULTITHREADED. +-

    • Switch: ++

      Data Dependence Violations at Container Level

      False Sharing

      • Switch: + _GLIBCXX_PROFILE_FALSE_SHARING. +

      • Goal: Detect elements in the + same container which share a cache line, are written by at least one +@@ -542,7 +542,7 @@ + foo.cc:1: advice: Change container structure or padding to avoid false + sharing in multithreaded access at foo.cc:4. Detected N shared cache lines. +

        +-

    ++

    Statistics

    + Switch: + _GLIBCXX_PROFILE_STATISTICS. +

    +@@ -555,4 +555,4 @@ + This diagnostic will not issue any advice, but it will print statistics for + each container construction site. The statistics will contain the cost + of each operation actually performed on the container. +-

    Prev Up Next
    Developer Information Home Chapter 20. The mt_allocator
    ++

    Prev Up Next
    Developer Information Home Chapter 20. The mt_allocator
    +Index: libstdc++-v3/doc/html/manual/source_organization.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/source_organization.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/source_organization.html (.../branches/gcc-4_7-branch) +@@ -1,97 +1,97 @@ + +- +-Directory Layout and Source Conventions
    Directory Layout and Source Conventions
    Prev Appendix A.  ++ ++Directory Layout and Source Conventions
    Directory Layout and Source Conventions
    Prev Appendix A.  + Contributing + +- Next

    ++

    		 Next

    Directory Layout and Source Conventions

    + The unpacked source directory of libstdc++ contains the files + needed to create the GNU C++ Library. +-


    +-It has subdirectories:
    +-
    +-  doc
    +-    Files in HTML and text format that document usage, quirks of the
    +-    implementation, and contributor checklists.
    +-
    +-  include
    +-    All header files for the C++ library are within this directory,
    +-    modulo specific runtime-related files that are in the libsupc++
    +-    directory.
    +-
    +-    include/std
    +-      Files meant to be found by #include <name> directives in
    +-      standard-conforming user programs.
    +-
    +-    include/c
    +-      Headers intended to directly include standard C headers.
    +-      [NB: this can be enabled via --enable-cheaders=c]
    +-
    +-    include/c_global
    +-      Headers intended to include standard C headers in
    +-      the global namespace, and put select names into the std::
    +-      namespace.  [NB: this is the default, and is the same as
    +-      --enable-cheaders=c_global]
    +-
    +-    include/c_std
    +-      Headers intended to include standard C headers
    +-      already in namespace std, and put select names into the std::
    +-      namespace.  [NB: this is the same as --enable-cheaders=c_std]
    +-
    +-    include/bits
    +-      Files included by standard headers and by other files in
    +-      the bits directory.
    +-
    +-    include/backward
    +-      Headers provided for backward compatibility, such as <iostream.h>.
    +-      They are not used in this library.
    +-
    +-    include/ext
    +-      Headers that define extensions to the standard library.  No
    +-      standard header refers to any of them.
    +-
    +-  scripts
    +-    Scripts that are used during the configure, build, make, or test
    +-    process.
    +-
    +-  src
    +-    Files that are used in constructing the library, but are not
    +-    installed.
    +-
    +-  testsuites/[backward, demangle, ext, performance, thread, 17_* to 30_*]
    +-    Test programs are here, and may be used to begin to exercise the
    +-    library.  Support for "make check" and "make check-install" is
    +-    complete, and runs through all the subdirectories here when this
    +-    command is issued from the build directory.  Please note that
    +-    "make check" requires DejaGNU 1.4 or later to be installed.  Please
    +-    note that "make check-script" calls the script mkcheck, which
    +-    requires bash, and which may need the paths to bash adjusted to
    +-    work properly, as /bin/bash is assumed.
    +-
    +-Other subdirectories contain variant versions of certain files
    +-that are meant to be copied or linked by the configure script.
    +-Currently these are:
    +-
    +-  config/abi
    +-  config/cpu
    +-  config/io
    +-  config/locale
    +-  config/os
    +-
    +-In addition, a subdirectory holds the convenience library libsupc++.
    +-
    +-  libsupc++
    +-    Contains the runtime library for C++, including exception
    +-    handling and memory allocation and deallocation, RTTI, terminate
    +-    handlers, etc.
    +-
    +-Note that glibc also has a bits/ subdirectory.  We will either
    +-need to be careful not to collide with names in its bits/
    +-directory; or rename bits to (e.g.) cppbits/.
    +-
    +-In files throughout the system, lines marked with an "XXX" indicate
    +-a bug or incompletely-implemented feature.  Lines marked "XXX MT"
    +-indicate a place that may require attention for multi-thread safety.
    +-  

    Prev Up Next
    Appendix A.  ++


    ++It has subdirectories:
    ++
    ++  doc
    ++    Files in HTML and text format that document usage, quirks of the
    ++    implementation, and contributor checklists.
    ++
    ++  include
    ++    All header files for the C++ library are within this directory,
    ++    modulo specific runtime-related files that are in the libsupc++
    ++    directory.
    ++
    ++    include/std
    ++      Files meant to be found by #include <name> directives in
    ++      standard-conforming user programs.
    ++
    ++    include/c
    ++      Headers intended to directly include standard C headers.
    ++      [NB: this can be enabled via --enable-cheaders=c]
    ++
    ++    include/c_global
    ++      Headers intended to include standard C headers in
    ++      the global namespace, and put select names into the std::
    ++      namespace.  [NB: this is the default, and is the same as
    ++      --enable-cheaders=c_global]
    ++
    ++    include/c_std
    ++      Headers intended to include standard C headers
    ++      already in namespace std, and put select names into the std::
    ++      namespace.  [NB: this is the same as --enable-cheaders=c_std]
    ++
    ++    include/bits
    ++      Files included by standard headers and by other files in
    ++      the bits directory.
    ++
    ++    include/backward
    ++      Headers provided for backward compatibility, such as <iostream.h>.
    ++      They are not used in this library.
    ++
    ++    include/ext
    ++      Headers that define extensions to the standard library.  No
    ++      standard header refers to any of them.
    ++
    ++  scripts
    ++    Scripts that are used during the configure, build, make, or test
    ++    process.
    ++
    ++  src
    ++    Files that are used in constructing the library, but are not
    ++    installed.
    ++
    ++  testsuites/[backward, demangle, ext, performance, thread, 17_* to 30_*]
    ++    Test programs are here, and may be used to begin to exercise the
    ++    library.  Support for "make check" and "make check-install" is
    ++    complete, and runs through all the subdirectories here when this
    ++    command is issued from the build directory.  Please note that
    ++    "make check" requires DejaGNU 1.4 or later to be installed.  Please
    ++    note that "make check-script" calls the script mkcheck, which
    ++    requires bash, and which may need the paths to bash adjusted to
    ++    work properly, as /bin/bash is assumed.
    ++
    ++Other subdirectories contain variant versions of certain files
    ++that are meant to be copied or linked by the configure script.
    ++Currently these are:
    ++
    ++  config/abi
    ++  config/cpu
    ++  config/io
    ++  config/locale
    ++  config/os
    ++
    ++In addition, a subdirectory holds the convenience library libsupc++.
    ++
    ++  libsupc++
    ++    Contains the runtime library for C++, including exception
    ++    handling and memory allocation and deallocation, RTTI, terminate
    ++    handlers, etc.
    ++
    ++Note that glibc also has a bits/ subdirectory.  We will either
    ++need to be careful not to collide with names in its bits/
    ++directory; or rename bits to (e.g.) cppbits/.
    ++
    ++In files throughout the system, lines marked with an "XXX" indicate
    ++a bug or incompletely-implemented feature.  Lines marked "XXX MT"
    ++indicate a place that may require attention for multi-thread safety.
    ++  

    Prev Up Next
    Appendix A.  + Contributing + +- Home Coding Style
    ++     		Home Coding Style
    +Index: libstdc++-v3/doc/html/manual/fstreams.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/fstreams.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/fstreams.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-File Based Streams
    File Based Streams
    Prev Chapter 13.  ++ ++File Based Streams
    File Based Streams
    Prev Chapter 13.  + Input and Output + +- Next

    ++

    		 Next

    File Based Streams

    Copying a File

    +

    So you want to copy a file quickly and easily, and most important, + completely portably. And since this is C++, you have an open + ifstream (call it IN) and an open ofstream (call it OUT): +@@ -49,7 +49,7 @@ + The operators shown above are all defined in the parent + basic_ostream class and are therefore available with all possible + descendants. +-

    ++

    Binary Input and Output

    +

    The first and most important thing to remember about binary I/O is + that opening a file with ios::binary is not, repeat + not, the only thing you have to do. It is not a silver +@@ -87,7 +87,7 @@ + of formatting functions and classes to perform something + which requires that formatting not be done? There are a + seemingly infinite number of solutions, and a few are listed here: +-

    • “Derive your own fstream-type classes and write your own ++

      • “Derive your own fstream-type classes and write your own + <</>> operators to do binary I/O on whatever data + types you're using.” +

        +@@ -138,7 +138,7 @@ +

        + An instructive thread from comp.lang.c++.moderated delved off into + this topic starting more or less at +- this ++ this + post and continuing to the end of the thread. (The subject heading is "binary iostreams" on both comp.std.c++ + and comp.lang.c++.moderated.) Take special note of the replies by James Kanze and Dietmar Kühl. +

        Briefly, the problems of byte ordering and type sizes mean that +@@ -147,4 +147,4 @@ + between arbitrary programs, or across a network, or from one + invocation of a program to another invocation of the same program + on a different platform, etc. +-

    Prev Up Next
    Memory Based Streams Home Interacting with C
    ++

    Prev Up Next
    Memory Based Streams Home Interacting with C
    +Index: libstdc++-v3/doc/html/manual/ext_demangling.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/ext_demangling.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/ext_demangling.html (.../branches/gcc-4_7-branch) +@@ -1,14 +1,14 @@ + +- +-Chapter 29. Demangling
    Chapter 29. Demangling
    Prev Part III.  ++ ++Chapter 29. Demangling
    Chapter 29. Demangling
    Prev Part III.  + Extensions + +- Next

    ++

    		 Next

    Chapter 29. Demangling

    + Transforming C++ ABI identifiers (like RTTI symbols) into the + original C++ source identifiers is called + “demangling.” +

    +- If you have read the source ++ If you have read the source + documentation for namespace abi then you are + aware of the cross-vendor C++ ABI in use by GCC. One of the + exposed functions is used for demangling, +@@ -71,4 +71,4 @@ + be writing C++ in order to demangle C++. (That also means we have to + use crummy memory management facilities, so don't forget to free() + the returned char array.) +-

    Prev Up Next
    Chapter 28. Input and Output Home Chapter 30. Concurrency
    ++

    Prev Up Next
    Chapter 28. Input and Output Home Chapter 30. Concurrency
    +Index: libstdc++-v3/doc/html/manual/ext_compile_checks.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/ext_compile_checks.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/ext_compile_checks.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Chapter 16. Compile Time Checks
    Chapter 16. Compile Time Checks
    Prev Part III.  ++ ++Chapter 16. Compile Time Checks
    Chapter 16. Compile Time Checks
    Prev Part III.  + Extensions + +- Next

    ++

    		 Next

    Chapter 16. Compile Time Checks

    + Also known as concept checking. +

    In 1999, SGI added concept checkers to their implementation + of the STL: code which checked the template parameters of +@@ -19,7 +19,7 @@ +

    The primary author of the checking code, Jeremy Siek, had already + started work on a replacement implementation. The new code has been + formally reviewed and accepted into +- the ++ the + Boost libraries, and we are pleased to incorporate it into the + GNU C++ library. +

    The new version imposes a much smaller space overhead on the generated +@@ -37,4 +37,4 @@ + support for template parameter constraints based on concepts in the core + language. This will obviate the need for the library-simulated concept + checking described above. +-

    Prev Up Next
     Home Chapter 17. Debug Mode
    ++

    Prev Up Next
     Home Chapter 17. Debug Mode
    +Index: libstdc++-v3/doc/html/manual/strings.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/strings.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/strings.html (.../branches/gcc-4_7-branch) +@@ -1,14 +1,14 @@ + +- +-Chapter 7.  Strings
    Chapter 7.  ++ ++Chapter 7.  Strings
    Chapter 7.  + Strings + +-
    Prev Part II.  ++
    Prev Part II.  + Standard Contents +-  Next
    		 Next

    Chapter 7.  + Strings +- +-

    Table of Contents

    String Classes
    Simple Transformations
    Case Sensitivity
    Arbitrary Character Types
    Tokenizing
    Shrink to Fit
    CString (MFC)

    ++ ++

    Table of Contents

    String Classes
    Simple Transformations
    Case Sensitivity
    Arbitrary Character Types
    Tokenizing
    Shrink to Fit
    CString (MFC)

    String Classes

    Simple Transformations

    + Here are Standard, simple, and portable ways to perform common + transformations on a string instance, such as + "convert to all upper case." The word transformations +@@ -64,7 +64,7 @@ + are overloaded names (declared in <cctype> and + <locale>) so the template-arguments for + transform<> cannot be deduced, as explained in +- this ++ this + message. + + At minimum, you can write short wrappers like +@@ -89,9 +89,9 @@ + str.erase(notwhite+1);

    Obviously, the calls to find could be inserted directly + into the calls to erase, in case your compiler does not + optimize named temporaries out of existence. +-

    ++

    Case Sensitivity

    +

    The well-known-and-if-it-isn't-well-known-it-ought-to-be +- Guru of the Week ++ Guru of the Week + discussions held on Usenet covered this topic in January of 1998. + Briefly, the challenge was, “write a 'ci_string' class which + is identical to the standard 'string' class, but is +@@ -108,10 +108,10 @@ + assert( strcmp( s.c_str(), "AbCdE" ) == 0 ); + assert( strcmp( s.c_str(), "abcde" ) != 0 );

    The solution is surprisingly easy. The original answer was + posted on Usenet, and a revised version appears in Herb Sutter's +- book Exceptional C++ and on his website as GotW 29. ++ book Exceptional C++ and on his website as GotW 29. +

    See? Told you it was easy!

    + Added June 2000: The May 2000 issue of C++ +- Report contains a fascinating article by ++ Report contains a fascinating article by + Matt Austern (yes, the Matt Austern) on why + case-insensitive comparisons are not as easy as they seem, and + why creating a class is the wrong way to go +@@ -123,10 +123,10 @@ + that nobody ever called me on it...) The GotW question and answer + remain useful instructional tools, however. +

    Added September 2000: James Kanze provided a link to a +- Unicode ++ Unicode + Technical Report discussing case handling, which provides some + very good information. +-

    ++

    Arbitrary Character Types

    +

    The std::basic_string is tantalizingly general, in that + it is parameterized on the type of the characters which it holds. + In theory, you could whip up a Unicode character class and instantiate +@@ -169,18 +169,18 @@ + works and can be specialized even for int and other + built-in types. +

    If you want to use your own special character class, then you have +- a lot ++ a lot + of work to do, especially if you with to use i18n features + (facets require traits information but don't have a traits argument). +-

    Another example of how to specialize char_traits was given on the ++

    Another example of how to specialize char_traits was given on the + mailing list and at a later date was put into the file + include/ext/pod_char_traits.h. We agree + that the way it's used with basic_string (scroll down to main()) +- doesn't look nice, but that's because the +- nice-looking first attempt turned out to not ++ doesn't look nice, but that's because the ++ nice-looking first attempt turned out to not + be conforming C++, due to the rule that CharT must be a POD. + (See how tricky this is?) +-

    ++

    Tokenizing

    +

    The Standard C (and C++) function strtok() leaves a lot to + be desired in terms of user-friendliness. It's unintuitive, it + destroys the character string on which it operates, and it requires +@@ -256,7 +256,7 @@ + tokenizing as well. Build an istringstream from the input text, + and then use std::getline with varying delimiters (the three-argument + signature) to extract tokens into a string. +-

    ++

    Shrink to Fit

    +

    From GCC 3.4 calling s.reserve(res) on a + string s with res < s.capacity() will + reduce the string's capacity to std::max(s.size(), res). +@@ -272,7 +272,7 @@ +

    In C++11 mode you can call + s.shrink_to_fit() to achieve the same effect as + s.reserve(s.size()). +-

    ++

    CString (MFC)

    +

    A common lament seen in various newsgroups deals with the Standard + string class as opposed to the Microsoft Foundation Class called + CString. Often programmers realize that a standard portable +@@ -280,9 +280,9 @@ + their application from a Win32 platform, they discover that they + are relying on special functions offered by the CString class. +

    Things are not as bad as they seem. In +- this ++ this + message, Joe Buck points out a few very important things: +-

    • The Standard string supports all the operations ++

      • The Standard string supports all the operations + that CString does, with three exceptions. +

      • Two of those exceptions (whitespace trimming and case + conversion) are trivial to implement. In fact, we do so +@@ -340,7 +340,7 @@ + performance is O(n). +

        Joe Buck also pointed out some other things to keep in mind when + comparing CString and the Standard string class: +-

        • CString permits access to its internal representation; coders ++

          • CString permits access to its internal representation; coders + who exploited that may have problems moving to string. +

          • Microsoft ships the source to CString (in the files + MFC\SRC\Str{core,ex}.cpp), so you could fix the allocation +@@ -360,7 +360,7 @@ + libstdc++ string, the SGI string, and the SGI rope, and this + is all before any allocator or traits customizations! (More + choices than you can shake a stick at -- want fries with that?) +-

    Prev Up Next
    Traits Home Chapter 8.  ++

    Prev Up Next
    Traits Home Chapter 8.  + Localization + +
    +Index: libstdc++-v3/doc/html/manual/containers_and_c.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/containers_and_c.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/containers_and_c.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Interacting with C
    Interacting with C
    Prev Chapter 9.  ++ ++Interacting with C
    Interacting with C
    Prev Chapter 9.  + Containers + +- Next

    ++

    		 Next

    Interacting with C

    Containers vs. Arrays

    + You're writing some code and can't decide whether to use builtin + arrays or some kind of container. There are compelling reasons + to use one of the container classes, but you're afraid that +@@ -84,7 +84,7 @@ + inline unsigned int lengthof (T (&)[sz]) { return sz; } +

    + looks just weird! Hint: unused parameters can be left nameless. +-

    Prev Up Next
    Associative Home Chapter 10.  ++

    Prev Up Next
    Associative Home Chapter 10.  + Iterators + +
    +Index: libstdc++-v3/doc/html/manual/io_and_c.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/io_and_c.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/io_and_c.html (.../branches/gcc-4_7-branch) +@@ -1,14 +1,14 @@ + +- +-Interacting with C
    Interacting with C
    Prev Chapter 13.  ++ ++Interacting with C
    Interacting with C
    Prev Chapter 13.  + Input and Output + +- Next

    ++

    		 Next

    Interacting with C

    Using FILE* and file descriptors

    + See the extensions for using + FILE and file descriptors with + ofstream and + ifstream. +-

    ++

    Performance

    + Pathetic Performance? Ditch C. +

    It sounds like a flame on C, but it isn't. Really. Calm down. + I'm just saying it to get your attention. +@@ -51,7 +51,7 @@ + clog, and their wide-character counterchapters). File stream + objects that you declare yourself have no such requirement and are fully + buffered. +-

    Prev Up Next
    File Based Streams Home Chapter 14.  ++

    Prev Up Next
    File Based Streams Home Chapter 14.  + Atomics + +
    +Index: libstdc++-v3/doc/html/manual/documentation_hacking.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/documentation_hacking.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/documentation_hacking.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Writing and Generating Documentation
    Writing and Generating Documentation
    Prev Appendix B.  ++ ++Writing and Generating Documentation
    Writing and Generating Documentation
    Prev Appendix B.  + Porting and Maintenance + +- Next

    ++

    		 Next

    Writing and Generating Documentation

    Introduction

    + Documentation for the GNU C++ Library is created from three + independent sources: a manual, a FAQ, and an API reference. +

    +@@ -25,9 +25,9 @@ + reference. Although divergent, this conforms to the GNU Project + recommendations as long as the output is of sufficient quality, + as per +- ++ + GNU Manuals. +-

    ++

    Generating Documentation

    + Certain Makefile rules are required by the GNU Coding + Standards. These standard rules generate HTML, PDF, XML, or man + files. For each of the generative rules, there is an additional +@@ -117,21 +117,29 @@ + supported, and are always aliased to dummy rules. These + unsupported formats are: info, + ps, and dvi. +-

    Table B.1. Doxygen Prerequisites

    ToolVersionRequired By
    coreutils8.5all
    bash4.1all
    doxygen1.7.0all
    graphviz2.26graphical hierarchies
    pdflatex2007-59pdf output

    ++

    Doxygen

    Prerequisites

    Table B.1. Doxygen Prerequisites

    ToolVersionRequired By
    coreutils8.5all
    bash4.1all
    doxygen1.7.6.1all
    graphviz2.26graphical hierarchies
    pdflatex2007-59pdf output

    + Prerequisite tools are Bash 2.0 or later, +- Doxygen, and +- the GNU ++ Doxygen, and ++ the GNU + coreutils. (GNU versions of find, xargs, and possibly + sed and grep are used, just because the GNU versions make + things very easy.) +

    + To generate the pretty pictures and hierarchy + graphs, the +- Graphviz package ++ Graphviz package + will need to be installed. For PDF +- output, ++ output, + pdflatex is required. +-

    ++

    ++ Be warned the PDF file generated via doxygen is extremely ++ large. At last count, the PDF file is over three thousand ++ pages. Generating this document taxes the underlying TeX ++ formatting system, and will require the expansion of TeX's memory ++ capacity. Specifically, the pool_size ++ variable in the configuration file texmf.cnf may ++ need to be increased by a minimum factor of two. ++

    Generating the Doxygen Files

    + The following Makefile rules run Doxygen to generate HTML + docs, XML docs, XML docs as a single file, PDF docs, and the + man pages. These rules are not conditional! If the required +@@ -163,7 +171,7 @@ + If you wish to tweak the Doxygen settings, do so by editing + doc/doxygen/user.cfg.in. Notes to fellow + library hackers are written in triple-# comments. +-

    ++

    Markup

    + In general, libstdc++ files should be formatted according to + the rules found in the + Coding Standard. Before +@@ -173,7 +181,7 @@ + Adding Doxygen markup to a file (informally called + “doxygenating”) is very simple. The Doxygen manual can be + found +- here. ++ here. + We try to use a very-recent version of Doxygen. +

    + For classes, use +@@ -185,10 +193,10 @@ + member functions. +

    + Some commentary to accompany +- the first list in the Special ++ the first list in the Special + Documentation Blocks section of + the Doxygen manual: +-

    1. For longer comments, use the Javadoc style...

    2. ++

      1. For longer comments, use the Javadoc style...

      2. + ...not the Qt style. The intermediate *'s are preferred. +

      3. + Use the triple-slash style only for one-line comments (the +@@ -218,14 +226,14 @@ + Complicated math functions should use the multi-line + format. An example from random.h: +

        +-


        +-/**
        +- * @brief A model of a linear congruential random number generator.
        +- *
        +- * @f[
        +- *     x_{i+1}\leftarrow(ax_{i} + c) \bmod m
        +- * @f]
        +- */
        ++


        ++/**
        ++ * @brief A model of a linear congruential random number generator.
        ++ *
        ++ * @f[
        ++ *     x_{i+1}\leftarrow(ax_{i} + c) \bmod m
        ++ * @f]
        ++ */
        +

        +

        + One area of note is the markup required for +@@ -234,10 +242,10 @@ + multiple directories, include part of the installed path to + disambiguate. For example: +

        +-


        +-/** @file debug/vector
        +- *  This file is a GNU debug extension to the Standard C++ Library.
        +- */
        ++


        ++/** @file debug/vector
        ++ *  This file is a GNU debug extension to the Standard C++ Library.
        ++ */
        +

        +

        + The other relevant detail for header files is the use of a +@@ -252,18 +260,18 @@ + headername in the file + block. An example: +

        +-


        +-/** @file bits/basic_string.h
        +- *  This is an internal header file, included by other library headers.
        +- *  Do not attempt to use it directly. @headername{string}
        +- */
        ++


        ++/** @file bits/basic_string.h
        ++ *  This is an internal header file, included by other library headers.
        ++ *  Do not attempt to use it directly. @headername{string}
        ++ */
        +

        +

        + Be careful about using certain, special characters when + writing Doxygen comments. Single and double quotes, and + separators in filenames are two common trouble spots. When in + doubt, consult the following table. +-

        Table B.2. HTML to Doxygen Markup Comparison

        HTMLDoxygen
        \\\
        "\"
        '\'
        <i>@a word
        <b>@b word
        <code>@c word
        <em>@a word
        <em><em>two words or more</em>

        Table B.3. Docbook Prerequisites

        ToolVersionRequired By
        docbook5-style-xsl1.76.1all
        xsltproc1.1.26all
        xmllint2.7.7validation
        dblatex0.3pdf output
        pdflatex2007-59pdf output
        docbook2X0.8.8info output
        epub3 stylesheetsb3epub output

        ++

        Table B.2. HTML to Doxygen Markup Comparison

        HTMLDoxygen
        \\\
        "\"
        '\'
        <i>@a word
        <b>@b word
        <code>@c word
        <em>@a word
        <em><em>two words or more</em>

        Docbook

        Prerequisites

        Table B.3. Docbook Prerequisites

        ToolVersionRequired By
        docbook5-style-xsl1.76.1all
        xsltproc1.1.26all
        xmllint2.7.7validation
        dblatex0.3pdf output
        pdflatex2007-59pdf output
        docbook2X0.8.8info output
        epub3 stylesheetsb3epub output

        + Editing the DocBook sources requires an XML editor. Many + exist: some notable options + include emacs, Kate, +@@ -298,19 +306,19 @@ + by a vendor package like libxml2 and docbook5-schemas-5.0-4 +

        + For PDF output, something that transforms valid Docbook XML to PDF is +- required. Possible solutions include dblatex, ++ required. Possible solutions include dblatex, + xmlto, or prince. Of + these, dblatex is the default. Other +- options are listed on the DocBook web pages. Please ++ options are listed on the DocBook web pages. Please + consult the list when + preparing printed manuals for current best practice and + suggestions. +

        + For Texinfo output, something that transforms valid Docbook +- XML to Texinfo is required. The default choice is docbook2X. ++ XML to Texinfo is required. The default choice is docbook2X. +

        +- For epub output, the stylesheets for EPUB3 are required. These stylesheets are still in development. To validate the created file, epubcheck is necessary. +-

        ++ For epub output, the stylesheets for EPUB3 are required. These stylesheets are still in development. To validate the created file, epubcheck is necessary. ++

        Generating the DocBook Files

        + The following Makefile rules generate (in order): an HTML + version of all the DocBook documentation, a PDF version of the + same, and a single XML document. These rules are not +@@ -335,7 +343,7 @@ + + make XSL_STYLE_DIR="/usr/share/xml/docbook/stylesheet/nwalsh" doc-html-docbook + +-

        ++

        Editing and Validation

        + After editing the xml sources, please make sure that the XML + documentation and markup is still valid. This can be + done easily, with the following validation rule: +@@ -355,90 +363,90 @@ + validation on the entire manual fails. +

        + All Docbook xml sources should always validate. No excuses! +-


        +-      Which files are important
        +-
        +-      All Docbook files are in the directory
        +-      libstdc++-v3/doc/xml
        +-
        +-      Inside this directory, the files of importance:
        +-      spine.xml   - index to documentation set
        +-      manual/spine.xml  - index to manual
        +-      manual/*.xml   - individual chapters and sections of the manual
        +-      faq.xml   - index to FAQ
        +-      api.xml   - index to source level / API
        +-
        +-      All *.txml files are template xml files, i.e., otherwise empty files with
        +-      the correct structure, suitable for filling in with new information.
        +-
        +-      Canonical Writing Style
        +-
        +-      class template
        +-      function template
        +-      member function template
        +-      (via C++ Templates, Vandevoorde)
        +-
        +-      class in namespace std: allocator, not std::allocator
        +-
        +-      header file: iostream, not <iostream>
        +-
        +-
        +-      General structure
        +-
        +-      <set>
        +-      <book>
        +-      </book>
        +-
        +-      <book>
        +-      <chapter>
        +-      </chapter>
        +-      </book>
        +-
        +-      <book>
        +-      <part>
        +-      <chapter>
        +-      <section>
        +-      </section>
        +-
        +-      <sect1>
        +-      </sect1>
        +-
        +-      <sect1>
        +-      <sect2>
        +-      </sect2>
        +-      </sect1>
        +-      </chapter>
        +-
        +-      <chapter>
        +-      </chapter>
        +-      </part>
        +-      </book>
        +-
        +-      </set>
        +-    

        ++

        File Organization and Basics


        ++      Which files are important
        ++
        ++      All Docbook files are in the directory
        ++      libstdc++-v3/doc/xml
        ++
        ++      Inside this directory, the files of importance:
        ++      spine.xml   - index to documentation set
        ++      manual/spine.xml  - index to manual
        ++      manual/*.xml   - individual chapters and sections of the manual
        ++      faq.xml   - index to FAQ
        ++      api.xml   - index to source level / API
        ++
        ++      All *.txml files are template xml files, i.e., otherwise empty files with
        ++      the correct structure, suitable for filling in with new information.
        ++
        ++      Canonical Writing Style
        ++
        ++      class template
        ++      function template
        ++      member function template
        ++      (via C++ Templates, Vandevoorde)
        ++
        ++      class in namespace std: allocator, not std::allocator
        ++
        ++      header file: iostream, not <iostream>
        ++
        ++
        ++      General structure
        ++
        ++      <set>
        ++      <book>
        ++      </book>
        ++
        ++      <book>
        ++      <chapter>
        ++      </chapter>
        ++      </book>
        ++
        ++      <book>
        ++      <part>
        ++      <chapter>
        ++      <section>
        ++      </section>
        ++
        ++      <sect1>
        ++      </sect1>
        ++
        ++      <sect1>
        ++      <sect2>
        ++      </sect2>
        ++      </sect1>
        ++      </chapter>
        ++
        ++      <chapter>
        ++      </chapter>
        ++      </part>
        ++      </book>
        ++
        ++      </set>
        ++    

        Markup By Example

        + Complete details on Docbook markup can be found in the DocBook + Element Reference, +- online. ++ online. + An incomplete reference for HTML to Docbook conversion is + detailed in the table below. +-

        Table B.4. HTML to Docbook XML Markup Comparison

        HTMLDocbook
        <p><para>
        <pre><computeroutput>, <programlisting>, +- <literallayout>
        <ul><itemizedlist>
        <ol><orderedlist>
        <il><listitem>
        <dl><variablelist>
        <dt><term>
        <dd><listitem>
        <a href=""><ulink url="">
        <code><literal>, <programlisting>
        <strong><emphasis>
        <em><emphasis>
        "<quote>

        ++

        Table B.4. HTML to Docbook XML Markup Comparison

        HTMLDocbook
        <p><para>
        <pre><computeroutput>, <programlisting>, ++ <literallayout>
        <ul><itemizedlist>
        <ol><orderedlist>
        <il><listitem>
        <dl><variablelist>
        <dt><term>
        <dd><listitem>
        <a href=""><ulink url="">
        <code><literal>, <programlisting>
        <strong><emphasis>
        <em><emphasis>
        "<quote>

        + And examples of detailed markup for which there are no real HTML + equivalents are listed in the table below. +-

        Table B.5. Docbook XML Element Use

        ElementUse
        <structname><structname>char_traits</structname>
        <classname><classname>string</classname>
        <function> ++

        Table B.5. Docbook XML Element Use

        ElementUse
        <structname><structname>char_traits</structname>
        <classname><classname>string</classname>
        <function> +

        <function>clear()</function>

        +

        <function>fs.clear()</function>

        +-
        <type><type>long long</type>
        <varname><varname>fs</varname>
        <literal> ++
        <type><type>long long</type>
        <varname><varname>fs</varname>
        <literal> +

        <literal>-Weffc++</literal>

        +

        <literal>rel_ops</literal>

        +-
        <constant> ++
        <constant> +

        <constant>_GNU_SOURCE</constant>

        +

        <constant>3.0</constant>

        +-
        <command><command>g++</command>
        <errortext><errortext>In instantiation of</errortext>
        <filename> ++
        <command><command>g++</command>
        <errortext><errortext>In instantiation of</errortext>
        <filename> +

        <filename class="headerfile">ctype.h</filename>

        +

        <filename class="directory">/home/gcc/build</filename>

        +

        <filename class="libraryfile">libstdc++.so</filename>

        +-

        Prev Up Next
        Appendix B.  ++

        Prev Up Next
        Appendix B.  + Porting and Maintenance + +- Home Porting to New Hardware or Operating Systems
        ++         		Home Porting to New Hardware or Operating Systems
        +Index: libstdc++-v3/doc/html/manual/extensions.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/extensions.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/extensions.html (.../branches/gcc-4_7-branch) +@@ -1,12 +1,12 @@ + +- +-Part III.  Extensions
        Part III.  ++ ++Part III.  Extensions
        Part III.  + Extensions + +-
        Prev The GNU C++ Library Manual Next
        Prev The GNU C++ Library Manual Next

        Part III.  + Extensions +- +-

        Table of Contents

        16. Compile Time Checks
        17. Debug Mode
        Intro
        Semantics
        Using
        Using the Debug Mode
        Using a Specific Debug Container
        Design
        Goals
        Methods
        The Wrapper Model
        Safe Iterators
        Safe Sequences (Containers)
        Precondition Checking
        Release- and debug-mode coexistence
        Compile-time coexistence of release- and debug-mode components
        Link- and run-time coexistence of release- and ++ ++

        Table of Contents

        16. Compile Time Checks
        17. Debug Mode
        Intro
        Semantics
        Using
        Using the Debug Mode
        Using a Specific Debug Container
        Design
        Goals
        Methods
        The Wrapper Model
        Safe Iterators
        Safe Sequences (Containers)
        Precondition Checking
        Release- and debug-mode coexistence
        Compile-time coexistence of release- and debug-mode components
        Link- and run-time coexistence of release- and + debug-mode components
        Alternatives for Coexistence
        Other Implementations
        18. Parallel Mode
        Intro
        Semantics
        Using
        Prerequisite Compiler Flags
        Using Parallel Mode
        Using Specific Parallel Components
        Design
        Interface Basics
        Configuration and Tuning
        Setting up the OpenMP Environment
        Compile Time Switches
        Run Time Settings and Defaults
        Implementation Namespaces
        Testing
        Bibliography
        19. Profile Mode
        Intro
        Using the Profile Mode
        Tuning the Profile Mode
        Design
        Wrapper Model
        Instrumentation
        Run Time Behavior
        Analysis and Diagnostics
        Cost Model
        Reports
        Testing
        Extensions for Custom Containers
        Empirical Cost Model
        Implementation Issues
        Stack Traces
        Symbolization of Instruction Addresses
        Concurrency
        Using the Standard Library in the Instrumentation Implementation
        Malloc Hooks
        Construction and Destruction of Global Objects
        Developer Information
        Big Picture
        How To Add A Diagnostic
        Diagnostics
        Diagnostic Template
        Containers
        Hashtable Too Small
        Hashtable Too Large
        Inefficient Hash
        Vector Too Small
        Vector Too Large
        Vector to Hashtable
        Hashtable to Vector
        Vector to List
        List to Vector
        List to Forward List (Slist)
        Ordered to Unordered Associative Container
        Algorithms
        Sort Algorithm Performance
        Data Locality
        Need Software Prefetch
        Linked Structure Locality
        Multithreaded Data Access
        Data Dependence Violations at Container Level
        False Sharing
        Statistics
        Bibliography
        20. The mt_allocator
        Intro
        Design Issues
        Overview
        Implementation
        Tunable Parameters
        Initialization
        Deallocation Notes
        Single Thread Example
        Multiple Thread Example
        21. The bitmap_allocator
        Design
        Implementation
        Free List Store
        Super Block
        Super Block Data Layout
        Maximum Wasted Percentage
        allocate
        deallocate
        Questions
        1
        2
        3
        Locality
        Overhead and Grow Policy
        22. Policy-Based Data Structures
        Intro
        Performance Issues
        Associative
        Priority Que
        Goals
        Associative
        Policy Choices
        Underlying Data Structures
        Iterators
        Functional
        Priority Queues
        Policy Choices
        Underlying Data Structures
        Binary Heaps
        Using
        Prerequisites
        Organization
        Tutorial
        Basic Use
        + Configuring via Template Parameters +
        +@@ -71,4 +71,4 @@ + Text modify Down +
        Observations
        Associative
        Priority_Queue
        Acknowledgments
        + Bibliography +-
        23. HP/SGI Extensions
        Backwards Compatibility
        Deprecated
        24. Utilities
        25. Algorithms
        26. Numerics
        27. Iterators
        28. Input and Output
        Derived filebufs
        29. Demangling
        30. Concurrency
        Design
        Interface to Locks and Mutexes
        Interface to Atomic Functions
        Implementation
        Using Builtin Atomic Functions
        Thread Abstraction
        Use
        Prev Up Next
        Interacting with C Home 
        ++
        23. HP/SGI Extensions
        Backwards Compatibility
        Deprecated
        24. Utilities
        25. Algorithms
        26. Numerics
        27. Iterators
        28. Input and Output
        Derived filebufs
        29. Demangling
        30. Concurrency
        Design
        Interface to Locks and Mutexes
        Interface to Atomic Functions
        Implementation
        Using Builtin Atomic Functions
        Thread Abstraction
        Use
        Prev Up Next
        Interacting with C Home 
        +Index: libstdc++-v3/doc/html/manual/parallel_mode.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/parallel_mode.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/parallel_mode.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Chapter 18. Parallel Mode
        Chapter 18. Parallel Mode
        Prev Part III.  ++ ++Chapter 18. Parallel Mode
        Chapter 18. Parallel Mode
        Prev Part III.  + Extensions + +- Next

        Table of Contents

        Intro
        Semantics
        Using
        Prerequisite Compiler Flags
        Using Parallel Mode
        Using Specific Parallel Components
        Design
        Interface Basics
        Configuration and Tuning
        Setting up the OpenMP Environment
        Compile Time Switches
        Run Time Settings and Defaults
        Implementation Namespaces
        Testing
        Bibliography

        The libstdc++ parallel mode is an experimental parallel ++

        		 Next

        Chapter 18. Parallel Mode

        Table of Contents

        Intro
        Semantics
        Using
        Prerequisite Compiler Flags
        Using Parallel Mode
        Using Specific Parallel Components
        Design
        Interface Basics
        Configuration and Tuning
        Setting up the OpenMP Environment
        Compile Time Switches
        Run Time Settings and Defaults
        Implementation Namespaces
        Testing
        Bibliography

        The libstdc++ parallel mode is an experimental parallel + implementation of many algorithms the C++ Standard Library. +

        + Several of the standard algorithms, for instance +@@ -11,14 +11,14 @@ + annotations. These parallel mode constructs and can be invoked by + explicit source declaration or by compiling existing sources with a + specific compiler flag. +-

        The following library components in the include +-numeric are included in the parallel mode:

        The following library components in the include +-algorithm are included in the parallel mode:

        ++

        Intro

        The following library components in the include ++numeric are included in the parallel mode:

        • std::accumulate

        • std::adjacent_difference

        • std::inner_product

        • std::partial_sum

        The following library components in the include ++algorithm are included in the parallel mode:

        • std::adjacent_find

        • std::count

        • std::count_if

        • std::equal

        • std::find

        • std::find_if

        • std::find_first_of

        • std::for_each

        • std::generate

        • std::generate_n

        • std::lexicographical_compare

        • std::mismatch

        • std::search

        • std::search_n

        • std::transform

        • std::replace

        • std::replace_if

        • std::max_element

        • std::merge

        • std::min_element

        • std::nth_element

        • std::partial_sort

        • std::partition

        • std::random_shuffle

        • std::set_union

        • std::set_intersection

        • std::set_symmetric_difference

        • std::set_difference

        • std::sort

        • std::stable_sort

        • std::unique_copy

        Bibliography

        + Parallelization of Bulk Operations for STL Dictionaries + . Johannes Singler. Leonor Frias. Copyright © 2007 . + Workshop on Highly Parallel Processing on a Chip (HPPC) 2007. (LNCS) +- .

        ++ .

        + The Multi-Core Standard Template Library + . Johannes Singler. Peter Sanders. Felix Putze. Copyright © 2007 . + Euro-Par 2007: Parallel Processing. (LNCS 4641) +- .

        Prev Up Next
        Design Home Semantics
        ++ .

      Prev Up Next
      Design Home Semantics
      +Index: libstdc++-v3/doc/html/manual/setup.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/setup.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/setup.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Chapter 2. Setup
      Chapter 2. Setup
      Prev Part I.  ++ ++Chapter 2. Setup
      Chapter 2. Setup
      Prev Part I.  + Introduction + +- Next

      Table of Contents

      Prerequisites
      Configure
      Make

      To transform libstdc++ sources into installed include files ++

      		 Next

      Chapter 2. Setup

      Table of Contents

      Prerequisites
      Configure
      Make

      To transform libstdc++ sources into installed include files + and properly built binaries useful for linking to other software is + a multi-step process. Steps include getting the sources, + configuring and building the sources, testing, and installation. +@@ -19,12 +19,12 @@ + make install +

      + Each step is described in more detail in the following sections. +-

      ++

      Prerequisites

      + Because libstdc++ is part of GCC, the primary source for + installation instructions is +- the GCC install page. ++ the GCC install page. + In particular, list of prerequisite software needed to build the library +- ++ + starts with those requirements. The same pages also list + the tools you will need if you wish to modify the source. +

      +@@ -32,7 +32,7 @@ +

      As of GCC 4.0.1 the minimum version of binutils required to build + libstdc++ is 2.15.90.0.1.1. You can get snapshots + (as well as releases) of binutils from +- ++ + ftp://sources.redhat.com/pub/binutils. + Older releases of libstdc++ do not require such a recent version, + but to take full advantage of useful space-saving features and +@@ -87,7 +87,7 @@ + libstdc++ after "C" locales are installed is not necessary. +

      + To install support for locales, do only one of the following: +-

      • install all locales

      • install just the necessary locales

        • with Debian GNU/Linux:

          Add the above list, as shown, to the file ++

          • install all locales

          • install just the necessary locales

            • with Debian GNU/Linux:

              Add the above list, as shown, to the file + /etc/locale.gen

              run /usr/sbin/locale-gen

            • on most Unix-like operating systems:

              localedef -i de_DE -f ISO-8859-1 de_DE

              (repeat for each entry in the above list)

            • + Instructions for other operating systems solicited. +-

      Prev Up Next
      Bugs Home Configure
      ++

    Prev Up Next
    Bugs Home Configure
    +Index: libstdc++-v3/doc/html/manual/backwards.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/backwards.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/backwards.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Backwards Compatibility
    Backwards Compatibility
    Prev Appendix B.  ++ ++Backwards Compatibility
    Backwards Compatibility
    Prev Appendix B.  + Porting and Maintenance + +- Next

    The first generation GNU C++ library was called libg++. It was a ++

    		 Next

    Backwards Compatibility

    First

    The first generation GNU C++ library was called libg++. It was a + separate GNU project, although reliably paired with GCC. Rumors imply + that it had a working relationship with at least two kinds of + dinosaur. +@@ -17,8 +17,8 @@ + really useful things that are used by a lot of people, the Standards + Committee couldn't include everything, and so a lot of those + “obvious” classes didn't get included. +-

    Known Issues include many of the limitations of its immediate ancestor.

    Portability notes and known implementation limitations are as follows.

    At least some older implementations don't have std::ios_base, so you should use std::ios::badbit, std::ios::failbit and std::ios::eofbit and std::ios::goodbit. +-

    ++

    Known Issues include many of the limitations of its immediate ancestor.

    Portability notes and known implementation limitations are as follows.

    No ios_base

    At least some older implementations don't have std::ios_base, so you should use std::ios::badbit, std::ios::failbit and std::ios::eofbit and std::ios::goodbit. ++

    No cout in <ostream.h>, no cin in <istream.h>

    + In earlier versions of the standard, + <fstream.h>, + <ostream.h> +@@ -29,10 +29,10 @@ + explicitly to get the required definitions. +

    Some include adjustment may be required.

    This project is no longer maintained or supported, and the sources + archived. For the desperate, +-the GCC extensions ++the GCC extensions + page describes where to find the last libg++ source. The code is + considered replaced and rewritten. +-

    ++

    Second

    + The second generation GNU C++ library was called libstdc++, or + libstdc++-v2. It spans the time between libg++ and pre-ISO C++ + standardization and is usually associated with the following GCC +@@ -44,7 +44,7 @@ + archived. The code is considered replaced and rewritten. +

    + Portability notes and known implementation limitations are as follows. +-

    ++

    Namespace std:: not supported

    + Some care is required to support C++ compiler and or library + implementation that do not have the standard library in + namespace std. +@@ -108,10 +108,10 @@ + AC_DEFINE(HAVE_NAMESPACE_STD,,[Define if g++ supports namespace std. ]) + fi + ]) +-

    ++

    Illegal iterator usage

    + The following illustrate implementation-allowed illegal iterator + use, and then correct use. +-

    • ++

      • + you cannot do ostream::operator<<(iterator) + to print the address of the iterator => use + operator<< &*iterator instead +@@ -121,7 +121,7 @@ +

      • + if (iterator) won't work any more => use + if (iterator != iterator_type()) +-

    isspace from <cctype> is a macro +

    + Glibc 2.0.x and 2.1.x define <ctype.h> functionality as macros + (isspace, isalpha etc.). +@@ -155,7 +155,7 @@ + (<ctype.h>) and the + definitions in namespace std:: + (<cctype>). +-

    ++

    No vector::at, deque::at, string::at

    + One solution is to add an autoconf-test for this: + 

    + AC_MSG_CHECKING(for container::at)
+@@ -181,7 +181,7 @@
+

    + If you are using other (non-GNU) compilers it might be a good idea + to check for string::at separately. +-

    ++

    No std::char_traits<char>::eof

    + Use some kind of autoconf test, plus this: + 

    + #ifdef HAVE_CHAR_TRAITS
+@@ -189,7 +189,7 @@
+ #else
+ #define CPP_EOF EOF
+ #endif
+-

    ++

    No string::clear

    + There are two functions for deleting the contents of a string: + clear and erase (the latter returns the + string). +@@ -207,18 +207,18 @@ + Unfortunately, clear is not implemented in this + version, so you should use erase (which is probably + faster than operator=(charT*)). +-

    + Removal of ostream::form and istream::scan + extensions +

    + These are no longer supported. Please use stringstreams instead. +-

    ++

    No basic_stringbuf, basic_stringstream

    + Although the ISO standard i/ostringstream-classes are + provided, (<sstream>), for + compatibility with older implementations the pre-ISO + i/ostrstream (<strstream>) interface is also provided, + with these caveats: +-

    • ++

      • + strstream is considered to be deprecated +

      • + strstream is limited to char +@@ -300,14 +300,14 @@ + Another example of using stringstreams is in this howto. +

        There is additional information in the libstdc++-v2 info files, in + particular “info iostream”. +-

      ++

      Little or no wide character support

      + Classes wstring and + char_traits<wchar_t> are + not supported. +-

      ++

      No templatized iostreams

      + Classes wfilebuf and + wstringstream are not supported. +-

      ++

      Thread safety issues

      + Earlier GCC releases had a somewhat different approach to + threading configuration and proper compilation. Before GCC 3.0, + configuration of the threading model was dictated by compiler +@@ -332,7 +332,7 @@ + against the gthr.h abstraction layer which is provided by gcc. A + minor problem that pops up every so often is different + interpretations of what "thread-safe" means for a +- library (not a general program). We currently use the same ++ library (not a general program). We currently use the same + definition that SGI uses for their STL subset. However, + the exception for read-only containers only applies to the STL + components. This definition is widely-used and something similar +@@ -343,12 +343,12 @@ + first relevant message in the thread; from there you can use + "Thread Next" to move down the thread. This farm is in + latest-to-oldest order. +-

      The third generation GNU C++ library is called libstdc++, or ++

      Third

      The third generation GNU C++ library is called libstdc++, or + libstdc++-v3. +

      The subset commonly known as the Standard Template Library + (chapters 23 through 25, mostly) is adapted from the final release + of the SGI STL (version 3.3), with extensive changes. +

      A more formal description of the V3 goals can be found in the + official design document. +-

      Portability notes and known implementation limitations are as follows.

      The pre-ISO C++ headers ++

      Portability notes and known implementation limitations are as follows.

      Pre-ISO headers moved to backwards or removed

      The pre-ISO C++ headers + (<iostream.h>, + <defalloc.h> etc.) are + available, unlike previous libstdc++ versions, but inclusion +@@ -375,7 +375,7 @@ + std:: into the global namespace. +

      For those of you new to ISO C++ (welcome, time travelers!), no, + that isn't a typo. Yes, the headers really have new names. +- Marshall Cline's C++ FAQ Lite has a good explanation in item ++ Marshall Cline's C++ FAQ Lite has a good explanation in item + [27.4]. +

      Some include adjustment may be required. What follows is an + autoconf test that defines PRE_STDCXX_HEADERS when they +@@ -438,7 +438,7 @@ + directive using namespace std; can be put at the global + scope. This should be enough to get this code compiling, assuming the + other usage is correct. +-

      At this time most of the features of the SGI STL extension have been ++

      Extension headers hash_map, hash_set moved to ext or backwards

      At this time most of the features of the SGI STL extension have been + replaced by standardized libraries. + In particular, the unordered_map and + unordered_set containers of TR1 and C++ 2011 +@@ -512,7 +512,7 @@ + AC_DEFINE(HAVE_EXT_HASH_SET,,[Define if ext/hash_set is present. ]) + fi + ]) +-

      No ios::nocreate/ios::noreplace. +

      The existence of ios::nocreate being used for + input-streams has been confirmed, most probably because the author + thought it would be more correct to specify nocreate explicitly. So +@@ -523,7 +523,7 @@ + decide whether you want to create/replace or not. To my knowledge, + even older implementations support app, ate + and trunc (except for app ?). +-

      + No stream::attach(int fd) +

      + Phil Edwards writes: It was considered and rejected for the ISO +@@ -539,14 +539,14 @@ +

      + An extension is available that implements this. + <ext/stdio_filebuf.h> contains a derived class called +- __gnu_cxx::stdio_filebuf. ++ __gnu_cxx::stdio_filebuf. + This class can be constructed from a C FILE* or a file + descriptor, and provides the fd() function. +

      + For another example of this, refer to +- fdstream example ++ fdstream example + by Nicolai Josuttis. +-

      + Support for C++98 dialect. +

      Check for complete library coverage of the C++1998/2003 standard. + 

      +@@ -614,7 +614,7 @@
+     AC_DEFINE(STDCXX_98_HEADERS,,[Define if ISO C++ 1998 header files are present. ])
+   fi
+ ])
+-

      + Support for C++TR1 dialect. +

      Check for library coverage of the TR1 standard. + 

      +@@ -691,7 +691,7 @@
+     AC_DEFINE(HAVE_TR1_UNORDERED_SET,,[Define if tr1/unordered_set is present. ])
+   fi
+ ])
+-

      + Support for C++11 dialect. +

      Check for baseline language coverage in the compiler for the C++11 standard. + 

      +@@ -935,25 +935,25 @@
+   but the autoconf checks above could be extended to test for incomplete
+   C++11 support with -std=c++0x and
+   -std=gnu++0x.
+-

      + Container::iterator_type is not necessarily Container::value_type* +

      + This is a change in behavior from older versions. Now, most + iterator_type typedefs in container classes are POD + objects, not value_type pointers. +-

      +- ++

      Bibliography

      ++ + Migrating to GCC 4.1 + +- . Dan Kegel.

      +- ++ . Dan Kegel.

      ++ + Building the Whole Debian Archive with GCC 4.1: A Summary + +- . Martin Michlmayr.

      +- ++ . Martin Michlmayr.

      ++ + Migration guide for GCC-3.2 + +- .

      Prev Up Next
      API Evolution and Deprecation History Home Appendix C.  ++ .

      Prev Up Next
      API Evolution and Deprecation History Home Appendix C.  + Free Software Needs Free Documentation + +
      +Index: libstdc++-v3/doc/html/manual/source_design_notes.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/source_design_notes.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/source_design_notes.html (.../branches/gcc-4_7-branch) +@@ -1,863 +1,863 @@ + +- +-Design Notes
      Design Notes
      Prev Appendix A.  ++ ++Design Notes
      Design Notes
      Prev Appendix A.  + Contributing + +- Next

      +-


      +-
      +-    The Library
      +-    -----------
      +-
      +-    This paper is covers two major areas:
      +-
      +-    - Features and policies not mentioned in the standard that
      +-    the quality of the library implementation depends on, including
      +-    extensions and "implementation-defined" features;
      +-
      +-    - Plans for required but unimplemented library features and
      +-    optimizations to them.
      +-
      +-    Overhead
      +-    --------
      +-
      +-    The standard defines a large library, much larger than the standard
      +-    C library. A naive implementation would suffer substantial overhead
      +-    in compile time, executable size, and speed, rendering it unusable
      +-    in many (particularly embedded) applications. The alternative demands
      +-    care in construction, and some compiler support, but there is no
      +-    need for library subsets.
      +-
      +-    What are the sources of this overhead?  There are four main causes:
      +-
      +-    - The library is specified almost entirely as templates, which
      +-    with current compilers must be included in-line, resulting in
      +-    very slow builds as tens or hundreds of thousands of lines
      +-    of function definitions are read for each user source file.
      +-    Indeed, the entire SGI STL, as well as the dos Reis valarray,
      +-    are provided purely as header files, largely for simplicity in
      +-    porting. Iostream/locale is (or will be) as large again.
      +-
      +-    - The library is very flexible, specifying a multitude of hooks
      +-    where users can insert their own code in place of defaults.
      +-    When these hooks are not used, any time and code expended to
      +-    support that flexibility is wasted.
      +-
      +-    - Templates are often described as causing to "code bloat". In
      +-    practice, this refers (when it refers to anything real) to several
      +-    independent processes. First, when a class template is manually
      +-    instantiated in its entirely, current compilers place the definitions
      +-    for all members in a single object file, so that a program linking
      +-    to one member gets definitions of all. Second, template functions
      +-    which do not actually depend on the template argument are, under
      +-    current compilers, generated anew for each instantiation, rather
      +-    than being shared with other instantiations. Third, some of the
      +-    flexibility mentioned above comes from virtual functions (both in
      +-    regular classes and template classes) which current linkers add
      +-    to the executable file even when they manifestly cannot be called.
      +-
      +-    - The library is specified to use a language feature, exceptions,
      +-    which in the current gcc compiler ABI imposes a run time and
      +-    code space cost to handle the possibility of exceptions even when
      +-    they are not used. Under the new ABI (accessed with -fnew-abi),
      +-    there is a space overhead and a small reduction in code efficiency
      +-    resulting from lost optimization opportunities associated with
      +-    non-local branches associated with exceptions.
      +-
      +-    What can be done to eliminate this overhead?  A variety of coding
      +-    techniques, and compiler, linker and library improvements and
      +-    extensions may be used, as covered below. Most are not difficult,
      +-    and some are already implemented in varying degrees.
      +-
      +-    Overhead: Compilation Time
      +-    --------------------------
      +-
      +-    Providing "ready-instantiated" template code in object code archives
      +-    allows us to avoid generating and optimizing template instantiations
      +-    in each compilation unit which uses them. However, the number of such
      +-    instantiations that are useful to provide is limited, and anyway this
      +-    is not enough, by itself, to minimize compilation time. In particular,
      +-    it does not reduce time spent parsing conforming headers.
      +-
      +-    Quicker header parsing will depend on library extensions and compiler
      +-    improvements.  One approach is some variation on the techniques
      +-    previously marketed as "pre-compiled headers", now standardized as
      +-    support for the "export" keyword. "Exported" template definitions
      +-    can be placed (once) in a "repository" -- really just a library, but
      +-    of template definitions rather than object code -- to be drawn upon
      +-    at link time when an instantiation is needed, rather than placed in
      +-    header files to be parsed along with every compilation unit.
      +-
      +-    Until "export" is implemented we can put some of the lengthy template
      +-    definitions in #if guards or alternative headers so that users can skip
      +-    over the full definitions when they need only the ready-instantiated
      +-    specializations.
      +-
      +-    To be precise, this means that certain headers which define
      +-    templates which users normally use only for certain arguments
      +-    can be instrumented to avoid exposing the template definitions
      +-    to the compiler unless a macro is defined. For example, in
      +-    <string>, we might have:
      +-
      +-    template <class _CharT, ... > class basic_string {
      +-    ... // member declarations
      +-    };
      +-    ... // operator declarations
      +-
      +-    #ifdef _STRICT_ISO_
      +-    # if _G_NO_TEMPLATE_EXPORT
      +-    #   include <bits/std_locale.h>  // headers needed by definitions
      +-    #   ...
      +-    #   include <bits/string.tcc>  // member and global template definitions.
      +-    # endif
      +-    #endif
      +-
      +-    Users who compile without specifying a strict-ISO-conforming flag
      +-    would not see many of the template definitions they now see, and rely
      +-    instead on ready-instantiated specializations in the library. This
      +-    technique would be useful for the following substantial components:
      +-    string, locale/iostreams, valarray. It would *not* be useful or
      +-    usable with the following: containers, algorithms, iterators,
      +-    allocator. Since these constitute a large (though decreasing)
      +-    fraction of the library, the benefit the technique offers is
      +-    limited.
      +-
      +-    The language specifies the semantics of the "export" keyword, but
      +-    the gcc compiler does not yet support it. When it does, problems
      +-    with large template inclusions can largely disappear, given some
      +-    minor library reorganization, along with the need for the apparatus
      +-    described above.
      +-
      +-    Overhead: Flexibility Cost
      +-    --------------------------
      +-
      +-    The library offers many places where users can specify operations
      +-    to be performed by the library in place of defaults. Sometimes
      +-    this seems to require that the library use a more-roundabout, and
      +-    possibly slower, way to accomplish the default requirements than
      +-    would be used otherwise.
      +-
      +-    The primary protection against this overhead is thorough compiler
      +-    optimization, to crush out layers of inline function interfaces.
      +-    Kuck & Associates has demonstrated the practicality of this kind
      +-    of optimization.
      +-
      +-    The second line of defense against this overhead is explicit
      +-    specialization. By defining helper function templates, and writing
      +-    specialized code for the default case, overhead can be eliminated
      +-    for that case without sacrificing flexibility. This takes full
      +-    advantage of any ability of the optimizer to crush out degenerate
      +-    code.
      +-
      +-    The library specifies many virtual functions which current linkers
      +-    load even when they cannot be called. Some minor improvements to the
      +-    compiler and to ld would eliminate any such overhead by simply
      +-    omitting virtual functions that the complete program does not call.
      +-    A prototype of this work has already been done. For targets where
      +-    GNU ld is not used, a "pre-linker" could do the same job.
      +-
      +-    The main areas in the standard interface where user flexibility
      +-    can result in overhead are:
      +-
      +-    - Allocators:  Containers are specified to use user-definable
      +-    allocator types and objects, making tuning for the container
      +-    characteristics tricky.
      +-
      +-    - Locales: the standard specifies locale objects used to implement
      +-    iostream operations, involving many virtual functions which use
      +-    streambuf iterators.
      +-
      +-    - Algorithms and containers: these may be instantiated on any type,
      +-    frequently duplicating code for identical operations.
      +-
      +-    - Iostreams and strings: users are permitted to use these on their
      +-    own types, and specify the operations the stream must use on these
      +-    types.
      +-
      +-    Note that these sources of overhead are _avoidable_. The techniques
      +-    to avoid them are covered below.
      +-
      +-    Code Bloat
      +-    ----------
      +-
      +-    In the SGI STL, and in some other headers, many of the templates
      +-    are defined "inline" -- either explicitly or by their placement
      +-    in class definitions -- which should not be inline. This is a
      +-    source of code bloat. Matt had remarked that he was relying on
      +-    the compiler to recognize what was too big to benefit from inlining,
      +-    and generate it out-of-line automatically. However, this also can
      +-    result in code bloat except where the linker can eliminate the extra
      +-    copies.
      +-
      +-    Fixing these cases will require an audit of all inline functions
      +-    defined in the library to determine which merit inlining, and moving
      +-    the rest out of line. This is an issue mainly in chapters 23, 25, and
      +-    27. Of course it can be done incrementally, and we should generally
      +-    accept patches that move large functions out of line and into ".tcc"
      +-    files, which can later be pulled into a repository. Compiler/linker
      +-    improvements to recognize very large inline functions and move them
      +-    out-of-line, but shared among compilation units, could make this
      +-    work unnecessary.
      +-
      +-    Pre-instantiating template specializations currently produces large
      +-    amounts of dead code which bloats statically linked programs. The
      +-    current state of the static library, libstdc++.a, is intolerable on
      +-    this account, and will fuel further confused speculation about a need
      +-    for a library "subset". A compiler improvement that treats each
      +-    instantiated function as a separate object file, for linking purposes,
      +-    would be one solution to this problem. An alternative would be to
      +-    split up the manual instantiation files into dozens upon dozens of
      +-    little files, each compiled separately, but an abortive attempt at
      +-    this was done for <string> and, though it is far from complete, it
      +-    is already a nuisance. A better interim solution (just until we have
      +-    "export") is badly needed.
      +-
      +-    When building a shared library, the current compiler/linker cannot
      +-    automatically generate the instantiations needed. This creates a
      +-    miserable situation; it means any time something is changed in the
      +-    library, before a shared library can be built someone must manually
      +-    copy the declarations of all templates that are needed by other parts
      +-    of the library to an "instantiation" file, and add it to the build
      +-    system to be compiled and linked to the library. This process is
      +-    readily automated, and should be automated as soon as possible.
      +-    Users building their own shared libraries experience identical
      +-    frustrations.
      +-
      +-    Sharing common aspects of template definitions among instantiations
      +-    can radically reduce code bloat. The compiler could help a great
      +-    deal here by recognizing when a function depends on nothing about
      +-    a template parameter, or only on its size, and giving the resulting
      +-    function a link-name "equate" that allows it to be shared with other
      +-    instantiations. Implementation code could take advantage of the
      +-    capability by factoring out code that does not depend on the template
      +-    argument into separate functions to be merged by the compiler.
      +-
      +-    Until such a compiler optimization is implemented, much can be done
      +-    manually (if tediously) in this direction. One such optimization is
      +-    to derive class templates from non-template classes, and move as much
      +-    implementation as possible into the base class. Another is to partial-
      +-    specialize certain common instantiations, such as vector<T*>, to share
      +-    code for instantiations on all types T. While these techniques work,
      +-    they are far from the complete solution that a compiler improvement
      +-    would afford.
      +-
      +-    Overhead: Expensive Language Features
      +-    -------------------------------------
      +-
      +-    The main "expensive" language feature used in the standard library
      +-    is exception support, which requires compiling in cleanup code with
      +-    static table data to locate it, and linking in library code to use
      +-    the table. For small embedded programs the amount of such library
      +-    code and table data is assumed by some to be excessive. Under the
      +-    "new" ABI this perception is generally exaggerated, although in some
      +-    cases it may actually be excessive.
      +-
      +-    To implement a library which does not use exceptions directly is
      +-    not difficult given minor compiler support (to "turn off" exceptions
      +-    and ignore exception constructs), and results in no great library
      +-    maintenance difficulties. To be precise, given "-fno-exceptions",
      +-    the compiler should treat "try" blocks as ordinary blocks, and
      +-    "catch" blocks as dead code to ignore or eliminate. Compiler
      +-    support is not strictly necessary, except in the case of "function
      +-    try blocks"; otherwise the following macros almost suffice:
      +-
      +-    #define throw(X)
      +-    #define try      if (true)
      +-    #define catch(X) else if (false)
      +-
      +-    However, there may be a need to use function try blocks in the
      +-    library implementation, and use of macros in this way can make
      +-    correct diagnostics impossible. Furthermore, use of this scheme
      +-    would require the library to call a function to re-throw exceptions
      +-    from a try block. Implementing the above semantics in the compiler
      +-    is preferable.
      +-
      +-    Given the support above (however implemented) it only remains to
      +-    replace code that "throws" with a call to a well-documented "handler"
      +-    function in a separate compilation unit which may be replaced by
      +-    the user. The main source of exceptions that would be difficult
      +-    for users to avoid is memory allocation failures, but users can
      +-    define their own memory allocation primitives that never throw.
      +-    Otherwise, the complete list of such handlers, and which library
      +-    functions may call them, would be needed for users to be able to
      +-    implement the necessary substitutes. (Fortunately, they have the
      +-    source code.)
      +-
      +-    Opportunities
      +-    -------------
      +-
      +-    The template capabilities of C++ offer enormous opportunities for
      +-    optimizing common library operations, well beyond what would be
      +-    considered "eliminating overhead". In particular, many operations
      +-    done in Glibc with macros that depend on proprietary language
      +-    extensions can be implemented in pristine Standard C++. For example,
      +-    the chapter 25 algorithms, and even C library functions such as strchr,
      +-    can be specialized for the case of static arrays of known (small) size.
      +-
      +-    Detailed optimization opportunities are identified below where
      +-    the component where they would appear is discussed. Of course new
      +-    opportunities will be identified during implementation.
      +-
      +-    Unimplemented Required Library Features
      +-    ---------------------------------------
      +-
      +-    The standard specifies hundreds of components, grouped broadly by
      +-    chapter. These are listed in excruciating detail in the CHECKLIST
      +-    file.
      +-
      +-    17 general
      +-    18 support
      +-    19 diagnostics
      +-    20 utilities
      +-    21 string
      +-    22 locale
      +-    23 containers
      +-    24 iterators
      +-    25 algorithms
      +-    26 numerics
      +-    27 iostreams
      +-    Annex D  backward compatibility
      +-
      +-    Anyone participating in implementation of the library should obtain
      +-    a copy of the standard, ISO 14882.  People in the U.S. can obtain an
      +-    electronic copy for US$18 from ANSI's web site. Those from other
      +-    countries should visit http://www.iso.org/ to find out the location
      +-    of their country's representation in ISO, in order to know who can
      +-    sell them a copy.
      +-
      +-    The emphasis in the following sections is on unimplemented features
      +-    and optimization opportunities.
      +-
      +-    Chapter 17  General
      +-    -------------------
      +-
      +-    Chapter 17 concerns overall library requirements.
      +-
      +-    The standard doesn't mention threads. A multi-thread (MT) extension
      +-    primarily affects operators new and delete (18), allocator (20),
      +-    string (21), locale (22), and iostreams (27). The common underlying
      +-    support needed for this is discussed under chapter 20.
      +-
      +-    The standard requirements on names from the C headers create a
      +-    lot of work, mostly done. Names in the C headers must be visible
      +-    in the std:: and sometimes the global namespace; the names in the
      +-    two scopes must refer to the same object. More stringent is that
      +-    Koenig lookup implies that any types specified as defined in std::
      +-    really are defined in std::. Names optionally implemented as
      +-    macros in C cannot be macros in C++. (An overview may be read at
      +-    <http://www.cantrip.org/cheaders.html>). The scripts "inclosure"
      +-    and "mkcshadow", and the directories shadow/ and cshadow/, are the
      +-    beginning of an effort to conform in this area.
      +-
      +-    A correct conforming definition of C header names based on underlying
      +-    C library headers, and practical linking of conforming namespaced
      +-    customer code with third-party C libraries depends ultimately on
      +-    an ABI change, allowing namespaced C type names to be mangled into
      +-    type names as if they were global, somewhat as C function names in a
      +-    namespace, or C++ global variable names, are left unmangled. Perhaps
      +-    another "extern" mode, such as 'extern "C-global"' would be an
      +-    appropriate place for such type definitions. Such a type would
      +-    affect mangling as follows:
      +-
      +-    namespace A {
      +-    struct X {};
      +-    extern "C-global" {  // or maybe just 'extern "C"'
      +-    struct Y {};
      +-    };
      +-    }
      +-    void f(A::X*);  // mangles to f__FPQ21A1X
      +-    void f(A::Y*);  // mangles to f__FP1Y
      +-
      +-    (It may be that this is really the appropriate semantics for regular
      +-    'extern "C"', and 'extern "C-global"', as an extension, would not be
      +-    necessary.) This would allow functions declared in non-standard C headers
      +-    (and thus fixable by neither us nor users) to link properly with functions
      +-    declared using C types defined in properly-namespaced headers. The
      +-    problem this solves is that C headers (which C++ programmers do persist
      +-    in using) frequently forward-declare C struct tags without including
      +-    the header where the type is defined, as in
      +-
      +-    struct tm;
      +-    void munge(tm*);
      +-
      +-    Without some compiler accommodation, munge cannot be called by correct
      +-    C++ code using a pointer to a correctly-scoped tm* value.
      +-
      +-    The current C headers use the preprocessor extension "#include_next",
      +-    which the compiler complains about when run "-pedantic".
      +-    (Incidentally, it appears that "-fpedantic" is currently ignored,
      +-    probably a bug.)  The solution in the C compiler is to use
      +-    "-isystem" rather than "-I", but unfortunately in g++ this seems
      +-    also to wrap the whole header in an 'extern "C"' block, so it's
      +-    unusable for C++ headers. The correct solution appears to be to
      +-    allow the various special include-directory options, if not given
      +-    an argument, to affect subsequent include-directory options additively,
      +-    so that if one said
      +-
      +-    -pedantic -iprefix $(prefix) \
      +-    -idirafter -ino-pedantic -ino-extern-c -iwithprefix -I g++-v3 \
      +-    -iwithprefix -I g++-v3/ext
      +-
      +-    the compiler would search $(prefix)/g++-v3 and not report
      +-    pedantic warnings for files found there, but treat files in
      +-    $(prefix)/g++-v3/ext pedantically. (The undocumented semantics
      +-    of "-isystem" in g++ stink. Can they be rescinded?  If not it
      +-    must be replaced with something more rationally behaved.)
      +-
      +-    All the C headers need the treatment above; in the standard these
      +-    headers are mentioned in various chapters. Below, I have only
      +-    mentioned those that present interesting implementation issues.
      +-
      +-    The components identified as "mostly complete", below, have not been
      +-    audited for conformance. In many cases where the library passes
      +-    conformance tests we have non-conforming extensions that must be
      +-    wrapped in #if guards for "pedantic" use, and in some cases renamed
      +-    in a conforming way for continued use in the implementation regardless
      +-    of conformance flags.
      +-
      +-    The STL portion of the library still depends on a header
      +-    stl/bits/stl_config.h full of #ifdef clauses. This apparatus
      +-    should be replaced with autoconf/automake machinery.
      +-
      +-    The SGI STL defines a type_traits<> template, specialized for
      +-    many types in their code including the built-in numeric and
      +-    pointer types and some library types, to direct optimizations of
      +-    standard functions. The SGI compiler has been extended to generate
      +-    specializations of this template automatically for user types,
      +-    so that use of STL templates on user types can take advantage of
      +-    these optimizations. Specializations for other, non-STL, types
      +-    would make more optimizations possible, but extending the gcc
      +-    compiler in the same way would be much better. Probably the next
      +-    round of standardization will ratify this, but probably with
      +-    changes, so it probably should be renamed to place it in the
      +-    implementation namespace.
      +-
      +-    The SGI STL also defines a large number of extensions visible in
      +-    standard headers. (Other extensions that appear in separate headers
      +-    have been sequestered in subdirectories ext/ and backward/.)  All
      +-    these extensions should be moved to other headers where possible,
      +-    and in any case wrapped in a namespace (not std!), and (where kept
      +-    in a standard header) girded about with macro guards. Some cannot be
      +-    moved out of standard headers because they are used to implement
      +-    standard features.  The canonical method for accommodating these
      +-    is to use a protected name, aliased in macro guards to a user-space
      +-    name. Unfortunately C++ offers no satisfactory template typedef
      +-    mechanism, so very ad-hoc and unsatisfactory aliasing must be used
      +-    instead.
      +-
      +-    Implementation of a template typedef mechanism should have the highest
      +-    priority among possible extensions, on the same level as implementation
      +-    of the template "export" feature.
      +-
      +-    Chapter 18  Language support
      +-    ----------------------------
      +-
      +-    Headers: <limits> <new> <typeinfo> <exception>
      +-    C headers: <cstddef> <climits> <cfloat>  <cstdarg> <csetjmp>
      +-    <ctime>   <csignal> <cstdlib> (also 21, 25, 26)
      +-
      +-    This defines the built-in exceptions, rtti, numeric_limits<>,
      +-    operator new and delete. Much of this is provided by the
      +-    compiler in its static runtime library.
      +-
      +-    Work to do includes defining numeric_limits<> specializations in
      +-    separate files for all target architectures. Values for integer types
      +-    except for bool and wchar_t are readily obtained from the C header
      +-    <limits.h>, but values for the remaining numeric types (bool, wchar_t,
      +-    float, double, long double) must be entered manually. This is
      +-    largely dog work except for those members whose values are not
      +-    easily deduced from available documentation. Also, this involves
      +-    some work in target configuration to identify the correct choice of
      +-    file to build against and to install.
      +-
      +-    The definitions of the various operators new and delete must be
      +-    made thread-safe, which depends on a portable exclusion mechanism,
      +-    discussed under chapter 20.  Of course there is always plenty of
      +-    room for improvements to the speed of operators new and delete.
      +-
      +-    <cstdarg>, in Glibc, defines some macros that gcc does not allow to
      +-    be wrapped into an inline function. Probably this header will demand
      +-    attention whenever a new target is chosen. The functions atexit(),
      +-    exit(), and abort() in cstdlib have different semantics in C++, so
      +-    must be re-implemented for C++.
      +-
      +-    Chapter 19  Diagnostics
      +-    -----------------------
      +-
      +-    Headers: <stdexcept>
      +-    C headers: <cassert> <cerrno>
      +-
      +-    This defines the standard exception objects, which are "mostly complete".
      +-    Cygnus has a version, and now SGI provides a slightly different one.
      +-    It makes little difference which we use.
      +-
      +-    The C global name "errno", which C allows to be a variable or a macro,
      +-    is required in C++ to be a macro. For MT it must typically result in
      +-    a function call.
      +-
      +-    Chapter 20  Utilities
      +-    ---------------------
      +-    Headers: <utility> <functional> <memory>
      +-    C header: <ctime> (also in 18)
      +-
      +-    SGI STL provides "mostly complete" versions of all the components
      +-    defined in this chapter. However, the auto_ptr<> implementation
      +-    is known to be wrong. Furthermore, the standard definition of it
      +-    is known to be unimplementable as written. A minor change to the
      +-    standard would fix it, and auto_ptr<> should be adjusted to match.
      +-
      +-    Multi-threading affects the allocator implementation, and there must
      +-    be configuration/installation choices for different users' MT
      +-    requirements. Anyway, users will want to tune allocator options
      +-    to support different target conditions, MT or no.
      +-
      +-    The primitives used for MT implementation should be exposed, as an
      +-    extension, for users' own work. We need cross-CPU "mutex" support,
      +-    multi-processor shared-memory atomic integer operations, and single-
      +-    processor uninterruptible integer operations, and all three configurable
      +-    to be stubbed out for non-MT use, or to use an appropriately-loaded
      +-    dynamic library for the actual runtime environment, or statically
      +-    compiled in for cases where the target architecture is known.
      +-
      +-    Chapter 21  String
      +-    ------------------
      +-    Headers: <string>
      +-    C headers: <cctype> <cwctype> <cstring> <cwchar> (also in 27)
      +-    <cstdlib> (also in 18, 25, 26)
      +-
      +-    We have "mostly-complete" char_traits<> implementations. Many of the
      +-    char_traits<char> operations might be optimized further using existing
      +-    proprietary language extensions.
      +-
      +-    We have a "mostly-complete" basic_string<> implementation. The work
      +-    to manually instantiate char and wchar_t specializations in object
      +-    files to improve link-time behavior is extremely unsatisfactory,
      +-    literally tripling library-build time with no commensurate improvement
      +-    in static program link sizes. It must be redone. (Similar work is
      +-    needed for some components in chapters 22 and 27.)
      +-
      +-    Other work needed for strings is MT-safety, as discussed under the
      +-    chapter 20 heading.
      +-
      +-    The standard C type mbstate_t from <cwchar> and used in char_traits<>
      +-    must be different in C++ than in C, because in C++ the default constructor
      +-    value mbstate_t() must be the "base" or "ground" sequence state.
      +-    (According to the likely resolution of a recently raised Core issue,
      +-    this may become unnecessary. However, there are other reasons to
      +-    use a state type not as limited as whatever the C library provides.)
      +-    If we might want to provide conversions from (e.g.) internally-
      +-    represented EUC-wide to externally-represented Unicode, or vice-
      +-    versa, the mbstate_t we choose will need to be more accommodating
      +-    than what might be provided by an underlying C library.
      +-
      +-    There remain some basic_string template-member functions which do
      +-    not overload properly with their non-template brethren. The infamous
      +-    hack akin to what was done in vector<> is needed, to conform to
      +-    23.1.1 para 10. The CHECKLIST items for basic_string marked 'X',
      +-    or incomplete, are so marked for this reason.
      +-
      +-    Replacing the string iterators, which currently are simple character
      +-    pointers, with class objects would greatly increase the safety of the
      +-    client interface, and also permit a "debug" mode in which range,
      +-    ownership, and validity are rigorously checked. The current use of
      +-    raw pointers as string iterators is evil. vector<> iterators need the
      +-    same treatment. Note that the current implementation freely mixes
      +-    pointers and iterators, and that must be fixed before safer iterators
      +-    can be introduced.
      +-
      +-    Some of the functions in <cstring> are different from the C version.
      +-    generally overloaded on const and non-const argument pointers. For
      +-    example, in <cstring> strchr is overloaded. The functions isupper
      +-    etc. in <cctype> typically implemented as macros in C are functions
      +-    in C++, because they are overloaded with others of the same name
      +-    defined in <locale>.
      +-
      +-    Many of the functions required in <cwctype> and <cwchar> cannot be
      +-    implemented using underlying C facilities on intended targets because
      +-    such facilities only partly exist.
      +-
      +-    Chapter 22  Locale
      +-    ------------------
      +-    Headers: <locale>
      +-    C headers: <clocale>
      +-
      +-    We have a "mostly complete" class locale, with the exception of
      +-    code for constructing, and handling the names of, named locales.
      +-    The ways that locales are named (particularly when categories
      +-    (e.g. LC_TIME, LC_COLLATE) are different) varies among all target
      +-    environments. This code must be written in various versions and
      +-    chosen by configuration parameters.
      +-
      +-    Members of many of the facets defined in <locale> are stubs. Generally,
      +-    there are two sets of facets: the base class facets (which are supposed
      +-    to implement the "C" locale) and the "byname" facets, which are supposed
      +-    to read files to determine their behavior. The base ctype<>, collate<>,
      +-    and numpunct<> facets are "mostly complete", except that the table of
      +-    bitmask values used for "is" operations, and corresponding mask values,
      +-    are still defined in libio and just included/linked. (We will need to
      +-    implement these tables independently, soon, but should take advantage
      +-    of libio where possible.)  The num_put<>::put members for integer types
      +-    are "mostly complete".
      +-
      +-    A complete list of what has and has not been implemented may be
      +-    found in CHECKLIST. However, note that the current definition of
      +-    codecvt<wchar_t,char,mbstate_t> is wrong. It should simply write
      +-    out the raw bytes representing the wide characters, rather than
      +-    trying to convert each to a corresponding single "char" value.
      +-
      +-    Some of the facets are more important than others. Specifically,
      +-    the members of ctype<>, numpunct<>, num_put<>, and num_get<> facets
      +-    are used by other library facilities defined in <string>, <istream>,
      +-    and <ostream>, and the codecvt<> facet is used by basic_filebuf<>
      +-    in <fstream>, so a conforming iostream implementation depends on
      +-    these.
      +-
      +-    The "long long" type eventually must be supported, but code mentioning
      +-    it should be wrapped in #if guards to allow pedantic-mode compiling.
      +-
      +-    Performance of num_put<> and num_get<> depend critically on
      +-    caching computed values in ios_base objects, and on extensions
      +-    to the interface with streambufs.
      +-
      +-    Specifically: retrieving a copy of the locale object, extracting
      +-    the needed facets, and gathering data from them, for each call to
      +-    (e.g.) operator<< would be prohibitively slow.  To cache format
      +-    data for use by num_put<> and num_get<> we have a _Format_cache<>
      +-    object stored in the ios_base::pword() array. This is constructed
      +-    and initialized lazily, and is organized purely for utility. It
      +-    is discarded when a new locale with different facets is imbued.
      +-
      +-    Using only the public interfaces of the iterator arguments to the
      +-    facet functions would limit performance by forbidding "vector-style"
      +-    character operations. The streambuf iterator optimizations are
      +-    described under chapter 24, but facets can also bypass the streambuf
      +-    iterators via explicit specializations and operate directly on the
      +-    streambufs, and use extended interfaces to get direct access to the
      +-    streambuf internal buffer arrays. These extensions are mentioned
      +-    under chapter 27. These optimizations are particularly important
      +-    for input parsing.
      +-
      +-    Unused virtual members of locale facets can be omitted, as mentioned
      +-    above, by a smart linker.
      +-
      +-    Chapter 23  Containers
      +-    ----------------------
      +-    Headers: <deque> <list> <queue> <stack> <vector> <map> <set> <bitset>
      +-
      +-    All the components in chapter 23 are implemented in the SGI STL.
      +-    They are "mostly complete"; they include a large number of
      +-    nonconforming extensions which must be wrapped. Some of these
      +-    are used internally and must be renamed or duplicated.
      +-
      +-    The SGI components are optimized for large-memory environments. For
      +-    embedded targets, different criteria might be more appropriate. Users
      +-    will want to be able to tune this behavior. We should provide
      +-    ways for users to compile the library with different memory usage
      +-    characteristics.
      +-
      +-    A lot more work is needed on factoring out common code from different
      +-    specializations to reduce code size here and in chapter 25. The
      +-    easiest fix for this would be a compiler/ABI improvement that allows
      +-    the compiler to recognize when a specialization depends only on the
      +-    size (or other gross quality) of a template argument, and allow the
      +-    linker to share the code with similar specializations. In its
      +-    absence, many of the algorithms and containers can be partial-
      +-    specialized, at least for the case of pointers, but this only solves
      +-    a small part of the problem. Use of a type_traits-style template
      +-    allows a few more optimization opportunities, more if the compiler
      +-    can generate the specializations automatically.
      +-
      +-    As an optimization, containers can specialize on the default allocator
      +-    and bypass it, or take advantage of details of its implementation
      +-    after it has been improved upon.
      +-
      +-    Replacing the vector iterators, which currently are simple element
      +-    pointers, with class objects would greatly increase the safety of the
      +-    client interface, and also permit a "debug" mode in which range,
      +-    ownership, and validity are rigorously checked. The current use of
      +-    pointers for iterators is evil.
      +-
      +-    As mentioned for chapter 24, the deque iterator is a good example of
      +-    an opportunity to implement a "staged" iterator that would benefit
      +-    from specializations of some algorithms.
      +-
      +-    Chapter 24  Iterators
      +-    ---------------------
      +-    Headers: <iterator>
      +-
      +-    Standard iterators are "mostly complete", with the exception of
      +-    the stream iterators, which are not yet templatized on the
      +-    stream type. Also, the base class template iterator<> appears
      +-    to be wrong, so everything derived from it must also be wrong,
      +-    currently.
      +-
      +-    The streambuf iterators (currently located in stl/bits/std_iterator.h,
      +-    but should be under bits/) can be rewritten to take advantage of
      +-    friendship with the streambuf implementation.
      +-
      +-    Matt Austern has identified opportunities where certain iterator
      +-    types, particularly including streambuf iterators and deque
      +-    iterators, have a "two-stage" quality, such that an intermediate
      +-    limit can be checked much more quickly than the true limit on
      +-    range operations. If identified with a member of iterator_traits,
      +-    algorithms may be specialized for this case. Of course the
      +-    iterators that have this quality can be identified by specializing
      +-    a traits class.
      +-
      +-    Many of the algorithms must be specialized for the streambuf
      +-    iterators, to take advantage of block-mode operations, in order
      +-    to allow iostream/locale operations' performance not to suffer.
      +-    It may be that they could be treated as staged iterators and
      +-    take advantage of those optimizations.
      +-
      +-    Chapter 25  Algorithms
      +-    ----------------------
      +-    Headers: <algorithm>
      +-    C headers: <cstdlib> (also in 18, 21, 26))
      +-
      +-    The algorithms are "mostly complete". As mentioned above, they
      +-    are optimized for speed at the expense of code and data size.
      +-
      +-    Specializations of many of the algorithms for non-STL types would
      +-    give performance improvements, but we must use great care not to
      +-    interfere with fragile template overloading semantics for the
      +-    standard interfaces. Conventionally the standard function template
      +-    interface is an inline which delegates to a non-standard function
      +-    which is then overloaded (this is already done in many places in
      +-    the library). Particularly appealing opportunities for the sake of
      +-    iostream performance are for copy and find applied to streambuf
      +-    iterators or (as noted elsewhere) for staged iterators, of which
      +-    the streambuf iterators are a good example.
      +-
      +-    The bsearch and qsort functions cannot be overloaded properly as
      +-    required by the standard because gcc does not yet allow overloading
      +-    on the extern-"C"-ness of a function pointer.
      +-
      +-    Chapter 26  Numerics
      +-    --------------------
      +-    Headers: <complex> <valarray> <numeric>
      +-    C headers: <cmath>, <cstdlib> (also 18, 21, 25)
      +-
      +-    Numeric components: Gabriel dos Reis's valarray, Drepper's complex,
      +-    and the few algorithms from the STL are "mostly done".  Of course
      +-    optimization opportunities abound for the numerically literate. It
      +-    is not clear whether the valarray implementation really conforms
      +-    fully, in the assumptions it makes about aliasing (and lack thereof)
      +-    in its arguments.
      +-
      +-    The C div() and ldiv() functions are interesting, because they are the
      +-    only case where a C library function returns a class object by value.
      +-    Since the C++ type div_t must be different from the underlying C type
      +-    (which is in the wrong namespace) the underlying functions div() and
      +-    ldiv() cannot be re-used efficiently. Fortunately they are trivial to
      +-    re-implement.
      +-
      +-    Chapter 27  Iostreams
      +-    ---------------------
      +-    Headers: <iosfwd> <streambuf> <ios> <ostream> <istream> <iostream>
      +-    <iomanip> <sstream> <fstream>
      +-    C headers: <cstdio> <cwchar> (also in 21)
      +-
      +-    Iostream is currently in a very incomplete state. <iosfwd>, <iomanip>,
      +-    ios_base, and basic_ios<> are "mostly complete". basic_streambuf<> and
      +-    basic_ostream<> are well along, but basic_istream<> has had little work
      +-    done. The standard stream objects, <sstream> and <fstream> have been
      +-    started; basic_filebuf<> "write" functions have been implemented just
      +-    enough to do "hello, world".
      +-
      +-    Most of the istream and ostream operators << and >> (with the exception
      +-    of the op<<(integer) ones) have not been changed to use locale primitives,
      +-    sentry objects, or char_traits members.
      +-
      +-    All these templates should be manually instantiated for char and
      +-    wchar_t in a way that links only used members into user programs.
      +-
      +-    Streambuf is fertile ground for optimization extensions. An extended
      +-    interface giving iterator access to its internal buffer would be very
      +-    useful for other library components.
      +-
      +-    Iostream operations (primarily operators << and >>) can take advantage
      +-    of the case where user code has not specified a locale, and bypass locale
      +-    operations entirely. The current implementation of op<</num_put<>::put,
      +-    for the integer types, demonstrates how they can cache encoding details
      +-    from the locale on each operation. There is lots more room for
      +-    optimization in this area.
      +-
      +-    The definition of the relationship between the standard streams
      +-    cout et al. and stdout et al. requires something like a "stdiobuf".
      +-    The SGI solution of using double-indirection to actually use a
      +-    stdio FILE object for buffering is unsatisfactory, because it
      +-    interferes with peephole loop optimizations.
      +-
      +-    The <sstream> header work has begun. stringbuf can benefit from
      +-    friendship with basic_string<> and basic_string<>::_Rep to use
      +-    those objects directly as buffers, and avoid allocating and making
      +-    copies.
      +-
      +-    The basic_filebuf<> template is a complex beast. It is specified to
      +-    use the locale facet codecvt<> to translate characters between native
      +-    files and the locale character encoding. In general this involves
      +-    two buffers, one of "char" representing the file and another of
      +-    "char_type", for the stream, with codecvt<> translating. The process
      +-    is complicated by the variable-length nature of the translation, and
      +-    the need to seek to corresponding places in the two representations.
      +-    For the case of basic_filebuf<char>, when no translation is needed,
      +-    a single buffer suffices. A specialized filebuf can be used to reduce
      +-    code space overhead when no locale has been imbued. Matt Austern's
      +-    work at SGI will be useful, perhaps directly as a source of code, or
      +-    at least as an example to draw on.
      +-
      +-    Filebuf, almost uniquely (cf. operator new), depends heavily on
      +-    underlying environmental facilities. In current releases iostream
      +-    depends fairly heavily on libio constant definitions, but it should
      +-    be made independent.  It also depends on operating system primitives
      +-    for file operations. There is immense room for optimizations using
      +-    (e.g.) mmap for reading. The shadow/ directory wraps, besides the
      +-    standard C headers, the libio.h and unistd.h headers, for use mainly
      +-    by filebuf. These wrappings have not been completed, though there
      +-    is scaffolding in place.
      +-
      +-    The encapsulation of certain C header <cstdio> names presents an
      +-    interesting problem. It is possible to define an inline std::fprintf()
      +-    implemented in terms of the 'extern "C"' vfprintf(), but there is no
      +-    standard vfscanf() to use to implement std::fscanf(). It appears that
      +-    vfscanf but be re-implemented in C++ for targets where no vfscanf
      +-    extension has been defined. This is interesting in that it seems
      +-    to be the only significant case in the C library where this kind of
      +-    rewriting is necessary. (Of course Glibc provides the vfscanf()
      +-    extension.)  (The functions related to exit() must be rewritten
      +-    for other reasons.)
      +-
      +-
      +-    Annex D
      +-    -------
      +-    Headers: <strstream>
      +-
      +-    Annex D defines many non-library features, and many minor
      +-    modifications to various headers, and a complete header.
      +-    It is "mostly done", except that the libstdc++-2 <strstream>
      +-    header has not been adopted into the library, or checked to
      +-    verify that it matches the draft in those details that were
      +-    clarified by the committee. Certainly it must at least be
      +-    moved into the std namespace.
      +-
      +-    We still need to wrap all the deprecated features in #if guards
      +-    so that pedantic compile modes can detect their use.
      +-
      +-    Nonstandard Extensions
      +-    ----------------------
      +-    Headers: <iostream.h> <strstream.h> <hash> <rbtree>
      +-    <pthread_alloc> <stdiobuf> (etc.)
      +-
      +-    User code has come to depend on a variety of nonstandard components
      +-    that we must not omit. Much of this code can be adopted from
      +-    libstdc++-v2 or from the SGI STL. This particularly includes
      +-    <iostream.h>, <strstream.h>, and various SGI extensions such
      +-    as <hash_map.h>. Many of these are already placed in the
      +-    subdirectories ext/ and backward/. (Note that it is better to
      +-    include them via "<backward/hash_map.h>" or "<ext/hash_map>" than
      +-    to search the subdirectory itself via a "-I" directive.
      +-  

      Prev Up Next
      Coding Style Home Appendix B.  ++ Next

      Design Notes

      ++


      ++
      ++    The Library
      ++    -----------
      ++
      ++    This paper is covers two major areas:
      ++
      ++    - Features and policies not mentioned in the standard that
      ++    the quality of the library implementation depends on, including
      ++    extensions and "implementation-defined" features;
      ++
      ++    - Plans for required but unimplemented library features and
      ++    optimizations to them.
      ++
      ++    Overhead
      ++    --------
      ++
      ++    The standard defines a large library, much larger than the standard
      ++    C library. A naive implementation would suffer substantial overhead
      ++    in compile time, executable size, and speed, rendering it unusable
      ++    in many (particularly embedded) applications. The alternative demands
      ++    care in construction, and some compiler support, but there is no
      ++    need for library subsets.
      ++
      ++    What are the sources of this overhead?  There are four main causes:
      ++
      ++    - The library is specified almost entirely as templates, which
      ++    with current compilers must be included in-line, resulting in
      ++    very slow builds as tens or hundreds of thousands of lines
      ++    of function definitions are read for each user source file.
      ++    Indeed, the entire SGI STL, as well as the dos Reis valarray,
      ++    are provided purely as header files, largely for simplicity in
      ++    porting. Iostream/locale is (or will be) as large again.
      ++
      ++    - The library is very flexible, specifying a multitude of hooks
      ++    where users can insert their own code in place of defaults.
      ++    When these hooks are not used, any time and code expended to
      ++    support that flexibility is wasted.
      ++
      ++    - Templates are often described as causing to "code bloat". In
      ++    practice, this refers (when it refers to anything real) to several
      ++    independent processes. First, when a class template is manually
      ++    instantiated in its entirely, current compilers place the definitions
      ++    for all members in a single object file, so that a program linking
      ++    to one member gets definitions of all. Second, template functions
      ++    which do not actually depend on the template argument are, under
      ++    current compilers, generated anew for each instantiation, rather
      ++    than being shared with other instantiations. Third, some of the
      ++    flexibility mentioned above comes from virtual functions (both in
      ++    regular classes and template classes) which current linkers add
      ++    to the executable file even when they manifestly cannot be called.
      ++
      ++    - The library is specified to use a language feature, exceptions,
      ++    which in the current gcc compiler ABI imposes a run time and
      ++    code space cost to handle the possibility of exceptions even when
      ++    they are not used. Under the new ABI (accessed with -fnew-abi),
      ++    there is a space overhead and a small reduction in code efficiency
      ++    resulting from lost optimization opportunities associated with
      ++    non-local branches associated with exceptions.
      ++
      ++    What can be done to eliminate this overhead?  A variety of coding
      ++    techniques, and compiler, linker and library improvements and
      ++    extensions may be used, as covered below. Most are not difficult,
      ++    and some are already implemented in varying degrees.
      ++
      ++    Overhead: Compilation Time
      ++    --------------------------
      ++
      ++    Providing "ready-instantiated" template code in object code archives
      ++    allows us to avoid generating and optimizing template instantiations
      ++    in each compilation unit which uses them. However, the number of such
      ++    instantiations that are useful to provide is limited, and anyway this
      ++    is not enough, by itself, to minimize compilation time. In particular,
      ++    it does not reduce time spent parsing conforming headers.
      ++
      ++    Quicker header parsing will depend on library extensions and compiler
      ++    improvements.  One approach is some variation on the techniques
      ++    previously marketed as "pre-compiled headers", now standardized as
      ++    support for the "export" keyword. "Exported" template definitions
      ++    can be placed (once) in a "repository" -- really just a library, but
      ++    of template definitions rather than object code -- to be drawn upon
      ++    at link time when an instantiation is needed, rather than placed in
      ++    header files to be parsed along with every compilation unit.
      ++
      ++    Until "export" is implemented we can put some of the lengthy template
      ++    definitions in #if guards or alternative headers so that users can skip
      ++    over the full definitions when they need only the ready-instantiated
      ++    specializations.
      ++
      ++    To be precise, this means that certain headers which define
      ++    templates which users normally use only for certain arguments
      ++    can be instrumented to avoid exposing the template definitions
      ++    to the compiler unless a macro is defined. For example, in
      ++    <string>, we might have:
      ++
      ++    template <class _CharT, ... > class basic_string {
      ++    ... // member declarations
      ++    };
      ++    ... // operator declarations
      ++
      ++    #ifdef _STRICT_ISO_
      ++    # if _G_NO_TEMPLATE_EXPORT
      ++    #   include <bits/std_locale.h>  // headers needed by definitions
      ++    #   ...
      ++    #   include <bits/string.tcc>  // member and global template definitions.
      ++    # endif
      ++    #endif
      ++
      ++    Users who compile without specifying a strict-ISO-conforming flag
      ++    would not see many of the template definitions they now see, and rely
      ++    instead on ready-instantiated specializations in the library. This
      ++    technique would be useful for the following substantial components:
      ++    string, locale/iostreams, valarray. It would *not* be useful or
      ++    usable with the following: containers, algorithms, iterators,
      ++    allocator. Since these constitute a large (though decreasing)
      ++    fraction of the library, the benefit the technique offers is
      ++    limited.
      ++
      ++    The language specifies the semantics of the "export" keyword, but
      ++    the gcc compiler does not yet support it. When it does, problems
      ++    with large template inclusions can largely disappear, given some
      ++    minor library reorganization, along with the need for the apparatus
      ++    described above.
      ++
      ++    Overhead: Flexibility Cost
      ++    --------------------------
      ++
      ++    The library offers many places where users can specify operations
      ++    to be performed by the library in place of defaults. Sometimes
      ++    this seems to require that the library use a more-roundabout, and
      ++    possibly slower, way to accomplish the default requirements than
      ++    would be used otherwise.
      ++
      ++    The primary protection against this overhead is thorough compiler
      ++    optimization, to crush out layers of inline function interfaces.
      ++    Kuck & Associates has demonstrated the practicality of this kind
      ++    of optimization.
      ++
      ++    The second line of defense against this overhead is explicit
      ++    specialization. By defining helper function templates, and writing
      ++    specialized code for the default case, overhead can be eliminated
      ++    for that case without sacrificing flexibility. This takes full
      ++    advantage of any ability of the optimizer to crush out degenerate
      ++    code.
      ++
      ++    The library specifies many virtual functions which current linkers
      ++    load even when they cannot be called. Some minor improvements to the
      ++    compiler and to ld would eliminate any such overhead by simply
      ++    omitting virtual functions that the complete program does not call.
      ++    A prototype of this work has already been done. For targets where
      ++    GNU ld is not used, a "pre-linker" could do the same job.
      ++
      ++    The main areas in the standard interface where user flexibility
      ++    can result in overhead are:
      ++
      ++    - Allocators:  Containers are specified to use user-definable
      ++    allocator types and objects, making tuning for the container
      ++    characteristics tricky.
      ++
      ++    - Locales: the standard specifies locale objects used to implement
      ++    iostream operations, involving many virtual functions which use
      ++    streambuf iterators.
      ++
      ++    - Algorithms and containers: these may be instantiated on any type,
      ++    frequently duplicating code for identical operations.
      ++
      ++    - Iostreams and strings: users are permitted to use these on their
      ++    own types, and specify the operations the stream must use on these
      ++    types.
      ++
      ++    Note that these sources of overhead are _avoidable_. The techniques
      ++    to avoid them are covered below.
      ++
      ++    Code Bloat
      ++    ----------
      ++
      ++    In the SGI STL, and in some other headers, many of the templates
      ++    are defined "inline" -- either explicitly or by their placement
      ++    in class definitions -- which should not be inline. This is a
      ++    source of code bloat. Matt had remarked that he was relying on
      ++    the compiler to recognize what was too big to benefit from inlining,
      ++    and generate it out-of-line automatically. However, this also can
      ++    result in code bloat except where the linker can eliminate the extra
      ++    copies.
      ++
      ++    Fixing these cases will require an audit of all inline functions
      ++    defined in the library to determine which merit inlining, and moving
      ++    the rest out of line. This is an issue mainly in chapters 23, 25, and
      ++    27. Of course it can be done incrementally, and we should generally
      ++    accept patches that move large functions out of line and into ".tcc"
      ++    files, which can later be pulled into a repository. Compiler/linker
      ++    improvements to recognize very large inline functions and move them
      ++    out-of-line, but shared among compilation units, could make this
      ++    work unnecessary.
      ++
      ++    Pre-instantiating template specializations currently produces large
      ++    amounts of dead code which bloats statically linked programs. The
      ++    current state of the static library, libstdc++.a, is intolerable on
      ++    this account, and will fuel further confused speculation about a need
      ++    for a library "subset". A compiler improvement that treats each
      ++    instantiated function as a separate object file, for linking purposes,
      ++    would be one solution to this problem. An alternative would be to
      ++    split up the manual instantiation files into dozens upon dozens of
      ++    little files, each compiled separately, but an abortive attempt at
      ++    this was done for <string> and, though it is far from complete, it
      ++    is already a nuisance. A better interim solution (just until we have
      ++    "export") is badly needed.
      ++
      ++    When building a shared library, the current compiler/linker cannot
      ++    automatically generate the instantiations needed. This creates a
      ++    miserable situation; it means any time something is changed in the
      ++    library, before a shared library can be built someone must manually
      ++    copy the declarations of all templates that are needed by other parts
      ++    of the library to an "instantiation" file, and add it to the build
      ++    system to be compiled and linked to the library. This process is
      ++    readily automated, and should be automated as soon as possible.
      ++    Users building their own shared libraries experience identical
      ++    frustrations.
      ++
      ++    Sharing common aspects of template definitions among instantiations
      ++    can radically reduce code bloat. The compiler could help a great
      ++    deal here by recognizing when a function depends on nothing about
      ++    a template parameter, or only on its size, and giving the resulting
      ++    function a link-name "equate" that allows it to be shared with other
      ++    instantiations. Implementation code could take advantage of the
      ++    capability by factoring out code that does not depend on the template
      ++    argument into separate functions to be merged by the compiler.
      ++
      ++    Until such a compiler optimization is implemented, much can be done
      ++    manually (if tediously) in this direction. One such optimization is
      ++    to derive class templates from non-template classes, and move as much
      ++    implementation as possible into the base class. Another is to partial-
      ++    specialize certain common instantiations, such as vector<T*>, to share
      ++    code for instantiations on all types T. While these techniques work,
      ++    they are far from the complete solution that a compiler improvement
      ++    would afford.
      ++
      ++    Overhead: Expensive Language Features
      ++    -------------------------------------
      ++
      ++    The main "expensive" language feature used in the standard library
      ++    is exception support, which requires compiling in cleanup code with
      ++    static table data to locate it, and linking in library code to use
      ++    the table. For small embedded programs the amount of such library
      ++    code and table data is assumed by some to be excessive. Under the
      ++    "new" ABI this perception is generally exaggerated, although in some
      ++    cases it may actually be excessive.
      ++
      ++    To implement a library which does not use exceptions directly is
      ++    not difficult given minor compiler support (to "turn off" exceptions
      ++    and ignore exception constructs), and results in no great library
      ++    maintenance difficulties. To be precise, given "-fno-exceptions",
      ++    the compiler should treat "try" blocks as ordinary blocks, and
      ++    "catch" blocks as dead code to ignore or eliminate. Compiler
      ++    support is not strictly necessary, except in the case of "function
      ++    try blocks"; otherwise the following macros almost suffice:
      ++
      ++    #define throw(X)
      ++    #define try      if (true)
      ++    #define catch(X) else if (false)
      ++
      ++    However, there may be a need to use function try blocks in the
      ++    library implementation, and use of macros in this way can make
      ++    correct diagnostics impossible. Furthermore, use of this scheme
      ++    would require the library to call a function to re-throw exceptions
      ++    from a try block. Implementing the above semantics in the compiler
      ++    is preferable.
      ++
      ++    Given the support above (however implemented) it only remains to
      ++    replace code that "throws" with a call to a well-documented "handler"
      ++    function in a separate compilation unit which may be replaced by
      ++    the user. The main source of exceptions that would be difficult
      ++    for users to avoid is memory allocation failures, but users can
      ++    define their own memory allocation primitives that never throw.
      ++    Otherwise, the complete list of such handlers, and which library
      ++    functions may call them, would be needed for users to be able to
      ++    implement the necessary substitutes. (Fortunately, they have the
      ++    source code.)
      ++
      ++    Opportunities
      ++    -------------
      ++
      ++    The template capabilities of C++ offer enormous opportunities for
      ++    optimizing common library operations, well beyond what would be
      ++    considered "eliminating overhead". In particular, many operations
      ++    done in Glibc with macros that depend on proprietary language
      ++    extensions can be implemented in pristine Standard C++. For example,
      ++    the chapter 25 algorithms, and even C library functions such as strchr,
      ++    can be specialized for the case of static arrays of known (small) size.
      ++
      ++    Detailed optimization opportunities are identified below where
      ++    the component where they would appear is discussed. Of course new
      ++    opportunities will be identified during implementation.
      ++
      ++    Unimplemented Required Library Features
      ++    ---------------------------------------
      ++
      ++    The standard specifies hundreds of components, grouped broadly by
      ++    chapter. These are listed in excruciating detail in the CHECKLIST
      ++    file.
      ++
      ++    17 general
      ++    18 support
      ++    19 diagnostics
      ++    20 utilities
      ++    21 string
      ++    22 locale
      ++    23 containers
      ++    24 iterators
      ++    25 algorithms
      ++    26 numerics
      ++    27 iostreams
      ++    Annex D  backward compatibility
      ++
      ++    Anyone participating in implementation of the library should obtain
      ++    a copy of the standard, ISO 14882.  People in the U.S. can obtain an
      ++    electronic copy for US$18 from ANSI's web site. Those from other
      ++    countries should visit http://www.iso.org/ to find out the location
      ++    of their country's representation in ISO, in order to know who can
      ++    sell them a copy.
      ++
      ++    The emphasis in the following sections is on unimplemented features
      ++    and optimization opportunities.
      ++
      ++    Chapter 17  General
      ++    -------------------
      ++
      ++    Chapter 17 concerns overall library requirements.
      ++
      ++    The standard doesn't mention threads. A multi-thread (MT) extension
      ++    primarily affects operators new and delete (18), allocator (20),
      ++    string (21), locale (22), and iostreams (27). The common underlying
      ++    support needed for this is discussed under chapter 20.
      ++
      ++    The standard requirements on names from the C headers create a
      ++    lot of work, mostly done. Names in the C headers must be visible
      ++    in the std:: and sometimes the global namespace; the names in the
      ++    two scopes must refer to the same object. More stringent is that
      ++    Koenig lookup implies that any types specified as defined in std::
      ++    really are defined in std::. Names optionally implemented as
      ++    macros in C cannot be macros in C++. (An overview may be read at
      ++    <http://www.cantrip.org/cheaders.html>). The scripts "inclosure"
      ++    and "mkcshadow", and the directories shadow/ and cshadow/, are the
      ++    beginning of an effort to conform in this area.
      ++
      ++    A correct conforming definition of C header names based on underlying
      ++    C library headers, and practical linking of conforming namespaced
      ++    customer code with third-party C libraries depends ultimately on
      ++    an ABI change, allowing namespaced C type names to be mangled into
      ++    type names as if they were global, somewhat as C function names in a
      ++    namespace, or C++ global variable names, are left unmangled. Perhaps
      ++    another "extern" mode, such as 'extern "C-global"' would be an
      ++    appropriate place for such type definitions. Such a type would
      ++    affect mangling as follows:
      ++
      ++    namespace A {
      ++    struct X {};
      ++    extern "C-global" {  // or maybe just 'extern "C"'
      ++    struct Y {};
      ++    };
      ++    }
      ++    void f(A::X*);  // mangles to f__FPQ21A1X
      ++    void f(A::Y*);  // mangles to f__FP1Y
      ++
      ++    (It may be that this is really the appropriate semantics for regular
      ++    'extern "C"', and 'extern "C-global"', as an extension, would not be
      ++    necessary.) This would allow functions declared in non-standard C headers
      ++    (and thus fixable by neither us nor users) to link properly with functions
      ++    declared using C types defined in properly-namespaced headers. The
      ++    problem this solves is that C headers (which C++ programmers do persist
      ++    in using) frequently forward-declare C struct tags without including
      ++    the header where the type is defined, as in
      ++
      ++    struct tm;
      ++    void munge(tm*);
      ++
      ++    Without some compiler accommodation, munge cannot be called by correct
      ++    C++ code using a pointer to a correctly-scoped tm* value.
      ++
      ++    The current C headers use the preprocessor extension "#include_next",
      ++    which the compiler complains about when run "-pedantic".
      ++    (Incidentally, it appears that "-fpedantic" is currently ignored,
      ++    probably a bug.)  The solution in the C compiler is to use
      ++    "-isystem" rather than "-I", but unfortunately in g++ this seems
      ++    also to wrap the whole header in an 'extern "C"' block, so it's
      ++    unusable for C++ headers. The correct solution appears to be to
      ++    allow the various special include-directory options, if not given
      ++    an argument, to affect subsequent include-directory options additively,
      ++    so that if one said
      ++
      ++    -pedantic -iprefix $(prefix) \
      ++    -idirafter -ino-pedantic -ino-extern-c -iwithprefix -I g++-v3 \
      ++    -iwithprefix -I g++-v3/ext
      ++
      ++    the compiler would search $(prefix)/g++-v3 and not report
      ++    pedantic warnings for files found there, but treat files in
      ++    $(prefix)/g++-v3/ext pedantically. (The undocumented semantics
      ++    of "-isystem" in g++ stink. Can they be rescinded?  If not it
      ++    must be replaced with something more rationally behaved.)
      ++
      ++    All the C headers need the treatment above; in the standard these
      ++    headers are mentioned in various chapters. Below, I have only
      ++    mentioned those that present interesting implementation issues.
      ++
      ++    The components identified as "mostly complete", below, have not been
      ++    audited for conformance. In many cases where the library passes
      ++    conformance tests we have non-conforming extensions that must be
      ++    wrapped in #if guards for "pedantic" use, and in some cases renamed
      ++    in a conforming way for continued use in the implementation regardless
      ++    of conformance flags.
      ++
      ++    The STL portion of the library still depends on a header
      ++    stl/bits/stl_config.h full of #ifdef clauses. This apparatus
      ++    should be replaced with autoconf/automake machinery.
      ++
      ++    The SGI STL defines a type_traits<> template, specialized for
      ++    many types in their code including the built-in numeric and
      ++    pointer types and some library types, to direct optimizations of
      ++    standard functions. The SGI compiler has been extended to generate
      ++    specializations of this template automatically for user types,
      ++    so that use of STL templates on user types can take advantage of
      ++    these optimizations. Specializations for other, non-STL, types
      ++    would make more optimizations possible, but extending the gcc
      ++    compiler in the same way would be much better. Probably the next
      ++    round of standardization will ratify this, but probably with
      ++    changes, so it probably should be renamed to place it in the
      ++    implementation namespace.
      ++
      ++    The SGI STL also defines a large number of extensions visible in
      ++    standard headers. (Other extensions that appear in separate headers
      ++    have been sequestered in subdirectories ext/ and backward/.)  All
      ++    these extensions should be moved to other headers where possible,
      ++    and in any case wrapped in a namespace (not std!), and (where kept
      ++    in a standard header) girded about with macro guards. Some cannot be
      ++    moved out of standard headers because they are used to implement
      ++    standard features.  The canonical method for accommodating these
      ++    is to use a protected name, aliased in macro guards to a user-space
      ++    name. Unfortunately C++ offers no satisfactory template typedef
      ++    mechanism, so very ad-hoc and unsatisfactory aliasing must be used
      ++    instead.
      ++
      ++    Implementation of a template typedef mechanism should have the highest
      ++    priority among possible extensions, on the same level as implementation
      ++    of the template "export" feature.
      ++
      ++    Chapter 18  Language support
      ++    ----------------------------
      ++
      ++    Headers: <limits> <new> <typeinfo> <exception>
      ++    C headers: <cstddef> <climits> <cfloat>  <cstdarg> <csetjmp>
      ++    <ctime>   <csignal> <cstdlib> (also 21, 25, 26)
      ++
      ++    This defines the built-in exceptions, rtti, numeric_limits<>,
      ++    operator new and delete. Much of this is provided by the
      ++    compiler in its static runtime library.
      ++
      ++    Work to do includes defining numeric_limits<> specializations in
      ++    separate files for all target architectures. Values for integer types
      ++    except for bool and wchar_t are readily obtained from the C header
      ++    <limits.h>, but values for the remaining numeric types (bool, wchar_t,
      ++    float, double, long double) must be entered manually. This is
      ++    largely dog work except for those members whose values are not
      ++    easily deduced from available documentation. Also, this involves
      ++    some work in target configuration to identify the correct choice of
      ++    file to build against and to install.
      ++
      ++    The definitions of the various operators new and delete must be
      ++    made thread-safe, which depends on a portable exclusion mechanism,
      ++    discussed under chapter 20.  Of course there is always plenty of
      ++    room for improvements to the speed of operators new and delete.
      ++
      ++    <cstdarg>, in Glibc, defines some macros that gcc does not allow to
      ++    be wrapped into an inline function. Probably this header will demand
      ++    attention whenever a new target is chosen. The functions atexit(),
      ++    exit(), and abort() in cstdlib have different semantics in C++, so
      ++    must be re-implemented for C++.
      ++
      ++    Chapter 19  Diagnostics
      ++    -----------------------
      ++
      ++    Headers: <stdexcept>
      ++    C headers: <cassert> <cerrno>
      ++
      ++    This defines the standard exception objects, which are "mostly complete".
      ++    Cygnus has a version, and now SGI provides a slightly different one.
      ++    It makes little difference which we use.
      ++
      ++    The C global name "errno", which C allows to be a variable or a macro,
      ++    is required in C++ to be a macro. For MT it must typically result in
      ++    a function call.
      ++
      ++    Chapter 20  Utilities
      ++    ---------------------
      ++    Headers: <utility> <functional> <memory>
      ++    C header: <ctime> (also in 18)
      ++
      ++    SGI STL provides "mostly complete" versions of all the components
      ++    defined in this chapter. However, the auto_ptr<> implementation
      ++    is known to be wrong. Furthermore, the standard definition of it
      ++    is known to be unimplementable as written. A minor change to the
      ++    standard would fix it, and auto_ptr<> should be adjusted to match.
      ++
      ++    Multi-threading affects the allocator implementation, and there must
      ++    be configuration/installation choices for different users' MT
      ++    requirements. Anyway, users will want to tune allocator options
      ++    to support different target conditions, MT or no.
      ++
      ++    The primitives used for MT implementation should be exposed, as an
      ++    extension, for users' own work. We need cross-CPU "mutex" support,
      ++    multi-processor shared-memory atomic integer operations, and single-
      ++    processor uninterruptible integer operations, and all three configurable
      ++    to be stubbed out for non-MT use, or to use an appropriately-loaded
      ++    dynamic library for the actual runtime environment, or statically
      ++    compiled in for cases where the target architecture is known.
      ++
      ++    Chapter 21  String
      ++    ------------------
      ++    Headers: <string>
      ++    C headers: <cctype> <cwctype> <cstring> <cwchar> (also in 27)
      ++    <cstdlib> (also in 18, 25, 26)
      ++
      ++    We have "mostly-complete" char_traits<> implementations. Many of the
      ++    char_traits<char> operations might be optimized further using existing
      ++    proprietary language extensions.
      ++
      ++    We have a "mostly-complete" basic_string<> implementation. The work
      ++    to manually instantiate char and wchar_t specializations in object
      ++    files to improve link-time behavior is extremely unsatisfactory,
      ++    literally tripling library-build time with no commensurate improvement
      ++    in static program link sizes. It must be redone. (Similar work is
      ++    needed for some components in chapters 22 and 27.)
      ++
      ++    Other work needed for strings is MT-safety, as discussed under the
      ++    chapter 20 heading.
      ++
      ++    The standard C type mbstate_t from <cwchar> and used in char_traits<>
      ++    must be different in C++ than in C, because in C++ the default constructor
      ++    value mbstate_t() must be the "base" or "ground" sequence state.
      ++    (According to the likely resolution of a recently raised Core issue,
      ++    this may become unnecessary. However, there are other reasons to
      ++    use a state type not as limited as whatever the C library provides.)
      ++    If we might want to provide conversions from (e.g.) internally-
      ++    represented EUC-wide to externally-represented Unicode, or vice-
      ++    versa, the mbstate_t we choose will need to be more accommodating
      ++    than what might be provided by an underlying C library.
      ++
      ++    There remain some basic_string template-member functions which do
      ++    not overload properly with their non-template brethren. The infamous
      ++    hack akin to what was done in vector<> is needed, to conform to
      ++    23.1.1 para 10. The CHECKLIST items for basic_string marked 'X',
      ++    or incomplete, are so marked for this reason.
      ++
      ++    Replacing the string iterators, which currently are simple character
      ++    pointers, with class objects would greatly increase the safety of the
      ++    client interface, and also permit a "debug" mode in which range,
      ++    ownership, and validity are rigorously checked. The current use of
      ++    raw pointers as string iterators is evil. vector<> iterators need the
      ++    same treatment. Note that the current implementation freely mixes
      ++    pointers and iterators, and that must be fixed before safer iterators
      ++    can be introduced.
      ++
      ++    Some of the functions in <cstring> are different from the C version.
      ++    generally overloaded on const and non-const argument pointers. For
      ++    example, in <cstring> strchr is overloaded. The functions isupper
      ++    etc. in <cctype> typically implemented as macros in C are functions
      ++    in C++, because they are overloaded with others of the same name
      ++    defined in <locale>.
      ++
      ++    Many of the functions required in <cwctype> and <cwchar> cannot be
      ++    implemented using underlying C facilities on intended targets because
      ++    such facilities only partly exist.
      ++
      ++    Chapter 22  Locale
      ++    ------------------
      ++    Headers: <locale>
      ++    C headers: <clocale>
      ++
      ++    We have a "mostly complete" class locale, with the exception of
      ++    code for constructing, and handling the names of, named locales.
      ++    The ways that locales are named (particularly when categories
      ++    (e.g. LC_TIME, LC_COLLATE) are different) varies among all target
      ++    environments. This code must be written in various versions and
      ++    chosen by configuration parameters.
      ++
      ++    Members of many of the facets defined in <locale> are stubs. Generally,
      ++    there are two sets of facets: the base class facets (which are supposed
      ++    to implement the "C" locale) and the "byname" facets, which are supposed
      ++    to read files to determine their behavior. The base ctype<>, collate<>,
      ++    and numpunct<> facets are "mostly complete", except that the table of
      ++    bitmask values used for "is" operations, and corresponding mask values,
      ++    are still defined in libio and just included/linked. (We will need to
      ++    implement these tables independently, soon, but should take advantage
      ++    of libio where possible.)  The num_put<>::put members for integer types
      ++    are "mostly complete".
      ++
      ++    A complete list of what has and has not been implemented may be
      ++    found in CHECKLIST. However, note that the current definition of
      ++    codecvt<wchar_t,char,mbstate_t> is wrong. It should simply write
      ++    out the raw bytes representing the wide characters, rather than
      ++    trying to convert each to a corresponding single "char" value.
      ++
      ++    Some of the facets are more important than others. Specifically,
      ++    the members of ctype<>, numpunct<>, num_put<>, and num_get<> facets
      ++    are used by other library facilities defined in <string>, <istream>,
      ++    and <ostream>, and the codecvt<> facet is used by basic_filebuf<>
      ++    in <fstream>, so a conforming iostream implementation depends on
      ++    these.
      ++
      ++    The "long long" type eventually must be supported, but code mentioning
      ++    it should be wrapped in #if guards to allow pedantic-mode compiling.
      ++
      ++    Performance of num_put<> and num_get<> depend critically on
      ++    caching computed values in ios_base objects, and on extensions
      ++    to the interface with streambufs.
      ++
      ++    Specifically: retrieving a copy of the locale object, extracting
      ++    the needed facets, and gathering data from them, for each call to
      ++    (e.g.) operator<< would be prohibitively slow.  To cache format
      ++    data for use by num_put<> and num_get<> we have a _Format_cache<>
      ++    object stored in the ios_base::pword() array. This is constructed
      ++    and initialized lazily, and is organized purely for utility. It
      ++    is discarded when a new locale with different facets is imbued.
      ++
      ++    Using only the public interfaces of the iterator arguments to the
      ++    facet functions would limit performance by forbidding "vector-style"
      ++    character operations. The streambuf iterator optimizations are
      ++    described under chapter 24, but facets can also bypass the streambuf
      ++    iterators via explicit specializations and operate directly on the
      ++    streambufs, and use extended interfaces to get direct access to the
      ++    streambuf internal buffer arrays. These extensions are mentioned
      ++    under chapter 27. These optimizations are particularly important
      ++    for input parsing.
      ++
      ++    Unused virtual members of locale facets can be omitted, as mentioned
      ++    above, by a smart linker.
      ++
      ++    Chapter 23  Containers
      ++    ----------------------
      ++    Headers: <deque> <list> <queue> <stack> <vector> <map> <set> <bitset>
      ++
      ++    All the components in chapter 23 are implemented in the SGI STL.
      ++    They are "mostly complete"; they include a large number of
      ++    nonconforming extensions which must be wrapped. Some of these
      ++    are used internally and must be renamed or duplicated.
      ++
      ++    The SGI components are optimized for large-memory environments. For
      ++    embedded targets, different criteria might be more appropriate. Users
      ++    will want to be able to tune this behavior. We should provide
      ++    ways for users to compile the library with different memory usage
      ++    characteristics.
      ++
      ++    A lot more work is needed on factoring out common code from different
      ++    specializations to reduce code size here and in chapter 25. The
      ++    easiest fix for this would be a compiler/ABI improvement that allows
      ++    the compiler to recognize when a specialization depends only on the
      ++    size (or other gross quality) of a template argument, and allow the
      ++    linker to share the code with similar specializations. In its
      ++    absence, many of the algorithms and containers can be partial-
      ++    specialized, at least for the case of pointers, but this only solves
      ++    a small part of the problem. Use of a type_traits-style template
      ++    allows a few more optimization opportunities, more if the compiler
      ++    can generate the specializations automatically.
      ++
      ++    As an optimization, containers can specialize on the default allocator
      ++    and bypass it, or take advantage of details of its implementation
      ++    after it has been improved upon.
      ++
      ++    Replacing the vector iterators, which currently are simple element
      ++    pointers, with class objects would greatly increase the safety of the
      ++    client interface, and also permit a "debug" mode in which range,
      ++    ownership, and validity are rigorously checked. The current use of
      ++    pointers for iterators is evil.
      ++
      ++    As mentioned for chapter 24, the deque iterator is a good example of
      ++    an opportunity to implement a "staged" iterator that would benefit
      ++    from specializations of some algorithms.
      ++
      ++    Chapter 24  Iterators
      ++    ---------------------
      ++    Headers: <iterator>
      ++
      ++    Standard iterators are "mostly complete", with the exception of
      ++    the stream iterators, which are not yet templatized on the
      ++    stream type. Also, the base class template iterator<> appears
      ++    to be wrong, so everything derived from it must also be wrong,
      ++    currently.
      ++
      ++    The streambuf iterators (currently located in stl/bits/std_iterator.h,
      ++    but should be under bits/) can be rewritten to take advantage of
      ++    friendship with the streambuf implementation.
      ++
      ++    Matt Austern has identified opportunities where certain iterator
      ++    types, particularly including streambuf iterators and deque
      ++    iterators, have a "two-stage" quality, such that an intermediate
      ++    limit can be checked much more quickly than the true limit on
      ++    range operations. If identified with a member of iterator_traits,
      ++    algorithms may be specialized for this case. Of course the
      ++    iterators that have this quality can be identified by specializing
      ++    a traits class.
      ++
      ++    Many of the algorithms must be specialized for the streambuf
      ++    iterators, to take advantage of block-mode operations, in order
      ++    to allow iostream/locale operations' performance not to suffer.
      ++    It may be that they could be treated as staged iterators and
      ++    take advantage of those optimizations.
      ++
      ++    Chapter 25  Algorithms
      ++    ----------------------
      ++    Headers: <algorithm>
      ++    C headers: <cstdlib> (also in 18, 21, 26))
      ++
      ++    The algorithms are "mostly complete". As mentioned above, they
      ++    are optimized for speed at the expense of code and data size.
      ++
      ++    Specializations of many of the algorithms for non-STL types would
      ++    give performance improvements, but we must use great care not to
      ++    interfere with fragile template overloading semantics for the
      ++    standard interfaces. Conventionally the standard function template
      ++    interface is an inline which delegates to a non-standard function
      ++    which is then overloaded (this is already done in many places in
      ++    the library). Particularly appealing opportunities for the sake of
      ++    iostream performance are for copy and find applied to streambuf
      ++    iterators or (as noted elsewhere) for staged iterators, of which
      ++    the streambuf iterators are a good example.
      ++
      ++    The bsearch and qsort functions cannot be overloaded properly as
      ++    required by the standard because gcc does not yet allow overloading
      ++    on the extern-"C"-ness of a function pointer.
      ++
      ++    Chapter 26  Numerics
      ++    --------------------
      ++    Headers: <complex> <valarray> <numeric>
      ++    C headers: <cmath>, <cstdlib> (also 18, 21, 25)
      ++
      ++    Numeric components: Gabriel dos Reis's valarray, Drepper's complex,
      ++    and the few algorithms from the STL are "mostly done".  Of course
      ++    optimization opportunities abound for the numerically literate. It
      ++    is not clear whether the valarray implementation really conforms
      ++    fully, in the assumptions it makes about aliasing (and lack thereof)
      ++    in its arguments.
      ++
      ++    The C div() and ldiv() functions are interesting, because they are the
      ++    only case where a C library function returns a class object by value.
      ++    Since the C++ type div_t must be different from the underlying C type
      ++    (which is in the wrong namespace) the underlying functions div() and
      ++    ldiv() cannot be re-used efficiently. Fortunately they are trivial to
      ++    re-implement.
      ++
      ++    Chapter 27  Iostreams
      ++    ---------------------
      ++    Headers: <iosfwd> <streambuf> <ios> <ostream> <istream> <iostream>
      ++    <iomanip> <sstream> <fstream>
      ++    C headers: <cstdio> <cwchar> (also in 21)
      ++
      ++    Iostream is currently in a very incomplete state. <iosfwd>, <iomanip>,
      ++    ios_base, and basic_ios<> are "mostly complete". basic_streambuf<> and
      ++    basic_ostream<> are well along, but basic_istream<> has had little work
      ++    done. The standard stream objects, <sstream> and <fstream> have been
      ++    started; basic_filebuf<> "write" functions have been implemented just
      ++    enough to do "hello, world".
      ++
      ++    Most of the istream and ostream operators << and >> (with the exception
      ++    of the op<<(integer) ones) have not been changed to use locale primitives,
      ++    sentry objects, or char_traits members.
      ++
      ++    All these templates should be manually instantiated for char and
      ++    wchar_t in a way that links only used members into user programs.
      ++
      ++    Streambuf is fertile ground for optimization extensions. An extended
      ++    interface giving iterator access to its internal buffer would be very
      ++    useful for other library components.
      ++
      ++    Iostream operations (primarily operators << and >>) can take advantage
      ++    of the case where user code has not specified a locale, and bypass locale
      ++    operations entirely. The current implementation of op<</num_put<>::put,
      ++    for the integer types, demonstrates how they can cache encoding details
      ++    from the locale on each operation. There is lots more room for
      ++    optimization in this area.
      ++
      ++    The definition of the relationship between the standard streams
      ++    cout et al. and stdout et al. requires something like a "stdiobuf".
      ++    The SGI solution of using double-indirection to actually use a
      ++    stdio FILE object for buffering is unsatisfactory, because it
      ++    interferes with peephole loop optimizations.
      ++
      ++    The <sstream> header work has begun. stringbuf can benefit from
      ++    friendship with basic_string<> and basic_string<>::_Rep to use
      ++    those objects directly as buffers, and avoid allocating and making
      ++    copies.
      ++
      ++    The basic_filebuf<> template is a complex beast. It is specified to
      ++    use the locale facet codecvt<> to translate characters between native
      ++    files and the locale character encoding. In general this involves
      ++    two buffers, one of "char" representing the file and another of
      ++    "char_type", for the stream, with codecvt<> translating. The process
      ++    is complicated by the variable-length nature of the translation, and
      ++    the need to seek to corresponding places in the two representations.
      ++    For the case of basic_filebuf<char>, when no translation is needed,
      ++    a single buffer suffices. A specialized filebuf can be used to reduce
      ++    code space overhead when no locale has been imbued. Matt Austern's
      ++    work at SGI will be useful, perhaps directly as a source of code, or
      ++    at least as an example to draw on.
      ++
      ++    Filebuf, almost uniquely (cf. operator new), depends heavily on
      ++    underlying environmental facilities. In current releases iostream
      ++    depends fairly heavily on libio constant definitions, but it should
      ++    be made independent.  It also depends on operating system primitives
      ++    for file operations. There is immense room for optimizations using
      ++    (e.g.) mmap for reading. The shadow/ directory wraps, besides the
      ++    standard C headers, the libio.h and unistd.h headers, for use mainly
      ++    by filebuf. These wrappings have not been completed, though there
      ++    is scaffolding in place.
      ++
      ++    The encapsulation of certain C header <cstdio> names presents an
      ++    interesting problem. It is possible to define an inline std::fprintf()
      ++    implemented in terms of the 'extern "C"' vfprintf(), but there is no
      ++    standard vfscanf() to use to implement std::fscanf(). It appears that
      ++    vfscanf but be re-implemented in C++ for targets where no vfscanf
      ++    extension has been defined. This is interesting in that it seems
      ++    to be the only significant case in the C library where this kind of
      ++    rewriting is necessary. (Of course Glibc provides the vfscanf()
      ++    extension.)  (The functions related to exit() must be rewritten
      ++    for other reasons.)
      ++
      ++
      ++    Annex D
      ++    -------
      ++    Headers: <strstream>
      ++
      ++    Annex D defines many non-library features, and many minor
      ++    modifications to various headers, and a complete header.
      ++    It is "mostly done", except that the libstdc++-2 <strstream>
      ++    header has not been adopted into the library, or checked to
      ++    verify that it matches the draft in those details that were
      ++    clarified by the committee. Certainly it must at least be
      ++    moved into the std namespace.
      ++
      ++    We still need to wrap all the deprecated features in #if guards
      ++    so that pedantic compile modes can detect their use.
      ++
      ++    Nonstandard Extensions
      ++    ----------------------
      ++    Headers: <iostream.h> <strstream.h> <hash> <rbtree>
      ++    <pthread_alloc> <stdiobuf> (etc.)
      ++
      ++    User code has come to depend on a variety of nonstandard components
      ++    that we must not omit. Much of this code can be adopted from
      ++    libstdc++-v2 or from the SGI STL. This particularly includes
      ++    <iostream.h>, <strstream.h>, and various SGI extensions such
      ++    as <hash_map.h>. Many of these are already placed in the
      ++    subdirectories ext/ and backward/. (Note that it is better to
      ++    include them via "<backward/hash_map.h>" or "<ext/hash_map>" than
      ++    to search the subdirectory itself via a "-I" directive.
      ++  

      Prev Up Next
      Coding Style Home Appendix B.  + Porting and Maintenance + +
      +Index: libstdc++-v3/doc/html/manual/facets.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/facets.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/facets.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Facets
      Facets
      Prev Chapter 8.  ++ ++Facets
      Facets
      Prev Chapter 8.  + Localization + +- Next

      ++

      		 Next

      Facets

      ctype

      Implementation

      Specializations

      + For the required specialization codecvt<wchar_t, char, mbstate_t> , + conversions are made between the internal character set (always UCS4 + on GNU/Linux) and whatever the currently selected locale for the +@@ -28,7 +28,7 @@ +

      + Neither of these two required specializations deals with Unicode + characters. +-

      Future

      • + How to deal with the global locale issue? +

      • + How to deal with different types than char, wchar_t?

      • +@@ -50,30 +50,30 @@ +

      • + Rename abstract base class. See if just smash-overriding is a + better approach. Clarify, add sanity to naming. +-

      ++

      Bibliography

      + The GNU C Library +- . Roland McGrath. Ulrich Drepper. Copyright © 2007 FSF. Chapters 6 Character Set Handling and 7 Locales and Internationalization.

      ++ . Roland McGrath. Ulrich Drepper. Copyright © 2007 FSF. Chapters 6 Character Set Handling and 7 Locales and Internationalization.

      + Correspondence +- . Ulrich Drepper. Copyright © 2002 .

      ++ . Ulrich Drepper. Copyright © 2002 .

      + ISO/IEC 14882:1998 Programming languages - C++ +- . Copyright © 1998 ISO.

      ++ . Copyright © 1998 ISO.

      + ISO/IEC 9899:1999 Programming languages - C +- . Copyright © 1999 ISO.

      +- ++ . Copyright © 1999 ISO.

      ++ + The Open Group Base Specifications, Issue 6 (IEEE Std. 1003.1-2004) + + . Copyright © 1999 +- The Open Group/The Institute of Electrical and Electronics Engineers, Inc..

      ++ The Open Group/The Institute of Electrical and Electronics Engineers, Inc..

      + The C++ Programming Language, Special Edition + . Bjarne Stroustrup. Copyright © 2000 Addison Wesley, Inc.. Appendix D. + Addison Wesley +- .

      ++ .

      + Standard C++ IOStreams and Locales + . + Advanced Programmer's Guide and Reference + . Angelika Langer. Klaus Kreft. Copyright © 2000 Addison Wesley Longman, Inc.. + Addison Wesley Longman +- .

      ++ .

      codecvt

      + The standard class codecvt attempts to address conversions between + different character encoding schemes. In particular, the standard + attempts to detail conversions between the implementation-defined wide +@@ -87,7 +87,7 @@ + addressed, and examples of correct usage for both the required + specializations for wide and narrow characters and the + implementation-provided extended functionality are given. +-

      ++

      Requirements

      + Around page 425 of the C++ Standard, this charming heading comes into view: +

      + 22.2.1.5 - Template class codecvt +@@ -133,7 +133,7 @@ + Two: The required conversions, by specifying mbstate_t as the third + template parameter, imply an implementation strategy that is mostly + (or wholly) based on the underlying C library, and the functions +-mcsrtombs and wcsrtombs in particular.

      ++mcsrtombs and wcsrtombs in particular.

      Design

      wchar_t Size

      + The simple implementation detail of wchar_t's size seems to + repeatedly confound people. Many systems use a two byte, + unsigned integral type to represent wide characters, and use an +@@ -145,7 +145,7 @@ + size for the type wchar_t. +

      + Thus, portable C++ code cannot assume a byte size (or endianness) either. +-

      ++

      Support for Unicode

      + Probably the most frequently asked question about code conversion + is: "So dudes, what's the deal with Unicode strings?" + The dude part is optional, but apparently the usefulness of +@@ -162,7 +162,7 @@ + needed is some kind of generalized type that accounts for the + issues that abstract encodings will need. The minimum information + that is required includes: +-

      • ++

        • + Identifiers for each of the codesets involved in the + conversion. For example, using the iconv family of functions + from the Single Unix Specification (what used to be called +@@ -213,7 +213,7 @@ + Some way to enforce strict type checking on the internal and + external types. As part of this, the size of the internal and + external types will need to be known. +-

      ++

      Other Issues

      + In addition, multi-threaded and multi-locale environments also impact + the design and requirements for code conversions. In particular, they + affect the required specialization codecvt<wchar_t, char, mbstate_t> +@@ -245,7 +245,7 @@ + conversions are made between the internal character set (always UCS4 + on GNU/Linux) and whatever the currently selected locale for the + LC_CTYPE category implements. +-

      ++

      Implementation

      + The two required specializations are implemented as follows: +

      + +@@ -347,7 +347,7 @@ + for this specialization, and usage of codecvt<internal character type, + external character type, encoding_state> is consistent with other + codecvt usage. +-

      A conversions involving string literal.

      ++

      Use

      A conversions involving string literal.

      +   typedef codecvt_base::result                  result;
+   typedef unsigned short                        unicode_t;
+   typedef unicode_t                             int_type;
+@@ -384,14 +384,14 @@
+   VERIFY( !int_traits::compare(i_arr, i_lit, size) );
+   VERIFY( efrom_next == e_lit + size );
+   VERIFY( ito_next == i_arr + size );
+-

      Future

      • + a. things that are sketchy, or remain unimplemented: + do_encoding, max_length and length member functions + are only weakly implemented. I have no idea how to do + this correctly, and in a generic manner. Nathan? +

      • + b. conversions involving std::string +-

        • ++

          • + how should operators != and == work for string of + different/same encoding? +

          • +@@ -401,7 +401,7 @@ + conversions between narrow, wide, and unicode strings +

        • + c. conversions involving std::filebuf and std::ostream +-

          • ++

            • + how to initialize the state object in a + standards-conformant manner? +

            • +@@ -410,50 +410,50 @@ +

            • + wchar_t/char internal buffers and conversions between + internal/external buffers? +-

        ++

      Bibliography

      + The GNU C Library + . Roland McGrath. Ulrich Drepper. Copyright © 2007 FSF. + Chapters 6 Character Set Handling and 7 Locales and Internationalization +- .

      ++ .

      + Correspondence +- . Ulrich Drepper. Copyright © 2002 .

      ++ . Ulrich Drepper. Copyright © 2002 .

      + ISO/IEC 14882:1998 Programming languages - C++ +- . Copyright © 1998 ISO.

      ++ . Copyright © 1998 ISO.

      + ISO/IEC 9899:1999 Programming languages - C +- . Copyright © 1999 ISO.

      +- ++ . Copyright © 1999 ISO.

      ++ + System Interface Definitions, Issue 7 (IEEE Std. 1003.1-2008) + + . Copyright © 2008 + The Open Group/The Institute of Electrical and Electronics + Engineers, Inc. +- .

      ++ .

      + The C++ Programming Language, Special Edition + . Bjarne Stroustrup. Copyright © 2000 Addison Wesley, Inc.. Appendix D. + Addison Wesley +- .

      ++ .

      + Standard C++ IOStreams and Locales + . + Advanced Programmer's Guide and Reference + . Angelika Langer. Klaus Kreft. Copyright © 2000 Addison Wesley Longman, Inc.. + Addison Wesley Longman +- .

      +- ++ .

      ++ + A brief description of Normative Addendum 1 + +- . Clive Feather. Extended Character Sets.

      +- ++ . Clive Feather. Extended Character Sets.

      ++ + The Unicode HOWTO + +- . Bruno Haible.

      +- ++ . Bruno Haible.

      ++ + UTF-8 and Unicode FAQ for Unix/Linux + +- . Markus Khun.

      ++ . Markus Khun.

      messages

      + The std::messages facet implements message retrieval functionality + equivalent to Java's java.text.MessageFormat .using either GNU gettext + or IEEE 1003.1-200 functions. +-

      ++

      Requirements

      + The std::messages facet is probably the most vaguely defined facet in + the standard library. It's assumed that this facility was built into + the standard library in order to convert string literals from one +@@ -502,7 +502,7 @@ + -6- Effects: Releases unspecified resources associated with cat. + -7- Notes: The limit on such resources, if any, is implementation-defined. + +-

      ++

      Design

      + A couple of notes on the standard. +

      + First, why is messages_base::catalog specified as a typedef +@@ -535,7 +535,7 @@ + string in 'get' is in the "C" locale. Thus, all source code is assumed + to be written in English, so translations are always from "en_US" to + other, explicitly named locales. +-

      ++

      Implementation

      Models

      + This is a relatively simple class, on the face of it. The standard + specifies very little in concrete terms, so generic + implementations that are conforming yet do very little are the +@@ -546,7 +546,7 @@ +

      + Three different mechanisms have been provided, selectable via + configure flags: +-

      • ++

        • + generic +

          + This model does very little, and is what is used by default. +@@ -576,7 +576,7 @@ + added for 'open' so that a directory could be specified with a given + message catalog. This simplifies calling conventions for the gnu + model. +-

        ++

        The GNU Model

        + The messages facet, because it is retrieving and converting + between characters sets, depends on the ctype and perhaps the + codecvt facet in a given locale. In addition, underlying "C" +@@ -588,7 +588,7 @@ + Making the message catalogs can be initially tricky, but become + quite simple with practice. For complete info, see the gettext + documentation. Here's an idea of what is required: +-

        • ++

          • + Make a source file with the required string literals that need + to be translated. See intl/string_literals.cc for + an example. +@@ -619,7 +619,7 @@ + + use_facet<messages<char> >(loc_de).open("libstdc++", locale(), dir); + +-

        ++

      Use

      + A simple example using the GNU model of message conversion. + 

      + #include <iostream>
+@@ -641,9 +641,9 @@
+   cout << "thank you in german:" << s02 << '\n';
+   mssg_de.close(cat_de);
+ }
+-

      Future

      • + Things that are sketchy, or remain unimplemented: +-

        • ++

          • + _M_convert_from_char, _M_convert_to_char are in flux, + depending on how the library ends up doing character set + conversions. It might not be possible to do a real character +@@ -691,47 +691,47 @@ + model. As of this writing, it is unknown how to query to see + if a specified message catalog exists using the gettext + package. +-

        ++

      Bibliography

      + The GNU C Library + . Roland McGrath. Ulrich Drepper. Copyright © 2007 FSF. Chapters 6 Character Set Handling, and 7 Locales and Internationalization +- .

      ++ .

      + Correspondence +- . Ulrich Drepper. Copyright © 2002 .

      ++ . Ulrich Drepper. Copyright © 2002 .

      + ISO/IEC 14882:1998 Programming languages - C++ +- . Copyright © 1998 ISO.

      ++ . Copyright © 1998 ISO.

      + ISO/IEC 9899:1999 Programming languages - C +- . Copyright © 1999 ISO.

      +- ++ . Copyright © 1999 ISO.

      ++ + System Interface Definitions, Issue 7 (IEEE Std. 1003.1-2008) + + . Copyright © 2008 + The Open Group/The Institute of Electrical and Electronics + Engineers, Inc. +- .

      ++ .

      + The C++ Programming Language, Special Edition + . Bjarne Stroustrup. Copyright © 2000 Addison Wesley, Inc.. Appendix D. + Addison Wesley +- .

      ++ .

      + Standard C++ IOStreams and Locales + . + Advanced Programmer's Guide and Reference + . Angelika Langer. Klaus Kreft. Copyright © 2000 Addison Wesley Longman, Inc.. + Addison Wesley Longman +- .

      +- ++ .

      ++ + API Specifications, Java Platform + + . java.util.Properties, java.text.MessageFormat, + java.util.Locale, java.util.ResourceBundle +- .

      +- ++ .

      ++ + GNU gettext tools, version 0.10.38, Native Language Support + Library and Tools. + +- .

      Prev Up Next
      Chapter 8.  ++ .

      Prev Up Next
      Chapter 8.  + Localization + +- Home Chapter 9.  ++ Home Chapter 9.  + Containers + +
      +Index: libstdc++-v3/doc/html/manual/diagnostics.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/diagnostics.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/diagnostics.html (.../branches/gcc-4_7-branch) +@@ -1,14 +1,14 @@ + +- +-Chapter 5.  Diagnostics
      Chapter 5.  ++ ++Chapter 5.  Diagnostics
      Chapter 5.  + Diagnostics + +-
      Prev Part II.  ++
      Prev Part II.  + Standard Contents +-  Next
      		 Next

      Chapter 5.  + Diagnostics +- +-

      Table of Contents

      Exceptions
      API Reference
      Adding Data to exception
      Concept Checking

      ++ ++

      Table of Contents

      Exceptions
      API Reference
      Adding Data to exception
      Concept Checking

      Exceptions

      API Reference

      + All exception objects are defined in one of the standard header + files: exception, + stdexcept, new, and +@@ -23,7 +23,7 @@ + found in the source documentation. +

      + Full API details. +-

      ++

      Adding Data to exception

      + The standard exception classes carry with them a single string as + data (usually describing what went wrong or where the 'throw' took + place). It's good to remember that you can add your own data to +@@ -40,4 +40,4 @@ + int e; + DBID id; // some user-defined type + }; +-

      Prev Up Next
      Termination Home Concept Checking
      ++
      Prev Up Next
      Termination Home Concept Checking
      +Index: libstdc++-v3/doc/html/manual/bk01pt03ch30s02.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch30s02.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch30s02.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Implementation
      Implementation
      Prev Chapter 30. Concurrency Next

      The functions for atomic operations described above are either ++ ++Implementation

      Implementation
      Prev Chapter 30. Concurrency Next

      Implementation

      Using Builtin Atomic Functions

      The functions for atomic operations described above are either + implemented via compiler intrinsics (if the underlying host is + capable) or by library fallbacks.

      Compiler intrinsics (builtins) are always preferred. However, as + the compiler builtins for atomics are not universally implemented, +@@ -22,14 +22,14 @@ + If builtins are possible for int-sized integral types, + ATOMIC_INT_LOCK_FREE will be defined. +

      For the following hosts, intrinsics are enabled by default. +-

      • alpha

      • ia64

      • powerpc

      • s390

      For others, some form of -march may work. On ++

      • alpha

      • ia64

      • powerpc

      • s390

      For others, some form of -march may work. On + non-ancient x86 hardware, -march=native usually does the + trick.

      For hosts without compiler intrinsics, but with capable + hardware, hand-crafted assembly is selected. This is the case for the following hosts: +-

      • cris

      • hppa

      • i386

      • i486

      • m48k

      • mips

      • sparc

      And for the rest, a simulated atomic lock via pthreads. +-

      Detailed information about compiler intrinsics for atomic operations can be found in the GCC documentation. ++

      • cris

      • hppa

      • i386

      • i486

      • m48k

      • mips

      • sparc

      And for the rest, a simulated atomic lock via pthreads. ++

      Detailed information about compiler intrinsics for atomic operations can be found in the GCC documentation. +

      More details on the library fallbacks from the porting section. +-

      A thin layer above IEEE 1003.1 (i.e. pthreads) is used to abstract ++

      Thread Abstraction

      A thin layer above IEEE 1003.1 (i.e. pthreads) is used to abstract + the thread interface for GCC. This layer is called "gthread," and is + comprised of one header file that wraps the host's default thread layer with + a POSIX-like interface. +@@ -37,9 +37,9 @@ + the current host. In libstdc++ implementation files, + <bits/gthr.h> is used to select the proper gthreads file. +

      Within libstdc++ sources, all calls to underlying thread functionality +-use this layer. More detail as to the specific interface can be found in the source documentation. ++use this layer. More detail as to the specific interface can be found in the source documentation. +

      By design, the gthread layer is interoperable with the types, + functions, and usage found in the usual <pthread.h> file, + including pthread_t, pthread_once_t, pthread_create, + etc. +-

      Prev Up Next
      Chapter 30. Concurrency Home Use
      ++

      Prev Up Next
      Chapter 30. Concurrency Home Use
      +Index: libstdc++-v3/doc/html/manual/bk01pt03ch20s03.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch20s03.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch20s03.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Implementation
      Implementation
      Prev Chapter 20. The mt_allocator Next

      Certain allocation parameters can be modified, or tuned. There ++ ++Implementation

      Implementation
      Prev Chapter 20. The mt_allocator Next

      Implementation

      Tunable Parameters

      Certain allocation parameters can be modified, or tuned. There + exists a nested struct __pool_base::_Tune that contains all + these parameters, which include settings for +-

      • Alignment

      • Maximum bytes before calling ::operator new directly

      • Minimum bytes

      • Size of underlying global allocations

      • Maximum number of supported threads

      • Migration of deallocations to the global free list

      • Shunt for global new and delete

      Adjusting parameters for a given instance of an allocator can only ++

      • Alignment

      • Maximum bytes before calling ::operator new directly

      • Minimum bytes

      • Size of underlying global allocations

      • Maximum number of supported threads

      • Migration of deallocations to the global free list

      • Shunt for global new and delete

      Adjusting parameters for a given instance of an allocator can only + happen before any allocations take place, when the allocator itself is + initialized. For instance: + 

      +@@ -39,7 +39,7 @@
+ 
+   return 0;
+ }
+-

      ++

      Initialization

      + The static variables (pointers to freelists, tuning parameters etc) + are initialized as above, or are set to the global defaults. +

      +@@ -131,7 +131,7 @@ + for this specific bin. This only occurs when a number of blocks + are grabbed from the global list to a thread specific list or when + a thread decides to return some blocks to the global freelist. +-

      Notes about deallocation. This allocator does not explicitly ++

      Deallocation Notes

      Notes about deallocation. This allocator does not explicitly + release memory. Because of this, memory debugging programs like + valgrind or purify may notice leaks: sorry about this + inconvenience. Operating systems will reclaim allocated memory at +@@ -156,6 +156,6 @@ + as part of a container's constructor. However, this assumption is + implementation-specific, and subject to change. For an example of a + pool that frees memory, see the following +- ++ + example. +-

      Prev Up Next
      Design Issues Home Single Thread Example
      ++

      Prev Up Next
      Design Issues Home Single Thread Example
      +Index: libstdc++-v3/doc/html/manual/appendix_free.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/appendix_free.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/appendix_free.html (.../branches/gcc-4_7-branch) +@@ -1,13 +1,13 @@ + +- +-Appendix C.  Free Software Needs Free Documentation
      Appendix C.  ++ ++Appendix C.  Free Software Needs Free Documentation
      Appendix C.  + Free Software Needs Free Documentation + +-
      Prev Part IV.  ++
      Prev Part IV.  + Appendices +- Next
      		 Next

      + Free Software Needs Free Documentation +- ++ +

      + The biggest deficiency in free operating systems is not in the + software--it is the lack of good free manuals that we can include in +@@ -41,7 +41,7 @@ + Free documentation, like free software, is a matter of freedom, + not price. The problem with these manuals was not that O'Reilly + Associates charged a price for printed copies--that in itself is fine. +-(The Free Software Foundation sells printed copies of ++(The Free Software Foundation sells printed copies of + free GNU manuals, too.) But GNU manuals are available in source code + form, while these manuals are available only on paper. GNU manuals + come with permission to copy and modify; the Perl manuals do not. +@@ -117,10 +117,10 @@ + check the distribution terms of a manual before you buy it, and + prefer copylefted manuals to non-copylefted ones. +

      +-[Note: We now maintain a web page ++[Note: We now maintain a web page + that lists free books available from other publishers]. +

      Copyright © 2004, 2005, 2006, 2007 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA

      Verbatim copying and distribution of this entire article are + permitted worldwide, without royalty, in any medium, provided this +-notice is preserved.

      Report any problems or suggestions to .

      Prev Up Next
      Backwards Compatibility Home Appendix D.  ++notice is preserved.

      Report any problems or suggestions to .

      Prev Up Next
      Backwards Compatibility Home Appendix D.  + GNU General Public License version 3 +
      +Index: libstdc++-v3/doc/html/manual/algorithms.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/algorithms.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/algorithms.html (.../branches/gcc-4_7-branch) +@@ -1,18 +1,18 @@ + +- +-Chapter 11.  Algorithms
      Chapter 11.  ++ ++Chapter 11.  Algorithms
      Chapter 11.  + Algorithms + +-
      Prev Part II.  ++
      Prev Part II.  + Standard Contents +-  Next
      		 Next

      Chapter 11.  + Algorithms +- ++ +

      Table of Contents

      Mutating
      swap
      Specializations

      + The neatest accomplishment of the algorithms section is that all the + work is done via iterators, not containers directly. This means two + important things: +-

      1. ++

        1. + Anything that behaves like an iterator can be used in one of + these algorithms. Raw pointers make great candidates, thus + built-in arrays are fine containers, as well as your own +@@ -42,7 +42,7 @@ + to cause so much confusion. Once you + get range into your head (it's not that hard, + honest!), then the algorithms are a cakewalk. +-

          If you call std::swap(x,y); where x and y are standard ++

          Mutating

          swap

          Specializations

          If you call std::swap(x,y); where x and y are standard + containers, then the call will automatically be replaced by a call to + x.swap(y); instead. +

          This allows member functions of each container class to take over, and +@@ -52,10 +52,10 @@ + fact use constant-time swaps.) This should not be surprising, since + for two containers of the same type to swap contents, only some + internal pointers to storage need to be exchanged. +-

          Prev Up Next
          Chapter 10.  ++

          Prev Up Next
          Chapter 10.  + Iterators + +- Home Chapter 12.  ++ Home Chapter 12.  + Numerics + +
          +Index: libstdc++-v3/doc/html/manual/appendix_porting.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/appendix_porting.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/appendix_porting.html (.../branches/gcc-4_7-branch) +@@ -1,13 +1,13 @@ + +- +-Appendix B.  Porting and Maintenance
          Appendix B.  ++ ++Appendix B.  Porting and Maintenance
          Appendix B.  + Porting and Maintenance + +-
          Prev Part IV.  ++
          Prev Part IV.  + Appendices +- Next
          		 Next

          + Porting and Maintenance +- ++ +

          Table of Contents

          Configure and Build Hacking
          Prerequisites
          Overview: What Comes from Where
          Storing Information in non-AC files (like configure.host)
          Coding and Commenting Conventions
          The acinclude.m4 layout
          GLIBCXX_ENABLE, the --enable maker
          Writing and Generating Documentation
          Introduction
          Generating Documentation
          Doxygen
          Prerequisites
          Generating the Doxygen Files
          Markup
          Docbook
          Prerequisites
          Generating the DocBook Files
          Editing and Validation
          File Organization and Basics
          Markup By Example
          Porting to New Hardware or Operating Systems
          Operating System
          CPU
          Character Types
          Thread Safety
          Numeric Limits
          Libtool
          Test
          Organization
          Directory Layout
          Naming Conventions
          Running the Testsuite
          Basic
          Variations
          Permutations
          Writing a new test case
          Test Harness and Utilities
          Dejagnu Harness Details
          Utilities
          Special Topics
          + Qualifying Exception Safety Guarantees + +@@ -30,8 +30,8 @@ + Support for C++11 dialect. +
          + Container::iterator_type is not necessarily Container::value_type* +-

          +- As noted previously, ++

          Configure and Build Hacking

          Prerequisites

          ++ As noted previously, + certain other tools are necessary for hacking on files that + control configure (configure.ac, + acinclude.m4) and make +@@ -41,17 +41,17 @@ + in GCC try to stay in sync with each other in terms of versions of + the auto-tools used, so please try to play nicely with the + neighbors. +-

          Figure B.1. Configure and Build File Dependencies

          Dependency Graph for Configure and Build Files

          ++

          Overview: What Comes from Where

          Figure B.1. Configure and Build File Dependencies

          Dependency Graph for Configure and Build Files

          + Regenerate all generated files by using the command sequence + "autoreconf" at the top level of the libstdc++ source + directory. The following will also work, but is much more complex: + "aclocal-1.11 && autoconf-2.64 && + autoheader-2.64 && automake-1.11" The version + numbers may be absent entirely or otherwise vary depending on +- the ++ the + current requirements and your vendor's choice of + installation names. +-

          ++

          Storing Information in non-AC files (like configure.host)

          + Until that glorious day when we can use AC_TRY_LINK with a + cross-compiler, we have to hardcode the results of what the tests + would have shown if they could be run. So we have an inflexible +@@ -73,7 +73,7 @@ + for instance, but then we would need arguments to aclocal/autoconf + to properly find them all when generating configure. I would + discourage that. +-

          ++

          Coding and Commenting Conventions

          + Most comments should use {octothorpes, shibboleths, hash marks, + pound signs, whatever} rather than "dnl". Nearly all comments in + configure.ac should. Comments inside macros written in ancilliary +@@ -90,7 +90,7 @@ + Do not use any $target* variables, such as + $target_alias. The single exception is in + configure.ac, for automake+dejagnu's sake. +-

          ++

          The acinclude.m4 layout

          + The nice thing about acinclude.m4/aclocal.m4 is that macros aren't + actually performed/called/expanded/whatever here, just loaded. So + we can arrange the contents however we like. As of this writing, +@@ -161,11 +161,11 @@ +

          + Things which we don't seem to use directly, but just has to be + present otherwise stuff magically goes wonky. +-

          ++

          GLIBCXX_ENABLE, the --enable maker

          + All the GLIBCXX_ENABLE_FOO macros use a common helper, + GLIBCXX_ENABLE. (You don't have to use it, but it's easy.) The + helper does two things for us: +-

          1. ++

            1. + Builds the call to the AC_ARG_ENABLE macro, with --help text + properly quoted and aligned. (Death to changequote!) +

            2. +@@ -190,7 +190,7 @@ + GLIBCXX_ENABLE (FEATURE, DEFAULT, HELP-ARG, HELP-STRING) + GLIBCXX_ENABLE (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, permit a|b|c) + GLIBCXX_ENABLE (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, SHELL-CODE-HANDLER) +-

              • ++

                • + FEATURE is the string that follows --enable. The results of the + test (such as it is) will be in the variable $enable_FEATURE, + where FEATURE has been squashed. Example: +@@ -218,7 +218,7 @@ +

                  + If you're wondering what that line noise in the last example was, + that's how you embed autoconf special characters in output text. +- They're called quadrigraphs ++ They're called quadrigraphs + and you should use them whenever necessary. +

                • HELP-STRING is what you think it is. Do not include the + "default" text like we used to do; it will be done for you by +@@ -249,4 +249,4 @@ + argument checking at all is done in this signature. See + GLIBCXX_ENABLE_CXX_FLAGS for an example of handling, and an error + message. +-

            Prev Up Next
            Design Notes Home Writing and Generating Documentation
            ++

          Prev Up Next
          Design Notes Home Writing and Generating Documentation
          +Index: libstdc++-v3/doc/html/manual/make.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/make.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/make.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Make
          Make
          Prev Chapter 2. Setup Next

          If you have never done this before, you should read the basic +- GCC Installation ++ ++Make

          Make
          Prev Chapter 2. Setup Next

          Make

          If you have never done this before, you should read the basic ++ GCC Installation + Instructions first. Read all of them. + Twice. +

          Then type: make, and congratulations, you've + started to build. +-

          Prev Up Next
          Configure Home Chapter 3. Using
          ++

          Prev Up Next
          Configure Home Chapter 3. Using
          +Index: libstdc++-v3/doc/html/manual/bk01pt03ch17s04.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch17s04.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch17s04.html (.../branches/gcc-4_7-branch) +@@ -1,11 +1,11 @@ + +- +-Design
          Design
          Prev Chapter 17. Debug Mode Next

          +-

          ++ ++Design

          Design
          Prev Chapter 17. Debug Mode Next

          Design

          ++

          Goals

          +

          The libstdc++ debug mode replaces unsafe (but efficient) standard + containers and iterators with semantically equivalent safe standard + containers and iterators to aid in debugging user programs. The +- following goals directed the design of the libstdc++ debug mode:

          • Correctness: the libstdc++ debug mode must not change ++ following goals directed the design of the libstdc++ debug mode:

            • Correctness: the libstdc++ debug mode must not change + the semantics of the standard library for all cases specified in + the ANSI/ISO C++ standard. The essence of this constraint is that + any valid C++ program should behave in the same manner regardless +@@ -39,7 +39,7 @@ + higher-numbered conformance levels are more usable (i.e., require + less recompilation) but are more complicated to implement than + the lower-numbered conformance levels. +-

              1. Full recompilation: The user must recompile his or ++

                1. Full recompilation: The user must recompile his or + her entire application and all C++ libraries it depends on, + including the C++ standard library that ships with the + compiler. This must be done even if only a small part of the +@@ -89,10 +89,10 @@ + (performance regression) or allocating extra memory associated + with each iterator with new (changes the program + semantics).

                +-

          ++

          Methods

          +

          This section provides an overall view of the design of the + libstdc++ debug mode and details the relationship between design +- decisions and the stated design goals.

          The libstdc++ debug mode uses a wrapper model where the ++ decisions and the stated design goals.

          The Wrapper Model

          The libstdc++ debug mode uses a wrapper model where the + debugging versions of library components (e.g., iterators and + containers) form a layer on top of the release versions of the + library components. The debugging components first verify that the +@@ -109,19 +109,19 @@ + their associated containers, which are necessary to detect certain + types of standard library usage errors such as dereferencing + past-the-end iterators or inserting into a container using an +- iterator from a different container.

          Iterator wrappers provide a debugging layer over any iterator that ++ iterator from a different container.

          Safe Iterators

          Iterator wrappers provide a debugging layer over any iterator that + is attached to a particular container, and will manage the + information detailing the iterator's state (singular, + dereferenceable, etc.) and tracking the container to which the + iterator is attached. Because iterators have a well-defined, common + interface the iterator wrapper is implemented with the iterator + adaptor class template __gnu_debug::_Safe_iterator, +- which takes two template parameters:

          • Iterator: The underlying iterator type, which must ++ which takes two template parameters:

            • Iterator: The underlying iterator type, which must + be either the iterator or const_iterator + typedef from the sequence type this iterator can reference.

            • Sequence: The type of sequence that this iterator + references. This sequence must be a safe sequence (discussed below) + whose iterator or const_iterator typedef +- is the type of the safe iterator.

          Container wrappers provide a debugging layer over a particular ++ is the type of the safe iterator.

          Safe Sequences (Containers)

          Container wrappers provide a debugging layer over a particular + container type. Because containers vary greatly in the member + functions they support and the semantics of those member functions + (especially in the area of iterator invalidation), container +@@ -157,7 +157,7 @@ + + // duplicate std::list interface with debugging semantics + }; +-

          The debug mode operates primarily by checking the preconditions of ++

          Precondition Checking

          The debug mode operates primarily by checking the preconditions of + all standard library operations that it supports. Preconditions that + are always checked (regardless of whether or not we are in debug + mode) are checked via the __check_xxx macros defined +@@ -184,7 +184,7 @@ + cousin _GLIBCXX_DEBUG_PEDASSERT, or the assertion + check macro that supports more advance formulation of error + messages, _GLIBCXX_DEBUG_VERIFY. These macros are +- documented more thoroughly in the debug mode source code.

          The libstdc++ debug mode is the first debug mode we know of that ++ documented more thoroughly in the debug mode source code.

          Release- and debug-mode coexistence

          The libstdc++ debug mode is the first debug mode we know of that + is able to provide the "Per-use recompilation" (4) guarantee, that + allows release-compiled and debug-compiled code to be linked and + executed together without causing unpredictable behavior. This +@@ -194,13 +194,13 @@ + environments by minimizing dependencies.

          Achieving link- and run-time coexistence is not a trivial + implementation task. To achieve this goal we required a small + extension to the GNU C++ compiler (since incorporated into the C++11 language specification, described in the GCC Manual for the C++ language as +- namespace ++ namespace + association), and a complex organization of debug- and + release-modes. The end result is that we have achieved per-use + recompilation but have had to give up some checking of the + std::basic_string class template (namely, safe + iterators). +-

          Both the release-mode components and the debug-mode ++

          Compile-time coexistence of release- and debug-mode components

          Both the release-mode components and the debug-mode + components need to exist within a single translation unit so that + the debug versions can wrap the release versions. However, only one + of these components should be user-visible at any particular +@@ -254,7 +254,7 @@ + // namespace __debug __attribute__ ((strong)); + inline namespace __debug { } + } +-

          Link- and run-time coexistence of release- and + debug-mode components

          Because each component has a distinct and separate release and + debug implementation, there is no issue with link-time + coexistence: the separate namespaces result in different mangled +@@ -301,7 +301,7 @@ + release-mode basic_string? While the answer could be + "both", and the difference hidden via renaming a la the + debug/release containers, we must note two things about locale +- facets:

          1. They exist as shared state: one can create a facet in one ++ facets:

            1. They exist as shared state: one can create a facet in one + translation unit and access the facet via the same type name in a + different translation unit. This means that we cannot have two + different versions of locale facets, because the types would not be +@@ -316,10 +316,10 @@ + changes. The effect on users is expected to be minimal, as there are + simple alternatives (e.g., __gnu_debug::basic_string), + and the usability benefit we gain from the ability to mix debug- and +- release-compiled translation units is enormous.

            The coexistence scheme above was chosen over many alternatives, ++ release-compiled translation units is enormous.

            Alternatives for Coexistence

            The coexistence scheme above was chosen over many alternatives, + including language-only solutions and solutions that also required + extensions to the C++ front end. The following is a partial list of +- solutions, with justifications for our rejection of each.

            • Completely separate debug/release libraries: This is by ++ solutions, with justifications for our rejection of each.

              • Completely separate debug/release libraries: This is by + far the simplest implementation option, where we do not allow any + coexistence of debug- and release-compiled translation units in a + program. This solution has an extreme negative affect on usability, +@@ -353,7 +353,7 @@ + declarations disallow specialization. This method fails + the correctness criteria.

              • Use implementation-specific properties of anonymous + namespaces. +- See this post ++ See this post + + This method fails the correctness criteria.

              • Extension: allow reopening on namespaces: This would + allow the debug mode to effectively alias the +@@ -376,7 +376,7 @@ + functions taking no arguments in mixed-mode settings resulting in + equivalent link names, vector::push_back() being + one example. +- See link ++ See link + name

              Other options may exist for implementing the debug mode, many of + which have probably been considered and others that may still be + lurking. This list may be expanded over time to include other +@@ -388,17 +388,17 @@ + that breaks user specialization), and additional testcases will be + added as we are able to identify other typical problem cases. These + test cases will serve as a benchmark by which we can compare debug +- mode implementations.

          ++ mode implementations.

          Other Implementations

          +

          There are several existing implementations of debug modes for C++ + standard library implementations, although none of them directly + supports debugging for programs using libstdc++. The existing +- implementations include:

          • SafeSTL: ++ implementations include:

            • SafeSTL: + SafeSTL was the original debugging version of the Standard Template + Library (STL), implemented by Cay S. Horstmann on top of the + Hewlett-Packard STL. Though it inspired much work in this area, it + has not been kept up-to-date for use with modern compilers or C++ +- standard library implementations.

            • STLport: STLport is a free +- implementation of the C++ standard library derived from the SGI implementation, and ++ standard library implementations.

            • STLport: STLport is a free ++ implementation of the C++ standard library derived from the SGI implementation, and + ported to many other platforms. It includes a debug mode that uses a + wrapper model (that in some ways inspired the libstdc++ debug mode + design), although at the time of this writing the debug mode is +@@ -409,4 +409,4 @@ + a full debug-mode implementation (including debugging for + CodeWarrior extensions) and is easy to use, although it meets only + the "Full recompilation" (1) recompilation +- guarantee.

          Prev Up Next
          Using Home Chapter 18. Parallel Mode
          ++ guarantee.

          Prev Up Next
          Using Home Chapter 18. Parallel Mode
          +Index: libstdc++-v3/doc/html/manual/pairs.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/pairs.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/pairs.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Pairs
          Pairs
          Prev Chapter 6.  ++ ++Pairs
          Pairs
          Prev Chapter 6.  + Utilities + +- Next

          The pair<T1,T2> is a simple and handy way to ++

          		 Next

          Pairs

          The pair<T1,T2> is a simple and handy way to + carry around a pair of objects. One is of type T1, and another of + type T2; they may be the same type, but you don't get anything + extra if they are. The two members can be accessed directly, as +@@ -38,7 +38,7 @@ + instance of a pair instantiated on their respective types: + 

          +     pair<int,MyClass> p = make_pair(4,myobject);
+-
          Prev Up Next
          Chapter 6.  ++
          Prev Up Next
          Chapter 6.  + Utilities + +- Home Memory
          ++           		Home Memory
          +Index: libstdc++-v3/doc/html/manual/bk01pt03ch18s04.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch18s04.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch18s04.html (.../branches/gcc-4_7-branch) +@@ -1,7 +1,7 @@ + +- +-Design
          Design
          Prev Chapter 18. Parallel Mode Next

          +-

          ++ ++Design

          Design
          Prev Chapter 18. Parallel Mode Next

          Design

          ++

          Interface Basics

          + All parallel algorithms are intended to have signatures that are + equivalent to the ISO C++ algorithms replaced. For instance, the + std::adjacent_find function is declared as: +@@ -36,13 +36,13 @@ + compile-time or run-time conditions. +

          The available signature options are specific for the different + algorithms/algorithm classes.

          The general view of overloads for the parallel algorithms look like this: +-

          • ISO C++ signature

          • ISO C++ signature + sequential_tag argument

          • ISO C++ signature + algorithm-specific tag type ++

            • ISO C++ signature

            • ISO C++ signature + sequential_tag argument

            • ISO C++ signature + algorithm-specific tag type + (several signatures)

            Please note that the implementation may use additional functions + (designated with the _switch suffix) to dispatch from the + ISO C++ signature to the correct parallel version. Also, some of the + algorithms do not have support for run-time conditions, so the last + overload is therefore missing. +-

          ++

          Configuration and Tuning

          Setting up the OpenMP Environment

          + Several aspects of the overall runtime environment can be manipulated + by standard OpenMP function calls. +

          +@@ -72,7 +72,7 @@ + nested parallelism (omp_set_nested), schedule kind + (omp_set_schedule), and others. See the OpenMP + documentation for more information. +-

          ++

          Compile Time Switches

          + To force an algorithm to execute sequentially, even though parallelism + is switched on in general via the macro _GLIBCXX_PARALLEL, + add __gnu_parallel::sequential_tag() to the end +@@ -126,7 +126,7 @@ + __gnu_parallel::balanced_quicksort_tag. + Multiway mergesort comes with the two splitting strategies for multi-way + merging. The quicksort options cannot be used for stable_sort. +-

          ++

          Run Time Settings and Defaults

          + The default parallelization strategy, the choice of specific algorithm + strategy, the minimum threshold limits for individual parallel + algorithms, and aspects of the underlying hardware can be specified as +@@ -175,7 +175,7 @@ + __gnu_parallel::_Settings::set, respectively. + Please note that the first call return a const object, so direct manipulation + is forbidden. +-See ++See + settings.h + for complete details. +

          +@@ -194,7 +194,7 @@ + + return 0; + } +-

          One namespace contain versions of code that are always ++

          Implementation Namespaces

          One namespace contain versions of code that are always + explicitly sequential: + __gnu_serial. +

          Two namespaces contain the parallel mode: +@@ -210,4 +210,4 @@ +

          More information, and an organized index of types and functions + related to the parallel mode on a per-namespace basis, can be found in + the generated source documentation. +-

          Prev Up Next
          Using Home Testing
          ++

          Prev Up Next
          Using Home Testing
          +Index: libstdc++-v3/doc/html/manual/test.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/test.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/test.html (.../branches/gcc-4_7-branch) +@@ -1,12 +1,12 @@ + +- +-Test
          Test
          Prev Appendix B.  ++ ++Test
          Test
          Prev Appendix B.  + Porting and Maintenance + +- Next

          ++

          		 Next

          Test

          + The libstdc++ testsuite includes testing for standard conformance, + regressions, ABI, and performance. +-

          ++

          Organization

          Directory Layout

          + The directory libsrcdir/testsuite contains the + individual test cases organized in sub-directories corresponding to + chapters of the C++ standard (detailed below), the dejagnu test +@@ -77,11 +77,11 @@ +

          + All new tests should be written with the policy of one test + case, one file in mind. +-

          ++

          Naming Conventions

          + In addition, there are some special names and suffixes that are + used within the testsuite to designate particular kinds of + tests. +-

          • ++

            • + _xin.cc +

              + This test case expects some kind of interactive input in order +@@ -131,7 +131,7 @@ + analyze runtime performance, for performance regression testing, + or for other optimization related analysis. At the moment, these + test cases are not run by default. +-

          ++

          Running the Testsuite

          Basic

          + You can check the status of the build without installing it + using the dejagnu harness, much like the rest of the gcc + tools.

           make check

          in the libbuilddir directory.

          or

           make check-target-libstdc++-v3

          in the gccbuilddir directory. +@@ -146,12 +146,12 @@ + output, and the executable output (if any). +

          + Archives of test results for various versions and platforms are +- available on the GCC website in the build ++ available on the GCC website in the build + status section of each individual release, and are also +- archived on a daily basis on the gcc-testresults ++ archived on a daily basis on the gcc-testresults + mailing list. Please check either of these places for a similar + combination of source version, operating system, and host CPU. +-

          ++

          Variations

          + There are several options for running tests, including testing + the regression tests, testing a subset of the regression tests, + testing the performance tests, testing just compilation, testing +@@ -222,7 +222,7 @@ +

          + Five files are generated that determine what test files + are run. These files are: +-

          • ++

            • + testsuite_files +

              + This is a list of all the test cases that will be run. Each +@@ -277,7 +277,7 @@ + We are interested in any strange failures of the testsuite; + please email the main libstdc++ mailing list if you see + something odd or have questions. +-

            ++

            Permutations

            + To run the libstdc++ test suite under the debug mode, edit + libstdc++-v3/scripts/testsuite_flags to add the + compile-time flag -D_GLIBCXX_DEBUG to the +@@ -297,7 +297,7 @@ + Or, just run the testsuites with CXXFLAGS + set to -D_GLIBCXX_DEBUG or + -D_GLIBCXX_PARALLEL. +-

          ++

          Writing a new test case

          + The first step in making a new test case is to choose the correct + directory and file name, given the organization as previously + described. +@@ -408,7 +408,7 @@ + // { dg-options "-O0" { target *-*-* } } +

          + More examples can be found in the libstdc++-v3/testsuite/*/*.cc files. +-

          ++

          Test Harness and Utilities

          Dejagnu Harness Details

          + Underlying details of testing for conformance and regressions are + abstracted via the GNU Dejagnu package. This is similar to the + rest of GCC. +@@ -435,7 +435,7 @@ +

          The config directory is searched for any particular "target + board" information unique to this library. This is currently unused and sets + only default variables. +-

          ++

          Utilities

          +

          + The testsuite directory also contains some files that implement + functionality that is intended to make writing test cases easier, +@@ -447,7 +447,7 @@ + during testing. +

          + These files include the following functionality: +-

          • ++

            • + testsuite_abi.h, + testsuite_abi.cc, + testsuite_abi_check.cc +@@ -477,7 +477,7 @@ + testsuite_hooks.cc +

              + A large number of utilities, including: +-

              • VERIFY

              • set_memory_limits

              • verify_demangle

              • run_tests_wrapped_locale

              • run_tests_wrapped_env

              • try_named_locale

              • try_mkfifo

              • func_callback

              • counter

              • copy_tracker

              • copy_constructor

              • assignment_operator

              • destructor

              • pod_char, pod_int and associated char_traits specializations

            • ++

              • VERIFY

              • set_memory_limits

              • verify_demangle

              • run_tests_wrapped_locale

              • run_tests_wrapped_env

              • try_named_locale

              • try_mkfifo

              • func_callback

              • counter

              • copy_tracker

              • copy_constructor

              • assignment_operator

              • destructor

              • pod_char, pod_int and associated char_traits specializations

            • + testsuite_io.h +

              + Error, exception, and constraint checking for +@@ -491,10 +491,10 @@ +

              + A number of class abstractions for performance counters, and + reporting functions including: +-

              • time_counter

              • resource_counter

              • report_performance

          Special Topics

          + Qualifying Exception Safety Guarantees +- +-

          ++ ++

          Overview

          + Testing is composed of running a particular test sequence, + and looking at what happens to the surrounding code when + exceptions are thrown. Each test is composed of measuring +@@ -524,9 +524,9 @@ + completes without an exception being thrown, assume all + potential error paths have been exercised in a sequential + manner. +-

          + Existing tests +-

          • ++

          • + Ad Hoc +

            + For example, +@@ -563,9 +563,9 @@ + instrumentation to iterator + and const_iterator types that throw + conditionally on iterator operations. +-

          + C++11 Requirements Test Sequence Descriptions +-

          • ++

          • + Basic +

            + Basic consistency on exception propagation tests. For +@@ -636,4 +636,4 @@ + The general form demonstrated in + testsuite/23_containers/list/requirements/exception/propagation_coherent.cc + . The instantiating test object is __gnu_test::propagation_coherent and is detailed in testsuite/util/exception/safety.h. +-

          Prev Up Next
          Porting to New Hardware or Operating Systems Home ABI Policy and Guidelines
          ++

          Prev Up Next
          Porting to New Hardware or Operating Systems Home ABI Policy and Guidelines
          +Index: libstdc++-v3/doc/html/manual/using_dynamic_or_shared.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/using_dynamic_or_shared.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/using_dynamic_or_shared.html (.../branches/gcc-4_7-branch) +@@ -1,10 +1,10 @@ + +- +-Linking
          Linking
          Prev Chapter 3. Using Next

          ++ ++Linking

          Linking
          Prev Chapter 3. Using Next

          Linking

          Almost Nothing

          + Or as close as it gets: freestanding. This is a minimal + configuration, with only partial support for the standard + library. Assume only the following header files can be used: +-

          Prev Up Next
          Macros Home Linking
          ++

          Prev Up Next
          Macros Home Linking
          +Index: libstdc++-v3/doc/html/manual/debug.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/debug.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/debug.html (.../branches/gcc-4_7-branch) +@@ -1,10 +1,10 @@ + +- +-Debugging Support
          Debugging Support
          Prev Chapter 3. Using Next

          ++ ++Debugging Support

          Debugging Support
          Prev Chapter 3. Using Next

          Debugging Support

          + There are numerous things that can be done to improve the ease with + which C++ binaries are debugged when using the GNU tool chain. Here + are some of them. +-

          ++

          Using g++

          + Compiler flags determine how debug information is transmitted + between compilation and debug or analysis tools. +

          +@@ -28,10 +28,10 @@ + platform can be identified via the value set by the + PREFERRED_DEBUGGING_TYPE macro in the gcc sources. +

          +- Many other options are available: please see "Options ++ Many other options are available: please see "Options + for Debugging Your Program" in Using the GNU Compiler + Collection (GCC) for a complete list. +-

          ++

          Debug Versions of Library Binary Files

          + If you would like debug symbols in libstdc++, there are two ways to + build libstdc++ with debug flags. The first is to run make from the + toplevel in a freshly-configured tree with +@@ -52,7 +52,7 @@ +

          + This quick and dirty approach is often sufficient for quick + debugging tasks, when you cannot or don't want to recompile your +- application to use the debug mode.

          ++ application to use the debug mode.

          Memory Leak Hunting

          + There are various third party memory tracing and debug utilities + that can be used to provide detailed memory allocation information + about C++ code. An exhaustive list of tools is not going to be +@@ -121,7 +121,7 @@ + up the runtime environment, library, and test file, might be: + 

          +    valgrind -v --num-callers=20 --leak-check=yes --leak-resolution=high --show-reachable=yes a.out
+-

          ++

          Data Race Hunting

          + All synchronization primitives used in the library internals need to be + understood by race detectors so that they do not produce false reports. +

          +@@ -157,11 +157,11 @@ +

          + The approach described above is known to work with the following race + detection tools: +- ++ + DRD, +- ++ + Helgrind, and +- ++ + ThreadSanitizer. +

          + With DRD, Helgrind and ThreadSanitizer you will need to define +@@ -171,9 +171,9 @@ + #define _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(A) ANNOTATE_HAPPENS_AFTER(A) +

          + Refer to the documentation of each particular tool for details. +-

          ++

          Using gdb

          +

          +- Many options are available for GDB itself: please see ++ Many options are available for GDB itself: please see + "GDB features for C++" in the GDB documentation. Also + recommended: the other parts of this manual. +

          +@@ -217,25 +217,25 @@ + pretty-printers were not loaded. +

          + For additional information on STL support and GDB please visit: +- "GDB Support ++ "GDB Support + for STL" in the GDB wiki. Additionally, in-depth + documentation and discussion of the pretty printing feature can be + found in "Pretty Printing" node in the GDB manual. You can find + on-line versions of the GDB user manual in GDB's homepage, at +- "GDB: The GNU Project ++ "GDB: The GNU Project + Debugger" . +-

          ++

          Tracking uncaught exceptions

          + The verbose + termination handler gives information about uncaught + exceptions which are killing the program. It is described in the + linked-to page. +-

          The Debug Mode ++

          Debug Mode

          The Debug Mode + has compile and run-time checks for many containers. +-

          The Compile-Time ++

          Compile Time Checking

          The Compile-Time + Checks Extension has compile-time checks for many algorithms. +-

          The Profile-based ++

          Profile-based Performance Analysis

          The Profile-based + Performance Analysis Extension has performance checks for many + algorithms. +-

          Prev Up Next
          Exceptions Home Part II.  ++

          Prev Up Next
          Exceptions Home Part II.  + Standard Contents +
          +Index: libstdc++-v3/doc/html/manual/localization.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/localization.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/localization.html (.../branches/gcc-4_7-branch) +@@ -1,18 +1,18 @@ + +- +-Chapter 8.  Localization
          Chapter 8.  ++ ++Chapter 8.  Localization
          Chapter 8.  + Localization + +-
          Prev Part II.  ++
          Prev Part II.  + Standard Contents +-  Next
          		 Next

          Chapter 8.  + Localization +- +-

          Table of Contents

          Locales
          locale
          Requirements
          Design
          Implementation
          Interacting with "C" locales
          Future
          Facets
          ctype
          Implementation
          Specializations
          Future
          codecvt
          Requirements
          Design
          wchar_t Size
          Support for Unicode
          Other Issues
          Implementation
          Use
          Future
          messages
          Requirements
          Design
          Implementation
          Models
          The GNU Model
          Use
          Future

          ++ ++

          Table of Contents

          Locales
          locale
          Requirements
          Design
          Implementation
          Interacting with "C" locales
          Future
          Facets
          ctype
          Implementation
          Specializations
          Future
          codecvt
          Requirements
          Design
          wchar_t Size
          Support for Unicode
          Other Issues
          Implementation
          Use
          Future
          messages
          Requirements
          Design
          Implementation
          Models
          The GNU Model
          Use
          Future

          Locales

          locale

          + Describes the basic locale object, including nested + classes id, facet, and the reference-counted implementation object, + class _Impl. +-

          ++

          Requirements

          + Class locale is non-templatized and has two distinct types nested + inside of it: +

          +@@ -26,7 +26,7 @@ + thousands separator in the locale. +

          + Literally, a facet is strictly defined: +-

          • ++

            • + Containing the following public data member: +

              + static locale::id id; +@@ -48,14 +48,14 @@ + +

          + Provides an index for looking up specific facets. +-

          ++

          Design

          + The major design challenge is fitting an object-orientated and + non-global locale design on top of POSIX and other relevant standards, + which include the Single Unix (nee X/Open.) +

          + Because C and earlier versions of POSIX fall down so completely, + portability is an issue. +-

          Implementation

          Interacting with "C" locales

          • + `locale -a` displays available locales. + 

            + af_ZA
+@@ -385,7 +385,7 @@
+   particular on the working of locale(""), which constructs the locale
+   object from the environment of the running program, that is, in
+   practice, the set of LC_ALL, LANG, etc. variable of the shell.
+-

          Future

          • + Locale initialization: at what point does _S_classic, _S_global + get initialized? Can named locales assume this initialization + has already taken place? +@@ -403,35 +403,35 @@ + What should non-required facet instantiations do? If the + generic implementation is provided, then how to end-users + provide specializations? +-

          ++

          Bibliography

          + The GNU C Library + . Roland McGrath. Ulrich Drepper. Copyright © 2007 FSF. + Chapters 6 Character Set Handling and 7 Locales and + Internationalization +- .

          ++ .

          + Correspondence +- . Ulrich Drepper. Copyright © 2002 .

          ++ . Ulrich Drepper. Copyright © 2002 .

          + ISO/IEC 14882:1998 Programming languages - C++ +- . Copyright © 1998 ISO.

          ++ . Copyright © 1998 ISO.

          + ISO/IEC 9899:1999 Programming languages - C +- . Copyright © 1999 ISO.

          +- ++ . Copyright © 1999 ISO.

          ++ + System Interface Definitions, Issue 7 (IEEE Std. 1003.1-2008) + + . Copyright © 2008 + The Open Group/The Institute of Electrical and Electronics + Engineers, Inc. +- .

          ++ .

          + The C++ Programming Language, Special Edition + . Bjarne Stroustrup. Copyright © 2000 Addison Wesley, Inc.. Appendix D. + Addison Wesley +- .

          ++ .

          + Standard C++ IOStreams and Locales + . + Advanced Programmer's Guide and Reference + . Angelika Langer. Klaus Kreft. Copyright © 2000 Addison Wesley Longman, Inc.. + Addison Wesley Longman +- .

          Prev Up Next
          Chapter 7.  ++ .

          Prev Up Next
          Chapter 7.  + Strings + +- Home Facets
          ++           		Home Facets
          +Index: libstdc++-v3/doc/html/manual/ext_algorithms.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/ext_algorithms.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/ext_algorithms.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Chapter 25. Algorithms
          Chapter 25. Algorithms
          Prev Part III.  ++ ++Chapter 25. Algorithms
          Chapter 25. Algorithms
          Prev Part III.  + Extensions + +- Next

          25.1.6 (count, count_if) is extended with two more versions of count ++

          		 Next

          Chapter 25. Algorithms

          25.1.6 (count, count_if) is extended with two more versions of count + and count_if. The standard versions return their results. The + additional signatures return void, but take a final parameter by + reference to which they assign their results, e.g., +@@ -15,9 +15,9 @@ + copy_n (_InputIter first, _Size count, _OutputIter result);

          which copies the first 'count' elements at 'first' into 'result'. +

          25.3 (sorting 'n' heaps 'n' stuff) is extended with some helper + predicates. Look in the doxygen-generated pages for notes on these. +-

          • is_heap tests whether or not a range is a heap.

          • is_sorted tests whether or not a range is sorted in ++

            • is_heap tests whether or not a range is a heap.

            • is_sorted tests whether or not a range is sorted in + nondescending order.

            25.3.8 (lexicographical_compare) is extended with + 

            +    lexicographical_compare_3way(_InputIter1 first1, _InputIter1 last1,
+ 				 _InputIter2 first2, _InputIter2 last2)

            which does... what? +-

          Prev Up Next
          Chapter 24. Utilities Home Chapter 26. Numerics
          ++

          Prev Up Next
          Chapter 24. Utilities Home Chapter 26. Numerics
          +Index: libstdc++-v3/doc/html/manual/debug_mode.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/debug_mode.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/debug_mode.html (.../branches/gcc-4_7-branch) +@@ -1,10 +1,10 @@ + +- +-Chapter 17. Debug Mode
          Chapter 17. Debug Mode
          Prev Part III.  ++ ++Chapter 17. Debug Mode
          Chapter 17. Debug Mode
          Prev Part III.  + Extensions + +- Next

          Table of Contents

          Intro
          Semantics
          Using
          Using the Debug Mode
          Using a Specific Debug Container
          Design
          Goals
          Methods
          The Wrapper Model
          Safe Iterators
          Safe Sequences (Containers)
          Precondition Checking
          Release- and debug-mode coexistence
          Compile-time coexistence of release- and debug-mode components
          Link- and run-time coexistence of release- and +- debug-mode components
          Alternatives for Coexistence
          Other Implementations

          ++

          		 Next

          Chapter 17. Debug Mode

          Table of Contents

          Intro
          Semantics
          Using
          Using the Debug Mode
          Using a Specific Debug Container
          Design
          Goals
          Methods
          The Wrapper Model
          Safe Iterators
          Safe Sequences (Containers)
          Precondition Checking
          Release- and debug-mode coexistence
          Compile-time coexistence of release- and debug-mode components
          Link- and run-time coexistence of release- and ++ debug-mode components
          Alternatives for Coexistence
          Other Implementations

          Intro

          + By default, libstdc++ is built with efficiency in mind, and + therefore performs little or no error checking that is not + required by the C++ standard. This means that programs that +@@ -21,7 +21,7 @@ + The libstdc++ debug mode performs checking for many areas of the + C++ standard, but the focus is on checking interactions among + standard iterators, containers, and algorithms, including: +-

          • Safe iterators: Iterators keep track of the ++

            • Safe iterators: Iterators keep track of the + container whose elements they reference, so errors such as + incrementing a past-the-end iterator or dereferencing an iterator + that points to a container that has been destructed are diagnosed +@@ -35,4 +35,4 @@ + the same predicate that was passed + to set_intersection; the libstdc++ debug mode will + detect an error if the sequence is not sorted or was sorted by a +- different predicate.

          Prev Up Next
          Chapter 16. Compile Time Checks Home Semantics
          ++ different predicate.

          Prev Up Next
          Chapter 16. Compile Time Checks Home Semantics
          +Index: libstdc++-v3/doc/html/manual/using_concurrency.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/using_concurrency.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/using_concurrency.html (.../branches/gcc-4_7-branch) +@@ -1,10 +1,10 @@ + +- +-Concurrency
          Concurrency
          Prev Chapter 3. Using Next

          This section discusses issues surrounding the proper compilation ++ ++Concurrency

          Concurrency
          Prev Chapter 3. Using Next

          Concurrency

          This section discusses issues surrounding the proper compilation + of multithreaded applications which use the Standard C++ + library. This information is GCC-specific since the C++ + standard does not address matters of multithreaded applications. +-

          All normal disclaimers aside, multithreaded C++ application are ++

          Prerequisites

          All normal disclaimers aside, multithreaded C++ application are + only supported when libstdc++ and all user code was built with + compilers which report (via gcc/g++ -v ) the same thread + model and that model is not single. As long as your +@@ -33,7 +33,7 @@ + -pthread is honored. Some other ports use other switches. + AFAIK, none of this is properly documented anywhere other than + in ``gcc -dumpspecs'' (look at lib and cpp entries). +-

          ++

          Thread Safety

          + In the terms of the 2011 C++ standard a thread-safe program is one which + does not perform any conflicting non-atomic operations on memory locations + and so does not contain any data races. +@@ -41,11 +41,11 @@ + races are caused by the library itself or by programs which use the + library correctly (as described below). + The C++11 memory model and library requirements are a more formal version +-of the SGI STL definition of thread safety, which the library used ++of the SGI STL definition of thread safety, which the library used + prior to the 2011 standard. +

          The library strives to be thread-safe when all of the following + conditions are met: +-

          • The system's libc is itself thread-safe, ++

            • The system's libc is itself thread-safe, +

            • + The compiler in use reports a thread model other than + 'single'. This can be tested via output from gcc +@@ -61,7 +61,7 @@ + Requisite command-line flags are used for atomic operations + and threading. Examples of this include -pthread + and -march=native, although specifics vary +- depending on the host environment. See Machine ++ depending on the host environment. See Machine + Dependent Options. +

            • + An implementation of atomicity.h functions +@@ -153,12 +153,12 @@ + t2.join(); + } +

              For further details of the C++11 memory model see Hans-J. Boehm's +- Threads +- and memory model for C++ pages, particularly the introduction +- and FAQ. +-

            +-

            This gets a bit tricky. Please read carefully, and bear with me. +-

            A wrapper ++ Threads ++ and memory model for C++ pages, particularly the introduction ++ and FAQ. ++

            Atomics

            ++

            IO

            This gets a bit tricky. Please read carefully, and bear with me. ++

            Structure

            A wrapper + type called __basic_file provides our abstraction layer + for the std::filebuf classes. Nearly all decisions dealing + with actual input and output must be made in __basic_file. +@@ -166,7 +166,7 @@ + but is not used in the current code. Providing locking at any higher + level is akin to providing locking within containers, and is not done + for the same reasons (see the links above). +-

            The __basic_file type is simply a collection of small wrappers around ++

            Defaults

            The __basic_file type is simply a collection of small wrappers around + the C stdio layer (again, see the link under Structure). We do no + locking ourselves, but simply pass through to calls to fopen, + fwrite, and so forth. +@@ -188,7 +188,7 @@ + contained in the stream formatting classes (e.g., setting up callbacks + inside an std::ofstream), you need to guard such accesses + like any other critical shared resource. +-

            A ++

            Future

            A + second choice may be available for I/O implementations: libio. This is + disabled by default, and in fact will not currently work due to other + issues. It will be revisited, however. +@@ -213,10 +213,10 @@ + version will see calls from libstdc++ directly into the glibc already + installed. For other platforms, a copy of the libio subsection will + be built and included in libstdc++. +-

            Don't forget that other cstdio implementations are possible. You could ++

            Alternatives

            Don't forget that other cstdio implementations are possible. You could + easily write one to perform your own forms of locking, to solve your + "interesting" problems. +-

            This section discusses issues surrounding the design of ++

            Containers

            This section discusses issues surrounding the design of + multithreaded applications which use Standard C++ containers. + All information in this section is current as of the gcc 3.0 + release and all later point releases. Although earlier gcc +@@ -228,9 +228,9 @@ + threaded and non-threaded code), see Chapter 17. +

            Two excellent pages to read when working with the Standard C++ + containers and threads are +- SGI's ++ SGI's + http://www.sgi.com/tech/stl/thread_safety.html and +- SGI's ++ SGI's + http://www.sgi.com/tech/stl/Allocators.html. +

            However, please ignore all discussions about the user-level + configuration of the lock implementation inside the STL +@@ -269,4 +269,4 @@ + useful are details + on allocator + options and capabilities. +-

          Prev Up Next
          Linking Home Exceptions
          ++

          Prev Up Next
          Linking Home Exceptions
          +Index: libstdc++-v3/doc/html/manual/bk01pt02.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt02.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt02.html (.../branches/gcc-4_7-branch) +@@ -1,8 +1,8 @@ + +- +-Part II.  Standard Contents
          Part II.  ++ ++Part II.  Standard Contents
          Part II.  + Standard Contents +-
          Prev The GNU C++ Library Manual Next
          Prev The GNU C++ Library Manual Next

          Part II.  + Standard Contents +

          Table of Contents

          4. + Support +@@ -13,13 +13,13 @@ +
          Exceptions
          API Reference
          Adding Data to exception
          Concept Checking
          6. + Utilities + +-
          Functors
          Pairs
          Memory
          Allocators
          Requirements
          Design Issues
          Implementation
          Interface Design
          Selecting Default Allocation Policy
          Disabling Memory Caching
          Using a Specific Allocator
          Custom Allocators
          Extension Allocators
          auto_ptr
          Limitations
          Use in Containers
          shared_ptr
          Requirements
          Design Issues
          Implementation
          Class Hierarchy
          Thread Safety
          Selecting Lock Policy
          Related functions and classes
          Use
          Examples
          Unresolved Issues
          Acknowledgments
          Traits
          7. ++
          Functors
          Pairs
          Memory
          Allocators
          Requirements
          Design Issues
          Implementation
          Interface Design
          Selecting Default Allocation Policy
          Disabling Memory Caching
          Using a Specific Allocator
          Custom Allocators
          Extension Allocators
          auto_ptr
          Limitations
          Use in Containers
          shared_ptr
          Requirements
          Design Issues
          Implementation
          Class Hierarchy
          Thread Safety
          Selecting Lock Policy
          Related functions and classes
          Use
          Examples
          Unresolved Issues
          Acknowledgments
          Traits
          7. + Strings + +
          String Classes
          Simple Transformations
          Case Sensitivity
          Arbitrary Character Types
          Tokenizing
          Shrink to Fit
          CString (MFC)
          8. + Localization + +-
          Locales
          locale
          Requirements
          Design
          Implementation
          Interacting with "C" locales
          Future
          Facets
          ctype
          Implementation
          Specializations
          Future
          codecvt
          Requirements
          Design
          wchar_t Size
          Support for Unicode
          Other Issues
          Implementation
          Use
          Future
          messages
          Requirements
          Design
          Implementation
          Models
          The GNU Model
          Use
          Future
          9. ++
          Locales
          locale
          Requirements
          Design
          Implementation
          Interacting with "C" locales
          Future
          Facets
          ctype
          Implementation
          Specializations
          Future
          codecvt
          Requirements
          Design
          wchar_t Size
          Support for Unicode
          Other Issues
          Implementation
          Use
          Future
          messages
          Requirements
          Design
          Implementation
          Models
          The GNU Model
          Use
          Future
          9. + Containers + +
          Sequences
          list
          list::size() is O(n)
          vector
          Space Overhead Management
          Associative
          Insertion Hints
          bitset
          Size Variable
          Type String
          Interacting with C
          Containers vs. Arrays
          10. +@@ -40,7 +40,7 @@ +
          API Reference
          15. + Concurrency + +-
          API Reference
          Prev Up Next
          Debugging Support Home Chapter 4.  ++
          API Reference
          Prev Up Next
          Debugging Support Home Chapter 4.  + Support + +
          +Index: libstdc++-v3/doc/html/manual/appendix_gfdl.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/appendix_gfdl.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/appendix_gfdl.html (.../branches/gcc-4_7-branch) +@@ -1,14 +1,14 @@ + +- +-Appendix E. GNU Free Documentation License
          Appendix E. GNU Free Documentation License
          Prev Part IV.  ++ ++Appendix E. GNU Free Documentation License
          Appendix E. GNU Free Documentation License
          Prev Part IV.  + Appendices +- Next

          Version 1.3, 3 November 2008

          ++

          		 Next

          GNU Free Documentation License

          Version 1.3, 3 November 2008

          + Copyright © 2000, 2001, 2002, 2007, 2008 +- Free Software Foundation, Inc. ++ Free Software Foundation, Inc. +

          + Everyone is permitted to copy and distribute verbatim copies of this + license document, but changing it is not allowed. +-

          ++

          + 0. PREAMBLE +

          + The purpose of this License is to make a manual, textbook, or other +@@ -31,7 +31,7 @@ + for any textual work, regardless of subject matter or whether it is + published as a printed book. We recommend this License principally for + works whose purpose is instruction or reference. +-

          ++

          + 1. APPLICABILITY AND DEFINITIONS +

          + This License applies to any manual or other work, in any medium, that +@@ -120,7 +120,7 @@ + but only as regards disclaiming warranties: any other implication that + these Warranty Disclaimers may have is void and has no effect on the + meaning of this License. +-

          ++

          + 2. VERBATIM COPYING +

          + You may copy and distribute the Document in any medium, either +@@ -135,7 +135,7 @@ +

          + You may also lend copies, under the same conditions stated above, and you + may publicly display copies. +-

          ++

          + 3. COPYING IN QUANTITY +

          + If you publish printed copies (or copies in media that commonly have +@@ -169,7 +169,7 @@ + It is requested, but not required, that you contact the authors of the + Document well before redistributing any large number of copies, to give + them a chance to provide you with an updated version of the Document. +-

          ++

          + 4. MODIFICATIONS +

          + You may copy and distribute a Modified Version of the Document under the +@@ -178,7 +178,7 @@ + filling the role of the Document, thus licensing distribution and + modification of the Modified Version to whoever possesses a copy of it. In + addition, you must do these things in the Modified Version: +-

          1. ++

            1. + Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions (which + should, if there were any, be listed in the History section of the +@@ -269,7 +269,7 @@ + The author(s) and publisher(s) of the Document do not by this License give + permission to use their names for publicity for or to assert or imply + endorsement of any Modified Version. +-

              ++

              + 5. COMBINING DOCUMENTS +

              + You may combine the Document with other documents released under this +@@ -294,7 +294,7 @@ + Entitled “Acknowledgements”, and any sections Entitled + “Dedications”. You must delete all sections Entitled + “Endorsements”. +-

              ++

              + 6. COLLECTIONS OF DOCUMENTS +

              + You may make a collection consisting of the Document and other documents +@@ -307,7 +307,7 @@ + it individually under this License, provided you insert a copy of this + License into the extracted document, and follow this License in all other + respects regarding verbatim copying of that document. +-

              ++

              + 7. AGGREGATION WITH INDEPENDENT WORKS +

              + A compilation of the Document or its derivatives with other separate and +@@ -325,7 +325,7 @@ + bracket the Document within the aggregate, or the electronic equivalent of + covers if the Document is in electronic form. Otherwise they must appear + on printed covers that bracket the whole aggregate. +-

              ++

              + 8. TRANSLATION +

              + Translation is considered a kind of modification, so you may distribute +@@ -344,7 +344,7 @@ + “Dedications”, or “History”, the requirement + (section 4) to Preserve its Title (section 1) will typically require + changing the actual title. +-

              ++

              + 9. TERMINATION +

              + You may not copy, modify, sublicense, or distribute the Document except as +@@ -370,14 +370,14 @@ + License. If your rights have been terminated and not permanently + reinstated, receipt of a copy of some or all of the same material does not + give you any rights to use it. +-

              ++

              + 10. FUTURE REVISIONS OF THIS LICENSE +

              + The Free Software Foundation may publish new, revised versions of the GNU + Free Documentation License from time to time. Such new versions will be + similar in spirit to the present version, but may differ in detail to + address new problems or concerns. See +- Copyleft. ++ Copyleft. +

              + Each version of the License is given a distinguishing version number. If + the Document specifies that a particular numbered version of this License +@@ -390,7 +390,7 @@ + can decide which future versions of this License can be used, that + proxy’s public statement of acceptance of a version permanently + authorizes you to choose that version for the Document. +-

              ++

              + 11. RELICENSING +

              + “Massive Multiauthor Collaboration Site” (or “MMC +@@ -419,7 +419,7 @@ + The operator of an MMC Site may republish an MMC contained in the site + under CC-BY-SA on the same site at any time before August 1, 2009, + provided the MMC is eligible for relicensing. +-

              ++

              + ADDENDUM: How to use this License for your documents +

              + To use this License in a document you have written, include a copy of the +@@ -444,6 +444,6 @@ + recommend releasing these examples in parallel under your choice of free + software license, such as the GNU General Public License, to permit their + use in free software. +-

            Prev Up Next
            Appendix D.  ++

            Prev Up Next
            Appendix D.  + GNU General Public License version 3 +-  Home 
            ++              		Home 
            +Index: libstdc++-v3/doc/html/manual/containers.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/containers.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/containers.html (.../branches/gcc-4_7-branch) +@@ -1,17 +1,17 @@ + +- +-Chapter 9.  Containers
            Chapter 9.  ++ ++Chapter 9.  Containers
            Chapter 9.  + Containers + +-
            Prev Part II.  ++
            Prev Part II.  + Standard Contents +-  Next
            		 Next

            Chapter 9.  + Containers +- +-

            Table of Contents

            Sequences
            list
            list::size() is O(n)
            vector
            Space Overhead Management
            Associative
            Insertion Hints
            bitset
            Size Variable
            Type String
            Interacting with C
            Containers vs. Arrays

            ++ ++

          Table of Contents

          Sequences
          list
          list::size() is O(n)
          vector
          Space Overhead Management
          Associative
          Insertion Hints
          bitset
          Size Variable
          Type String
          Interacting with C
          Containers vs. Arrays

          Sequences

          list

          list::size() is O(n)

          + Yes it is, and that's okay. This is a decision that we preserved + when we imported SGI's STL implementation. The following is +- quoted from their FAQ: ++ quoted from their FAQ: +

          + The size() member function, for list and slist, takes time + proportional to the number of elements in the list. This was a +@@ -42,14 +42,14 @@ + 

          + 	 if (L.empty())
+ 	     ...
+-

          +-

          +- In this ++

          vector

          ++

          Space Overhead Management

          ++ In this + message to the list, Daniel Kostecky announced work on an + alternate form of std::vector that would support + hints on the number of elements to be over-allocated. The design + was also described, along with possible implementation choices. +

          +- The first two alpha releases were announced here +- and here. +-

          Prev Up Next
          Facets Home Associative
          ++ The first two alpha releases were announced here ++ and here. ++

          Prev Up Next
          Facets Home Associative
          +Index: libstdc++-v3/doc/html/manual/io.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/io.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/io.html (.../branches/gcc-4_7-branch) +@@ -1,14 +1,14 @@ + +- +-Chapter 13.  Input and Output
          Chapter 13.  ++ ++Chapter 13.  Input and Output
          Chapter 13.  + Input and Output + +-
          Prev Part II.  ++
          Prev Part II.  + Standard Contents +-  Next
          		 Next

          Chapter 13.  + Input and Output +- +-

          Table of Contents

          Iostream Objects
          Stream Buffers
          Derived streambuf Classes
          Buffering
          Memory Based Streams
          Compatibility With strstream
          File Based Streams
          Copying a File
          Binary Input and Output
          Interacting with C
          Using FILE* and file descriptors
          Performance

          To minimize the time you have to wait on the compiler, it's good to ++ ++

          Table of Contents

          Iostream Objects
          Stream Buffers
          Derived streambuf Classes
          Buffering
          Memory Based Streams
          Compatibility With strstream
          File Based Streams
          Copying a File
          Binary Input and Output
          Interacting with C
          Using FILE* and file descriptors
          Performance

          Iostream Objects

          To minimize the time you have to wait on the compiler, it's good to + only include the headers you really need. Many people simply include + <iostream> when they don't need to -- and that can penalize + your runtime as well. Here are some tips on which header to use +@@ -118,4 +118,4 @@ + the standard objects in that source file; you'll pay less startup + time. Only include the header files you need to in general; your + compile times will go down when there's less parsing work to do. +-

          Prev Up Next
          Interacting with C Home Stream Buffers
          ++

          Prev Up Next
          Interacting with C Home Stream Buffers
          +Index: libstdc++-v3/doc/html/manual/index.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/index.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/index.html (.../branches/gcc-4_7-branch) +@@ -1,8 +1,8 @@ + +- +-The GNU C++ Library Manual
          The GNU C++ Library Manual
          Prev   Next

          Table of Contents

          I. ++ ++The GNU C++ Library Manual
          The GNU C++ Library Manual
          Prev   Next

          The GNU C++ Library Manual

          Paolo Carlini

          Phil Edwards

          Doug Gregor

          Benjamin Kosnik

          Dhruv Matani

          Jason Merrill

          Mark Mitchell

          Nathan Myers

          Felix Natter

          Stefan Olsson

          Silvius Rus

          Johannes Singler

          Ami Tavory

          Jonathan Wakely

          Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ++ FSF ++

          Table of Contents

          I. + Introduction + +
          1. Status
          Implementation Status
          C++ 1998/2003
          Implementation Status
          Implementation Specific Behavior
          C++ 2011
          Implementation Specific Behavior
          C++ TR1
          Implementation Specific Behavior
          C++ TR 24733
          License
          The Code: GPL
          The Documentation: GPL, FDL
          Bugs
          Implementation Bugs
          Standard Bugs
          2. Setup
          Prerequisites
          Configure
          Make
          3. Using
          Command Options
          Headers
          Header Files
          Mixing Headers
          The C Headers and namespace std
          Precompiled Headers
          Macros
          Namespaces
          Available Namespaces
          namespace std
          Using Namespace Composition
          Linking
          Almost Nothing
          Finding Dynamic or Shared Libraries
          Concurrency
          Prerequisites
          Thread Safety
          Atomics
          IO
          Structure
          Defaults
          Future
          Alternatives
          Containers
          Exceptions
          Exception Safety
          Exception Neutrality
          Doing without
          Compatibility
          With C
          With POSIX thread cancellation
          Debugging Support
          Using g++
          Debug Versions of Library Binary Files
          Memory Leak Hunting
          Data Race Hunting
          Using gdb
          Tracking uncaught exceptions
          Debug Mode
          Compile Time Checking
          Profile-based Performance Analysis
          II. +@@ -16,13 +16,13 @@ +
          Exceptions
          API Reference
          Adding Data to exception
          Concept Checking
          6. + Utilities + +-
          Functors
          Pairs
          Memory
          Allocators
          Requirements
          Design Issues
          Implementation
          Interface Design
          Selecting Default Allocation Policy
          Disabling Memory Caching
          Using a Specific Allocator
          Custom Allocators
          Extension Allocators
          auto_ptr
          Limitations
          Use in Containers
          shared_ptr
          Requirements
          Design Issues
          Implementation
          Class Hierarchy
          Thread Safety
          Selecting Lock Policy
          Related functions and classes
          Use
          Examples
          Unresolved Issues
          Acknowledgments
          Traits
          7. ++
          Functors
          Pairs
          Memory
          Allocators
          Requirements
          Design Issues
          Implementation
          Interface Design
          Selecting Default Allocation Policy
          Disabling Memory Caching
          Using a Specific Allocator
          Custom Allocators
          Extension Allocators
          auto_ptr
          Limitations
          Use in Containers
          shared_ptr
          Requirements
          Design Issues
          Implementation
          Class Hierarchy
          Thread Safety
          Selecting Lock Policy
          Related functions and classes
          Use
          Examples
          Unresolved Issues
          Acknowledgments
          Traits
          7. + Strings + +
          String Classes
          Simple Transformations
          Case Sensitivity
          Arbitrary Character Types
          Tokenizing
          Shrink to Fit
          CString (MFC)
          8. + Localization + +-
          Locales
          locale
          Requirements
          Design
          Implementation
          Interacting with "C" locales
          Future
          Facets
          ctype
          Implementation
          Specializations
          Future
          codecvt
          Requirements
          Design
          wchar_t Size
          Support for Unicode
          Other Issues
          Implementation
          Use
          Future
          messages
          Requirements
          Design
          Implementation
          Models
          The GNU Model
          Use
          Future
          9. ++
          Locales
          locale
          Requirements
          Design
          Implementation
          Interacting with "C" locales
          Future
          Facets
          ctype
          Implementation
          Specializations
          Future
          codecvt
          Requirements
          Design
          wchar_t Size
          Support for Unicode
          Other Issues
          Implementation
          Use
          Future
          messages
          Requirements
          Design
          Implementation
          Models
          The GNU Model
          Use
          Future
          9. + Containers + +
          Sequences
          list
          list::size() is O(n)
          vector
          Space Overhead Management
          Associative
          Insertion Hints
          bitset
          Size Variable
          Type String
          Interacting with C
          Containers vs. Arrays
          10. +@@ -46,7 +46,7 @@ +
          API Reference
          III. + Extensions + +-
          16. Compile Time Checks
          17. Debug Mode
          Intro
          Semantics
          Using
          Using the Debug Mode
          Using a Specific Debug Container
          Design
          Goals
          Methods
          The Wrapper Model
          Safe Iterators
          Safe Sequences (Containers)
          Precondition Checking
          Release- and debug-mode coexistence
          Compile-time coexistence of release- and debug-mode components
          Link- and run-time coexistence of release- and ++
          16. Compile Time Checks
          17. Debug Mode
          Intro
          Semantics
          Using
          Using the Debug Mode
          Using a Specific Debug Container
          Design
          Goals
          Methods
          The Wrapper Model
          Safe Iterators
          Safe Sequences (Containers)
          Precondition Checking
          Release- and debug-mode coexistence
          Compile-time coexistence of release- and debug-mode components
          Link- and run-time coexistence of release- and + debug-mode components
          Alternatives for Coexistence
          Other Implementations
          18. Parallel Mode
          Intro
          Semantics
          Using
          Prerequisite Compiler Flags
          Using Parallel Mode
          Using Specific Parallel Components
          Design
          Interface Basics
          Configuration and Tuning
          Setting up the OpenMP Environment
          Compile Time Switches
          Run Time Settings and Defaults
          Implementation Namespaces
          Testing
          Bibliography
          19. Profile Mode
          Intro
          Using the Profile Mode
          Tuning the Profile Mode
          Design
          Wrapper Model
          Instrumentation
          Run Time Behavior
          Analysis and Diagnostics
          Cost Model
          Reports
          Testing
          Extensions for Custom Containers
          Empirical Cost Model
          Implementation Issues
          Stack Traces
          Symbolization of Instruction Addresses
          Concurrency
          Using the Standard Library in the Instrumentation Implementation
          Malloc Hooks
          Construction and Destruction of Global Objects
          Developer Information
          Big Picture
          How To Add A Diagnostic
          Diagnostics
          Diagnostic Template
          Containers
          Hashtable Too Small
          Hashtable Too Large
          Inefficient Hash
          Vector Too Small
          Vector Too Large
          Vector to Hashtable
          Hashtable to Vector
          Vector to List
          List to Vector
          List to Forward List (Slist)
          Ordered to Unordered Associative Container
          Algorithms
          Sort Algorithm Performance
          Data Locality
          Need Software Prefetch
          Linked Structure Locality
          Multithreaded Data Access
          Data Dependence Violations at Container Level
          False Sharing
          Statistics
          Bibliography
          20. The mt_allocator
          Intro
          Design Issues
          Overview
          Implementation
          Tunable Parameters
          Initialization
          Deallocation Notes
          Single Thread Example
          Multiple Thread Example
          21. The bitmap_allocator
          Design
          Implementation
          Free List Store
          Super Block
          Super Block Data Layout
          Maximum Wasted Percentage
          allocate
          deallocate
          Questions
          1
          2
          3
          Locality
          Overhead and Grow Policy
          22. Policy-Based Data Structures
          Intro
          Performance Issues
          Associative
          Priority Que
          Goals
          Associative
          Policy Choices
          Underlying Data Structures
          Iterators
          Functional
          Priority Queues
          Policy Choices
          Underlying Data Structures
          Binary Heaps
          Using
          Prerequisites
          Organization
          Tutorial
          Basic Use
          + Configuring via Template Parameters +
          +@@ -146,21 +146,21 @@ + +
          D. + GNU General Public License version 3 +-
          E. GNU Free Documentation License

          List of Figures

          22.1. Node Invariants
          22.2. Underlying Associative Data Structures
          22.3. Range Iteration in Different Data Structures
          22.4. Point Iteration in Hash Data Structures
          22.5. Effect of erase in different underlying data structures
          22.6. Underlying Priority Queue Data Structures
          22.7. Exception Hierarchy
          22.8. Non-unique Mapping Standard Containers
          22.9. ++
          E. GNU Free Documentation License

          List of Figures

          22.1. Node Invariants
          22.2. Underlying Associative Data Structures
          22.3. Range Iteration in Different Data Structures
          22.4. Point Iteration in Hash Data Structures
          22.5. Effect of erase in different underlying data structures
          22.6. Underlying Priority Queue Data Structures
          22.7. Exception Hierarchy
          22.8. Non-unique Mapping Standard Containers
          22.9. + Effect of embedded lists in + std::multimap +-
          22.10. Non-unique Mapping Containers
          22.11. Point Iterator Hierarchy
          22.12. Invalidation Guarantee Tags Hierarchy
          22.13. Container Tag Hierarchy
          22.14. Hash functions, ranged-hash functions, and +- range-hashing functions
          22.15. Insert hash sequence diagram
          22.16. Insert hash sequence diagram with a null policy
          22.17. Hash policy class diagram
          22.18. Balls and bins
          22.19. Insert resize sequence diagram
          22.20. Standard resize policy trigger sequence +- diagram
          22.21. Standard resize policy size sequence +- diagram
          22.22. Tree node invariants
          22.23. Tree node invalidation
          22.24. A tree and its update policy
          22.25. Restoring node invariants
          22.26. Insert update sequence
          22.27. Useless update path
          22.28. A PATRICIA trie
          22.29. A trie and its update policy
          22.30. A simple list
          22.31. The counter algorithm
          22.32. Underlying Priority-Queue Data-Structures.
          22.33. Priority-Queue Data-Structure Tags.
          B.1. Configure and Build File Dependencies

          List of Tables

          1.1. C++ 1998/2003 Implementation Status
          1.2. C++ 2011 Implementation Status
          1.3. C++ TR1 Implementation Status
          1.4. C++ TR 24733 Implementation Status
          3.1. C++ Command Options
          3.2. C++ 1998 Library Headers
          3.3. C++ 1998 Library Headers for C Library Facilities
          3.4. C++ 2011 Library Headers
          3.5. C++ 2011 Library Headers for C Library Facilities
          3.6. C++ TR 1 Library Headers
          3.7. C++ TR 1 Library Headers for C Library Facilities
          3.8. C++ TR 24733 Decimal Floating-Point Header
          3.9. C++ ABI Headers
          3.10. Extension Headers
          3.11. Extension Debug Headers
          3.12. Extension Profile Headers
          3.13. Extension Parallel Headers
          17.1. Debugging Containers
          17.2. Debugging Containers C++11
          18.1. Parallel Algorithms
          19.1. Profile Code Location
          19.2. Profile Diagnostics
          21.1. Bitmap Allocator Memory Map
          B.1. Doxygen Prerequisites
          B.2. HTML to Doxygen Markup Comparison
          B.3. Docbook Prerequisites
          B.4. HTML to Docbook XML Markup Comparison
          B.5. Docbook XML Element Use
          B.6. Extension Allocators
          B.7. Extension Allocators Continued

          List of Equations

          22.1. Ranged Hash Function
          22.2. Range-Hashing, Division Method
          22.3. Division via Prime Modulo
          22.4. Division via Bit Mask
          22.5. ++
          22.10. Non-unique Mapping Containers
          22.11. Point Iterator Hierarchy
          22.12. Invalidation Guarantee Tags Hierarchy
          22.13. Container Tag Hierarchy
          22.14. Hash functions, ranged-hash functions, and ++ range-hashing functions
          22.15. Insert hash sequence diagram
          22.16. Insert hash sequence diagram with a null policy
          22.17. Hash policy class diagram
          22.18. Balls and bins
          22.19. Insert resize sequence diagram
          22.20. Standard resize policy trigger sequence ++ diagram
          22.21. Standard resize policy size sequence ++ diagram
          22.22. Tree node invariants
          22.23. Tree node invalidation
          22.24. A tree and its update policy
          22.25. Restoring node invariants
          22.26. Insert update sequence
          22.27. Useless update path
          22.28. A PATRICIA trie
          22.29. A trie and its update policy
          22.30. A simple list
          22.31. The counter algorithm
          22.32. Underlying Priority-Queue Data-Structures.
          22.33. Priority-Queue Data-Structure Tags.
          B.1. Configure and Build File Dependencies

          List of Tables

          1.1. C++ 1998/2003 Implementation Status
          1.2. C++ 2011 Implementation Status
          1.3. C++ TR1 Implementation Status
          1.4. C++ TR 24733 Implementation Status
          3.1. C++ Command Options
          3.2. C++ 1998 Library Headers
          3.3. C++ 1998 Library Headers for C Library Facilities
          3.4. C++ 2011 Library Headers
          3.5. C++ 2011 Library Headers for C Library Facilities
          3.6. C++ TR 1 Library Headers
          3.7. C++ TR 1 Library Headers for C Library Facilities
          3.8. C++ TR 24733 Decimal Floating-Point Header
          3.9. C++ ABI Headers
          3.10. Extension Headers
          3.11. Extension Debug Headers
          3.12. Extension Profile Headers
          3.13. Extension Parallel Headers
          17.1. Debugging Containers
          17.2. Debugging Containers C++11
          18.1. Parallel Algorithms
          19.1. Profile Code Location
          19.2. Profile Diagnostics
          21.1. Bitmap Allocator Memory Map
          B.1. Doxygen Prerequisites
          B.2. HTML to Doxygen Markup Comparison
          B.3. Docbook Prerequisites
          B.4. HTML to Docbook XML Markup Comparison
          B.5. Docbook XML Element Use
          B.6. Extension Allocators
          B.7. Extension Allocators Continued

          List of Equations

          22.1. Ranged Hash Function
          22.2. Range-Hashing, Division Method
          22.3. Division via Prime Modulo
          22.4. Division via Bit Mask
          22.5. + A Standard String Hash Function +-
          22.6. ++
          22.6. + Only k String DNA Hash +-
          22.7. ++
          22.7. + Probability of Probe Sequence of Length k +-
          22.8. ++
          22.8. + Probability Probe Sequence in Some Bin +-
          Prev   Next
          The GNU C++ Library Home Part I.  ++
          Prev   Next
          The GNU C++ Library Home Part I.  + Introduction + +
          +Index: libstdc++-v3/doc/html/manual/bk01pt03ch30s03.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch30s03.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch30s03.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Use
          Use
          Prev Chapter 30. Concurrency Next

          Typical usage of the last two constructs is demonstrated as follows: ++ ++Use

          Use
          Prev Chapter 30. Concurrency Next

          Use

          Typical usage of the last two constructs is demonstrated as follows: + 

          + #include <ext/concurrence.h>
+ 
+@@ -31,6 +31,6 @@
+ concurrence-related errors. These classes
+ are: __concurrence_lock_error, __concurrence_unlock_error, __concurrence_wait_error,
+ and __concurrence_broadcast_error.
+-
          Prev Up Next
          Implementation Home Part IV.  ++

          Prev Up Next
          Implementation Home Part IV.  + Appendices +
          +Index: libstdc++-v3/doc/html/manual/bk01pt02ch05s02.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt02ch05s02.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt02ch05s02.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Concept Checking
          Concept Checking
          Prev Chapter 5.  ++ ++Concept Checking
          Concept Checking
          Prev Chapter 5.  + Diagnostics + +- Next

          ++

          		 Next

          Concept Checking

          + In 1999, SGI added “concept checkers” to their + implementation of the STL: code which checked the template + parameters of instantiated pieces of the STL, in order to insure +@@ -21,7 +21,7 @@ + The primary author of the checking code, Jeremy Siek, had already + started work on a replacement implementation. The new code was + formally reviewed and accepted into +- the ++ the + Boost libraries, and we are pleased to incorporate it into the + GNU C++ library. +

          +@@ -41,10 +41,10 @@ + for example template argument types may need to be complete when used in + a template definition, rather than at the point of instantiation. + There are no plans to address these shortcomings. +-

          Prev Up Next
          Chapter 5.  ++

          Prev Up Next
          Chapter 5.  + Diagnostics + +- Home Chapter 6.  ++ Home Chapter 6.  + Utilities + +
          +Index: libstdc++-v3/doc/html/manual/bk01pt03ch20s04.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/bk01pt03ch20s04.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/bk01pt03ch20s04.html (.../branches/gcc-4_7-branch) +@@ -1,6 +1,6 @@ + +- +-Single Thread Example
          Single Thread Example
          Prev Chapter 20. The mt_allocator Next

          ++ ++Single Thread Example

          Single Thread Example
          Prev Chapter 20. The mt_allocator Next

          Single Thread Example

          + Let's start by describing how the data on a freelist is laid out in memory. + This is the first two blocks in freelist for thread id 3 in bin 3 (8 bytes): + 

          +@@ -76,4 +76,4 @@
+ The decision to add deallocated blocks to the front of the freelist was made
+ after a set of performance measurements that showed that this is roughly 10%
+ faster than maintaining a set of "last pointers" as well.
+-
          Prev Up Next
          Implementation Home Multiple Thread Example
          ++

          Prev Up Next
          Implementation Home Multiple Thread Example
          +Index: libstdc++-v3/doc/html/manual/numerics_and_c.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/numerics_and_c.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/numerics_and_c.html (.../branches/gcc-4_7-branch) +@@ -1,9 +1,9 @@ + +- +-Interacting with C
          Interacting with C
          Prev Chapter 12.  ++ ++Interacting with C
          Interacting with C
          Prev Chapter 12.  + Numerics + +- Next

          One of the major reasons why FORTRAN can chew through numbers so well ++

          		 Next

          Interacting with C

          Numerics vs. Arrays

          One of the major reasons why FORTRAN can chew through numbers so well + is that it is defined to be free of pointer aliasing, an assumption + that C89 is not allowed to make, and neither is C++98. C99 adds a new + keyword, restrict, to apply to individual pointers. The +@@ -18,7 +18,7 @@ + speaking this is only one of the five template classes, and they are + designed to be familiar to people who have worked with the BLAS + libraries before. +-

          In addition to the other topics on this page, we'll note here some ++

          C99

          In addition to the other topics on this page, we'll note here some + of the C99 features that appear in libstdc++. +

          The C99 features depend on the --enable-c99 configure flag. + This flag is already on by default, but it can be disabled by the +@@ -31,7 +31,7 @@ + are supported, as is the lldiv_t typedef. Also supported + are the wide character functions using 'long long', like + wcstoll. +-

          Prev Up Next
          Generalized Operations Home Chapter 13.  ++

          Prev Up Next
          Generalized Operations Home Chapter 13.  + Input and Output + +
          +Index: libstdc++-v3/doc/html/manual/appendix_gpl.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/appendix_gpl.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/appendix_gpl.html (.../branches/gcc-4_7-branch) +@@ -1,20 +1,20 @@ + +- +-Appendix D.  GNU General Public License version 3
          Appendix D.  ++ ++Appendix D.  GNU General Public License version 3
          Appendix D.  + GNU General Public License version 3 +-
          Prev Part IV.  ++
          Prev Part IV.  + Appendices +- Next
          		 Next

          + GNU General Public License version 3 +

          + Version 3, 29 June 2007 +

          + Copyright © 2007 Free Software Foundation, Inc. +- http://www.fsf.org/ ++ http://www.fsf.org/ +

          + Everyone is permitted to copy and distribute verbatim copies of this license + document, but changing it is not allowed. +-

          ++

          + Preamble +

          + The GNU General Public License is a free, copyleft +@@ -78,9 +78,9 @@ +

          + The precise terms and conditions for copying, distribution and modification + follow. +-

          ++

          + TERMS AND CONDITIONS +-

          ++

          + 0. Definitions. +

          + “This License” refers to version 3 of the GNU +@@ -122,7 +122,7 @@ + License, and how to view a copy of this License. If the interface presents + a list of user commands or options, such as a menu, a prominent item in the + list meets this criterion. +-

          ++

          + 1. Source Code. +

          + The “source code” for a work means the preferred form of the +@@ -162,7 +162,7 @@ + automatically from other parts of the Corresponding Source. +

          + The Corresponding Source for a work in source code form is that same work. +-

          ++

          + 2. Basic Permissions. +

          + All rights granted under this License are granted for the term of copyright +@@ -187,7 +187,7 @@ + Conveying under any other circumstances is permitted solely under the + conditions stated below. Sublicensing is not allowed; section 10 makes it + unnecessary. +-

          ++

          + 3. Protecting Users’ Legal Rights From Anti-Circumvention Law. +

          + No covered work shall be deemed part of an effective technological measure +@@ -202,7 +202,7 @@ + the work as a means of enforcing, against the work’s users, your or + third parties’ legal rights to forbid circumvention of technological + measures. +-

          ++

          + 4. Conveying Verbatim Copies. +

          + You may convey verbatim copies of the Program’s source code as you +@@ -215,13 +215,13 @@ +

          + You may charge any price or no price for each copy that you convey, and you + may offer support or warranty protection for a fee. +-

          ++

          + 5. Conveying Modified Source Versions. +

          + You may convey a work based on the Program, or the modifications to produce + it from the Program, in the form of source code under the terms of section + 4, provided that you also meet all of these conditions: +-

          1. ++

            1. + The work must carry prominent notices stating that you modified it, and + giving a relevant date. +

            2. +@@ -251,13 +251,13 @@ + or legal rights of the compilation’s users beyond what the individual works + permit. Inclusion of a covered work in an aggregate does not cause + this License to apply to the other parts of the aggregate. +-

              ++

              + 6. Conveying Non-Source Forms. +

              + You may convey a covered work in object code form under the terms of + sections 4 and 5, provided that you also convey the machine-readable + Corresponding Source under the terms of this License, in one of these ways: +-

              1. ++

                1. + Convey the object code in, or embodied in, a physical product (including + a physical distribution medium), accompanied by the Corresponding Source + fixed on a durable physical medium customarily used for software +@@ -346,7 +346,7 @@ + (and with an implementation available to the public in source code form), + and must require no special password or key for unpacking, reading or + copying. +-

                  ++

                  + 7. Additional Terms. +

                  + “Additional permissions” are terms that supplement the terms of +@@ -368,7 +368,7 @@ + Notwithstanding any other provision of this License, for material you add + to a covered work, you may (if authorized by the copyright holders of that + material) supplement the terms of this License with terms: +-

                  1. ++

                    1. + Disclaiming warranty or limiting liability differently from the terms + of sections 15 and 16 of this License; or +

                    2. +@@ -410,7 +410,7 @@ + Additional terms, permissive or non-permissive, may be stated in the form + of a separately written license, or stated as exceptions; the above + requirements apply either way. +-

                      ++

                      + 8. Termination. +

                      + You may not propagate or modify a covered work except as expressly provided +@@ -436,7 +436,7 @@ + License. If your rights have been terminated and not permanently + reinstated, you do not qualify to receive new licenses for the same + material under section 10. +-

                      ++

                      + 9. Acceptance Not Required for Having Copies. +

                      + You are not required to accept this License in order to receive or run a +@@ -447,7 +447,7 @@ + These actions infringe copyright if you do not accept this License. + Therefore, by modifying or propagating a covered work, you indicate your + acceptance of this License to do so. +-

                      ++

                      + 10. Automatic Licensing of Downstream Recipients. +

                      + Each time you convey a covered work, the recipient automatically receives a +@@ -472,7 +472,7 @@ + or counterclaim in a lawsuit) alleging that any patent claim is infringed + by making, using, selling, offering for sale, or importing the Program or + any portion of it. +-

                      ++

                      + 11. Patents. +

                      + A “contributor” is a copyright holder who authorizes use under +@@ -539,7 +539,7 @@ + Nothing in this License shall be construed as excluding or limiting any + implied license or other defenses to infringement that may otherwise be + available to you under applicable patent law. +-

                      ++

                      + 12. No Surrender of Others’ Freedom. +

                      + If conditions are imposed on you (whether by court order, agreement or +@@ -551,7 +551,7 @@ + to collect a royalty for further conveying from those to whom you convey the + Program, the only way you could satisfy both those terms and this License + would be to refrain entirely from conveying the Program. +-

                      ++

                      + 13. Use with the GNU Affero General Public License. +

                      + Notwithstanding any other provision of this License, you have permission to +@@ -562,7 +562,7 @@ + requirements of the GNU Affero General Public License, + section 13, concerning interaction through a network will apply to the + combination as such. +-

                      ++

                      + 14. Revised Versions of this License. +

                      + The Free Software Foundation may publish revised and/or new versions of the +@@ -587,7 +587,7 @@ + Later license versions may give you additional or different permissions. + However, no additional obligations are imposed on any author or copyright + holder as a result of your choosing to follow a later version. +-

                      ++

                      + 15. Disclaimer of Warranty. +

                      + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE +@@ -598,7 +598,7 @@ + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH + YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL + NECESSARY SERVICING, REPAIR OR CORRECTION. +-

                      ++

                      + 16. Limitation of Liability. +

                      + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL +@@ -610,7 +610,7 @@ + PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), + EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF + SUCH DAMAGES. +-

                      ++

                      + 17. Interpretation of Sections 15 and 16. +

                      + If the disclaimer of warranty and limitation of liability provided above +@@ -619,9 +619,9 @@ + waiver of all civil liability in connection with the Program, unless a + warranty or assumption of liability accompanies a copy of the Program in + return for a fee. +-

                      ++

                      + END OF TERMS AND CONDITIONS +-

                      ++

                      + How to Apply These Terms to Your New Programs +

                      + If you develop a new program, and you want it to be of the greatest possible +@@ -648,7 +648,7 @@ + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License +-along with this program. If not, see http://www.gnu.org/licenses/. ++along with this program. If not, see http://www.gnu.org/licenses/. +

                      + Also add information on how to contact you by electronic and paper mail. +

                      +@@ -669,15 +669,15 @@ + if any, to sign a “copyright disclaimer” for the program, if + necessary. For more information on this, and how to apply and follow the + GNU GPL, see +- http://www.gnu.org/licenses/. ++ http://www.gnu.org/licenses/. +

                      + The GNU General Public License does not permit + incorporating your program into proprietary programs. If your program is a + subroutine library, you may consider it more useful to permit linking + proprietary applications with the library. If this is what you want to do, + use the GNU Lesser General Public License instead of this +- License. But first, please read http://www.gnu.org/philosophy/why-not-lgpl.html. +-

                    Prev Up Next
                    Appendix C.  ++ License. But first, please read http://www.gnu.org/philosophy/why-not-lgpl.html. ++

                    Prev Up Next
                    Appendix C.  + Free Software Needs Free Documentation + +- Home Appendix E. GNU Free Documentation License
                    ++                     		Home Appendix E. GNU Free Documentation License
                    +Index: libstdc++-v3/doc/html/manual/source_code_style.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/source_code_style.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/source_code_style.html (.../branches/gcc-4_7-branch) +@@ -1,620 +1,620 @@ + +- +-Coding Style
                    Coding Style
                    Prev Appendix A.  ++ ++Coding Style
                    Coding Style
                    Prev Appendix A.  + Contributing + +- Next

                    +-

                    ++

                    		 Next

                    Coding Style

                    ++

                    Bad Identifiers

                    + Identifiers that conflict and should be avoided. +-


                    +-      This is the list of names “reserved to the
                    +-      implementation                    ”                     that have been claimed by certain
                    +-      compilers and system headers of interest, and should not be used
                    +-      in the library. It will grow, of course.  We generally are
                    +-      interested in names that are not all-caps, except for those like
                    +-      "_T"
                    +-
                    +-      For Solaris:
                    +-      _B
                    +-      _C
                    +-      _L
                    +-      _N
                    +-      _P
                    +-      _S
                    +-      _U
                    +-      _X
                    +-      _E1
                    +-      ..
                    +-      _E24
                    +-
                    +-      Irix adds:
                    +-      _A
                    +-      _G
                    +-
                    +-      MS adds:
                    +-      _T
                    +-
                    +-      BSD adds:
                    +-      __used
                    +-      __unused
                    +-      __inline
                    +-      _Complex
                    +-      __istype
                    +-      __maskrune
                    +-      __tolower
                    +-      __toupper
                    +-      __wchar_t
                    +-      __wint_t
                    +-      _res
                    +-      _res_ext
                    +-      __tg_*
                    +-
                    +-      SPU adds:
                    +-      __ea
                    +-
                    +-      For GCC:
                    +-
                    +-      [Note that this list is out of date. It applies to the old
                    +-      name-mangling; in G++ 3.0 and higher a different name-mangling is
                    +-      used. In addition, many of the bugs relating to G++ interpreting
                    +-      these names as operators have been fixed.]
                    +-
                    +-      The full set of __* identifiers (combined from gcc/cp/lex.c and
                    +-      gcc/cplus-dem.c) that are either old or new, but are definitely
                    +-      recognized by the demangler, is:
                    +-
                    +-      __aa
                    +-      __aad
                    +-      __ad
                    +-      __addr
                    +-      __adv
                    +-      __aer
                    +-      __als
                    +-      __alshift
                    +-      __amd
                    +-      __ami
                    +-      __aml
                    +-      __amu
                    +-      __aor
                    +-      __apl
                    +-      __array
                    +-      __ars
                    +-      __arshift
                    +-      __as
                    +-      __bit_and
                    +-      __bit_ior
                    +-      __bit_not
                    +-      __bit_xor
                    +-      __call
                    +-      __cl
                    +-      __cm
                    +-      __cn
                    +-      __co
                    +-      __component
                    +-      __compound
                    +-      __cond
                    +-      __convert
                    +-      __delete
                    +-      __dl
                    +-      __dv
                    +-      __eq
                    +-      __er
                    +-      __ge
                    +-      __gt
                    +-      __indirect
                    +-      __le
                    +-      __ls
                    +-      __lt
                    +-      __max
                    +-      __md
                    +-      __method_call
                    +-      __mi
                    +-      __min
                    +-      __minus
                    +-      __ml
                    +-      __mm
                    +-      __mn
                    +-      __mult
                    +-      __mx
                    +-      __ne
                    +-      __negate
                    +-      __new
                    +-      __nop
                    +-      __nt
                    +-      __nw
                    +-      __oo
                    +-      __op
                    +-      __or
                    +-      __pl
                    +-      __plus
                    +-      __postdecrement
                    +-      __postincrement
                    +-      __pp
                    +-      __pt
                    +-      __rf
                    +-      __rm
                    +-      __rs
                    +-      __sz
                    +-      __trunc_div
                    +-      __trunc_mod
                    +-      __truth_andif
                    +-      __truth_not
                    +-      __truth_orif
                    +-      __vc
                    +-      __vd
                    +-      __vn
                    +-
                    +-      SGI badnames:
                    +-      __builtin_alloca
                    +-      __builtin_fsqrt
                    +-      __builtin_sqrt
                    +-      __builtin_fabs
                    +-      __builtin_dabs
                    +-      __builtin_cast_f2i
                    +-      __builtin_cast_i2f
                    +-      __builtin_cast_d2ll
                    +-      __builtin_cast_ll2d
                    +-      __builtin_copy_dhi2i
                    +-      __builtin_copy_i2dhi
                    +-      __builtin_copy_dlo2i
                    +-      __builtin_copy_i2dlo
                    +-      __add_and_fetch
                    +-      __sub_and_fetch
                    +-      __or_and_fetch
                    +-      __xor_and_fetch
                    +-      __and_and_fetch
                    +-      __nand_and_fetch
                    +-      __mpy_and_fetch
                    +-      __min_and_fetch
                    +-      __max_and_fetch
                    +-      __fetch_and_add
                    +-      __fetch_and_sub
                    +-      __fetch_and_or
                    +-      __fetch_and_xor
                    +-      __fetch_and_and
                    +-      __fetch_and_nand
                    +-      __fetch_and_mpy
                    +-      __fetch_and_min
                    +-      __fetch_and_max
                    +-      __lock_test_and_set
                    +-      __lock_release
                    +-      __lock_acquire
                    +-      __compare_and_swap
                    +-      __synchronize
                    +-      __high_multiply
                    +-      __unix
                    +-      __sgi
                    +-      __linux__
                    +-      __i386__
                    +-      __i486__
                    +-      __cplusplus
                    +-      __embedded_cplusplus
                    +-      // long double conversion members mangled as __opr
                    +-      // http://gcc.gnu.org/ml/libstdc++/1999-q4/msg00060.html
                    +-      __opr
                    +-    


                    +-      This library is written to appropriate C++ coding standards. As such,
                    +-      it is intended to precede the recommendations of the GNU Coding
                    +-      Standard, which can be referenced in full here:
                    +-
                    +-                          http://www.gnu.org/prep/standards/standards.html#Formatting
                    +-
                    +-      The rest of this is also interesting reading, but skip the "Design
                    +-      Advice" part.
                    +-
                    +-      The GCC coding conventions are here, and are also useful:
                    +-      http://gcc.gnu.org/codingconventions.html
                    +-
                    +-      In addition, because it doesn't seem to be stated explicitly anywhere
                    +-      else, there is an 80 column source limit.
                    +-
                    +-      ChangeLog entries for member functions should use the
                    +-      classname::member function name syntax as follows:
                    +-
                    +-
                    +-1999-04-15  Dennis Ritchie  <dr@att.com>
                    +-
                    +-      * src/basic_file.cc (__basic_file::open): Fix thinko in
                    +-      _G_HAVE_IO_FILE_OPEN bits.
                    +-
                    +-
                    +-      Notable areas of divergence from what may be previous local practice
                    +-      (particularly for GNU C) include:
                    +-
                    +-      01. Pointers and references
                    +-      
                    +-        char* p = "flop";
                    +-        char& c = *p;
                    +-          -NOT-
                    +-        char *p = "flop";  // wrong
                    +-        char &c = *p;      // wrong
                    +-      
                    +-
                    +-      Reason: In C++, definitions are mixed with executable code. Here,
                    +-      p is being initialized, not *p.  This is near-universal
                    +-      practice among C++ programmers; it is normal for C hackers
                    +-      to switch spontaneously as they gain experience.
                    +-
                    +-      02. Operator names and parentheses
                    +-      
                    +-        operator==(type)
                    +-          -NOT-
                    +-        operator == (type)  // wrong
                    +-      
                    +-
                    +-      Reason: The == is part of the function name. Separating
                    +-      it makes the declaration look like an expression.
                    +-
                    +-      03. Function names and parentheses
                    +-      
                    +-        void mangle()
                    +-          -NOT-
                    +-        void mangle ()  // wrong
                    +-      
                    +-
                    +-      Reason: no space before parentheses (except after a control-flow
                    +-      keyword) is near-universal practice for C++. It identifies the
                    +-      parentheses as the function-call operator or declarator, as
                    +-      opposed to an expression or other overloaded use of parentheses.
                    +-
                    +-      04. Template function indentation
                    +-      
                    +-        template<typename T>
                    +-          void
                    +-          template_function(args)
                    +-          { }
                    +-          -NOT-
                    +-        template<class T>
                    +-        void template_function(args) {};
                    +-      
                    +-
                    +-      Reason: In class definitions, without indentation whitespace is
                    +-      needed both above and below the declaration to distinguish
                    +-      it visually from other members. (Also, re: "typename"
                    +-      rather than "class".)  T often could be int, which is
                    +-      not a class. ("class", here, is an anachronism.)
                    +-
                    +-      05. Template class indentation
                    +-      
                    +-        template<typename _CharT, typename _Traits>
                    +-          class basic_ios : public ios_base
                    +-          {
                    +-          public:
                    +-            // Types:
                    +-          };
                    +-          -NOT-
                    +-        template<class _CharT, class _Traits>
                    +-        class basic_ios : public ios_base
                    +-          {
                    +-          public:
                    +-            // Types:
                    +-          };
                    +-          -NOT-
                    +-        template<class _CharT, class _Traits>
                    +-          class basic_ios : public ios_base
                    +-        {
                    +-          public:
                    +-            // Types:
                    +-        };
                    +-      
                    +-
                    +-      06. Enumerators
                    +-      
                    +-        enum
                    +-        {
                    +-          space = _ISspace,
                    +-          print = _ISprint,
                    +-          cntrl = _IScntrl
                    +-        };
                    +-          -NOT-
                    +-        enum { space = _ISspace, print = _ISprint, cntrl = _IScntrl };
                    +-      
                    +-
                    +-      07. Member initialization lists
                    +-      All one line, separate from class name.
                    +-
                    +-      
                    +-        gribble::gribble()
                    +-        : _M_private_data(0), _M_more_stuff(0), _M_helper(0)
                    +-        { }
                    +-          -NOT-
                    +-        gribble::gribble() : _M_private_data(0), _M_more_stuff(0), _M_helper(0)
                    +-        { }
                    +-      
                    +-
                    +-      08. Try/Catch blocks
                    +-      
                    +-        try
                    +-          {
                    +-            //
                    +-          }
                    +-        catch (...)
                    +-          {
                    +-            //
                    +-          }
                    +-          -NOT-
                    +-        try {
                    +-          //
                    +-        } catch(...) {
                    +-          //
                    +-        }
                    +-      
                    +-
                    +-      09. Member functions declarations and definitions
                    +-      Keywords such as extern, static, export, explicit, inline, etc
                    +-      go on the line above the function name. Thus
                    +-
                    +-      
                    +-      virtual int
                    +-      foo()
                    +-      -NOT-
                    +-      virtual int foo()
                    +-      
                    +-
                    +-      Reason: GNU coding conventions dictate return types for functions
                    +-      are on a separate line than the function name and parameter list
                    +-      for definitions. For C++, where we have member functions that can
                    +-      be either inline definitions or declarations, keeping to this
                    +-      standard allows all member function names for a given class to be
                    +-      aligned to the same margin, increasing readability.
                    +-
                    +-
                    +-      10. Invocation of member functions with "this->"
                    +-      For non-uglified names, use this->name to call the function.
                    +-
                    +-      
                    +-      this->sync()
                    +-      -NOT-
                    +-      sync()
                    +-      
                    +-
                    +-      Reason: Koenig lookup.
                    +-
                    +-      11. Namespaces
                    +-      
                    +-      namespace std
                    +-      {
                    +-        blah blah blah;
                    +-      } // namespace std
                    +-
                    +-      -NOT-
                    +-
                    +-      namespace std {
                    +-        blah blah blah;
                    +-      } // namespace std
                    +-      
                    +-
                    +-      12. Spacing under protected and private in class declarations:
                    +-      space above, none below
                    +-      i.e.
                    +-
                    +-      
                    +-      public:
                    +-        int foo;
                    +-
                    +-      -NOT-
                    +-      public:
                    +-
                    +-        int foo;
                    +-      
                    +-
                    +-      13. Spacing WRT return statements.
                    +-      no extra spacing before returns, no parenthesis
                    +-      i.e.
                    +-
                    +-      
                    +-      }
                    +-      return __ret;
                    +-
                    +-      -NOT-
                    +-      }
                    +-
                    +-      return __ret;
                    +-
                    +-      -NOT-
                    +-
                    +-      }
                    +-      return (__ret);
                    +-      
                    +-
                    +-
                    +-      14. Location of global variables.
                    +-      All global variables of class type, whether in the "user visible"
                    +-      space (e.g., cin) or the implementation namespace, must be defined
                    +-      as a character array with the appropriate alignment and then later
                    +-      re-initialized to the correct value.
                    +-
                    +-      This is due to startup issues on certain platforms, such as AIX.
                    +-      For more explanation and examples, see src/globals.cc. All such
                    +-      variables should be contained in that file, for simplicity.
                    +-
                    +-      15. Exception abstractions
                    +-      Use the exception abstractions found in functexcept.h, which allow
                    +-      C++ programmers to use this library with -fno-exceptions.  (Even if
                    +-      that is rarely advisable, it's a necessary evil for backwards
                    +-      compatibility.)
                    +-
                    +-      16. Exception error messages
                    +-      All start with the name of the function where the exception is
                    +-      thrown, and then (optional) descriptive text is added. Example:
                    +-
                    +-      
                    +-      __throw_logic_error(__N("basic_string::_S_construct NULL not valid"));
                    +-      
                    +-
                    +-      Reason: The verbose terminate handler prints out exception::what(),
                    +-      as well as the typeinfo for the thrown exception. As this is the
                    +-      default terminate handler, by putting location info into the
                    +-      exception string, a very useful error message is printed out for
                    +-      uncaught exceptions. So useful, in fact, that non-programmers can
                    +-      give useful error messages, and programmers can intelligently
                    +-      speculate what went wrong without even using a debugger.
                    +-
                    +-      17. The doxygen style guide to comments is a separate document,
                    +-      see index.
                    +-
                    +-      The library currently has a mixture of GNU-C and modern C++ coding
                    +-      styles. The GNU C usages will be combed out gradually.
                    +-
                    +-      Name patterns:
                    +-
                    +-      For nonstandard names appearing in Standard headers, we are constrained
                    +-      to use names that begin with underscores. This is called "uglification".
                    +-      The convention is:
                    +-
                    +-      Local and argument names:  __[a-z].*
                    +-
                    +-      Examples:  __count  __ix  __s1
                    +-
                    +-      Type names and template formal-argument names: _[A-Z][^_].*
                    +-
                    +-      Examples:  _Helper  _CharT  _N
                    +-
                    +-      Member data and function names: _M_.*
                    +-
                    +-      Examples:  _M_num_elements  _M_initialize ()
                    +-
                    +-      Static data members, constants, and enumerations: _S_.*
                    +-
                    +-      Examples: _S_max_elements  _S_default_value
                    +-
                    +-      Don't use names in the same scope that differ only in the prefix,
                    +-      e.g. _S_top and _M_top. See BADNAMES for a list of forbidden names.
                    +-      (The most tempting of these seem to be and "_T" and "__sz".)
                    +-
                    +-      Names must never have "__" internally; it would confuse name
                    +-      unmanglers on some targets. Also, never use "__[0-9]", same reason.
                    +-
                    +-      --------------------------
                    +-
                    +-      [BY EXAMPLE]
                    +-      
                    +-
                    +-      #ifndef  _HEADER_
                    +-      #define  _HEADER_ 1
                    +-
                    +-      namespace std
                    +-      {
                    +-        class gribble
                    +-        {
                    +-        public:
                    +-          gribble() throw();
                    +-
                    +-          gribble(const gribble&);
                    +-
                    +-          explicit
                    +-          gribble(int __howmany);
                    +-
                    +-          gribble&
                    +-          operator=(const gribble&);
                    +-
                    +-          virtual
                    +-          ~gribble() throw ();
                    +-
                    +-          // Start with a capital letter, end with a period.
                    +-          inline void
                    +-          public_member(const char* __arg) const;
                    +-
                    +-          // In-class function definitions should be restricted to one-liners.
                    +-          int
                    +-          one_line() { return 0 }
                    +-
                    +-          int
                    +-          two_lines(const char* arg)
                    +-          { return strchr(arg, 'a'); }
                    +-
                    +-          inline int
                    +-          three_lines();  // inline, but defined below.
                    +-
                    +-          // Note indentation.
                    +-          template<typename _Formal_argument>
                    +-            void
                    +-            public_template() const throw();
                    +-
                    +-          template<typename _Iterator>
                    +-            void
                    +-            other_template();
                    +-
                    +-        private:
                    +-          class _Helper;
                    +-
                    +-          int _M_private_data;
                    +-          int _M_more_stuff;
                    +-          _Helper* _M_helper;
                    +-          int _M_private_function();
                    +-
                    +-          enum _Enum
                    +-            {
                    +-              _S_one,
                    +-              _S_two
                    +-            };
                    +-
                    +-          static void
                    +-          _S_initialize_library();
                    +-        };
                    +-
                    +-        // More-or-less-standard language features described by lack, not presence.
                    +-      # ifndef _G_NO_LONGLONG
                    +-        extern long long _G_global_with_a_good_long_name;  // avoid globals!
                    +-      # endif
                    +-
                    +-        // Avoid in-class inline definitions, define separately;
                    +-        // likewise for member class definitions:
                    +-        inline int
                    +-        gribble::public_member() const
                    +-        { int __local = 0; return __local; }
                    +-
                    +-        class gribble::_Helper
                    +-        {
                    +-          int _M_stuff;
                    +-
                    +-          friend class gribble;
                    +-        };
                    +-      }
                    +-
                    +-      // Names beginning with "__": only for arguments and
                    +-      //   local variables; never use "__" in a type name, or
                    +-      //   within any name; never use "__[0-9]".
                    +-
                    +-      #endif /* _HEADER_ */
                    +-
                    +-
                    +-      namespace std
                    +-      {
                    +-        template<typename T>  // notice: "typename", not "class", no space
                    +-          long_return_value_type<with_many, args>
                    +-          function_name(char* pointer,               // "char *pointer" is wrong.
                    +-                        char* argument,
                    +-                        const Reference& ref)
                    +-          {
                    +-            // int a_local;  /* wrong; see below. */
                    +-            if (test)
                    +-            {
                    +-              nested code
                    +-            }
                    +-
                    +-            int a_local = 0;  // declare variable at first use.
                    +-
                    +-            //  char a, b, *p;   /* wrong */
                    +-            char a = 'a';
                    +-            char b = a + 1;
                    +-            char* c = "abc";  // each variable goes on its own line, always.
                    +-
                    +-            // except maybe here...
                    +-            for (unsigned i = 0, mask = 1; mask; ++i, mask <<= 1) {
                    +-              // ...
                    +-            }
                    +-          }
                    +-
                    +-        gribble::gribble()
                    +-        : _M_private_data(0), _M_more_stuff(0), _M_helper(0)
                    +-        { }
                    +-
                    +-        int
                    +-        gribble::three_lines()
                    +-        {
                    +-          // doesn't fit in one line.
                    +-        }
                    +-      } // namespace std
                    +-      
                    +-    

                    Prev Up Next
                    Directory Layout and Source Conventions Home Design Notes
                    ++


                    ++      This is the list of names “reserved to the
                    ++      implementation                    ”                     that have been claimed by certain
                    ++      compilers and system headers of interest, and should not be used
                    ++      in the library. It will grow, of course.  We generally are
                    ++      interested in names that are not all-caps, except for those like
                    ++      "_T"
                    ++
                    ++      For Solaris:
                    ++      _B
                    ++      _C
                    ++      _L
                    ++      _N
                    ++      _P
                    ++      _S
                    ++      _U
                    ++      _X
                    ++      _E1
                    ++      ..
                    ++      _E24
                    ++
                    ++      Irix adds:
                    ++      _A
                    ++      _G
                    ++
                    ++      MS adds:
                    ++      _T
                    ++
                    ++      BSD adds:
                    ++      __used
                    ++      __unused
                    ++      __inline
                    ++      _Complex
                    ++      __istype
                    ++      __maskrune
                    ++      __tolower
                    ++      __toupper
                    ++      __wchar_t
                    ++      __wint_t
                    ++      _res
                    ++      _res_ext
                    ++      __tg_*
                    ++
                    ++      SPU adds:
                    ++      __ea
                    ++
                    ++      For GCC:
                    ++
                    ++      [Note that this list is out of date. It applies to the old
                    ++      name-mangling; in G++ 3.0 and higher a different name-mangling is
                    ++      used. In addition, many of the bugs relating to G++ interpreting
                    ++      these names as operators have been fixed.]
                    ++
                    ++      The full set of __* identifiers (combined from gcc/cp/lex.c and
                    ++      gcc/cplus-dem.c) that are either old or new, but are definitely
                    ++      recognized by the demangler, is:
                    ++
                    ++      __aa
                    ++      __aad
                    ++      __ad
                    ++      __addr
                    ++      __adv
                    ++      __aer
                    ++      __als
                    ++      __alshift
                    ++      __amd
                    ++      __ami
                    ++      __aml
                    ++      __amu
                    ++      __aor
                    ++      __apl
                    ++      __array
                    ++      __ars
                    ++      __arshift
                    ++      __as
                    ++      __bit_and
                    ++      __bit_ior
                    ++      __bit_not
                    ++      __bit_xor
                    ++      __call
                    ++      __cl
                    ++      __cm
                    ++      __cn
                    ++      __co
                    ++      __component
                    ++      __compound
                    ++      __cond
                    ++      __convert
                    ++      __delete
                    ++      __dl
                    ++      __dv
                    ++      __eq
                    ++      __er
                    ++      __ge
                    ++      __gt
                    ++      __indirect
                    ++      __le
                    ++      __ls
                    ++      __lt
                    ++      __max
                    ++      __md
                    ++      __method_call
                    ++      __mi
                    ++      __min
                    ++      __minus
                    ++      __ml
                    ++      __mm
                    ++      __mn
                    ++      __mult
                    ++      __mx
                    ++      __ne
                    ++      __negate
                    ++      __new
                    ++      __nop
                    ++      __nt
                    ++      __nw
                    ++      __oo
                    ++      __op
                    ++      __or
                    ++      __pl
                    ++      __plus
                    ++      __postdecrement
                    ++      __postincrement
                    ++      __pp
                    ++      __pt
                    ++      __rf
                    ++      __rm
                    ++      __rs
                    ++      __sz
                    ++      __trunc_div
                    ++      __trunc_mod
                    ++      __truth_andif
                    ++      __truth_not
                    ++      __truth_orif
                    ++      __vc
                    ++      __vd
                    ++      __vn
                    ++
                    ++      SGI badnames:
                    ++      __builtin_alloca
                    ++      __builtin_fsqrt
                    ++      __builtin_sqrt
                    ++      __builtin_fabs
                    ++      __builtin_dabs
                    ++      __builtin_cast_f2i
                    ++      __builtin_cast_i2f
                    ++      __builtin_cast_d2ll
                    ++      __builtin_cast_ll2d
                    ++      __builtin_copy_dhi2i
                    ++      __builtin_copy_i2dhi
                    ++      __builtin_copy_dlo2i
                    ++      __builtin_copy_i2dlo
                    ++      __add_and_fetch
                    ++      __sub_and_fetch
                    ++      __or_and_fetch
                    ++      __xor_and_fetch
                    ++      __and_and_fetch
                    ++      __nand_and_fetch
                    ++      __mpy_and_fetch
                    ++      __min_and_fetch
                    ++      __max_and_fetch
                    ++      __fetch_and_add
                    ++      __fetch_and_sub
                    ++      __fetch_and_or
                    ++      __fetch_and_xor
                    ++      __fetch_and_and
                    ++      __fetch_and_nand
                    ++      __fetch_and_mpy
                    ++      __fetch_and_min
                    ++      __fetch_and_max
                    ++      __lock_test_and_set
                    ++      __lock_release
                    ++      __lock_acquire
                    ++      __compare_and_swap
                    ++      __synchronize
                    ++      __high_multiply
                    ++      __unix
                    ++      __sgi
                    ++      __linux__
                    ++      __i386__
                    ++      __i486__
                    ++      __cplusplus
                    ++      __embedded_cplusplus
                    ++      // long double conversion members mangled as __opr
                    ++      // http://gcc.gnu.org/ml/libstdc++/1999-q4/msg00060.html
                    ++      __opr
                    ++    

                  By Example


                  ++      This library is written to appropriate C++ coding standards. As such,
                  ++      it is intended to precede the recommendations of the GNU Coding
                  ++      Standard, which can be referenced in full here:
                  ++
                  ++      http://www.gnu.org/prep/standards/standards.html#Formatting
                  ++
                  ++      The rest of this is also interesting reading, but skip the "Design
                  ++      Advice" part.
                  ++
                  ++      The GCC coding conventions are here, and are also useful:
                  ++      http://gcc.gnu.org/codingconventions.html
                  ++
                  ++      In addition, because it doesn't seem to be stated explicitly anywhere
                  ++      else, there is an 80 column source limit.
                  ++
                  ++      ChangeLog entries for member functions should use the
                  ++      classname::member function name syntax as follows:
                  ++
                  ++
                  ++1999-04-15  Dennis Ritchie  <dr@att.com>
                  ++
                  ++      * src/basic_file.cc (__basic_file::open): Fix thinko in
                  ++      _G_HAVE_IO_FILE_OPEN bits.
                  ++
                  ++
                  ++      Notable areas of divergence from what may be previous local practice
                  ++      (particularly for GNU C) include:
                  ++
                  ++      01. Pointers and references
                  ++      
                  ++        char* p = "flop";
                  ++        char& c = *p;
                  ++          -NOT-
                  ++        char *p = "flop";  // wrong
                  ++        char &c = *p;      // wrong
                  ++      
                  ++
                  ++      Reason: In C++, definitions are mixed with executable code. Here,
                  ++      p is being initialized, not *p.  This is near-universal
                  ++      practice among C++ programmers; it is normal for C hackers
                  ++      to switch spontaneously as they gain experience.
                  ++
                  ++      02. Operator names and parentheses
                  ++      
                  ++        operator==(type)
                  ++          -NOT-
                  ++        operator == (type)  // wrong
                  ++      
                  ++
                  ++      Reason: The == is part of the function name. Separating
                  ++      it makes the declaration look like an expression.
                  ++
                  ++      03. Function names and parentheses
                  ++      
                  ++        void mangle()
                  ++          -NOT-
                  ++        void mangle ()  // wrong
                  ++      
                  ++
                  ++      Reason: no space before parentheses (except after a control-flow
                  ++      keyword) is near-universal practice for C++. It identifies the
                  ++      parentheses as the function-call operator or declarator, as
                  ++      opposed to an expression or other overloaded use of parentheses.
                  ++
                  ++      04. Template function indentation
                  ++      
                  ++        template<typename T>
                  ++          void
                  ++          template_function(args)
                  ++          { }
                  ++          -NOT-
                  ++        template<class T>
                  ++        void template_function(args) {};
                  ++      
                  ++
                  ++      Reason: In class definitions, without indentation whitespace is
                  ++      needed both above and below the declaration to distinguish
                  ++      it visually from other members. (Also, re: "typename"
                  ++      rather than "class".)  T often could be int, which is
                  ++      not a class. ("class", here, is an anachronism.)
                  ++
                  ++      05. Template class indentation
                  ++      
                  ++        template<typename _CharT, typename _Traits>
                  ++          class basic_ios : public ios_base
                  ++          {
                  ++          public:
                  ++            // Types:
                  ++          };
                  ++          -NOT-
                  ++        template<class _CharT, class _Traits>
                  ++        class basic_ios : public ios_base
                  ++          {
                  ++          public:
                  ++            // Types:
                  ++          };
                  ++          -NOT-
                  ++        template<class _CharT, class _Traits>
                  ++          class basic_ios : public ios_base
                  ++        {
                  ++          public:
                  ++            // Types:
                  ++        };
                  ++      
                  ++
                  ++      06. Enumerators
                  ++      
                  ++        enum
                  ++        {
                  ++          space = _ISspace,
                  ++          print = _ISprint,
                  ++          cntrl = _IScntrl
                  ++        };
                  ++          -NOT-
                  ++        enum { space = _ISspace, print = _ISprint, cntrl = _IScntrl };
                  ++      
                  ++
                  ++      07. Member initialization lists
                  ++      All one line, separate from class name.
                  ++
                  ++      
                  ++        gribble::gribble()
                  ++        : _M_private_data(0), _M_more_stuff(0), _M_helper(0)
                  ++        { }
                  ++          -NOT-
                  ++        gribble::gribble() : _M_private_data(0), _M_more_stuff(0), _M_helper(0)
                  ++        { }
                  ++      
                  ++
                  ++      08. Try/Catch blocks
                  ++      
                  ++        try
                  ++          {
                  ++            //
                  ++          }
                  ++        catch (...)
                  ++          {
                  ++            //
                  ++          }
                  ++          -NOT-
                  ++        try {
                  ++          //
                  ++        } catch(...) {
                  ++          //
                  ++        }
                  ++      
                  ++
                  ++      09. Member functions declarations and definitions
                  ++      Keywords such as extern, static, export, explicit, inline, etc
                  ++      go on the line above the function name. Thus
                  ++
                  ++      
                  ++      virtual int
                  ++      foo()
                  ++      -NOT-
                  ++      virtual int foo()
                  ++      
                  ++
                  ++      Reason: GNU coding conventions dictate return types for functions
                  ++      are on a separate line than the function name and parameter list
                  ++      for definitions. For C++, where we have member functions that can
                  ++      be either inline definitions or declarations, keeping to this
                  ++      standard allows all member function names for a given class to be
                  ++      aligned to the same margin, increasing readability.
                  ++
                  ++
                  ++      10. Invocation of member functions with "this->"
                  ++      For non-uglified names, use this->name to call the function.
                  ++
                  ++      
                  ++      this->sync()
                  ++      -NOT-
                  ++      sync()
                  ++      
                  ++
                  ++      Reason: Koenig lookup.
                  ++
                  ++      11. Namespaces
                  ++      
                  ++      namespace std
                  ++      {
                  ++        blah blah blah;
                  ++      } // namespace std
                  ++
                  ++      -NOT-
                  ++
                  ++      namespace std {
                  ++        blah blah blah;
                  ++      } // namespace std
                  ++      
                  ++
                  ++      12. Spacing under protected and private in class declarations:
                  ++      space above, none below
                  ++      i.e.
                  ++
                  ++      
                  ++      public:
                  ++        int foo;
                  ++
                  ++      -NOT-
                  ++      public:
                  ++
                  ++        int foo;
                  ++      
                  ++
                  ++      13. Spacing WRT return statements.
                  ++      no extra spacing before returns, no parenthesis
                  ++      i.e.
                  ++
                  ++      
                  ++      }
                  ++      return __ret;
                  ++
                  ++      -NOT-
                  ++      }
                  ++
                  ++      return __ret;
                  ++
                  ++      -NOT-
                  ++
                  ++      }
                  ++      return (__ret);
                  ++      
                  ++
                  ++
                  ++      14. Location of global variables.
                  ++      All global variables of class type, whether in the "user visible"
                  ++      space (e.g., cin) or the implementation namespace, must be defined
                  ++      as a character array with the appropriate alignment and then later
                  ++      re-initialized to the correct value.
                  ++
                  ++      This is due to startup issues on certain platforms, such as AIX.
                  ++      For more explanation and examples, see src/globals.cc. All such
                  ++      variables should be contained in that file, for simplicity.
                  ++
                  ++      15. Exception abstractions
                  ++      Use the exception abstractions found in functexcept.h, which allow
                  ++      C++ programmers to use this library with -fno-exceptions.  (Even if
                  ++      that is rarely advisable, it's a necessary evil for backwards
                  ++      compatibility.)
                  ++
                  ++      16. Exception error messages
                  ++      All start with the name of the function where the exception is
                  ++      thrown, and then (optional) descriptive text is added. Example:
                  ++
                  ++      
                  ++      __throw_logic_error(__N("basic_string::_S_construct NULL not valid"));
                  ++      
                  ++
                  ++      Reason: The verbose terminate handler prints out exception::what(),
                  ++      as well as the typeinfo for the thrown exception. As this is the
                  ++      default terminate handler, by putting location info into the
                  ++      exception string, a very useful error message is printed out for
                  ++      uncaught exceptions. So useful, in fact, that non-programmers can
                  ++      give useful error messages, and programmers can intelligently
                  ++      speculate what went wrong without even using a debugger.
                  ++
                  ++      17. The doxygen style guide to comments is a separate document,
                  ++      see index.
                  ++
                  ++      The library currently has a mixture of GNU-C and modern C++ coding
                  ++      styles. The GNU C usages will be combed out gradually.
                  ++
                  ++      Name patterns:
                  ++
                  ++      For nonstandard names appearing in Standard headers, we are constrained
                  ++      to use names that begin with underscores. This is called "uglification".
                  ++      The convention is:
                  ++
                  ++      Local and argument names:  __[a-z].*
                  ++
                  ++      Examples:  __count  __ix  __s1
                  ++
                  ++      Type names and template formal-argument names: _[A-Z][^_].*
                  ++
                  ++      Examples:  _Helper  _CharT  _N
                  ++
                  ++      Member data and function names: _M_.*
                  ++
                  ++      Examples:  _M_num_elements  _M_initialize ()
                  ++
                  ++      Static data members, constants, and enumerations: _S_.*
                  ++
                  ++      Examples: _S_max_elements  _S_default_value
                  ++
                  ++      Don't use names in the same scope that differ only in the prefix,
                  ++      e.g. _S_top and _M_top. See BADNAMES for a list of forbidden names.
                  ++      (The most tempting of these seem to be and "_T" and "__sz".)
                  ++
                  ++      Names must never have "__" internally; it would confuse name
                  ++      unmanglers on some targets. Also, never use "__[0-9]", same reason.
                  ++
                  ++      --------------------------
                  ++
                  ++      [BY EXAMPLE]
                  ++      
                  ++
                  ++      #ifndef  _HEADER_
                  ++      #define  _HEADER_ 1
                  ++
                  ++      namespace std
                  ++      {
                  ++        class gribble
                  ++        {
                  ++        public:
                  ++          gribble() throw();
                  ++
                  ++          gribble(const gribble&);
                  ++
                  ++          explicit
                  ++          gribble(int __howmany);
                  ++
                  ++          gribble&
                  ++          operator=(const gribble&);
                  ++
                  ++          virtual
                  ++          ~gribble() throw ();
                  ++
                  ++          // Start with a capital letter, end with a period.
                  ++          inline void
                  ++          public_member(const char* __arg) const;
                  ++
                  ++          // In-class function definitions should be restricted to one-liners.
                  ++          int
                  ++          one_line() { return 0 }
                  ++
                  ++          int
                  ++          two_lines(const char* arg)
                  ++          { return strchr(arg, 'a'); }
                  ++
                  ++          inline int
                  ++          three_lines();  // inline, but defined below.
                  ++
                  ++          // Note indentation.
                  ++          template<typename _Formal_argument>
                  ++            void
                  ++            public_template() const throw();
                  ++
                  ++          template<typename _Iterator>
                  ++            void
                  ++            other_template();
                  ++
                  ++        private:
                  ++          class _Helper;
                  ++
                  ++          int _M_private_data;
                  ++          int _M_more_stuff;
                  ++          _Helper* _M_helper;
                  ++          int _M_private_function();
                  ++
                  ++          enum _Enum
                  ++            {
                  ++              _S_one,
                  ++              _S_two
                  ++            };
                  ++
                  ++          static void
                  ++          _S_initialize_library();
                  ++        };
                  ++
                  ++        // More-or-less-standard language features described by lack, not presence.
                  ++      # ifndef _G_NO_LONGLONG
                  ++        extern long long _G_global_with_a_good_long_name;  // avoid globals!
                  ++      # endif
                  ++
                  ++        // Avoid in-class inline definitions, define separately;
                  ++        // likewise for member class definitions:
                  ++        inline int
                  ++        gribble::public_member() const
                  ++        { int __local = 0; return __local; }
                  ++
                  ++        class gribble::_Helper
                  ++        {
                  ++          int _M_stuff;
                  ++
                  ++          friend class gribble;
                  ++        };
                  ++      }
                  ++
                  ++      // Names beginning with "__": only for arguments and
                  ++      //   local variables; never use "__" in a type name, or
                  ++      //   within any name; never use "__[0-9]".
                  ++
                  ++      #endif /* _HEADER_ */
                  ++
                  ++
                  ++      namespace std
                  ++      {
                  ++        template<typename T>  // notice: "typename", not "class", no space
                  ++          long_return_value_type<with_many, args>
                  ++          function_name(char* pointer,               // "char *pointer" is wrong.
                  ++                        char* argument,
                  ++                        const Reference& ref)
                  ++          {
                  ++            // int a_local;  /* wrong; see below. */
                  ++            if (test)
                  ++            {
                  ++              nested code
                  ++            }
                  ++
                  ++            int a_local = 0;  // declare variable at first use.
                  ++
                  ++            //  char a, b, *p;   /* wrong */
                  ++            char a = 'a';
                  ++            char b = a + 1;
                  ++            char* c = "abc";  // each variable goes on its own line, always.
                  ++
                  ++            // except maybe here...
                  ++            for (unsigned i = 0, mask = 1; mask; ++i, mask <<= 1) {
                  ++              // ...
                  ++            }
                  ++          }
                  ++
                  ++        gribble::gribble()
                  ++        : _M_private_data(0), _M_more_stuff(0), _M_helper(0)
                  ++        { }
                  ++
                  ++        int
                  ++        gribble::three_lines()
                  ++        {
                  ++          // doesn't fit in one line.
                  ++        }
                  ++      } // namespace std
                  ++      
                  ++    

                Prev Up Next
                Directory Layout and Source Conventions Home Design Notes
                +Index: libstdc++-v3/doc/html/manual/streambufs.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/streambufs.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/streambufs.html (.../branches/gcc-4_7-branch) +@@ -1,15 +1,15 @@ + +- +-Stream Buffers
                Stream Buffers
                Prev Chapter 13.  ++ ++Stream Buffers
                Stream Buffers
                Prev Chapter 13.  + Input and Output + +- Next

                ++

                		 Next

                Stream Buffers

                Derived streambuf Classes

                +

                Creating your own stream buffers for I/O can be remarkably easy. + If you are interested in doing so, we highly recommend two very + excellent books: +- Standard C++ ++ Standard C++ + IOStreams and Locales by Langer and Kreft, ISBN 0-201-18395-1, and +- The C++ Standard Library ++ The C++ Standard Library + by Nicolai Josuttis, ISBN 0-201-37926-0. Both are published by + Addison-Wesley, who isn't paying us a cent for saying that, honest. +

                Here is a simple example, io/outbuf1, from the Josuttis text. It +@@ -55,9 +55,9 @@ + } +

                Try it yourself! More examples can be found in 3.1.x code, in + include/ext/*_filebuf.h, and in this article by James Kanze: +- Filtering ++ Filtering + Streambufs. +-

                First, are you sure that you understand buffering? Particularly ++

                Buffering

                First, are you sure that you understand buffering? Particularly + the fact that C++ may not, in fact, have anything to do with it? +

                The rules for buffering can be a little odd, but they aren't any + different from those of C. (Maybe that's why they can be a bit +@@ -131,7 +131,7 @@ + just those at the language/library level. Kernel buffers, disk + buffers, and the like will also have an effect. Inspecting and + changing those are system-dependent. +-

                Prev Up Next
                Chapter 13.  ++

                Prev Up Next
                Chapter 13.  + Input and Output + +- Home Memory Based Streams
                ++                 		Home Memory Based Streams
                +Index: libstdc++-v3/doc/html/manual/utilities.html +=================================================================== +--- a/src/libstdc++-v3/doc/html/manual/utilities.html (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/html/manual/utilities.html (.../branches/gcc-4_7-branch) +@@ -1,17 +1,17 @@ + +- +-Chapter 6.  Utilities
                Chapter 6.  ++ ++Chapter 6.  Utilities
                Chapter 6.  + Utilities + +-
                Prev Part II.  ++
                Prev Part II.  + Standard Contents +-  Next
                		 Next

                Chapter 6.  + Utilities +- +-

                Table of Contents

                Functors
                Pairs
                Memory
                Allocators
                Requirements
                Design Issues
                Implementation
                Interface Design
                Selecting Default Allocation Policy
                Disabling Memory Caching
                Using a Specific Allocator
                Custom Allocators
                Extension Allocators
                auto_ptr
                Limitations
                Use in Containers
                shared_ptr
                Requirements
                Design Issues
                Implementation
                Class Hierarchy
                Thread Safety
                Selecting Lock Policy
                Related functions and classes
                Use
                Examples
                Unresolved Issues
                Acknowledgments
                Traits

                If you don't know what functors are, you're not alone. Many people ++ ++

          Table of Contents

          Functors
          Pairs
          Memory
          Allocators
          Requirements
          Design Issues
          Implementation
          Interface Design
          Selecting Default Allocation Policy
          Disabling Memory Caching
          Using a Specific Allocator
          Custom Allocators
          Extension Allocators
          auto_ptr
          Limitations
          Use in Containers
          shared_ptr
          Requirements
          Design Issues
          Implementation
          Class Hierarchy
          Thread Safety
          Selecting Lock Policy
          Related functions and classes
          Use
          Examples
          Unresolved Issues
          Acknowledgments
          Traits

          Functors

          If you don't know what functors are, you're not alone. Many people + get slightly the wrong idea. In the interest of not reinventing + the wheel, we will refer you to the introduction to the functor + concept written by SGI as part of their STL, in +- their ++ their + http://www.sgi.com/tech/stl/functors.html. +-

          Prev Up Next
          Concept Checking Home Pairs
          ++

          Prev Up Next
          Concept Checking Home Pairs
          +Index: libstdc++-v3/doc/xsl/customization.xsl.in +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/xml + +Property changes on: libstdc++-v3/doc/xsl/customization.xsl.in +___________________________________________________________________ +Added: svn:mime-type + + application/xml + +Index: libstdc++-v3/doc/Makefile.am +=================================================================== +--- a/src/libstdc++-v3/doc/Makefile.am (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/doc/Makefile.am (.../branches/gcc-4_7-branch) +@@ -465,9 +465,10 @@ + #XSL_STYLE_DIR = /usr/share/xml/docbook/stylesheet/docbook-xsl-ns + #XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets + XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl +-XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl +-XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl ++XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml/chunk.xsl ++XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/html/docbook.xsl + XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub3/chunk.xsl ++XSL_LOCAL_STYLE = ${glibcxx_builddir}/doc/xsl/customization.xsl + + ${docbook_outdir}/epub: + mkdir -p ${docbook_outdir}/epub +@@ -529,21 +530,25 @@ + stamp-html-docbook-data: stamp-html-docbook-images stamp-html-docbook-lwg + $(STAMP) stamp-html-docbook-data + +-# HTML, index plus chapters ++# HTML, "chunked" into index plus chapters as separate pages + stamp-html-docbook: $(xml_sources) ${docbook_outdir}/html + @echo "Generating html files..." + $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) -o ${docbook_outdir}/html/ \ +- $(XSL_HTML_STYLE) ${top_srcdir}/doc/xml/spine.xml ++ --stringparam chunker.output.encoding UTF-8 \ ++ $(XSL_HTML_STYLE) \ ++ ${top_srcdir}/doc/xml/spine.xml + $(STAMP) stamp-html-docbook + + doc-html-docbook: stamp-html-docbook-data + + # HTML, all one page ++# NB: Have to generate customization XSL for UTF-8 output. + manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html + stamp-html-single-docbook: $(xml_sources) ${docbook_outdir}/html + @echo "Generating html single file..." + $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) -o ${manual_html} \ +- $(XSL_HTML_SINGLE_STYLE) ${top_srcdir}/doc/xml/spine.xml ++ ${XSL_LOCAL_STYLE} \ ++ ${top_srcdir}/doc/xml/spine.xml + $(STAMP) stamp-html-single-docbook + + doc-html-single-docbook: stamp-html-single-docbook +Index: libstdc++-v3/include/bits/atomic_base.h +=================================================================== +--- a/src/libstdc++-v3/include/bits/atomic_base.h (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/include/bits/atomic_base.h (.../branches/gcc-4_7-branch) +@@ -73,7 +73,7 @@ + + inline void + atomic_signal_fence(memory_order __m) noexcept +- { __atomic_thread_fence(__m); } ++ { __atomic_signal_fence(__m); } + + /// kill_dependency + template +Index: libstdc++-v3/ChangeLog +=================================================================== +--- a/src/libstdc++-v3/ChangeLog (.../tags/gcc_4_7_2_release) ++++ b/src/libstdc++-v3/ChangeLog (.../branches/gcc-4_7-branch) +@@ -1,3 +1,31 @@ ++2012-10-10 Andrew MacLeod ++ ++ PR libstdc++/54861 ++ * include/bits/atomic_base.h (atomic_signal_fence): Call ++ __atomic_signal_fence instead of __atomic_thread_fence. ++ ++2012-09-20 Benjamin Kosnik ++ ++ PR libstdc++/54102, part 2 ++ * doc/Makefile.am (XSL_HTML_STYLE): use xhtml, not html. ++ * doc/Makefile.in: Regenerate. ++ * doc/html/*: Same. ++ ++2012-09-20 Benjamin Kosnik ++ ++ * doc/html/*: Regenerate. ++ ++2012-09-20 Benjamin Kosnik ++ ++ PR libstdc++/54102 ++ * doc/xsl/customization.xsl.in: New. ++ * configure.ac: Output local copy of customization xsl. ++ * doc/Makefile.am (stamp-html-single-docbook): Use XSL_LOCAL_STYLE. ++ (stamp-html-docbook): Set stringparam to UTF-8. ++ * Makefile.in: Regenerated. ++ * configure: Same. ++ * doc/Makefile.in: Same. ++ + 2012-09-20 Release Manager + + * GCC 4.7.2 released. +Index: boehm-gc/Makefile.in +=================================================================== +--- a/src/boehm-gc/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/boehm-gc/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,13 +36,10 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = . +-DIST_COMMON = $(am__configure_deps) $(srcdir)/../compile \ +- $(srcdir)/../config.guess $(srcdir)/../config.sub \ +- $(srcdir)/../depcomp $(srcdir)/../install-sh \ +- $(srcdir)/../ltmain.sh $(srcdir)/../missing \ +- $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/threads.mk.in \ +- $(top_srcdir)/configure ChangeLog depcomp ++DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/configure $(am__configure_deps) \ ++ $(srcdir)/../mkinstalldirs $(srcdir)/threads.mk.in \ ++ $(srcdir)/../depcomp + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/depstand.m4 \ +@@ -63,14 +60,6 @@ + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = +-am__libgcjgc_la_SOURCES_DIST = allchblk.c alloc.c blacklst.c \ +- checksums.c dbg_mlc.c dyn_load.c finalize.c gc_dlopen.c \ +- gcj_mlc.c headers.c malloc.c mallocx.c mark.c mark_rts.c \ +- misc.c new_hblk.c obj_map.c os_dep.c pcr_interface.c \ +- ptr_chck.c real_malloc.c reclaim.c specific.c stubborn.c \ +- typd_mlc.c backgraph.c win32_threads.c pthread_support.c \ +- pthread_stop_world.c darwin_stop_world.c \ +- powerpc_darwin_mach_dep.s + @POWERPC_DARWIN_TRUE@am__objects_1 = powerpc_darwin_mach_dep.lo + am_libgcjgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \ + dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \ +@@ -80,14 +69,6 @@ + backgraph.lo win32_threads.lo pthread_support.lo \ + pthread_stop_world.lo darwin_stop_world.lo $(am__objects_1) + libgcjgc_la_OBJECTS = $(am_libgcjgc_la_OBJECTS) +-am__libgcjgc_convenience_la_SOURCES_DIST = allchblk.c alloc.c \ +- blacklst.c checksums.c dbg_mlc.c dyn_load.c finalize.c \ +- gc_dlopen.c gcj_mlc.c headers.c malloc.c mallocx.c mark.c \ +- mark_rts.c misc.c new_hblk.c obj_map.c os_dep.c \ +- pcr_interface.c ptr_chck.c real_malloc.c reclaim.c specific.c \ +- stubborn.c typd_mlc.c backgraph.c win32_threads.c \ +- pthread_support.c pthread_stop_world.c darwin_stop_world.c \ +- powerpc_darwin_mach_dep.s + am__objects_2 = allchblk.lo alloc.lo blacklst.lo checksums.lo \ + dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \ + headers.lo malloc.lo mallocx.lo mark.lo mark_rts.lo misc.lo \ +@@ -115,8 +96,6 @@ + LTCCASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) + SOURCES = $(libgcjgc_la_SOURCES) $(libgcjgc_convenience_la_SOURCES) +-DIST_SOURCES = $(am__libgcjgc_la_SOURCES_DIST) \ +- $(am__libgcjgc_convenience_la_SOURCES_DIST) + MULTISRCTOP = + MULTIBUILDTOP = + MULTIDIRS = +@@ -133,47 +112,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir dist dist-all distcheck ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-distdir = $(PACKAGE)-$(VERSION) +-top_distdir = $(distdir) +-am__remove_distdir = \ +- { test ! -d "$(distdir)" \ +- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr "$(distdir)"; }; } +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AM_CPPFLAGS = @AM_CPPFLAGS@ +@@ -314,7 +256,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AUTOMAKE_OPTIONS = foreign subdir-objects ++AUTOMAKE_OPTIONS = foreign subdir-objects no-dist + ACLOCAL_AMFLAGS = -I .. -I ../config + SUBDIRS = include testsuite + noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la +@@ -672,182 +614,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- $(am__remove_distdir) +- test -d "$(distdir)" || mkdir "$(distdir)" +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -755 \ +- -exec chmod u+rwx,go+rx {} \; -o \ +- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r "$(distdir)" +-dist-gzip: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) +- +-dist-bzip2: distdir +- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 +- $(am__remove_distdir) +- +-dist-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) +- +-dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz +- $(am__remove_distdir) +- +-dist-tarZ: distdir +- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z +- $(am__remove_distdir) +- +-dist-shar: distdir +- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz +- $(am__remove_distdir) +- +-dist-zip: distdir +- -rm -f $(distdir).zip +- zip -rq $(distdir).zip $(distdir) +- $(am__remove_distdir) +- +-dist dist-all: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) +- +-# This target untars the dist file and tries a VPATH configuration. Then +-# it guarantees that the distribution is self-contained by making another +-# tarfile. +-distcheck: dist +- case '$(DIST_ARCHIVES)' in \ +- *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ +- *.tar.xz*) \ +- xz -dc $(distdir).tar.xz | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ +- *.zip*) \ +- unzip $(distdir).zip ;;\ +- esac +- chmod -R a-w $(distdir); chmod a+w $(distdir) +- mkdir $(distdir)/_build +- mkdir $(distdir)/_inst +- chmod a-w $(distdir) +- test -d $(distdir)/_build || exit 0; \ +- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ +- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && am__cwd=`pwd` \ +- && $(am__cd) $(distdir)/_build \ +- && ../configure --srcdir=.. --prefix="$$dc_install_base" \ +- $(DISTCHECK_CONFIGURE_FLAGS) \ +- && $(MAKE) $(AM_MAKEFLAGS) \ +- && $(MAKE) $(AM_MAKEFLAGS) dvi \ +- && $(MAKE) $(AM_MAKEFLAGS) check \ +- && $(MAKE) $(AM_MAKEFLAGS) install \ +- && $(MAKE) $(AM_MAKEFLAGS) installcheck \ +- && $(MAKE) $(AM_MAKEFLAGS) uninstall \ +- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ +- distuninstallcheck \ +- && chmod -R a-w "$$dc_install_base" \ +- && ({ \ +- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ +- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ +- } || { rm -rf "$$dc_destdir"; exit 1; }) \ +- && rm -rf "$$dc_destdir" \ +- && $(MAKE) $(AM_MAKEFLAGS) dist \ +- && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ +- && cd "$$am__cwd" \ +- || exit 1 +- $(am__remove_distdir) +- @(echo "$(distdir) archives ready for distribution: "; \ +- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +-distuninstallcheck: +- @$(am__cd) '$(distuninstallcheck_dir)' \ +- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ +- || { echo "ERROR: files left after uninstall:" ; \ +- if test -n "$(DESTDIR)"; then \ +- echo " (check DESTDIR support)"; \ +- fi ; \ +- $(distuninstallcheck_listfiles) ; \ +- exit 1; } >&2 +-distcleancheck: distclean +- @if test '$(srcdir)' = . ; then \ +- echo "ERROR: distcleancheck can only run from a VPATH build" ; \ +- exit 1 ; \ +- fi +- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ +- || { echo "ERROR: files left in build directory after distclean:" ; \ +- $(distcleancheck_listfiles) ; \ +- exit 1; } >&2 + check-am: all-am + check: check-recursive + all-am: Makefile $(LTLIBRARIES) all-multi +@@ -960,21 +726,19 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-multi am--refresh check check-am clean \ + clean-generic clean-libtool clean-multi \ +- clean-noinstLTLIBRARIES ctags ctags-recursive dist dist-all \ +- dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \ +- dist-zip distcheck distclean distclean-compile \ +- distclean-generic distclean-libtool distclean-multi \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-multi \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-multi mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \ +- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am ++ clean-noinstLTLIBRARIES ctags ctags-recursive distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-multi distclean-tags dvi dvi-am html html-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-multi install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-multi mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ mostlyclean-multi pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + override CFLAGS := $(filter-out $(O0_CFLAGS), $(CFLAGS)) $(O0_CFLAGS) + +Index: boehm-gc/include/Makefile.in +=================================================================== +--- a/src/boehm-gc/include/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/boehm-gc/include/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,9 +36,9 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = include +-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/gc_config.h.in \ +- $(srcdir)/gc_ext_config.h.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/gc_config.h.in $(srcdir)/gc_ext_config.h.in \ ++ $(noinst_HEADERS) + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/depstand.m4 \ +@@ -55,11 +55,9 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + HEADERS = $(noinst_HEADERS) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AM_CPPFLAGS = @AM_CPPFLAGS@ +@@ -323,37 +321,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(HEADERS) gc_config.h gc_ext_config.h +@@ -453,16 +420,15 @@ + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool ctags distclean distclean-generic distclean-hdr \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am tags uninstall uninstall-am + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +Index: boehm-gc/ChangeLog +=================================================================== +--- a/src/boehm-gc/ChangeLog (.../tags/gcc_4_7_2_release) ++++ b/src/boehm-gc/ChangeLog (.../branches/gcc-4_7-branch) +@@ -1,3 +1,11 @@ ++2012-09-20 Jakub Jelinek ++ ++ PR other/43620 ++ * Makefile.am (AUTOMAKE_OPTIONS): Add no-dist. ++ * Makefile.in: Regenerated. ++ * include/Makefile.in: Regenerated. ++ * testsuite/Makefile.in: Regenerated. ++ + 2012-09-20 Release Manager + + * GCC 4.7.2 released. +Index: boehm-gc/testsuite/Makefile.in +=================================================================== +--- a/src/boehm-gc/testsuite/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/boehm-gc/testsuite/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = testsuite +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/depstand.m4 \ +@@ -53,10 +53,8 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir + RUNTEST = runtest +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AM_CPPFLAGS = @AM_CPPFLAGS@ +@@ -267,37 +265,6 @@ + -l='$(DEJATOOL)'; for tool in $$l; do \ + rm -f $$tool.sum $$tool.log; \ + done +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU + check: check-am +@@ -399,8 +366,8 @@ + + .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \ + clean-libtool distclean distclean-DEJAGNU distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-libtool dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ +Index: boehm-gc/Makefile.am +=================================================================== +--- a/src/boehm-gc/Makefile.am (.../tags/gcc_4_7_2_release) ++++ b/src/boehm-gc/Makefile.am (.../branches/gcc-4_7-branch) +@@ -4,7 +4,7 @@ + ## files that should be in the distribution are not mentioned in this + ## Makefile.am. + +-AUTOMAKE_OPTIONS = foreign subdir-objects ++AUTOMAKE_OPTIONS = foreign subdir-objects no-dist + ACLOCAL_AMFLAGS = -I .. -I ../config + + SUBDIRS = include testsuite +Index: libjava/classpath/Makefile.in +=================================================================== +--- a/src/libjava/classpath/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,25 +35,15 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/../../compile \ +- $(srcdir)/../../config.guess $(srcdir)/../../config.sub \ +- $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \ +- $(srcdir)/../../missing $(srcdir)/../../mkinstalldirs \ +- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(top_srcdir)/configure \ ++DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ ++ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/configure $(am__configure_deps) \ ++ $(srcdir)/../../mkinstalldirs \ + $(top_srcdir)/gnu/classpath/Configuration.java.in \ + $(top_srcdir)/gnu/java/security/Configuration.java.in \ + $(top_srcdir)/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \ + $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader.in \ +- $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in \ +- ../../ABOUT-NLS ../../COPYING ../../COPYING.LIB \ +- ../../ChangeLog ../../README ../../compile ../../config.guess \ +- ../../config.rpath ../../config.sub ../../depcomp \ +- ../../install-sh ../../ltmain.sh ../../missing \ +- ../../mkinstalldirs ../../ylwrap AUTHORS COPYING ChangeLog \ +- INSTALL NEWS TODO compile config.guess config.rpath config.sub \ +- depcomp install-sh ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig \ +- ltmain.sh missing mkinstalldirs ++ $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -92,7 +82,6 @@ + resource/META-INF/services/javax.sound.sampled.spi.MixerProvider + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + MULTISRCTOP = + MULTIBUILDTOP = + MULTIDIRS = +@@ -109,46 +98,9 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir dist dist-all distcheck ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-distdir = $(PACKAGE)-$(VERSION) +-top_distdir = $(distdir) +-am__remove_distdir = \ +- { test ! -d "$(distdir)" \ +- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr "$(distdir)"; }; } +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -582,185 +534,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- $(am__remove_distdir) +- test -d "$(distdir)" || mkdir "$(distdir)" +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook +- -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -755 \ +- -exec chmod u+rwx,go+rx {} \; -o \ +- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r "$(distdir)" +-dist-gzip: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) +- +-dist-bzip2: distdir +- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 +- $(am__remove_distdir) +- +-dist-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) +- +-dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz +- $(am__remove_distdir) +- +-dist-tarZ: distdir +- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z +- $(am__remove_distdir) +- +-dist-shar: distdir +- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz +- $(am__remove_distdir) +- +-dist-zip: distdir +- -rm -f $(distdir).zip +- zip -rq $(distdir).zip $(distdir) +- $(am__remove_distdir) +- +-dist dist-all: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) +- +-# This target untars the dist file and tries a VPATH configuration. Then +-# it guarantees that the distribution is self-contained by making another +-# tarfile. +-distcheck: dist +- case '$(DIST_ARCHIVES)' in \ +- *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ +- *.tar.xz*) \ +- xz -dc $(distdir).tar.xz | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ +- *.zip*) \ +- unzip $(distdir).zip ;;\ +- esac +- chmod -R a-w $(distdir); chmod a+w $(distdir) +- mkdir $(distdir)/_build +- mkdir $(distdir)/_inst +- chmod a-w $(distdir) +- test -d $(distdir)/_build || exit 0; \ +- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ +- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && am__cwd=`pwd` \ +- && $(am__cd) $(distdir)/_build \ +- && ../configure --srcdir=.. --prefix="$$dc_install_base" \ +- $(DISTCHECK_CONFIGURE_FLAGS) \ +- && $(MAKE) $(AM_MAKEFLAGS) \ +- && $(MAKE) $(AM_MAKEFLAGS) dvi \ +- && $(MAKE) $(AM_MAKEFLAGS) check \ +- && $(MAKE) $(AM_MAKEFLAGS) install \ +- && $(MAKE) $(AM_MAKEFLAGS) installcheck \ +- && $(MAKE) $(AM_MAKEFLAGS) uninstall \ +- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ +- distuninstallcheck \ +- && chmod -R a-w "$$dc_install_base" \ +- && ({ \ +- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ +- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ +- } || { rm -rf "$$dc_destdir"; exit 1; }) \ +- && rm -rf "$$dc_destdir" \ +- && $(MAKE) $(AM_MAKEFLAGS) dist \ +- && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ +- && cd "$$am__cwd" \ +- || exit 1 +- $(am__remove_distdir) +- @(echo "$(distdir) archives ready for distribution: "; \ +- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +-distuninstallcheck: +- @$(am__cd) '$(distuninstallcheck_dir)' \ +- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ +- || { echo "ERROR: files left after uninstall:" ; \ +- if test -n "$(DESTDIR)"; then \ +- echo " (check DESTDIR support)"; \ +- fi ; \ +- $(distuninstallcheck_listfiles) ; \ +- exit 1; } >&2 +-distcleancheck: distclean +- @if test '$(srcdir)' = . ; then \ +- echo "ERROR: distcleancheck can only run from a VPATH build" ; \ +- exit 1 ; \ +- fi +- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ +- || { echo "ERROR: files left in build directory after distclean:" ; \ +- $(distcleancheck_listfiles) ; \ +- exit 1; } >&2 + check-am: all-am + check: check-recursive + all-am: Makefile all-multi +@@ -869,20 +642,17 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-multi am--refresh check check-am clean \ + clean-generic clean-libtool clean-multi ctags ctags-recursive \ +- dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \ +- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ +- distclean-generic distclean-libtool distclean-multi \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-multi \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-multi mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-multi pdf pdf-am ps ps-am tags \ +- tags-recursive uninstall uninstall-am ++ distclean distclean-generic distclean-libtool distclean-multi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-multi install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-multi mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \ ++ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am + + + native: lib +Index: libjava/classpath/scripts/Makefile.in +=================================================================== +--- a/src/libjava/classpath/scripts/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/scripts/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,8 +35,8 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = scripts +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/check_jni_methods.sh.in $(srcdir)/classpath.spec.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/classpath.spec.in $(srcdir)/check_jni_methods.sh.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -69,8 +69,6 @@ + CONFIG_CLEAN_FILES = classpath.spec check_jni_methods.sh + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -331,37 +329,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -460,13 +427,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +Index: libjava/classpath/resource/Makefile.in +=================================================================== +--- a/src/libjava/classpath/resource/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/resource/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = resource +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -69,7 +69,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +@@ -93,7 +92,6 @@ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(loggingdir)" "$(DESTDIR)$(securitydir)" + DATA = $(logging_DATA) $(security_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -393,37 +391,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(DATA) +@@ -525,17 +492,17 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-loggingDATA install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-securityDATA install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-loggingDATA uninstall-securityDATA ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-loggingDATA install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-securityDATA \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-loggingDATA \ ++ uninstall-securityDATA + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +Index: libjava/classpath/tools/Makefile.in +=================================================================== +--- a/src/libjava/classpath/tools/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/tools/Makefile.in (.../branches/gcc-4_7-branch) +@@ -44,13 +44,13 @@ + @CREATE_WRAPPERS_TRUE@@INSTALL_BINARIES_FALSE@ $(am__EXEEXT_2) + @CREATE_GJDOC_TRUE@@CREATE_WRAPPERS_FALSE@am__append_2 = gjdoc + subdir = tools +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/gappletviewer.in $(srcdir)/gjar.in \ +- $(srcdir)/gjarsigner.in $(srcdir)/gjavah.in $(srcdir)/gjdoc.in \ +- $(srcdir)/gkeytool.in $(srcdir)/gnative2ascii.in \ +- $(srcdir)/gorbd.in $(srcdir)/grmic.in $(srcdir)/grmid.in \ +- $(srcdir)/grmiregistry.in $(srcdir)/gserialver.in \ +- $(srcdir)/gtnameserv.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/gappletviewer.in $(srcdir)/gjarsigner.in \ ++ $(srcdir)/gkeytool.in $(srcdir)/gjar.in \ ++ $(srcdir)/gnative2ascii.in $(srcdir)/gserialver.in \ ++ $(srcdir)/grmiregistry.in $(srcdir)/gtnameserv.in \ ++ $(srcdir)/gorbd.in $(srcdir)/grmid.in $(srcdir)/grmic.in \ ++ $(srcdir)/gjavah.in $(srcdir)/gjdoc.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -96,7 +96,6 @@ + @CREATE_WRAPPERS_TRUE@ $(am__EXEEXT_1) + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" + PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) +-am__gappletviewer_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gappletviewer_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gappletviewer-toolwrapper.$(OBJEXT) + gappletviewer_OBJECTS = $(am_gappletviewer_OBJECTS) +@@ -104,14 +103,12 @@ + gappletviewer_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gappletviewer_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gjar_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjar_OBJECTS = gjar-toolwrapper.$(OBJEXT) + gjar_OBJECTS = $(am_gjar_OBJECTS) + gjar_LDADD = $(LDADD) + gjar_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gjar_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gjarsigner_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjarsigner_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gjarsigner-toolwrapper.$(OBJEXT) + gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS) +@@ -119,7 +116,6 @@ + gjarsigner_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gjarsigner_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gjavah_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjavah_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gjavah-toolwrapper.$(OBJEXT) + gjavah_OBJECTS = $(am_gjavah_OBJECTS) +@@ -127,14 +123,12 @@ + gjavah_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gjavah_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gjdoc_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjdoc_OBJECTS = gjdoc-toolwrapper.$(OBJEXT) + gjdoc_OBJECTS = $(am_gjdoc_OBJECTS) + gjdoc_LDADD = $(LDADD) + gjdoc_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gjdoc_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gkeytool_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gkeytool_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gkeytool-toolwrapper.$(OBJEXT) + gkeytool_OBJECTS = $(am_gkeytool_OBJECTS) +@@ -142,7 +136,6 @@ + gkeytool_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gkeytool_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gnative2ascii_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gnative2ascii_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gnative2ascii-toolwrapper.$(OBJEXT) + gnative2ascii_OBJECTS = $(am_gnative2ascii_OBJECTS) +@@ -150,28 +143,24 @@ + gnative2ascii_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gnative2ascii_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gorbd_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gorbd_OBJECTS = gorbd-toolwrapper.$(OBJEXT) + gorbd_OBJECTS = $(am_gorbd_OBJECTS) + gorbd_LDADD = $(LDADD) + gorbd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gorbd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__grmic_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_grmic_OBJECTS = grmic-toolwrapper.$(OBJEXT) + grmic_OBJECTS = $(am_grmic_OBJECTS) + grmic_LDADD = $(LDADD) + grmic_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(grmic_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__grmid_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_grmid_OBJECTS = grmid-toolwrapper.$(OBJEXT) + grmid_OBJECTS = $(am_grmid_OBJECTS) + grmid_LDADD = $(LDADD) + grmid_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(grmid_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__grmiregistry_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_grmiregistry_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ grmiregistry-toolwrapper.$(OBJEXT) + grmiregistry_OBJECTS = $(am_grmiregistry_OBJECTS) +@@ -179,7 +168,6 @@ + grmiregistry_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(grmiregistry_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gserialver_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gserialver_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gserialver-toolwrapper.$(OBJEXT) + gserialver_OBJECTS = $(am_gserialver_OBJECTS) +@@ -187,7 +175,6 @@ + gserialver_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gserialver_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gtnameserv_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gtnameserv_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gtnameserv-toolwrapper.$(OBJEXT) + gtnameserv_OBJECTS = $(am_gtnameserv_OBJECTS) +@@ -235,17 +222,9 @@ + $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \ + $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \ + $(gserialver_SOURCES) $(gtnameserv_SOURCES) +-DIST_SOURCES = $(am__gappletviewer_SOURCES_DIST) \ +- $(am__gjar_SOURCES_DIST) $(am__gjarsigner_SOURCES_DIST) \ +- $(am__gjavah_SOURCES_DIST) $(am__gjdoc_SOURCES_DIST) \ +- $(am__gkeytool_SOURCES_DIST) $(am__gnative2ascii_SOURCES_DIST) \ +- $(am__gorbd_SOURCES_DIST) $(am__grmic_SOURCES_DIST) \ +- $(am__grmid_SOURCES_DIST) $(am__grmiregistry_SOURCES_DIST) \ +- $(am__gserialver_SOURCES_DIST) $(am__gtnameserv_SOURCES_DIST) + DATA = $(noinst_DATA) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -1199,40 +1178,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +@@ -1343,9 +1288,9 @@ + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ +- ctags dist-hook distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-binPROGRAMS \ ++ ctags distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install install-am install-binPROGRAMS \ + install-binSCRIPTS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ +Index: libjava/classpath/configure.ac +=================================================================== +--- a/src/libjava/classpath/configure.ac (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/configure.ac (.../branches/gcc-4_7-branch) +@@ -75,7 +75,7 @@ + AC_SUBST(CLASSPATH_CONVENIENCE) + + AC_PREREQ(2.64) +-AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) ++AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar no-dist -Wno-portability]) + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local/classpath) + +Index: libjava/classpath/doc/Makefile.in +=================================================================== +--- a/src/libjava/classpath/doc/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/doc/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = doc +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in texinfo.tex ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + INFO_DEPS = cp-tools.info + am__TEXINFO_TEX_DIR = $(srcdir)/../../gcc/doc/include + DVIS = cp-tools.dvi +@@ -116,37 +115,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -756,81 +728,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @list='$(MANS)'; if test -n "$$list"; then \ +- list=`for p in $$list; do \ +- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ +- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ +- if test -n "$$list" && \ +- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ +- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ +- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ +- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ +- echo " typically \`make maintainer-clean' will remove them" >&2; \ +- exit 1; \ +- else :; fi; \ +- else :; fi +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-info + check-am: all-am + check: check-recursive + all-am: Makefile $(INFO_DEPS) $(MANS) all-local +@@ -1020,18 +917,18 @@ + all all-am all-local check check-am clean clean-aminfo \ + clean-generic clean-libtool ctags ctags-recursive dist-info \ + distclean distclean-generic distclean-libtool distclean-tags \ +- distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-man1 install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs installdirs-am maintainer-clean \ +- maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ +- mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-dvi-am uninstall-html-am uninstall-info-am \ +- uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am ++ dvi dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-man1 \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-aminfo \ ++ maintainer-clean-generic mostlyclean mostlyclean-aminfo \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am uninstall-dvi-am \ ++ uninstall-html-am uninstall-info-am uninstall-man \ ++ uninstall-man1 uninstall-pdf-am uninstall-ps-am + + + .texinfo.dvi: +Index: libjava/classpath/doc/api/Makefile.in +=================================================================== +--- a/src/libjava/classpath/doc/api/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/doc/api/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = doc/api +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -69,9 +69,7 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + DATA = $(noinst_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -330,37 +328,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(DATA) +@@ -459,16 +426,16 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-data-local \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-local + + + @CREATE_API_DOCS_TRUE@install-data-local: +Index: libjava/classpath/external/Makefile.in +=================================================================== +--- a/src/libjava/classpath/external/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/external/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ +@@ -79,37 +78,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -496,65 +468,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-recursive + all-am: Makefile +@@ -657,13 +570,13 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am +Index: libjava/classpath/external/jsr166/Makefile.in +=================================================================== +--- a/src/libjava/classpath/external/jsr166/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/external/jsr166/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/jsr166 +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -398,37 +396,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -527,13 +494,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +Index: libjava/classpath/external/sax/Makefile.in +=================================================================== +--- a/src/libjava/classpath/external/sax/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/external/sax/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/sax +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -366,37 +364,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -495,13 +462,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +Index: libjava/classpath/external/w3c_dom/Makefile.in +=================================================================== +--- a/src/libjava/classpath/external/w3c_dom/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/external/w3c_dom/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/w3c_dom +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -473,37 +471,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -602,13 +569,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +Index: libjava/classpath/external/relaxngDatatype/Makefile.in +=================================================================== +--- a/src/libjava/classpath/external/relaxngDatatype/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/external/relaxngDatatype/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/relaxngDatatype +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -338,37 +336,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -467,13 +434,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +Index: libjava/classpath/include/Makefile.in +=================================================================== +--- a/src/libjava/classpath/include/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/include/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = include +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/config.h.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ +@@ -69,8 +69,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -500,37 +498,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + @CREATE_JNI_HEADERS_FALSE@all-local: +@@ -632,8 +599,8 @@ + + .PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool distclean distclean-generic distclean-hdr \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-libtool dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ +Index: libjava/classpath/native/jni/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ +@@ -79,36 +78,9 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -510,65 +482,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-recursive + all-am: Makefile all-local +@@ -671,16 +584,16 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-local check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive distclean \ +- distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am ++ distclean-generic distclean-libtool distclean-tags dvi dvi-am \ ++ html html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + + all-local: +Index: libjava/classpath/native/jni/classpath/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/classpath/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/classpath/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/classpath +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -86,10 +86,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libclasspath_la_SOURCES) +-DIST_SOURCES = $(libclasspath_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -445,37 +443,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -581,8 +548,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ +Index: libjava/classpath/native/jni/gstreamer-peer/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/gstreamer-peer/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/gstreamer-peer/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/gstreamer-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -114,10 +114,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgstreamerpeer_la_SOURCES) +-DIST_SOURCES = $(libgstreamerpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -514,37 +512,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -653,8 +620,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/jni/midi-dssi/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/midi-dssi/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/midi-dssi/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/midi-dssi +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -114,10 +114,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgjsmdssi_la_SOURCES) +-DIST_SOURCES = $(libgjsmdssi_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -496,37 +494,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -635,8 +602,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/jni/gconf-peer/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/gconf-peer/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/gconf-peer/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/gconf-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgconfpeer_la_SOURCES) +-DIST_SOURCES = $(libgconfpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -489,37 +487,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -628,8 +595,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/jni/java-io/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/java-io/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/java-io/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-io +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -111,10 +111,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavaio_la_SOURCES) +-DIST_SOURCES = $(libjavaio_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -494,37 +492,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -633,8 +600,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/jni/native-lib/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/native-lib/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/native-lib/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/native-lib +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -86,10 +86,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libclasspathnative_la_SOURCES) +-DIST_SOURCES = $(libclasspathnative_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -448,37 +446,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -584,8 +551,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ +Index: libjava/classpath/native/jni/java-util/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/java-util/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/java-util/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-util +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -108,10 +108,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavautil_la_SOURCES) +-DIST_SOURCES = $(libjavautil_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -483,37 +481,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -622,8 +589,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/jni/java-lang/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/java-lang/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/java-lang/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-lang +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -123,12 +123,8 @@ + SOURCES = $(libjavalang_la_SOURCES) \ + $(libjavalangmanagement_la_SOURCES) \ + $(libjavalangreflect_la_SOURCES) +-DIST_SOURCES = $(libjavalang_la_SOURCES) \ +- $(libjavalangmanagement_la_SOURCES) \ +- $(libjavalangreflect_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -521,37 +517,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -660,8 +625,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/jni/midi-alsa/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/midi-alsa/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/midi-alsa/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/midi-alsa +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -114,10 +114,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgjsmalsa_la_SOURCES) +-DIST_SOURCES = $(libgjsmalsa_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -496,37 +494,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -635,8 +602,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/jni/java-nio/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/java-nio/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/java-nio/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-nio +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -119,10 +119,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavanio_la_SOURCES) +-DIST_SOURCES = $(libjavanio_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -519,37 +517,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -658,8 +625,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/jni/java-net/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/java-net/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/java-net/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-net +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -96,10 +96,6 @@ + $(top_builddir)/native/jni/classpath/jcl.lo \ + $(top_builddir)/native/jni/native-lib/libclasspathnative.la \ + $(am__DEPENDENCIES_1) +-am__libjavanet_la_SOURCES_DIST = javanet.c javanet.h \ +- java_net_VMInetAddress.c java_net_VMNetworkInterface.c \ +- java_net_VMURLConnection.c gnu_java_net_VMPlainSocketImpl.c \ +- gnu_java_net_local_LocalSocketImpl.c local.c local.h + @ENABLE_LOCAL_SOCKETS_FALSE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo + @ENABLE_LOCAL_SOCKETS_TRUE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo \ + @ENABLE_LOCAL_SOCKETS_TRUE@ local.lo +@@ -121,10 +117,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavanet_la_SOURCES) +-DIST_SOURCES = $(am__libjavanet_la_SOURCES_DIST) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -518,37 +512,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -657,8 +620,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/jni/java-math/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/java-math/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/java-math/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-math +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavamath_la_SOURCES) +-DIST_SOURCES = $(libjavamath_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -487,37 +485,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -626,8 +593,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/jni/xmlj/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/xmlj/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/xmlj/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/xmlj +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -110,10 +110,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libxmlj_la_SOURCES) +-DIST_SOURCES = $(libxmlj_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -511,37 +509,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -650,8 +617,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/jni/qt-peer/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/qt-peer/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/qt-peer/Makefile.in (.../branches/gcc-4_7-branch) +@@ -39,7 +39,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/qt-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -116,10 +116,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libqtpeer_la_SOURCES) $(nodist_libqtpeer_la_SOURCES) +-DIST_SOURCES = $(libqtpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -577,37 +575,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +@@ -717,8 +684,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ +Index: libjava/classpath/native/jni/gtk-peer/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jni/gtk-peer/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jni/gtk-peer/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/gtk-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -150,10 +150,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgtkpeer_la_SOURCES) +-DIST_SOURCES = $(libgtkpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -620,37 +618,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -759,8 +726,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/Makefile.in (.../branches/gcc-4_7-branch) +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ +@@ -79,36 +78,9 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -498,65 +470,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-recursive + all-am: Makefile +@@ -659,13 +572,13 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am +Index: libjava/classpath/native/jawt/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/jawt/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/jawt/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jawt +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjawt_la_SOURCES) +-DIST_SOURCES = $(libjawt_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -492,37 +490,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -631,8 +598,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/native/fdlibm/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/fdlibm/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/fdlibm/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/fdlibm +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -95,10 +95,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libfdlibm_la_SOURCES) +-DIST_SOURCES = $(libfdlibm_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -553,37 +551,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -689,8 +656,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ +Index: libjava/classpath/native/plugin/Makefile.in +=================================================================== +--- a/src/libjava/classpath/native/plugin/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/native/plugin/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/plugin +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgcjwebplugin_la_SOURCES) +-DIST_SOURCES = $(libgcjwebplugin_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -497,37 +495,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -636,8 +603,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +Index: libjava/classpath/lib/Makefile.in +=================================================================== +--- a/src/libjava/classpath/lib/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/lib/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,9 +36,9 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = lib +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/copy-vmresources.sh.in $(srcdir)/gen-classlist.sh.in \ +- $(srcdir)/mkcollections.pl.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/mkcollections.pl.in $(srcdir)/gen-classlist.sh.in \ ++ $(srcdir)/copy-vmresources.sh.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -72,9 +72,7 @@ + copy-vmresources.sh + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + DATA = $(noinst_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -356,40 +354,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook + check-am: all-am + check: check-am + all-am: Makefile $(DATA) +@@ -492,17 +456,16 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-local install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-local ++ clean-local distclean distclean-generic distclean-libtool dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-local + + + sinclude $(JAVA_DEPEND) +Index: libjava/classpath/ChangeLog.gcj +=================================================================== +--- a/src/libjava/classpath/ChangeLog.gcj (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/ChangeLog.gcj (.../branches/gcc-4_7-branch) +@@ -1,3 +1,42 @@ ++2012-09-20 Jakub Jelinek ++ ++ PR other/43620 ++ * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. ++ * Makefile.in: Regenerated. ++ * doc/Makefile.in: Regenerated. ++ * doc/api/Makefile.in: Regenerated. ++ * examples/Makefile.in: Regenerated. ++ * external/Makefile.in: Regenerated. ++ * external/jsr166/Makefile.in: Regenerated. ++ * external/relaxngDatatype/Makefile.in: Regenerated. ++ * external/sax/Makefile.in: Regenerated. ++ * external/w3c_dom/Makefile.in: Regenerated. ++ * include/Makefile.in: Regenerated. ++ * lib/Makefile.in: Regenerated. ++ * native/Makefile.in: Regenerated. ++ * native/fdlibm/Makefile.in: Regenerated. ++ * native/jawt/Makefile.in: Regenerated. ++ * native/jni/Makefile.in: Regenerated. ++ * native/jni/classpath/Makefile.in: Regenerated. ++ * native/jni/gconf-peer/Makefile.in: Regenerated. ++ * native/jni/gstreamer-peer/Makefile.in: Regenerated. ++ * native/jni/gtk-peer/Makefile.in: Regenerated. ++ * native/jni/java-io/Makefile.in: Regenerated. ++ * native/jni/java-lang/Makefile.in: Regenerated. ++ * native/jni/java-math/Makefile.in: Regenerated. ++ * native/jni/java-net/Makefile.in: Regenerated. ++ * native/jni/java-nio/Makefile.in: Regenerated. ++ * native/jni/java-util/Makefile.in: Regenerated. ++ * native/jni/midi-alsa/Makefile.in: Regenerated. ++ * native/jni/midi-dssi/Makefile.in: Regenerated. ++ * native/jni/native-lib/Makefile.in: Regenerated. ++ * native/jni/qt-peer/Makefile.in: Regenerated. ++ * native/jni/xmlj/Makefile.in: Regenerated. ++ * native/plugin/Makefile.in: Regenerated. ++ * resource/Makefile.in: Regenerated. ++ * scripts/Makefile.in: Regenerated. ++ * tools/Makefile.in: Regenerated. ++ + 2012-01-01 Jakub Jelinek + + * gnu/java/rmi/registry/RegistryImpl.java (version): Update +Index: libjava/classpath/examples/Makefile.in +=================================================================== +--- a/src/libjava/classpath/examples/Makefile.in (.../tags/gcc_4_7_2_release) ++++ b/src/libjava/classpath/examples/Makefile.in (.../branches/gcc-4_7-branch) +@@ -36,8 +36,8 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = examples +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/Makefile.java2d.in $(srcdir)/Makefile.jawt.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.jawt.in $(srcdir)/Makefile.java2d.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -70,7 +70,6 @@ + CONFIG_CLEAN_FILES = Makefile.jawt Makefile.java2d + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +@@ -94,7 +93,6 @@ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(exampledir)" + DATA = $(example_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -419,40 +417,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +@@ -557,17 +521,17 @@ + .MAKE: all check install install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-local install-dvi install-dvi-am \ +- install-exampleDATA install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-exampleDATA uninstall-local ++ clean-local distclean distclean-generic distclean-libtool dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exampleDATA install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-exampleDATA uninstall-local + + + # Make sure all sources and icons are also installed so users can use them. +Index: libgcc/config.host +=================================================================== +--- a/src/libgcc/config.host (.../tags/gcc_4_7_2_release) ++++ b/src/libgcc/config.host (.../branches/gcc-4_7-branch) +@@ -213,7 +213,7 @@ + esac + ;; + *-*-openbsd*) +- tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic" ++ tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip" + case ${target_thread_file} in + posix) + tmake_file="$tmake_file t-openbsd-thread" +Index: libgcc/unwind-dw2-fde-dip.c +=================================================================== +--- a/src/libgcc/unwind-dw2-fde-dip.c (.../tags/gcc_4_7_2_release) ++++ b/src/libgcc/unwind-dw2-fde-dip.c (.../branches/gcc-4_7-branch) +@@ -33,7 +33,7 @@ + + #include "tconfig.h" + #include "tsystem.h" +-#ifndef inhibit_libc ++#if !defined(inhibit_libc) && !defined(__OpenBSD__) + #include /* Get DT_CONFIG. */ + #endif + #include "coretypes.h" +@@ -60,6 +60,12 @@ + #endif + + #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ ++ && defined(__OpenBSD__) ++# define ElfW(type) Elf_##type ++# define USE_PT_GNU_EH_FRAME ++#endif ++ ++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ + && defined(TARGET_DL_ITERATE_PHDR) \ + && defined(__sun__) && defined(__svr4__) + # define USE_PT_GNU_EH_FRAME +Index: libgcc/ChangeLog +=================================================================== +--- a/src/libgcc/ChangeLog (.../tags/gcc_4_7_2_release) ++++ b/src/libgcc/ChangeLog (.../branches/gcc-4_7-branch) +@@ -1,3 +1,10 @@ ++2012-10-06 Mark Kettenis ++ ++ * config.host (*-*-openbsd*): Add t-eh-dw2-dip to tmake_file. ++ * unwind-dw2-fde-dip.c: Don't include on OpenBSD. ++ (USE_PT_GNU_EH_FRAME): Define for OpenBSD. ++ (ElfW): Likewise. ++ + 2012-09-20 Release Manager + + * GCC 4.7.2 released. +Index: gcc/DATESTAMP +=================================================================== +--- a/src/gcc/DATESTAMP (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/DATESTAMP (.../branches/gcc-4_7-branch) +@@ -1 +1 @@ +-20120920 ++20121015 +Index: gcc/ChangeLog +=================================================================== +--- a/src/gcc/ChangeLog (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/ChangeLog (.../branches/gcc-4_7-branch) +@@ -1,3 +1,214 @@ ++2012-09-15 Uros Bizjak ++ ++ Backport from mainline ++ 2012-10-15 Uros Bizjak ++ ++ * config/i386/sse.md (UNSPEC_MOVU): Remove. ++ (UNSPEC_LOADU): New. ++ (UNSPEC_STOREU): Ditto. ++ (_movu): Split to ... ++ (_loadu): ... this and ... ++ (_storeu) ... this. ++ (_movdqu): Split to ... ++ (_loaddqu): ... this and ... ++ (_storedqu): ... this. ++ (*sse4_2_pcmpestr_unaligned): Update. ++ (*sse4_2_pcmpistr_unaligned): Ditto. ++ ++ * config/i386/i386.c (ix86_avx256_split_vector_move_misalign): Use ++ gen_avx_load{dqu,ups,upd}256 to load from unaligned memory and ++ gen_avx_store{dqu,ups,upd}256 to store to unaligned memory. ++ (ix86_expand_vector_move_misalign): Use gen_sse_loadups or ++ gen_sse2_load{dqu,upd} to load from unaligned memory and ++ gen_sse_loadups or gen_sse2_store{dqu,upd}256 to store to ++ unaligned memory. ++ (struct builtin_description bdesc_spec) : ++ Use CODE_FOR_sse_loadups. ++ : Use CODE_FOR_sse2_loadupd. ++ : Use CODE_FOR_sse2_loaddqu. ++ : Use CODE_FOR_sse_storeups. ++ : Use CODE_FOR_sse2_storeupd. ++ : Use CODE_FOR_sse2_storedqu. ++ : Use CODE_FOR_avx_loadups256. ++ : Use CODE_FOR_avx_loadupd256. ++ : Use CODE_FOR_avx_loaddqu256. ++ : Use CODE_FOR_avx_storeups256. ++ : Use CODE_FOR_avx_storeupd256. ++ : Use CODE_FOR_avx_storedqu256. ++ ++2012-10-15 Steven Bosscher ++ ++ Backport from trunk (r190222): ++ ++ PR tree-optimization/54146 ++ * ifcvt.c: Include pointer-set.h. ++ (cond_move_process_if_block): Change type of then_regs and ++ else_regs from alloca'd array to pointer_sets. ++ (check_cond_move_block): Update for this change. ++ (cond_move_convert_if_block): Likewise. ++ * Makefile.in: Fix dependencies for ifcvt.o. ++ ++2012-10-15 Richard Guenther ++ ++ PR tree-optimization/54920 ++ * tree-ssa-pre.c (create_expression_by_pieces): Properly ++ allocate temporary storage for all NARY elements. ++ ++2012-10-08 Georg-Johann Lay ++ ++ PR target/54854 ++ * doc/invoke.texi (AVR Options): Deprecate -mshort-calls. ++ ++2012-10-05 Mark Kettenis ++ ++ * config.gcc (*-*-openbsd4.[3-9]|*-*-openbsd[5-9]*): Set ++ default_use_cxa_atexit to yes. ++ ++2012-10-05 John David Anglin ++ ++ * config/pa/pa.md: Adjust unamed HImode add insn pattern. ++ ++2012-10-05 Jan Hubicka ++ Jakub Jelinek ++ ++ PR tree-optimization/33763 ++ * tree-inline.c (expand_call_inline): Silently ignore always_inline ++ attribute for redefined extern inline functions. ++ ++2012-10-03 H.J. Lu ++ ++ Backported from mainline ++ 2012-10-03 Andrew W. Nosenko ++ ++ * config/i386/driver-i386.c (host_detect_local_cpu): Fix logic ++ in SSE and YMM state support check for -march=native. ++ ++2012-10-03 Alexandre Oliva ++ ++ PR debug/53135 ++ * dwarf2out.c (value_format): Use block4 for dw_val_class_loc ++ when needed. ++ ++2012-10-02 H.J. Lu ++ ++ Backported from mainline ++ 2012-10-02 H.J. Lu ++ ++ PR target/54785 ++ * doc/invoke.texi: Document -mprefer-avx128. ++ ++2012-10-02 H.J. Lu ++ ++ Backported from mainline ++ 2012-10-02 H.J. Lu ++ ++ PR target/54741 ++ * config/i386/driver-i386.c (XCR_XFEATURE_ENABLED_MASK): New. ++ (XSTATE_FP): Likewise. ++ (XSTATE_SSE): Likewise. ++ (XSTATE_YMM): Likewise. ++ (host_detect_local_cpu): Disable AVX, AVX2, FMA, FMA4 and XOP if ++ SSE and YMM states aren't supported. ++ ++2012-10-01 Tom de Vries ++ ++ * var-tracking.c (set_dv_changed): Add an 'inline' function specifier to ++ the prototype. ++ ++2012-10-01 Andreas Krebbel ++ ++ PR target/54746 ++ * config/s390/s390.c (s390_option_override): Add missing break. ++ ++2012-09-29 Andreas Tobler ++ ++ Backport from mainline ++ 2012-09-29 Andreas Tobler ++ ++ * config.gcc: Replace 'host' with 'target' when configuring for ++ powerpc64*-*-freebsd. ++ ++2012-09-28 Meador Inge ++ ++ Backport from mainline ++ 2012-09-27 Meador Inge ++ ++ * gcc-ar.c (main): Handle the returning of the sub-process error ++ code correctly. ++ ++2012-09-28 Georg-Johann Lay ++ ++ Backport from 2012-09-28 trunk r191821. ++ * config/avr/avr.c (avr_pgm_check_var_decl): Fix non-error diagnostic. ++ ++2012-09-27 Jakub Jelinek ++ ++ PR target/54703 ++ * simplify-rtx.c (simplify_binary_operation_1): Perform ++ (x - (x & y)) -> (x & ~y) optimization only for integral modes. ++ ++2012-09-24 Eric Botcazou ++ ++ * tree-streamer-in.c (unpack_ts_type_common_value_fields): Stream in ++ TYPE_NONALIASED_COMPONENT flag. ++ * tree-streamer-out.c (pack_ts_type_common_value_fields): Stream out ++ TYPE_NONALIASED_COMPONENT flag. ++ ++2012-09-21 Richard Guenther ++ ++ PR middle-end/54638 ++ Backport from mainline ++ 2012-04-19 Richard Guenther ++ ++ * ira-int.h (ira_allocno_object_iter_cond): Avoid out-of-bound ++ array access. ++ ++2012-09-20 Joseph Myers ++ ++ PR c/54552 ++ * c-typeck.c (c_cast_expr): When casting to a type requiring ++ C_MAYBE_CONST_EXPR to be created, pass the inner expression to ++ c_fully_fold first. ++ ++2012-09-20 Joseph Myers ++ ++ PR c/54103 ++ * c-typeck.c (build_unary_op): Pass original argument of ++ TRUTH_NOT_EXPR to c_objc_common_truthvalue_conversion, then remove ++ any C_MAYBE_CONST_EXPR, if it has integer operands. ++ (build_binary_op): Pass original arguments of TRUTH_ANDIF_EXPR, ++ TRUTH_ORIF_EXPR, TRUTH_AND_EXPR, TRUTH_OR_EXPR and TRUTH_XOR_EXPR ++ to c_objc_common_truthvalue_conversion, then remove any ++ C_MAYBE_CONST_EXPR, if they have integer operands. Use ++ c_objc_common_truthvalue_conversion not ++ c_common_truthvalue_conversion. ++ (c_objc_common_truthvalue_conversion): Build NE_EXPR directly and ++ call note_integer_operands for arguments with integer operands ++ that are not integer constants. ++ ++2012-09-20 Jakub Jelinek ++ ++ Backported from mainline ++ 2012-09-17 Jakub Jelinek ++ ++ PR tree-optimization/54563 ++ * tree-ssa-math-opts.c (execute_cse_sincos): Call ++ gimple_purge_dead_eh_edges if last call has been changed. ++ ++ 2012-09-14 Jakub Jelinek ++ ++ PR target/54564 ++ * config/i386/sse.md (fmai_vmfmadd_): Use (match_dup 1) ++ instead of (match_dup 0) as second argument to vec_merge. ++ (*fmai_fmadd_, *fmai_fmsub_): Likewise. ++ Remove third alternative. ++ (*fmai_fnmadd_, *fmai_fnmsub_): Likewise. Negate ++ operand 2 instead of operand 1, but put it as first argument ++ of fma. ++ * config/i386/fmaintrin.h (_mm_fnmadd_sd, _mm_fnmadd_ss, ++ _mm_fnmsub_sd, _mm_fnmsub_ss): Negate the second argument instead ++ of the first. ++ + 2012-09-20 Release Manager + + * GCC 4.7.2 released. +@@ -7,12 +223,12 @@ + Backport from mainline + 2012-09-07 Andi Kleen + +- * gcc/lto-streamer.h (res_pair): Add. +- (lto_file_decl_data): Replace resolutions with respairs. +- Add max_index. +- * gcc/lto/lto.c (lto_resolution_read): Remove max_index. Add rp. +- Initialize respairs. +- (lto_file_finalize): Set up resolutions vector lazily from respairs. ++ * gcc/lto-streamer.h (res_pair): Add. ++ (lto_file_decl_data): Replace resolutions with respairs. ++ Add max_index. ++ * gcc/lto/lto.c (lto_resolution_read): Remove max_index. Add rp. ++ Initialize respairs. ++ (lto_file_finalize): Set up resolutions vector lazily from respairs. + + 2012-09-14 Walter Lee + +@@ -78,7 +294,7 @@ + + 2012-09-12 Christian Bruel + +- * config/sh/newlib.h (NO_IMPLICIT_EXTERN_C): Define. ++ * config/sh/newlib.h (NO_IMPLICIT_EXTERN_C): Define. + + 2012-09-12 Jakub Jelinek + +Index: gcc/testsuite/gcc.target/arm/arm.exp +=================================================================== +--- a/src/gcc/testsuite/gcc.target/arm/arm.exp (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.target/arm/arm.exp (.../branches/gcc-4_7-branch) +@@ -30,6 +30,11 @@ + set DEFAULT_CFLAGS " -ansi -pedantic-errors" + } + ++# This variable should only apply to tests called in this exp file. ++global dg_runtest_extra_prunes ++set dg_runtest_extra_prunes "" ++lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch" ++ + # Initialize `dg'. + dg-init + +@@ -39,3 +44,5 @@ + + # All done. + dg-finish ++ ++set dg_runtest_extra_prunes "" +Index: gcc/testsuite/gcc.target/i386/avx256-unaligned-load-1.c +=================================================================== +--- a/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-1.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-1.c (.../branches/gcc-4_7-branch) +@@ -14,6 +14,6 @@ + c[i] = a[i] * b[i+3]; + } + +-/* { dg-final { scan-assembler-not "avx_movups256/1" } } */ +-/* { dg-final { scan-assembler "sse_movups/1" } } */ ++/* { dg-final { scan-assembler-not "avx_loadups256" } } */ ++/* { dg-final { scan-assembler "sse_loadups" } } */ + /* { dg-final { scan-assembler "vinsertf128" } } */ +Index: gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c +=================================================================== +--- a/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c (.../branches/gcc-4_7-branch) +@@ -17,6 +17,6 @@ + d[i] = c[i] * 20.0; + } + +-/* { dg-final { scan-assembler-not "avx_movupd256/2" } } */ ++/* { dg-final { scan-assembler-not "avx_storeupd256" } } */ + /* { dg-final { scan-assembler "vmovupd.*\\*movv2df_internal/3" } } */ + /* { dg-final { scan-assembler "vextractf128" } } */ +Index: gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c +=================================================================== +--- a/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c (.../branches/gcc-4_7-branch) +@@ -24,6 +24,6 @@ + } + } + +-/* { dg-final { scan-assembler-not "avx_movdqu256/1" } } */ +-/* { dg-final { scan-assembler "sse2_movdqu/1" } } */ ++/* { dg-final { scan-assembler-not "avx_loaddqu256" } } */ ++/* { dg-final { scan-assembler "sse2_loaddqu" } } */ + /* { dg-final { scan-assembler "vinsert.128" } } */ +Index: gcc/testsuite/gcc.target/i386/pr54703.c +=================================================================== +--- a/src/gcc/testsuite/gcc.target/i386/pr54703.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.target/i386/pr54703.c (.../branches/gcc-4_7-branch) +@@ -0,0 +1,36 @@ ++/* PR target/54703 */ ++/* { dg-do run { target sse2_runtime } } */ ++/* { dg-options "-O -msse2" } */ ++/* { dg-additional-options "-mavx -mtune=bdver1" { target avx_runtime } } */ ++ ++extern void abort (void); ++typedef double V __attribute__((vector_size(16))); ++ ++union { ++ unsigned long long m[2]; ++ V v; ++} u = { { 0xffffffffff000000ULL, 0xffffffffff000000ULL } }; ++ ++static inline V ++foo (V x) ++{ ++ V y = __builtin_ia32_andpd (x, u.v); ++ V z = __builtin_ia32_subpd (x, y); ++ return __builtin_ia32_mulpd (y, z); ++} ++ ++void ++test (V *x) ++{ ++ V a = { 2.1, 2.1 }; ++ *x = foo (foo (a)); ++} ++ ++int ++main () ++{ ++ test (&u.v); ++ if (u.m[0] != 0x3acbf487f0a30550ULL || u.m[1] != u.m[0]) ++ abort (); ++ return 0; ++} +Index: gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c +=================================================================== +--- a/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c (.../branches/gcc-4_7-branch) +@@ -14,7 +14,7 @@ + b[i+3] = a[i] * c[i]; + } + +-/* { dg-final { scan-assembler "avx_movups256/2" } } */ +-/* { dg-final { scan-assembler-not "avx_movups/2" } } */ ++/* { dg-final { scan-assembler "avx_storeups256" } } */ ++/* { dg-final { scan-assembler-not "sse_storeups" } } */ + /* { dg-final { scan-assembler-not "\\*avx_movv4sf_internal/3" } } */ + /* { dg-final { scan-assembler-not "vextractf128" } } */ +Index: gcc/testsuite/gcc.target/i386/avx256-unaligned-load-3.c +=================================================================== +--- a/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-3.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-3.c (.../branches/gcc-4_7-branch) +@@ -14,6 +14,6 @@ + c[i] = a[i] * b[i+3]; + } + +-/* { dg-final { scan-assembler-not "avx_movupd256/1" } } */ +-/* { dg-final { scan-assembler "sse2_movupd/1" } } */ ++/* { dg-final { scan-assembler-not "avx_loadupd256" } } */ ++/* { dg-final { scan-assembler "sse2_loadupd" } } */ + /* { dg-final { scan-assembler "vinsertf128" } } */ +Index: gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c +=================================================================== +--- a/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c (.../branches/gcc-4_7-branch) +@@ -17,6 +17,6 @@ + d[i] = c[i] * 20.0; + } + +-/* { dg-final { scan-assembler-not "avx_movups256/2" } } */ ++/* { dg-final { scan-assembler-not "avx_storeups256" } } */ + /* { dg-final { scan-assembler "vmovups.*\\*movv4sf_internal/3" } } */ + /* { dg-final { scan-assembler "vextractf128" } } */ +Index: gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c +=================================================================== +--- a/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c (.../branches/gcc-4_7-branch) +@@ -14,6 +14,6 @@ + b[i] = a[i+3] * 2; + } + +-/* { dg-final { scan-assembler "avx_movups256/1" } } */ +-/* { dg-final { scan-assembler-not "avx_movups/1" } } */ ++/* { dg-final { scan-assembler "avx_loadups256" } } */ ++/* { dg-final { scan-assembler-not "sse_loadups" } } */ + /* { dg-final { scan-assembler-not "vinsertf128" } } */ +Index: gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c +=================================================================== +--- a/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c (.../branches/gcc-4_7-branch) +@@ -24,6 +24,6 @@ + } + } + +-/* { dg-final { scan-assembler-not "avx_movdqu256/2" } } */ ++/* { dg-final { scan-assembler-not "avx_storedqu256" } } */ + /* { dg-final { scan-assembler "vmovdqu.*\\*movv16qi_internal/3" } } */ + /* { dg-final { scan-assembler "vextract.128" } } */ +Index: gcc/testsuite/lib/gcc-dg.exp +=================================================================== +--- a/src/gcc/testsuite/lib/gcc-dg.exp (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/lib/gcc-dg.exp (.../branches/gcc-4_7-branch) +@@ -211,9 +211,13 @@ + proc gcc-dg-prune { system text } { + global additional_prunes + ++ # Extra prune rules that will apply to tests defined in a .exp file. ++ # Always remember to clear it in .exp file after executed all tests. ++ global dg_runtest_extra_prunes ++ + set text [prune_gcc_output $text] + +- foreach p $additional_prunes { ++ foreach p "$additional_prunes $dg_runtest_extra_prunes" { + if { [string length $p] > 0 } { + # Following regexp matches a complete line containing $p. + regsub -all "(^|\n)\[^\n\]*$p\[^\n\]*" $text "" text +@@ -672,6 +676,7 @@ + set additional_files "" + set additional_sources "" + set additional_prunes "" ++ set dg_runtest_extra_prunes "" + set shouldfail 0 + if [info exists compiler_conditional_xfail_data] { + unset compiler_conditional_xfail_data +@@ -745,7 +750,7 @@ + # Process the dg- directive, including adding the regular expression + # to the new message entry in dg-messages. + set msgcnt [llength ${dg-messages}] +- catch { eval $msgproc $dgargs } ++ eval $msgproc $dgargs + + # If the target expression wasn't satisfied there is no new message. + if { [llength ${dg-messages}] == $msgcnt } { +@@ -809,3 +814,4 @@ + } + + set additional_prunes "" ++set dg_runtest_extra_prunes "" +Index: gcc/testsuite/lib/target-supports.exp +=================================================================== +--- a/src/gcc/testsuite/lib/target-supports.exp (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/lib/target-supports.exp (.../branches/gcc-4_7-branch) +@@ -2993,7 +2993,7 @@ + set et_vect_widen_mult_qi_to_hi_saved 0 + } + if { [istarget powerpc*-*-*] +- || ([istarget arm*-*-*] && [check_effective_target_arm_neon]) } { ++ || ([istarget arm*-*-*] && [check_effective_target_arm_neon_ok]) } { + set et_vect_widen_mult_qi_to_hi_saved 1 + } + } +@@ -3027,7 +3027,7 @@ + || [istarget ia64-*-*] + || [istarget i?86-*-*] + || [istarget x86_64-*-*] +- || ([istarget arm*-*-*] && [check_effective_target_arm_neon]) } { ++ || ([istarget arm*-*-*] && [check_effective_target_arm_neon_ok]) } { + set et_vect_widen_mult_hi_to_si_saved 1 + } + } +@@ -3048,7 +3048,7 @@ + } else { + set et_vect_widen_mult_qi_to_hi_pattern_saved 0 + if { [istarget powerpc*-*-*] +- || ([istarget arm*-*-*] && [check_effective_target_arm_neon]) } { ++ || ([istarget arm*-*-*] && [check_effective_target_arm_neon_ok]) } { + set et_vect_widen_mult_qi_to_hi_pattern_saved 1 + } + } +@@ -3073,7 +3073,7 @@ + || [istarget ia64-*-*] + || [istarget i?86-*-*] + || [istarget x86_64-*-*] +- || ([istarget arm*-*-*] && [check_effective_target_arm_neon]) } { ++ || ([istarget arm*-*-*] && [check_effective_target_arm_neon_ok]) } { + set et_vect_widen_mult_hi_to_si_pattern_saved 1 + } + } +@@ -3203,7 +3203,7 @@ + || [istarget i?86-*-*] + || [istarget x86_64-*-*] + || [istarget spu-*-*] +- || ([istarget arm*-*-*] && [check_effective_target_arm_neon] ++ || ([istarget arm*-*-*] && [check_effective_target_arm_neon_ok] + && [check_effective_target_arm_little_endian]) } { + set et_vect_pack_trunc_saved 1 + } +@@ -3229,7 +3229,7 @@ + || [istarget x86_64-*-*] + || [istarget spu-*-*] + || [istarget ia64-*-*] +- || ([istarget arm*-*-*] && [check_effective_target_arm_neon] ++ || ([istarget arm*-*-*] && [check_effective_target_arm_neon_ok] + && [check_effective_target_arm_little_endian]) } { + set et_vect_unpack_saved 1 + } +@@ -3646,7 +3646,7 @@ + global et_vect_multiple_sizes_saved + + set et_vect_multiple_sizes_saved 0 +- if { ([istarget arm*-*-*] && [check_effective_target_arm_neon]) } { ++ if { ([istarget arm*-*-*] && [check_effective_target_arm_neon_ok]) } { + set et_vect_multiple_sizes_saved 1 + } + if { ([istarget x86_64-*-*] || [istarget i?86-*-*]) } { +Index: gcc/testsuite/gfortran.dg/class_allocate_13.f90 +=================================================================== +--- a/src/gcc/testsuite/gfortran.dg/class_allocate_13.f90 (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gfortran.dg/class_allocate_13.f90 (.../branches/gcc-4_7-branch) +@@ -0,0 +1,31 @@ ++! { dg-do run } ++! ++! PR 54784: [4.7/4.8 Regression] [OOP] wrong code in polymorphic allocation with SOURCE ++! ++! Contributed by Jeremy Kozdon ++ ++program bug ++ implicit none ++ ++ type :: block ++ real, allocatable :: fields ++ end type ++ ++ type :: list ++ class(block),allocatable :: B ++ end type ++ ++ type :: domain ++ type(list),dimension(2) :: L ++ end type ++ ++ type(domain) :: d ++ type(block) :: b1 ++ ++ allocate(b1%fields,source=5.) ++ ++ allocate(d%L(2)%B,source=b1) ! wrong code ++ ++ if (d%L(2)%B%fields/=5.) call abort() ++ ++end program +Index: gcc/testsuite/gcc.c-torture/compile/pr54103-2.c +=================================================================== +--- a/src/gcc/testsuite/gcc.c-torture/compile/pr54103-2.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.c-torture/compile/pr54103-2.c (.../branches/gcc-4_7-branch) +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 / 0 || 0 ? : 0; ++} +Index: gcc/testsuite/gcc.c-torture/compile/pr54103-4.c +=================================================================== +--- a/src/gcc/testsuite/gcc.c-torture/compile/pr54103-4.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.c-torture/compile/pr54103-4.c (.../branches/gcc-4_7-branch) +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 / 0 && 1 ? : 0; ++} +Index: gcc/testsuite/gcc.c-torture/compile/pr54103-6.c +=================================================================== +--- a/src/gcc/testsuite/gcc.c-torture/compile/pr54103-6.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.c-torture/compile/pr54103-6.c (.../branches/gcc-4_7-branch) +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 || 65536*65536 ? : 0; ++} +Index: gcc/testsuite/gcc.c-torture/compile/pr54552-1.c +=================================================================== +--- a/src/gcc/testsuite/gcc.c-torture/compile/pr54552-1.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.c-torture/compile/pr54552-1.c (.../branches/gcc-4_7-branch) +@@ -0,0 +1,8 @@ ++void ++f (void) ++{ ++ unsigned n = 10; ++ ++ typedef double T[n]; ++ (double (*)[n])((unsigned char (*)[sizeof (T)]){ 0 }); ++} +Index: gcc/testsuite/gcc.c-torture/compile/pr54103-1.c +=================================================================== +--- a/src/gcc/testsuite/gcc.c-torture/compile/pr54103-1.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.c-torture/compile/pr54103-1.c (.../branches/gcc-4_7-branch) +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 || 0 / 0 ? : 0; ++} +Index: gcc/testsuite/gcc.c-torture/compile/pr54103-3.c +=================================================================== +--- a/src/gcc/testsuite/gcc.c-torture/compile/pr54103-3.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.c-torture/compile/pr54103-3.c (.../branches/gcc-4_7-branch) +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 1 && 0 / 0 ? : 0; ++} +Index: gcc/testsuite/gcc.c-torture/compile/pr54103-5.c +=================================================================== +--- a/src/gcc/testsuite/gcc.c-torture/compile/pr54103-5.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.c-torture/compile/pr54103-5.c (.../branches/gcc-4_7-branch) +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ !(0 / 0); ++} +Index: gcc/testsuite/gnat.dg/oconst6.ads +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/oconst6.ads (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/oconst6.ads (.../branches/gcc-4_7-branch) +@@ -1,18 +0,0 @@ +--- { dg-do compile } +--- { dg-final { scan-assembler-not "elabs" } } +- +-package OCONST6 is +- +- type Sequence is array (1 .. 1) of Natural; +- +- type Message is record +- Data : Sequence; +- end record; +- +- for Message'Alignment use 1; +- pragma PACK (Message); +- +- ACK : Message := (Data => (others => 1)); +- +-end; +- +Index: gcc/testsuite/gnat.dg/opt20.adb +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/opt20.adb (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/opt20.adb (.../branches/gcc-4_7-branch) +@@ -1,3 +1,6 @@ ++-- { dg-do compile } ++-- { dg-options "-O2 -gnatpn" } ++ + with Ada.Characters.Handling; use Ada.Characters.Handling; + + package body Opt20 is +Index: gcc/testsuite/gnat.dg/opt20.ads +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/opt20.ads (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/opt20.ads (.../branches/gcc-4_7-branch) +@@ -1,6 +1,3 @@ +--- { dg-do compile } +--- { dg-options "-O2 -gnatpn" } +- + with Opt20_Pkg; use Opt20_Pkg; + + package Opt20 is +Index: gcc/testsuite/gnat.dg/addr1.adb +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/addr1.adb (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/addr1.adb (.../branches/gcc-4_7-branch) +@@ -1,3 +1,5 @@ ++-- { dg-do compile } ++ + with System; + package body addr1 is + task type T is +Index: gcc/testsuite/gnat.dg/addr1.ads +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/addr1.ads (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/addr1.ads (.../branches/gcc-4_7-branch) +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package addr1 is + pragma Elaborate_Body; + end; +Index: gcc/testsuite/gnat.dg/discr23.ads +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/discr23.ads (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/discr23.ads (.../branches/gcc-4_7-branch) +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package Discr23 is + + procedure Dummy; +Index: gcc/testsuite/gnat.dg/concat2.adb +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/concat2.adb (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/concat2.adb (.../branches/gcc-4_7-branch) +@@ -1,3 +1,6 @@ ++-- { dg-do compile } ++-- { dg-options "-O" } ++ + with Text_IO; use Text_IO; + + package body Concat2 is +@@ -15,4 +18,3 @@ + end; + + end Concat2; +- +Index: gcc/testsuite/gnat.dg/concat2.ads +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/concat2.ads (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/concat2.ads (.../branches/gcc-4_7-branch) +@@ -1,6 +1,3 @@ +--- { dg-do compile } +--- { dg-options "-O" } +- + package Concat2 is + + procedure Browse; +Index: gcc/testsuite/gnat.dg/vect8.adb +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/vect8.adb (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/vect8.adb (.../branches/gcc-4_7-branch) +@@ -1,3 +1,6 @@ ++-- { dg-do compile } ++-- { dg-options "-w" } ++ + package body Vect8 is + + function Foo (V : Vec) return Vec is +Index: gcc/testsuite/gnat.dg/vect8.ads +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/vect8.ads (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/vect8.ads (.../branches/gcc-4_7-branch) +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package Vect8 is + + type Vec is array (1 .. 2) of Long_Float; +Index: gcc/testsuite/gnat.dg/array16.adb +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/array16.adb (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/array16.adb (.../branches/gcc-4_7-branch) +@@ -1,3 +1,6 @@ ++-- { dg-do compile } ++-- { dg-options "-O -gnatn -fdump-tree-optimized" } ++ + package body Array16 is + + function F1 (A : access My_T1) return My_T1 is +@@ -20,3 +23,6 @@ + end; + + end Array16; ++ ++-- { dg-final { scan-tree-dump-not "secondary_stack" "optimized" } } ++-- { dg-final { cleanup-tree-dump "optimized" } } +Index: gcc/testsuite/gnat.dg/array16.ads +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/array16.ads (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/array16.ads (.../branches/gcc-4_7-branch) +@@ -1,6 +1,3 @@ +--- { dg-do compile } +--- { dg-options "-O -gnatn -fdump-tree-optimized" } +- + with Array16_Pkg; + + package Array16 is +@@ -26,6 +23,3 @@ + procedure Proc (A : access My_T1; B : access My_T2); + + end Array16; +- +--- { dg-final { scan-tree-dump-not "secondary_stack" "optimized" } } +--- { dg-final { cleanup-tree-dump "optimized" } } +Index: gcc/testsuite/gnat.dg/nested_float_packed.ads +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/nested_float_packed.ads (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/nested_float_packed.ads (.../branches/gcc-4_7-branch) +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package Nested_Float_Packed is + + type Float_Type is record +@@ -20,5 +18,3 @@ + Data_Block : array (Range_Type) + of Data_Type := (others => Default_Data); + end; +- +- +Index: gcc/testsuite/gnat.dg/lto15.adb +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/lto15.adb (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/lto15.adb (.../branches/gcc-4_7-branch) +@@ -1,5 +1,6 @@ + -- { dg-do compile } + -- { dg-options "-O -flto -g" } ++-- { dg-require-effective-target lto } + + package body Lto15 is + +Index: gcc/testsuite/gnat.dg/specs/oconst6.ads +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/specs/oconst6.ads (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/specs/oconst6.ads (.../branches/gcc-4_7-branch) +@@ -0,0 +1,18 @@ ++-- { dg-do compile } ++-- { dg-final { scan-assembler-not "elabs" } } ++ ++package OCONST6 is ++ ++ type Sequence is array (1 .. 1) of Natural; ++ ++ type Message is record ++ Data : Sequence; ++ end record; ++ ++ for Message'Alignment use 1; ++ pragma PACK (Message); ++ ++ ACK : Message := (Data => (others => 1)); ++ ++end; ++ +Index: gcc/testsuite/gnat.dg/atomic5.adb +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/atomic5.adb (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/atomic5.adb (.../branches/gcc-4_7-branch) +@@ -1,3 +1,5 @@ ++-- { dg-do compile } ++ + package body Atomic5 is + + function Create return R is +Index: gcc/testsuite/gnat.dg/atomic5.ads +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/atomic5.ads (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/atomic5.ads (.../branches/gcc-4_7-branch) +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + with Unchecked_Conversion; + + package Atomic5 is +Index: gcc/testsuite/gnat.dg/discr29.adb +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/discr29.adb (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/discr29.adb (.../branches/gcc-4_7-branch) +@@ -1,3 +1,5 @@ ++-- { dg-do compile } ++ + package body Discr29 is + + procedure Proc (R : out Rec3) is +Index: gcc/testsuite/gnat.dg/discr29.ads +=================================================================== +--- a/src/gcc/testsuite/gnat.dg/discr29.ads (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gnat.dg/discr29.ads (.../branches/gcc-4_7-branch) +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package Discr29 is + + type Rec1 is record +Index: gcc/testsuite/gcc.dg/c90-const-expr-8.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/c90-const-expr-8.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/c90-const-expr-8.c (.../branches/gcc-4_7-branch) +@@ -22,6 +22,6 @@ + E5 = 0 * -INT_MIN, /* { dg-warning "12:integer overflow in expression" } */ + /* { dg-error "3:overflow in constant expression" "constant" { target *-*-* } 22 } */ + E6 = 0 * !-INT_MIN, /* { dg-warning "13:integer overflow in expression" } */ +- /* { dg-error "3:not an integer constant" "constant" { target *-*-* } 24 } */ ++ /* { dg-error "8:not an integer constant" "constant" { target *-*-* } 24 } */ + E7 = INT_MIN % -1 /* Not an overflow. */ + }; +Index: gcc/testsuite/gcc.dg/torture/pr53922.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/torture/pr53922.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/torture/pr53922.c (.../branches/gcc-4_7-branch) +@@ -1,5 +1,6 @@ + /* { dg-do run } */ + /* { dg-require-weak "" } */ ++/* { dg-skip-if "No undefined weak" { hppa*-*-hpux* && { ! lp64 } } { "*" } { "" } } */ + + int x(int a) + { +Index: gcc/testsuite/gcc.dg/torture/pr54920.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/torture/pr54920.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/torture/pr54920.c (.../branches/gcc-4_7-branch) +@@ -0,0 +1,13 @@ ++/* { dg-do compile } */ ++ ++typedef short __v8hi __attribute__ ((__vector_size__ (16))); ++typedef long long __m128i __attribute__ ((__vector_size__ (16))); ++int a; ++__m128i b; ++ ++void ++fn1 () ++{ ++ while (1) ++ b = (__m128i) (__v8hi) { a, 0, 0, 0, 0, 0 }; ++} +Index: gcc/testsuite/gcc.dg/pr45259.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/pr45259.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/pr45259.c (.../branches/gcc-4_7-branch) +@@ -1,6 +1,7 @@ + /* PR debug/45259 */ + /* { dg-do compile } */ +-/* { dg-options "-g -O2 -fpic -w" { target fpic } } */ ++/* { dg-options "-g -O2 -w -fpic" { target fpic } } */ ++/* { dg-options "-g -O2 -w" { target { ! fpic } } } */ + + struct S { void (*bar) (long); }; + struct T { struct S *t; }; +Index: gcc/testsuite/gcc.dg/vect/no-vfa-vect-79.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/no-vfa-vect-79.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/no-vfa-vect-79.c (.../branches/gcc-4_7-branch) +@@ -46,6 +46,6 @@ + If/when the aliasing problems are resolved, unalignment may + prevent vectorization on some targets. */ + /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */ +-/* { dg-final { scan-tree-dump-times "can't determine dependence" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "can't determine dependence" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "can't determine dependence" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/no-vfa-vect-102a.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102a.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102a.c (.../branches/gcc-4_7-branch) +@@ -53,7 +53,7 @@ + } + + /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" } } */ +-/* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ + +Index: gcc/testsuite/gcc.dg/vect/vect-outer-3a-big-array.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-outer-3a-big-array.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-outer-3a-big-array.c (.../branches/gcc-4_7-branch) +@@ -49,6 +49,6 @@ + } + + /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail vect_no_align } } } */ +-/* { dg-final { scan-tree-dump-times "step doesn't divide the vector-size" 2 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "step doesn't divide the vector-size" 2 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "step doesn't divide the vector-size" 3 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/vect-outer-1a.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c (.../branches/gcc-4_7-branch) +@@ -20,6 +20,6 @@ + } + + /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ +-/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "strided access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/fast-math-pr35982.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/fast-math-pr35982.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/fast-math-pr35982.c (.../branches/gcc-4_7-branch) +@@ -21,5 +21,5 @@ + } + + /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_extract_even_odd || vect_strided2 } } } } */ +-/* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { xfail { vect_extract_even_odd || vect_strided2 } } } } */ ++/* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { target { ! { vect_extract_even_odd || vect_strided2 } } } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/vect-outer-1b.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c (.../branches/gcc-4_7-branch) +@@ -22,6 +22,6 @@ + } + + /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ +-/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "strided access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c (.../branches/gcc-4_7-branch) +@@ -20,6 +20,6 @@ + } + + /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ +-/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "strided access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/vect-outer-2b.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c (.../branches/gcc-4_7-branch) +@@ -37,6 +37,6 @@ + return 0; + } + +-/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "strided access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/vect-outer-3a.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-outer-3a.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-outer-3a.c (.../branches/gcc-4_7-branch) +@@ -49,6 +49,6 @@ + } + + /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail vect_no_align } } } */ +-/* { dg-final { scan-tree-dump-times "step doesn't divide the vector-size" 2 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "step doesn't divide the vector-size" 2 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "step doesn't divide the vector-size" 3 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/no-vfa-vect-37.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/no-vfa-vect-37.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/no-vfa-vect-37.c (.../branches/gcc-4_7-branch) +@@ -58,6 +58,6 @@ + If/when the aliasing problems are resolved, unalignment may + prevent vectorization on some targets. */ + /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" { xfail *-*-* } } } */ +-/* { dg-final { scan-tree-dump-times "can't determine dependence" 2 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "can't determine dependence" 2 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "can't determine dependence" 4 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/vect-outer-3b.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c (.../branches/gcc-4_7-branch) +@@ -49,6 +49,6 @@ + } + + /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ +-/* { dg-final { scan-tree-dump-times "strided access in outer loop" 2 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "strided access in outer loop" 2 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "strided access in outer loop" 4 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c (.../branches/gcc-4_7-branch) +@@ -22,6 +22,6 @@ + } + + /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ +-/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "strided access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c (.../branches/gcc-4_7-branch) +@@ -45,7 +45,7 @@ + } + + /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" } } */ +-/* { dg-final { scan-tree-dump-times "can't determine dependence" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "can't determine dependence" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "can't determine dependence" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ + +Index: gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c (.../branches/gcc-4_7-branch) +@@ -53,7 +53,7 @@ + } + + /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" } } */ +-/* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ + +Index: gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c (.../branches/gcc-4_7-branch) +@@ -58,7 +58,7 @@ + } + + /* { dg-final { scan-tree-dump-times "vect_recog_dot_prod_pattern: detected" 1 "vect" { xfail *-*-* } } } */ +-/* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 2 "vect" { target vect_multiple_sizes } } } */ + + /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */ +Index: gcc/testsuite/gcc.dg/vect/pr52298.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/pr52298.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/pr52298.c (.../branches/gcc-4_7-branch) +@@ -1,4 +1,3 @@ +-/* { dg-do run } */ + /* { dg-options "-O1 -ftree-vectorize -fno-tree-pre -fno-tree-loop-im" } */ + + extern void abort (void); +Index: gcc/testsuite/gcc.dg/vect/vect-outer-1.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-outer-1.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-outer-1.c (.../branches/gcc-4_7-branch) +@@ -22,6 +22,6 @@ + } + + /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ +-/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "strided access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c (.../branches/gcc-4_7-branch) +@@ -22,6 +22,6 @@ + } + + /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ +-/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "strided access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "strided access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +Index: gcc/testsuite/gcc.dg/vect/vect-104.c +=================================================================== +--- a/src/gcc/testsuite/gcc.dg/vect/vect-104.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/gcc.dg/vect/vect-104.c (.../branches/gcc-4_7-branch) +@@ -64,7 +64,7 @@ + } + + /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" } } */ +-/* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 1 "vect" { xfail vect_multiple_sizes } } } */ ++/* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 1 "vect" { target { ! vect_multiple_sizes } } } } */ + /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 2 "vect" { target vect_multiple_sizes } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ + +Index: gcc/testsuite/ChangeLog +=================================================================== +--- a/src/gcc/testsuite/ChangeLog (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/ChangeLog (.../branches/gcc-4_7-branch) +@@ -1,3 +1,161 @@ ++2012-10-15 Uros Bizjak ++ ++ Backport from mainline ++ 2012-10-15 Uros Bizjak ++ ++ * gcc.target/i386/avx256-unaligned-load-1.c: Update asm scan patterns. ++ * gcc.target/i386/avx256-unaligned-load-2.c: Ditto. ++ * gcc.target/i386/avx256-unaligned-load-3.c: Ditto. ++ * gcc.target/i386/avx256-unaligned-load-4.c: Ditto. ++ * gcc.target/i386/avx256-unaligned-store-1.c: Ditto. ++ * gcc.target/i386/avx256-unaligned-store-2.c: Ditto. ++ * gcc.target/i386/avx256-unaligned-store-3.c: Ditto. ++ * gcc.target/i386/avx256-unaligned-store-4.c: Ditto. ++ ++2012-10-15 Richard Guenther ++ ++ PR tree-optimization/54920 ++ * gcc.dg/torture/pr54920.c: New testcase. ++ ++2012-10-14 Janus Weil ++ ++ PR fortran/54784 ++ * gfortran.dg/class_allocate_13.f90: New. ++ ++2012-10-08 Terry Guo ++ ++ Backported from mainline ++ 2012-09-19 Terry Guo ++ ++ * lib/gcc-dg.exp (dg_runtest_extra_prunes): New variable to define ++ extra prune rules that will be applied to all tests in a .exp file. ++ (gcc-dg-prune): Use rules defined by the above variable. ++ * gcc.target/arm/arm.exp (dg_runtest_extra_prunes): Skip all the ++ harmless warnings on architecture switch conflict. ++ ++2012-10-08 Jakub Jelinek ++ ++ PR c++/54858 ++ * g++.dg/template/pr54858.C: New test. ++ ++2012-10-05 Jakub Jelinek ++ ++ PR tree-optimization/33763 ++ * c-c++-common/pr33763.c: New test. ++ ++2012-10-03 Jakub Jelinek ++ ++ PR c++/54777 ++ * g++.dg/cpp0x/constexpr-ref4.C: New test. ++ ++2012-09-30 John David Anglin ++ ++ PR target/54083 ++ * gcc.dg/torture/pr53922.c: Skip on 32-bit hppa-*-hpux*. ++ ++2012-09-27 Jakub Jelinek ++ ++ PR target/54703 ++ * gcc.target/i386/pr54703.c: New test. ++ ++2012-09-24 Janis Johnson ++ ++ Backport from mainline: ++ ++ 2012-07-24 Janis Johnson ++ * lib/gcc-dg.exp (process-message): Don't ignore errors. ++ ++ 2012-07-25 Janis Johnson ++ * g++.dg/cpp0x/nullptr21.c: Remove printfs, make self-checking. ++ ++ 2012-07-26 Janis Johnson ++ * gcc.dg/pr45259.c: Only -fpic depends on fpic support. ++ ++ 2012-09-18 Janis Johnson ++ * gcc.dg/vect/pr52298.c: Remove "dg-do run". ++ ++ 2012-09-18 Janis Johnson ++ * lib/target-supports.exp ++ (check_effective_target_vect_widen_mult_qi_to_hi, ++ check_effective_target_vect_widen_mult_hi_to_si, ++ check_effective_target_vect_widen_mult_qi_to_hi_pattern, ++ check_effective_target_vect_widen_mult_hi_to_si_pattern, ++ check_effective_target_vect_pack_trunc, ++ check_effective_target_vect_unpack, ++ check_effective_target_vect_multiple_sizes): Check arm_neon_ok ++ instead of arm_none. ++ ++ 2012-09-18 Janis Johnson ++ * gcc.dg/vect/no-vfa-vect-101.c: Skip a check for an irrelevant ++ target instead of xfailing it. ++ * gcc.dg/vect/no-vfa-vect-102.c: Likewise. ++ * gcc.dg/vect/no-vfa-vect-102a.c: Likewise. ++ * gcc.dg/vect/no-vfa-vect-37.c: Likewise. ++ * gcc.dg/vect/no-vfa-vect-79.c: Likewise. ++ * gcc.dg/vect/vect-104.c: Likewise. ++ * gcc.dg/vect/vect-outer-1-big-array.c: Likewise. ++ * gcc.dg/vect/vect-outer-1.c: Likewise. ++ * gcc.dg/vect/vect-outer-1a-big-array.c: Likewise. ++ * gcc.dg/vect/vect-outer-1a.c: Likewise. ++ * gcc.dg/vect/vect-outer-1b-big-array.c: Likewise. ++ * gcc.dg/vect/vect-outer-1b.c: Likewise. ++ * gcc.dg/vect/vect-outer-2b.c: Likewise. ++ * gcc.dg/vect/vect-outer-3a-big-array.c: Likewise. ++ * gcc.dg/vect/vect-outer-3a.c: Likewise. ++ * gcc.dg/vect/vect-outer-3b.c: Likewise. ++ * gcc.dg/vect/vect-reduc-dot-s8b.c: Likewise. ++ ++ 2012-09-18 Janis Johnson ++ * gcc.dg/vect/fast-math-pr35982.c: Skip check instead of xfail. ++ ++2012-09-22 John David Anglin ++ ++ Backport from mainline: ++ 2012-09-16 John David Anglin ++ ++ PR testsuite/54007 ++ * gnat.dg/lto15.adb: Require lto. ++ ++2012-09-20 Eric Botcazou ++ ++ * gnat.dg/opt20.ads: Move dg directive to... ++ * gnat.dg/opt20.adb: ...here. ++ * gnat.dg/addr1.ad[sb]: Likewise. ++ * gnat.dg/concat2.ad[sb]: Likewise. ++ * gnat.dg/array16.ad[sb]: Likewise. ++ * gnat.dg/atomic5.ad[sb]: Likewise. ++ * gnat.dg/discr29.ad[sb]: Likewise. ++ * gnat.dg/noreturn5.ad[sb]: Likewise. ++ * gnat.dg/vect8.ad[sb]: Likewise. Add dg-options. ++ * gnat.dg/discr23.ads: Remove dg directive. ++ * gnat.dg/nested_float_packed.ads: Likewise. ++ * gnat.dg/oconst6.ads: Move to... ++ * gnat.dg/specs/oconst6.ads: ...here. ++ ++2012-09-20 Joseph Myers ++ ++ PR c/54552 ++ * gcc.c-torture/compile/pr54552-1.c: New test. ++ ++2012-09-20 Joseph Myers ++ ++ PR c/54103 ++ * gcc.c-torture/compile/pr54103-1.c, ++ gcc.c-torture/compile/pr54103-2.c, ++ gcc.c-torture/compile/pr54103-3.c, ++ gcc.c-torture/compile/pr54103-4.c, ++ gcc.c-torture/compile/pr54103-5.c, ++ gcc.c-torture/compile/pr54103-6.c: New tests. ++ * gcc.dg/c90-const-expr-8.c: Update expected column number. ++ ++2012-09-20 Jakub Jelinek ++ ++ Backported from mainline ++ 2012-09-17 Jakub Jelinek ++ ++ PR tree-optimization/54563 ++ * g++.dg/torture/pr54563.C: New test. ++ + 2012-09-20 Release Manager + + * GCC 4.7.2 released. +Index: gcc/testsuite/g++.dg/cpp0x/nullptr21.C +=================================================================== +--- a/src/gcc/testsuite/g++.dg/cpp0x/nullptr21.C (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/g++.dg/cpp0x/nullptr21.C (.../branches/gcc-4_7-branch) +@@ -3,42 +3,53 @@ + + // Test throw and catch + +-#include ++extern "C" void abort (void); + + typedef decltype(nullptr) nullptr_t; + ++int result[2]; ++ ++void __attribute__((noinline)) ++foo (int i, int j) ++{ ++ result[i] = j; ++} ++ + int main() + { + try { + throw nullptr; + } catch (void*) { +- printf("Test 1 Fail"); ++ foo (0, 1); + } catch (bool) { +- printf("Test 1 Fail"); ++ foo (0, 2); + } catch (int) { +- printf("Test 1 Fail"); ++ foo (0, 3); + } catch (long int) { +- printf("Test 1 Fail"); ++ foo (0, 4); + } catch (nullptr_t) { +- printf("Test 1 OK"); ++ foo (0, 5); + } catch (...) { +- printf("Test 1 Fail"); +- } // { dg-output "Test 1 OK" } ++ foo (0, 6); ++ } + + nullptr_t mynull = 0; + try { + throw mynull; + } catch (void*) { +- printf("Test 2 Fail"); ++ foo (1, 1); + } catch (bool) { +- printf("Test 2 Fail"); ++ foo (1, 2); + } catch (int) { +- printf("Test 2 Fail"); ++ foo (1, 3); + } catch (long int) { +- printf("Test 2 Fail"); ++ foo (1, 4); + } catch (nullptr_t) { +- printf("Test 2 OK"); ++ foo (1, 5); + } catch (...) { +- printf("Test 2 Fail"); +- } // { dg-output "Test 2 OK" } ++ foo (1, 6); ++ } ++ ++ if (result[0] != 5 || result[1] != 5) ++ abort (); + } +Index: gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C +=================================================================== +--- a/src/gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C (.../branches/gcc-4_7-branch) +@@ -0,0 +1,18 @@ ++// PR c++/54777 ++// { dg-options -std=c++0x } ++ ++struct S ++{ ++ int s[1]; ++ constexpr const int &foo (unsigned i) { return (i < 1 ? 0 : throw 1), s[i]; } ++ constexpr const int &bar (unsigned i) { return i < 1 ? s[i] : (throw 0, s[i]); } ++}; ++ ++int ++main () ++{ ++ constexpr S a {}; ++ constexpr int i = a.foo (0); ++ constexpr int j = a.bar (0); ++ static_assert (i == j, "Ouch"); ++} +Index: gcc/testsuite/g++.dg/torture/pr54563.C +=================================================================== +--- a/src/gcc/testsuite/g++.dg/torture/pr54563.C (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/g++.dg/torture/pr54563.C (.../branches/gcc-4_7-branch) +@@ -0,0 +1,14 @@ ++// PR tree-optimization/54563 ++// { dg-do compile } ++ ++extern "C" float powf (float, float); ++struct S { ~S (); }; ++double bar (); ++double x; ++ ++void ++foo () ++{ ++ S s; ++ x = powf (bar (), 2.); ++} +Index: gcc/testsuite/g++.dg/template/pr54858.C +=================================================================== +--- a/src/gcc/testsuite/g++.dg/template/pr54858.C (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/g++.dg/template/pr54858.C (.../branches/gcc-4_7-branch) +@@ -0,0 +1,21 @@ ++// PR c++/54858 ++// { dg-do compile } ++ ++template struct A {}; ++template struct B {}; ++template struct C ++{ ++ A<0> c0; B, &C::c0> d0; // { dg-error "could not convert template argument" } ++ A<0> c1; B, &C::c1> d1; // { dg-error "could not convert template argument" } ++ A<0> c2; B, &C::c2> d2; // { dg-error "could not convert template argument" } ++ A<0> c3; B, &C::c3> d3; // { dg-error "could not convert template argument" } ++ A<0> c4; B, &C::c4> d4; // { dg-error "could not convert template argument" } ++ A<0> c5; B, &C::c5> d5; // { dg-error "could not convert template argument" } ++ A<0> c6; B, &C::c6> d6; // { dg-error "could not convert template argument" } ++ A<0> c7; B, &C::c7> d7; // { dg-error "could not convert template argument" } ++ A<0> c8; B, &C::c8> d8; // { dg-error "could not convert template argument" } ++ A<0> c9; B, &C::c9> d9; // { dg-error "could not convert template argument" } ++ A<0> ca; B, &C::ca> da; // { dg-error "could not convert template argument" } ++ A<0> cb; B, &C::cb> db; // { dg-error "could not convert template argument" } ++}; ++C e; +Index: gcc/testsuite/c-c++-common/pr33763.c +=================================================================== +--- a/src/gcc/testsuite/c-c++-common/pr33763.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/testsuite/c-c++-common/pr33763.c (.../branches/gcc-4_7-branch) +@@ -0,0 +1,60 @@ ++/* PR tree-optimization/33763 */ ++/* { dg-do compile } */ ++/* { dg-options "-O2" } */ ++ ++typedef struct ++{ ++ void *a; ++ void *b; ++} T; ++extern void *foo (const char *, const char *); ++extern void *bar (void *, const char *, T); ++extern int baz (const char *, int); ++ ++extern inline __attribute__ ((always_inline, gnu_inline)) int ++baz (const char *x, int y) ++{ ++ return 2; ++} ++ ++int ++baz (const char *x, int y) ++{ ++ return 1; ++} ++ ++int xa, xb; ++ ++static void * ++inl (const char *x, const char *y) ++{ ++ T t = { &xa, &xb }; ++ int *f = (int *) __builtin_malloc (sizeof (int)); ++ const char *z; ++ int o = 0; ++ void *r = 0; ++ ++ for (z = y; *z; z++) ++ { ++ if (*z == 'r') ++ o |= 1; ++ if (*z == 'w') ++ o |= 2; ++ } ++ if (o == 1) ++ *f = baz (x, 0); ++ if (o == 2) ++ *f = baz (x, 1); ++ if (o == 3) ++ *f = baz (x, 2); ++ ++ if (o && *f > 0) ++ r = bar (f, "w", t); ++ return r; ++} ++ ++void * ++foo (const char *x, const char *y) ++{ ++ return inl (x, y); ++} +Index: gcc/cp/tree.c +=================================================================== +--- a/src/gcc/cp/tree.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/cp/tree.c (.../branches/gcc-4_7-branch) +@@ -1,7 +1,7 @@ + /* Language-dependent node constructors for parse phase of GNU compiler. + Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +- 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011 +- Free Software Foundation, Inc. ++ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, ++ 2012 Free Software Foundation, Inc. + Hacked by Michael Tiemann (tiemann@cygnus.com) + + This file is part of GCC. +@@ -2366,6 +2366,7 @@ + + case VAR_DECL: + case CONST_DECL: ++ case FIELD_DECL: + case FUNCTION_DECL: + case TEMPLATE_DECL: + case IDENTIFIER_NODE: +Index: gcc/cp/ChangeLog +=================================================================== +--- a/src/gcc/cp/ChangeLog (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/cp/ChangeLog (.../branches/gcc-4_7-branch) +@@ -1,3 +1,15 @@ ++2012-10-08 Jakub Jelinek ++ ++ PR c++/54858 ++ * tree.c (cp_tree_equal): Handle FIELD_DECL. ++ ++2012-10-03 Jakub Jelinek ++ ++ PR c++/54777 ++ * semantics.c (cxx_eval_constant_expression) : If ++ not ignoring the second operand, pass the original second operand ++ and not one with stripped nops to cxx_eval_constant_expression. ++ + 2012-09-20 Release Manager + + * GCC 4.7.2 released. +Index: gcc/cp/semantics.c +=================================================================== +--- a/src/gcc/cp/semantics.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/cp/semantics.c (.../branches/gcc-4_7-branch) +@@ -7682,6 +7682,7 @@ + /* Check that the LHS is constant and then discard it. */ + cxx_eval_constant_expression (call, op0, allow_non_constant, + false, non_constant_p); ++ op1 = TREE_OPERAND (t, 1); + r = cxx_eval_constant_expression (call, op1, allow_non_constant, + addr, non_constant_p); + } +Index: gcc/ira-int.h +=================================================================== +--- a/src/gcc/ira-int.h (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/ira-int.h (.../branches/gcc-4_7-branch) +@@ -1138,8 +1138,13 @@ + ira_allocno_object_iter_cond (ira_allocno_object_iterator *i, ira_allocno_t a, + ira_object_t *o) + { +- *o = ALLOCNO_OBJECT (a, i->n); +- return i->n++ < ALLOCNO_NUM_OBJECTS (a); ++ int n = i->n++; ++ if (n < ALLOCNO_NUM_OBJECTS (a)) ++ { ++ *o = ALLOCNO_OBJECT (a, n); ++ return true; ++ } ++ return false; + } + + /* Loop over all objects associated with allocno A. In each +Index: gcc/tree-ssa-math-opts.c +=================================================================== +--- a/src/gcc/tree-ssa-math-opts.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/tree-ssa-math-opts.c (.../branches/gcc-4_7-branch) +@@ -1,5 +1,5 @@ + /* Global, SSA-based optimizations using mathematical identities. +- Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 ++ Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This file is part of GCC. +@@ -1387,12 +1387,18 @@ + FOR_EACH_BB (bb) + { + gimple_stmt_iterator gsi; ++ bool cleanup_eh = false; + + for (gsi = gsi_after_labels (bb); !gsi_end_p (gsi); gsi_next (&gsi)) + { + gimple stmt = gsi_stmt (gsi); + tree fndecl; + ++ /* Only the last stmt in a bb could throw, no need to call ++ gimple_purge_dead_eh_edges if we change something in the middle ++ of a basic block. */ ++ cleanup_eh = false; ++ + if (is_gimple_call (stmt) + && gimple_call_lhs (stmt) + && (fndecl = gimple_call_fndecl (stmt)) +@@ -1430,6 +1436,7 @@ + gimple_set_location (new_stmt, loc); + unlink_stmt_vdef (stmt); + gsi_replace (&gsi, new_stmt, true); ++ cleanup_eh = true; + } + break; + +@@ -1450,6 +1457,7 @@ + gimple_set_location (new_stmt, loc); + unlink_stmt_vdef (stmt); + gsi_replace (&gsi, new_stmt, true); ++ cleanup_eh = true; + } + break; + +@@ -1465,6 +1473,7 @@ + gimple_set_location (new_stmt, loc); + unlink_stmt_vdef (stmt); + gsi_replace (&gsi, new_stmt, true); ++ cleanup_eh = true; + } + break; + +@@ -1472,6 +1481,8 @@ + } + } + } ++ if (cleanup_eh) ++ cfg_changed |= gimple_purge_dead_eh_edges (bb); + } + + statistics_counter_event (cfun, "sincos statements inserted", +Index: gcc/ifcvt.c +=================================================================== +--- a/src/gcc/ifcvt.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/ifcvt.c (.../branches/gcc-4_7-branch) +@@ -44,6 +44,7 @@ + #include "tree-pass.h" + #include "df.h" + #include "vec.h" ++#include "pointer-set.h" + #include "vecprim.h" + #include "dbgcnt.h" + +@@ -2689,12 +2690,14 @@ + + /* Check whether a block is suitable for conditional move conversion. + Every insn must be a simple set of a register to a constant or a +- register. For each assignment, store the value in the array VALS, +- indexed by register number, then store the register number in +- REGS. COND is the condition we will test. */ ++ register. For each assignment, store the value in the pointer map ++ VALS, keyed indexed by register pointer, then store the register ++ pointer in REGS. COND is the condition we will test. */ + + static int +-check_cond_move_block (basic_block bb, rtx *vals, VEC (int, heap) **regs, ++check_cond_move_block (basic_block bb, ++ struct pointer_map_t *vals, ++ VEC (rtx, heap) **regs, + rtx cond) + { + rtx insn; +@@ -2708,6 +2711,7 @@ + FOR_BB_INSNS (bb, insn) + { + rtx set, dest, src; ++ void **slot; + + if (!NONDEBUG_INSN_P (insn) || JUMP_P (insn)) + continue; +@@ -2734,14 +2738,14 @@ + /* Don't try to handle this if the source register was + modified earlier in the block. */ + if ((REG_P (src) +- && vals[REGNO (src)] != NULL) ++ && pointer_map_contains (vals, src)) + || (GET_CODE (src) == SUBREG && REG_P (SUBREG_REG (src)) +- && vals[REGNO (SUBREG_REG (src))] != NULL)) ++ && pointer_map_contains (vals, SUBREG_REG (src)))) + return FALSE; + + /* Don't try to handle this if the destination register was + modified earlier in the block. */ +- if (vals[REGNO (dest)] != NULL) ++ if (pointer_map_contains (vals, dest)) + return FALSE; + + /* Don't try to handle this if the condition uses the +@@ -2755,17 +2759,18 @@ + && modified_between_p (src, insn, NEXT_INSN (BB_END (bb)))) + return FALSE; + +- vals[REGNO (dest)] = src; ++ slot = pointer_map_insert (vals, (void *) dest); ++ *slot = (void *) src; + +- VEC_safe_push (int, heap, *regs, REGNO (dest)); ++ VEC_safe_push (rtx, heap, *regs, dest); + } + + return TRUE; + } + + /* Given a basic block BB suitable for conditional move conversion, +- a condition COND, and arrays THEN_VALS and ELSE_VALS containing the +- register values depending on COND, emit the insns in the block as ++ a condition COND, and pointer maps THEN_VALS and ELSE_VALS containing ++ the register values depending on COND, emit the insns in the block as + conditional moves. If ELSE_BLOCK is true, THEN_BB was already + processed. The caller has started a sequence for the conversion. + Return true if successful, false if something goes wrong. */ +@@ -2773,7 +2778,8 @@ + static bool + cond_move_convert_if_block (struct noce_if_info *if_infop, + basic_block bb, rtx cond, +- rtx *then_vals, rtx *else_vals, ++ struct pointer_map_t *then_vals, ++ struct pointer_map_t *else_vals, + bool else_block_p) + { + enum rtx_code code; +@@ -2786,7 +2792,7 @@ + FOR_BB_INSNS (bb, insn) + { + rtx set, target, dest, t, e; +- unsigned int regno; ++ void **then_slot, **else_slot; + + /* ??? Maybe emit conditional debug insn? */ + if (!NONDEBUG_INSN_P (insn) || JUMP_P (insn)) +@@ -2795,10 +2801,11 @@ + gcc_assert (set && REG_P (SET_DEST (set))); + + dest = SET_DEST (set); +- regno = REGNO (dest); + +- t = then_vals[regno]; +- e = else_vals[regno]; ++ then_slot = pointer_map_contains (then_vals, dest); ++ else_slot = pointer_map_contains (else_vals, dest); ++ t = then_slot ? (rtx) *then_slot : NULL_RTX; ++ e = else_slot ? (rtx) *else_slot : NULL_RTX; + + if (else_block_p) + { +@@ -2842,31 +2849,25 @@ + rtx jump = if_info->jump; + rtx cond = if_info->cond; + rtx seq, loc_insn; +- int max_reg, size, c, reg; +- rtx *then_vals; +- rtx *else_vals; +- VEC (int, heap) *then_regs = NULL; +- VEC (int, heap) *else_regs = NULL; ++ rtx reg; ++ int c; ++ struct pointer_map_t *then_vals; ++ struct pointer_map_t *else_vals; ++ VEC (rtx, heap) *then_regs = NULL; ++ VEC (rtx, heap) *else_regs = NULL; + unsigned int i; ++ int success_p = FALSE; + + /* Build a mapping for each block to the value used for each + register. */ +- max_reg = max_reg_num (); +- size = (max_reg + 1) * sizeof (rtx); +- then_vals = (rtx *) alloca (size); +- else_vals = (rtx *) alloca (size); +- memset (then_vals, 0, size); +- memset (else_vals, 0, size); ++ then_vals = pointer_map_create (); ++ else_vals = pointer_map_create (); + + /* Make sure the blocks are suitable. */ + if (!check_cond_move_block (then_bb, then_vals, &then_regs, cond) + || (else_bb + && !check_cond_move_block (else_bb, else_vals, &else_regs, cond))) +- { +- VEC_free (int, heap, then_regs); +- VEC_free (int, heap, else_regs); +- return FALSE; +- } ++ goto done; + + /* Make sure the blocks can be used together. If the same register + is set in both blocks, and is not set to a constant in both +@@ -2875,41 +2876,38 @@ + source register does not change after the assignment. Also count + the number of registers set in only one of the blocks. */ + c = 0; +- FOR_EACH_VEC_ELT (int, then_regs, i, reg) ++ FOR_EACH_VEC_ELT (rtx, then_regs, i, reg) + { +- if (!then_vals[reg] && !else_vals[reg]) +- continue; ++ void **then_slot = pointer_map_contains (then_vals, reg); ++ void **else_slot = pointer_map_contains (else_vals, reg); + +- if (!else_vals[reg]) ++ gcc_checking_assert (then_slot); ++ if (!else_slot) + ++c; + else + { +- if (!CONSTANT_P (then_vals[reg]) +- && !CONSTANT_P (else_vals[reg]) +- && !rtx_equal_p (then_vals[reg], else_vals[reg])) +- { +- VEC_free (int, heap, then_regs); +- VEC_free (int, heap, else_regs); +- return FALSE; +- } ++ rtx then_val = (rtx) *then_slot; ++ rtx else_val = (rtx) *else_slot; ++ if (!CONSTANT_P (then_val) && !CONSTANT_P (else_val) ++ && !rtx_equal_p (then_val, else_val)) ++ goto done; + } + } + + /* Finish off c for MAX_CONDITIONAL_EXECUTE. */ +- FOR_EACH_VEC_ELT (int, else_regs, i, reg) +- if (!then_vals[reg]) +- ++c; ++ FOR_EACH_VEC_ELT (rtx, else_regs, i, reg) ++ { ++ gcc_checking_assert (pointer_map_contains (else_vals, reg)); ++ if (!pointer_map_contains (then_vals, reg)) ++ ++c; ++ } + + /* Make sure it is reasonable to convert this block. What matters + is the number of assignments currently made in only one of the + branches, since if we convert we are going to always execute + them. */ + if (c > MAX_CONDITIONAL_EXECUTE) +- { +- VEC_free (int, heap, then_regs); +- VEC_free (int, heap, else_regs); +- return FALSE; +- } ++ goto done; + + /* Try to emit the conditional moves. First do the then block, + then do anything left in the else blocks. */ +@@ -2921,17 +2919,11 @@ + then_vals, else_vals, true))) + { + end_sequence (); +- VEC_free (int, heap, then_regs); +- VEC_free (int, heap, else_regs); +- return FALSE; ++ goto done; + } + seq = end_ifcvt_sequence (if_info); + if (!seq) +- { +- VEC_free (int, heap, then_regs); +- VEC_free (int, heap, else_regs); +- return FALSE; +- } ++ goto done; + + loc_insn = first_active_insn (then_bb); + if (!loc_insn) +@@ -2962,9 +2954,14 @@ + + num_updated_if_blocks++; + +- VEC_free (int, heap, then_regs); +- VEC_free (int, heap, else_regs); +- return TRUE; ++ success_p = TRUE; ++ ++done: ++ pointer_map_destroy (then_vals); ++ pointer_map_destroy (else_vals); ++ VEC_free (rtx, heap, then_regs); ++ VEC_free (rtx, heap, else_regs); ++ return success_p; + } + + +Index: gcc/dwarf2out.c +=================================================================== +--- a/src/gcc/dwarf2out.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/dwarf2out.c (.../branches/gcc-4_7-branch) +@@ -8012,6 +8012,8 @@ + return DW_FORM_block1; + case 2: + return DW_FORM_block2; ++ case 4: ++ return DW_FORM_block4; + default: + gcc_unreachable (); + } +Index: gcc/go/ChangeLog +=================================================================== +--- a/src/gcc/go/ChangeLog (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/ChangeLog (.../branches/gcc-4_7-branch) +@@ -1,3 +1,7 @@ ++2012-09-20 Ian Lance Taylor ++ ++ * Make-lang.in (go/gogo.o): Depend on filenames.h. ++ + 2012-09-20 Release Manager + + * GCC 4.7.2 released. +Index: gcc/go/Make-lang.in +=================================================================== +--- a/src/gcc/go/Make-lang.in (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/Make-lang.in (.../branches/gcc-4_7-branch) +@@ -289,10 +289,11 @@ + convert.h output.h $(DIAGNOSTIC_H) $(GO_TYPES_H) \ + $(GO_EXPRESSIONS_H) $(GO_STATEMENTS_H) $(GO_RUNTIME_H) \ + go/gofrontend/backend.h $(GO_GOGO_H) +-go/gogo.o: go/gofrontend/gogo.cc $(GO_SYSTEM_H) $(GO_C_H) \ +- go/gofrontend/go-dump.h $(GO_LEX_H) $(GO_TYPES_H) $(GO_STATEMENTS_H) \ +- $(GO_EXPRESSIONS_H) go/gofrontend/dataflow.h $(GO_RUNTIME_H) \ +- $(GO_IMPORT_H) $(GO_EXPORT_H) go/gofrontend/backend.h $(GO_GOGO_H) ++go/gogo.o: go/gofrontend/gogo.cc $(GO_SYSTEM_H) \ ++ $(srcdir)/../include/filenames.h $(GO_C_H) go/gofrontend/go-dump.h \ ++ $(GO_LEX_H) $(GO_TYPES_H) $(GO_STATEMENTS_H) $(GO_EXPRESSIONS_H) \ ++ go/gofrontend/dataflow.h $(GO_RUNTIME_H) $(GO_IMPORT_H) \ ++ $(GO_EXPORT_H) go/gofrontend/backend.h $(GO_GOGO_H) + go/import.o: go/gofrontend/import.cc $(GO_SYSTEM_H) \ + $(srcdir)/../include/filenames.h $(srcdir)/../include/simple-object.h \ + $(GO_C_H) $(GO_GOGO_H) $(GO_LEX_H) $(GO_TYPES_H) $(GO_EXPORT_H) \ +Index: gcc/go/gofrontend/gogo.cc +=================================================================== +--- a/src/gcc/go/gofrontend/gogo.cc (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/gofrontend/gogo.cc (.../branches/gcc-4_7-branch) +@@ -6,6 +6,8 @@ + + #include "go-system.h" + ++#include "filenames.h" ++ + #include "go-c.h" + #include "go-dump.h" + #include "lex.h" +@@ -385,6 +387,57 @@ + bool is_local_name_exported, + Location location) + { ++ if (filename.empty()) ++ { ++ error_at(location, "import path is empty"); ++ return; ++ } ++ ++ const char *pf = filename.data(); ++ const char *pend = pf + filename.length(); ++ while (pf < pend) ++ { ++ unsigned int c; ++ int adv = Lex::fetch_char(pf, &c); ++ if (adv == 0) ++ { ++ error_at(location, "import path contains invalid UTF-8 sequence"); ++ return; ++ } ++ if (c == '\0') ++ { ++ error_at(location, "import path contains NUL"); ++ return; ++ } ++ if (c < 0x20 || c == 0x7f) ++ { ++ error_at(location, "import path contains control character"); ++ return; ++ } ++ if (c == '\\') ++ { ++ error_at(location, "import path contains backslash; use slash"); ++ return; ++ } ++ if (Lex::is_unicode_space(c)) ++ { ++ error_at(location, "import path contains space character"); ++ return; ++ } ++ if (c < 0x7f && strchr("!\"#$%&'()*,:;<=>?[]^`{|}", c) != NULL) ++ { ++ error_at(location, "import path contains invalid character '%c'", c); ++ return; ++ } ++ pf += adv; ++ } ++ ++ if (IS_ABSOLUTE_PATH(filename.c_str())) ++ { ++ error_at(location, "import path cannot be absolute path"); ++ return; ++ } ++ + if (filename == "unsafe") + { + this->import_unsafe(local_name, is_local_name_exported, location); +@@ -1003,7 +1056,15 @@ + Named_object* no = this->current_bindings()->add_type(name, NULL, type, + location); + if (!this->in_global_scope() && no->is_type()) +- no->type_value()->set_in_function(this->functions_.back().function); ++ { ++ Named_object* f = this->functions_.back().function; ++ unsigned int index; ++ if (f->is_function()) ++ index = f->func_value()->new_local_type_index(); ++ else ++ index = 0; ++ no->type_value()->set_in_function(f, index); ++ } + } + + // Add a named type. +@@ -1025,7 +1086,12 @@ + if (!this->in_global_scope() && no->is_type_declaration()) + { + Named_object* f = this->functions_.back().function; +- no->type_declaration_value()->set_in_function(f); ++ unsigned int index; ++ if (f->is_function()) ++ index = f->func_value()->new_local_type_index(); ++ else ++ index = 0; ++ no->type_declaration_value()->set_in_function(f, index); + } + return no; + } +@@ -2806,7 +2872,8 @@ + Build_method_tables::type(Type* type) + { + Named_type* nt = type->named_type(); +- if (nt != NULL) ++ Struct_type* st = type->struct_type(); ++ if (nt != NULL || st != NULL) + { + for (std::vector::const_iterator p = + this->interfaces_.begin(); +@@ -2816,11 +2883,24 @@ + // We ask whether a pointer to the named type implements the + // interface, because a pointer can implement more methods + // than a value. +- if ((*p)->implements_interface(Type::make_pointer_type(nt), NULL)) ++ if (nt != NULL) + { +- nt->interface_method_table(this->gogo_, *p, false); +- nt->interface_method_table(this->gogo_, *p, true); ++ if ((*p)->implements_interface(Type::make_pointer_type(nt), ++ NULL)) ++ { ++ nt->interface_method_table(this->gogo_, *p, false); ++ nt->interface_method_table(this->gogo_, *p, true); ++ } + } ++ else ++ { ++ if ((*p)->implements_interface(Type::make_pointer_type(st), ++ NULL)) ++ { ++ st->interface_method_table(this->gogo_, *p, false); ++ st->interface_method_table(this->gogo_, *p, true); ++ } ++ } + } + } + return TRAVERSE_CONTINUE; +@@ -2989,9 +3069,10 @@ + Function::Function(Function_type* type, Function* enclosing, Block* block, + Location location) + : type_(type), enclosing_(enclosing), results_(NULL), +- closure_var_(NULL), block_(block), location_(location), fndecl_(NULL), +- defer_stack_(NULL), results_are_named_(false), calls_recover_(false), +- is_recover_thunk_(false), has_recover_thunk_(false) ++ closure_var_(NULL), block_(block), location_(location), labels_(), ++ local_type_count_(0), fndecl_(NULL), defer_stack_(NULL), ++ results_are_named_(false), calls_recover_(false), is_recover_thunk_(false), ++ has_recover_thunk_(false) + { + } + +@@ -4157,7 +4238,7 @@ + else if (type->is_call_multiple_result_type()) + { + error_at(this->location_, +- "single variable set to multiple value function call"); ++ "single variable set to multiple-value function call"); + type = Type::make_error_type(); + } + +@@ -4599,9 +4680,10 @@ + go_assert(this->classification_ == NAMED_OBJECT_TYPE_DECLARATION); + Type_declaration* td = this->u_.type_declaration; + td->define_methods(named_type); +- Named_object* in_function = td->in_function(); ++ unsigned int index; ++ Named_object* in_function = td->in_function(&index); + if (in_function != NULL) +- named_type->set_in_function(in_function); ++ named_type->set_in_function(in_function, index); + delete td; + this->classification_ = NAMED_OBJECT_TYPE; + this->u_.type_value = named_type; +Index: gcc/go/gofrontend/gogo.h +=================================================================== +--- a/src/gcc/go/gofrontend/gogo.h (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/gofrontend/gogo.h (.../branches/gcc-4_7-branch) +@@ -574,7 +574,7 @@ + // Build an interface method table for a type: a list of function + // pointers, one for each interface method. This returns a decl. + tree +- interface_method_table_for_type(const Interface_type*, Named_type*, ++ interface_method_table_for_type(const Interface_type*, Type*, + bool is_pointer); + + // Return a tree which allocate SIZE bytes to hold values of type +@@ -963,6 +963,11 @@ + void + check_labels() const; + ++ // Note that a new local type has been added. Return its index. ++ unsigned int ++ new_local_type_index() ++ { return this->local_type_count_++; } ++ + // Whether this function calls the predeclared recover function. + bool + calls_recover() const +@@ -1084,6 +1089,8 @@ + Location location_; + // Labels defined or referenced in the function. + Labels labels_; ++ // The number of local types defined in this function. ++ unsigned int local_type_count_; + // The function decl. + tree fndecl_; + // The defer stack variable. A pointer to this variable is used to +@@ -1638,8 +1645,8 @@ + { + public: + Type_declaration(Location location) +- : location_(location), in_function_(NULL), methods_(), +- issued_warning_(false) ++ : location_(location), in_function_(NULL), in_function_index_(0), ++ methods_(), issued_warning_(false) + { } + + // Return the location. +@@ -1650,13 +1657,19 @@ + // Return the function in which this type is declared. This will + // return NULL for a type declared in global scope. + Named_object* +- in_function() +- { return this->in_function_; } ++ in_function(unsigned int* pindex) ++ { ++ *pindex = this->in_function_index_; ++ return this->in_function_; ++ } + + // Set the function in which this type is declared. + void +- set_in_function(Named_object* f) +- { this->in_function_ = f; } ++ set_in_function(Named_object* f, unsigned int index) ++ { ++ this->in_function_ = f; ++ this->in_function_index_ = index; ++ } + + // Add a method to this type. This is used when methods are defined + // before the type. +@@ -1689,6 +1702,8 @@ + // If this type is declared in a function, a pointer back to the + // function in which it is defined. + Named_object* in_function_; ++ // The index of this type in IN_FUNCTION_. ++ unsigned int in_function_index_; + // Methods defined before the type is defined. + Methods methods_; + // True if we have issued a warning about a use of this type +Index: gcc/go/gofrontend/types.h +=================================================================== +--- a/src/gcc/go/gofrontend/types.h (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/gofrontend/types.h (.../branches/gcc-4_7-branch) +@@ -983,6 +983,19 @@ + method_function(const Methods*, const std::string& name, + bool* is_ambiguous); + ++ // A mapping from interfaces to the associated interface method ++ // tables for this type. This maps to a decl. ++ typedef Unordered_map_hash(const Interface_type*, tree, Type_hash_identical, ++ Type_identical) Interface_method_tables; ++ ++ // Return a pointer to the interface method table for TYPE for the ++ // interface INTERFACE. ++ static tree ++ interface_method_table(Gogo* gogo, Type* type, ++ const Interface_type *interface, bool is_pointer, ++ Interface_method_tables** method_tables, ++ Interface_method_tables** pointer_tables); ++ + // Return a composite literal for the type descriptor entry for a + // type. + static Expression* +@@ -1994,7 +2007,8 @@ + public: + Struct_type(Struct_field_list* fields, Location location) + : Type(TYPE_STRUCT), +- fields_(fields), location_(location), all_methods_(NULL) ++ fields_(fields), location_(location), all_methods_(NULL), ++ interface_method_tables_(NULL), pointer_interface_method_tables_(NULL) + { } + + // Return the field NAME. This only looks at local fields, not at +@@ -2076,6 +2090,14 @@ + Method* + method_function(const std::string& name, bool* is_ambiguous) const; + ++ // Return a pointer to the interface method table for this type for ++ // the interface INTERFACE. If IS_POINTER is true, set the type ++ // descriptor to a pointer to this type, otherwise set it to this ++ // type. ++ tree ++ interface_method_table(Gogo*, const Interface_type* interface, ++ bool is_pointer); ++ + // Traverse just the field types of a struct type. + int + traverse_field_types(Traverse* traverse) +@@ -2156,6 +2178,13 @@ + Location location_; + // If this struct is unnamed, a list of methods. + Methods* all_methods_; ++ // A mapping from interfaces to the associated interface method ++ // tables for this type. Only used if this struct is unnamed. ++ Interface_method_tables* interface_method_tables_; ++ // A mapping from interfaces to the associated interface method ++ // tables for pointers to this type. Only used if this struct is ++ // unnamed. ++ Interface_method_tables* pointer_interface_method_tables_; + }; + + // The type of an array. +@@ -2623,8 +2652,8 @@ + public: + Named_type(Named_object* named_object, Type* type, Location location) + : Type(TYPE_NAMED), +- named_object_(named_object), in_function_(NULL), type_(type), +- local_methods_(NULL), all_methods_(NULL), ++ named_object_(named_object), in_function_(NULL), in_function_index_(0), ++ type_(type), local_methods_(NULL), all_methods_(NULL), + interface_method_tables_(NULL), pointer_interface_method_tables_(NULL), + location_(location), named_btype_(NULL), dependencies_(), + is_visible_(true), is_error_(false), is_placeholder_(false), +@@ -2651,13 +2680,19 @@ + // Return the function in which this type is defined. This will + // return NULL for a type defined in global scope. + const Named_object* +- in_function() const +- { return this->in_function_; } ++ in_function(unsigned int *pindex) const ++ { ++ *pindex = this->in_function_index_; ++ return this->in_function_; ++ } + + // Set the function in which this type is defined. + void +- set_in_function(Named_object* f) +- { this->in_function_ = f; } ++ set_in_function(Named_object* f, unsigned int index) ++ { ++ this->in_function_ = f; ++ this->in_function_index_ = index; ++ } + + // Return the name of the type. + const std::string& +@@ -2855,16 +2890,13 @@ + void + create_placeholder(Gogo*); + +- // A mapping from interfaces to the associated interface method +- // tables for this type. This maps to a decl. +- typedef Unordered_map_hash(const Interface_type*, tree, Type_hash_identical, +- Type_identical) Interface_method_tables; +- + // A pointer back to the Named_object for this type. + Named_object* named_object_; + // If this type is defined in a function, a pointer back to the + // function in which it is defined. + Named_object* in_function_; ++ // The index of this type in IN_FUNCTION_. ++ unsigned int in_function_index_; + // The actual type. + Type* type_; + // The list of methods defined for this type. Any named type can +Index: gcc/go/gofrontend/parse.cc +=================================================================== +--- a/src/gcc/go/gofrontend/parse.cc (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/gofrontend/parse.cc (.../branches/gcc-4_7-branch) +@@ -1631,12 +1631,16 @@ + + // Note that INIT was already parsed with the old name bindings, so + // we don't have to worry that it will accidentally refer to the +- // newly declared variables. ++ // newly declared variables. But we do have to worry about a mix of ++ // newly declared variables and old variables if the old variables ++ // appear in the initializations. + + Expression_list::const_iterator pexpr; + if (init != NULL) + pexpr = init->begin(); + bool any_new = false; ++ Expression_list* vars = new Expression_list(); ++ Expression_list* vals = new Expression_list(); + for (Typed_identifier_list::const_iterator p = til->begin(); + p != til->end(); + ++p) +@@ -1644,7 +1648,7 @@ + if (init != NULL) + go_assert(pexpr != init->end()); + this->init_var(*p, type, init == NULL ? NULL : *pexpr, is_coloneq, +- false, &any_new); ++ false, &any_new, vars, vals); + if (init != NULL) + ++pexpr; + } +@@ -1652,6 +1656,7 @@ + go_assert(pexpr == init->end()); + if (is_coloneq && !any_new) + error_at(location, "variables redeclared but no variable is new"); ++ this->finish_init_vars(vars, vals, location); + } + + // See if we need to initialize a list of variables from a function +@@ -1674,13 +1679,15 @@ + Named_object* first_var = NULL; + unsigned int index = 0; + bool any_new = false; ++ Expression_list* ivars = new Expression_list(); ++ Expression_list* ivals = new Expression_list(); + for (Typed_identifier_list::const_iterator pv = vars->begin(); + pv != vars->end(); + ++pv, ++index) + { + Expression* init = Expression::make_call_result(call, index); + Named_object* no = this->init_var(*pv, type, init, is_coloneq, false, +- &any_new); ++ &any_new, ivars, ivals); + + if (this->gogo_->in_global_scope() && no->is_variable()) + { +@@ -1700,6 +1707,8 @@ + if (is_coloneq && !any_new) + error_at(location, "variables redeclared but no variable is new"); + ++ this->finish_init_vars(ivars, ivals, location); ++ + return true; + } + +@@ -1725,7 +1734,7 @@ + Typed_identifier_list::const_iterator p = vars->begin(); + Expression* init = type == NULL ? index : NULL; + Named_object* val_no = this->init_var(*p, type, init, is_coloneq, +- type == NULL, &any_new); ++ type == NULL, &any_new, NULL, NULL); + if (type == NULL && any_new && val_no->is_variable()) + val_no->var_value()->set_type_from_init_tuple(); + Expression* val_var = Expression::make_var_reference(val_no, location); +@@ -1735,7 +1744,7 @@ + if (var_type == NULL) + var_type = Type::lookup_bool_type(); + Named_object* no = this->init_var(*p, var_type, NULL, is_coloneq, false, +- &any_new); ++ &any_new, NULL, NULL); + Expression* present_var = Expression::make_var_reference(no, location); + + if (is_coloneq && !any_new) +@@ -1790,7 +1799,7 @@ + Typed_identifier_list::const_iterator p = vars->begin(); + Expression* init = type == NULL ? receive : NULL; + Named_object* val_no = this->init_var(*p, type, init, is_coloneq, +- type == NULL, &any_new); ++ type == NULL, &any_new, NULL, NULL); + if (type == NULL && any_new && val_no->is_variable()) + val_no->var_value()->set_type_from_init_tuple(); + Expression* val_var = Expression::make_var_reference(val_no, location); +@@ -1800,7 +1809,7 @@ + if (var_type == NULL) + var_type = Type::lookup_bool_type(); + Named_object* no = this->init_var(*p, var_type, NULL, is_coloneq, false, +- &any_new); ++ &any_new, NULL, NULL); + Expression* received_var = Expression::make_var_reference(no, location); + + if (is_coloneq && !any_new) +@@ -1857,7 +1866,7 @@ + if (var_type == NULL) + var_type = type_guard->type(); + Named_object* val_no = this->init_var(*p, var_type, NULL, is_coloneq, false, +- &any_new); ++ &any_new, NULL, NULL); + Expression* val_var = Expression::make_var_reference(val_no, location); + + ++p; +@@ -1865,7 +1874,7 @@ + if (var_type == NULL) + var_type = Type::lookup_bool_type(); + Named_object* no = this->init_var(*p, var_type, NULL, is_coloneq, false, +- &any_new); ++ &any_new, NULL, NULL); + Expression* ok_var = Expression::make_var_reference(no, location); + + Expression* texpr = type_guard->expr(); +@@ -1904,7 +1913,8 @@ + + Named_object* + Parse::init_var(const Typed_identifier& tid, Type* type, Expression* init, +- bool is_coloneq, bool type_from_init, bool* is_new) ++ bool is_coloneq, bool type_from_init, bool* is_new, ++ Expression_list* vars, Expression_list* vals) + { + Location location = tid.location(); + +@@ -1946,9 +1956,9 @@ + // like v, ok := x.(int). + if (!type_from_init && init != NULL) + { +- Expression *v = Expression::make_var_reference(no, location); +- Statement *s = Statement::make_assignment(v, init, location); +- this->gogo_->add_statement(s); ++ go_assert(vars != NULL && vals != NULL); ++ vars->push_back(Expression::make_var_reference(no, location)); ++ vals->push_back(init); + } + return no; + } +@@ -1983,6 +1993,36 @@ + return this->gogo_->add_variable(buf, var); + } + ++// Finish the variable initialization by executing any assignments to ++// existing variables when using :=. These must be done as a tuple ++// assignment in case of something like n, a, b := 1, b, a. ++ ++void ++Parse::finish_init_vars(Expression_list* vars, Expression_list* vals, ++ Location location) ++{ ++ if (vars->empty()) ++ { ++ delete vars; ++ delete vals; ++ } ++ else if (vars->size() == 1) ++ { ++ go_assert(!this->gogo_->in_global_scope()); ++ this->gogo_->add_statement(Statement::make_assignment(vars->front(), ++ vals->front(), ++ location)); ++ delete vars; ++ delete vals; ++ } ++ else ++ { ++ go_assert(!this->gogo_->in_global_scope()); ++ this->gogo_->add_statement(Statement::make_tuple_assignment(vars, vals, ++ location)); ++ } ++} ++ + // SimpleVarDecl = identifier ":=" Expression . + + // We've already seen the identifier. +@@ -2723,7 +2763,11 @@ + } + else + { +- error_at(this->location(), "expected %<,%> or %<}%>"); ++ if (token->is_op(OPERATOR_SEMICOLON)) ++ error_at(this->location(), ++ "need trailing comma before newline in composite literal"); ++ else ++ error_at(this->location(), "expected %<,%> or %<}%>"); + + this->gogo_->mark_locals_used(); + int depth = 0; +@@ -3311,6 +3355,61 @@ + bool* is_type_switch) + { + const Token* token = this->peek_token(); ++ ++ // There is a complex parse for <- chan. The choices are ++ // Convert x to type <- chan int: ++ // (<- chan int)(x) ++ // Receive from (x converted to type chan <- chan int): ++ // (<- chan <- chan int (x)) ++ // Convert x to type <- chan (<- chan int). ++ // (<- chan <- chan int)(x) ++ if (token->is_op(OPERATOR_CHANOP)) ++ { ++ Location location = token->location(); ++ if (this->advance_token()->is_keyword(KEYWORD_CHAN)) ++ { ++ Expression* expr = this->primary_expr(false, may_be_composite_lit, ++ NULL); ++ if (expr->is_error_expression()) ++ return expr; ++ else if (!expr->is_type_expression()) ++ return Expression::make_receive(expr, location); ++ else ++ { ++ if (expr->type()->is_error_type()) ++ return expr; ++ ++ // We picked up "chan TYPE", but it is not a type ++ // conversion. ++ Channel_type* ct = expr->type()->channel_type(); ++ if (ct == NULL) ++ { ++ // This is probably impossible. ++ error_at(location, "expected channel type"); ++ return Expression::make_error(location); ++ } ++ else if (ct->may_receive()) ++ { ++ // <- chan TYPE. ++ Type* t = Type::make_channel_type(false, true, ++ ct->element_type()); ++ return Expression::make_type(t, location); ++ } ++ else ++ { ++ // <- chan <- TYPE. Because we skipped the leading ++ // <-, we parsed this as chan <- TYPE. With the ++ // leading <-, we parse it as <- chan (<- TYPE). ++ Type *t = this->reassociate_chan_direction(ct, location); ++ return Expression::make_type(t, location); ++ } ++ } ++ } ++ ++ this->unget_token(Token::make_operator_token(OPERATOR_CHANOP, location)); ++ token = this->peek_token(); ++ } ++ + if (token->is_op(OPERATOR_PLUS) + || token->is_op(OPERATOR_MINUS) + || token->is_op(OPERATOR_NOT) +@@ -3323,14 +3422,6 @@ + Operator op = token->op(); + this->advance_token(); + +- if (op == OPERATOR_CHANOP +- && this->peek_token()->is_keyword(KEYWORD_CHAN)) +- { +- // This is "<- chan" which must be the start of a type. +- this->unget_token(Token::make_operator_token(op, location)); +- return Expression::make_type(this->type(), location); +- } +- + Expression* expr = this->unary_expr(false, may_be_composite_lit, NULL); + if (expr->is_error_expression()) + ; +@@ -3350,6 +3441,32 @@ + is_type_switch); + } + ++// This is called for the obscure case of ++// (<- chan <- chan int)(x) ++// In unary_expr we remove the leading <- and parse the remainder, ++// which gives us ++// chan <- (chan int) ++// When we add the leading <- back in, we really want ++// <- chan (<- chan int) ++// This means that we need to reassociate. ++ ++Type* ++Parse::reassociate_chan_direction(Channel_type *ct, Location location) ++{ ++ Channel_type* ele = ct->element_type()->channel_type(); ++ if (ele == NULL) ++ { ++ error_at(location, "parse error"); ++ return Type::make_error_type(); ++ } ++ Type* sub = ele; ++ if (ele->may_send()) ++ sub = Type::make_channel_type(false, true, ele->element_type()); ++ else ++ sub = this->reassociate_chan_direction(ele, location); ++ return Type::make_channel_type(false, true, sub); ++} ++ + // Statement = + // Declaration | LabeledStmt | SimpleStmt | + // GoStmt | ReturnStmt | BreakStmt | ContinueStmt | GotoStmt | +@@ -5036,7 +5153,8 @@ + bool any_new = false; + + const Typed_identifier* pti = &til->front(); +- Named_object* no = this->init_var(*pti, NULL, expr, true, true, &any_new); ++ Named_object* no = this->init_var(*pti, NULL, expr, true, true, &any_new, ++ NULL, NULL); + if (any_new && no->is_variable()) + no->var_value()->set_type_from_range_index(); + p_range_clause->index = Expression::make_var_reference(no, location); +@@ -5047,7 +5165,7 @@ + { + pti = &til->back(); + bool is_new = false; +- no = this->init_var(*pti, NULL, expr, true, true, &is_new); ++ no = this->init_var(*pti, NULL, expr, true, true, &is_new, NULL, NULL); + if (is_new && no->is_variable()) + no->var_value()->set_type_from_range_value(); + if (is_new) +@@ -5337,7 +5455,8 @@ + + if (!token->is_string()) + { +- error_at(this->location(), "missing import package name"); ++ error_at(this->location(), "import statement not a string"); ++ this->advance_token(); + return; + } + +Index: gcc/go/gofrontend/statements.cc +=================================================================== +--- a/src/gcc/go/gofrontend/statements.cc (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/gofrontend/statements.cc (.../branches/gcc-4_7-branch) +@@ -3313,16 +3313,10 @@ + p != this->cases_->end(); + ++p) + { +- Expression* this_cond; +- if (val_temp == NULL) +- this_cond = *p; +- else +- { +- Expression* ref = Expression::make_temporary_reference(val_temp, +- loc); +- this_cond = Expression::make_binary(OPERATOR_EQEQ, ref, *p, loc); +- } +- ++ Expression* ref = Expression::make_temporary_reference(val_temp, ++ loc); ++ Expression* this_cond = Expression::make_binary(OPERATOR_EQEQ, ref, ++ *p, loc); + if (cond == NULL) + cond = this_cond; + else +@@ -3846,6 +3840,16 @@ + return new Constant_switch_statement(this->val_, this->clauses_, + this->break_label_, loc); + ++ if (this->val_ != NULL ++ && !this->val_->type()->is_comparable() ++ && !Type::are_compatible_for_comparison(true, this->val_->type(), ++ Type::make_nil_type(), NULL)) ++ { ++ error_at(this->val_->location(), ++ "cannot switch on value whose type that may not be compared"); ++ return Statement::make_error_statement(loc); ++ } ++ + Block* b = new Block(enclosing, loc); + + if (this->clauses_->empty()) +@@ -3856,15 +3860,12 @@ + return Statement::make_statement(val, true); + } + +- Temporary_statement* val_temp; +- if (this->val_ == NULL) +- val_temp = NULL; +- else +- { +- // var val_temp VAL_TYPE = VAL +- val_temp = Statement::make_temporary(NULL, this->val_, loc); +- b->add_statement(val_temp); +- } ++ // var val_temp VAL_TYPE = VAL ++ Expression* val = this->val_; ++ if (val == NULL) ++ val = Expression::make_boolean(true, loc); ++ Temporary_statement* val_temp = Statement::make_temporary(NULL, val, loc); ++ b->add_statement(val_temp); + + this->clauses_->lower(b, val_temp, this->break_label()); + +Index: gcc/go/gofrontend/gogo-tree.cc +=================================================================== +--- a/src/gcc/go/gofrontend/gogo-tree.cc (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/gofrontend/gogo-tree.cc (.../branches/gcc-4_7-branch) +@@ -1002,9 +1002,19 @@ + } + if (this->is_type()) + { +- const Named_object* in_function = this->type_value()->in_function(); ++ unsigned int index; ++ const Named_object* in_function = this->type_value()->in_function(&index); + if (in_function != NULL) +- decl_name += '$' + Gogo::unpack_hidden_name(in_function->name()); ++ { ++ decl_name += '$' + Gogo::unpack_hidden_name(in_function->name()); ++ if (index > 0) ++ { ++ char buf[30]; ++ snprintf(buf, sizeof buf, "%u", index); ++ decl_name += '$'; ++ decl_name += buf; ++ } ++ } + } + return get_identifier_from_string(decl_name); + } +@@ -2133,8 +2143,7 @@ + + tree + Gogo::interface_method_table_for_type(const Interface_type* interface, +- Named_type* type, +- bool is_pointer) ++ Type* type, bool is_pointer) + { + const Typed_identifier_list* interface_methods = interface->methods(); + go_assert(!interface_methods->empty()); +@@ -2163,7 +2172,9 @@ + // interface. If the interface has hidden methods, and the named + // type is defined in a different package, then the interface + // conversion table will be defined by that other package. +- if (has_hidden_methods && type->named_object()->package() != NULL) ++ if (has_hidden_methods ++ && type->named_type() != NULL ++ && type->named_type()->named_object()->package() != NULL) + { + tree array_type = build_array_type(const_ptr_type_node, NULL); + tree decl = build_decl(BUILTINS_LOCATION, VAR_DECL, id, array_type); +@@ -2191,13 +2202,20 @@ + Linemap::predeclared_location()); + elt->value = fold_convert(const_ptr_type_node, tdp); + ++ Named_type* nt = type->named_type(); ++ Struct_type* st = type->struct_type(); ++ go_assert(nt != NULL || st != NULL); + size_t i = 1; + for (Typed_identifier_list::const_iterator p = interface_methods->begin(); + p != interface_methods->end(); + ++p, ++i) + { + bool is_ambiguous; +- Method* m = type->method_function(p->name(), &is_ambiguous); ++ Method* m; ++ if (nt != NULL) ++ m = nt->method_function(p->name(), &is_ambiguous); ++ else ++ m = st->method_function(p->name(), &is_ambiguous); + go_assert(m != NULL); + + Named_object* no = m->named_object(); +Index: gcc/go/gofrontend/lex.cc +=================================================================== +--- a/src/gcc/go/gofrontend/lex.cc (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/gofrontend/lex.cc (.../branches/gcc-4_7-branch) +@@ -722,7 +722,16 @@ + unsigned int ci; + bool issued_error; + this->lineoff_ = p - this->linebuf_; +- this->advance_one_utf8_char(p, &ci, &issued_error); ++ const char *pnext = this->advance_one_utf8_char(p, &ci, ++ &issued_error); ++ ++ // Ignore byte order mark at start of file. ++ if (ci == 0xfeff) ++ { ++ p = pnext; ++ break; ++ } ++ + if (Lex::is_unicode_letter(ci)) + return this->gather_identifier(); + +@@ -831,6 +840,14 @@ + *issued_error = true; + return p + 1; + } ++ ++ // Warn about byte order mark, except at start of file. ++ if (*value == 0xfeff && (this->lineno_ != 1 || this->lineoff_ != 0)) ++ { ++ error_at(this->location(), "Unicode (UTF-8) BOM in middle of file"); ++ *issued_error = true; ++ } ++ + return p + adv; + } + +@@ -1295,6 +1312,12 @@ + // Turn it into the "replacement character". + v = 0xfffd; + } ++ if (v >= 0xd800 && v < 0xe000) ++ { ++ warning_at(location, 0, ++ "unicode code point 0x%x is invalid surrogate pair", v); ++ v = 0xfffd; ++ } + if (v <= 0xffff) + { + buf[0] = 0xe0 + (v >> 12); +@@ -1705,6 +1728,27 @@ + unsigned int stride; + }; + ++// A table of whitespace characters--Unicode code points classified as ++// "Space", "C" locale whitespace characters, the "next line" control ++// character (0085), the line separator (2028), the paragraph ++// separator (2029), and the "zero-width non-break space" (feff). ++ ++static const Unicode_range unicode_space[] = ++{ ++ { 0x0009, 0x000d, 1 }, ++ { 0x0020, 0x0020, 1 }, ++ { 0x0085, 0x0085, 1 }, ++ { 0x00a0, 0x00a0, 1 }, ++ { 0x1680, 0x1680, 1 }, ++ { 0x180e, 0x180e, 1 }, ++ { 0x2000, 0x200a, 1 }, ++ { 0x2028, 0x2029, 1 }, ++ { 0x202f, 0x202f, 1 }, ++ { 0x205f, 0x205f, 1 }, ++ { 0x3000, 0x3000, 1 }, ++ { 0xfeff, 0xfeff, 1 }, ++}; ++ + // A table of Unicode digits--Unicode code points classified as + // "Digit". + +@@ -2294,6 +2338,15 @@ + } + } + ++// Return whether C is a space character. ++ ++bool ++Lex::is_unicode_space(unsigned int c) ++{ ++ return Lex::is_in_unicode_range(c, unicode_space, ++ ARRAY_SIZE(unicode_space)); ++} ++ + // Return whether C is a Unicode digit--a Unicode code point + // classified as "Digit". + +Index: gcc/go/gofrontend/types.cc +=================================================================== +--- a/src/gcc/go/gofrontend/types.cc (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/gofrontend/types.cc (.../branches/gcc-4_7-branch) +@@ -430,7 +430,7 @@ + + case TYPE_CALL_MULTIPLE_RESULT: + if (reason != NULL) +- *reason = "invalid use of multiple value function call"; ++ *reason = "invalid use of multiple-value function call"; + return false; + + default: +@@ -588,6 +588,9 @@ + p != fields->end(); + ++p) + { ++ if (Gogo::is_sink_name(p->field_name())) ++ continue; ++ + if (!p->type()->is_comparable()) + { + if (reason != NULL) +@@ -633,8 +636,8 @@ + if (rhs->is_call_multiple_result_type()) + { + if (reason != NULL) +- reason->assign(_("multiple value function call in " +- "single value context")); ++ reason->assign(_("multiple-value function call in " ++ "single-value context")); + return false; + } + } +@@ -1295,7 +1298,8 @@ + return "__go_td_" + this->mangled_name(gogo); + + Named_object* no = nt->named_object(); +- const Named_object* in_function = nt->in_function(); ++ unsigned int index; ++ const Named_object* in_function = nt->in_function(&index); + std::string ret = "__go_tdn_"; + if (nt->is_builtin()) + go_assert(in_function == NULL); +@@ -1310,6 +1314,13 @@ + { + ret.append(Gogo::unpack_hidden_name(in_function->name())); + ret.append(1, '.'); ++ if (index > 0) ++ { ++ char buf[30]; ++ snprintf(buf, sizeof buf, "%u", index); ++ ret.append(buf); ++ ret.append(1, '.'); ++ } + } + } + +@@ -1746,9 +1757,19 @@ + { + // This name is already hidden or not as appropriate. + base_name = name->name(); +- const Named_object* in_function = name->in_function(); ++ unsigned int index; ++ const Named_object* in_function = name->in_function(&index); + if (in_function != NULL) +- base_name += '$' + Gogo::unpack_hidden_name(in_function->name()); ++ { ++ base_name += '$' + Gogo::unpack_hidden_name(in_function->name()); ++ if (index > 0) ++ { ++ char buf[30]; ++ snprintf(buf, sizeof buf, "%u", index); ++ base_name += '$'; ++ base_name += buf; ++ } ++ } + } + std::string hash_name = base_name + "$hash"; + std::string equal_name = base_name + "$equal"; +@@ -1989,10 +2010,19 @@ + ? gogo->pkgpath() + : package->pkgpath()); + n.assign(pkgpath); +- if (name->in_function() != NULL) ++ unsigned int index; ++ const Named_object* in_function = name->in_function(&index); ++ if (in_function != NULL) + { + n.append(1, '.'); +- n.append(Gogo::unpack_hidden_name(name->in_function()->name())); ++ n.append(Gogo::unpack_hidden_name(in_function->name())); ++ if (index > 0) ++ { ++ char buf[30]; ++ snprintf(buf, sizeof buf, "%u", index); ++ n.append(1, '.'); ++ n.append(buf); ++ } + } + s = Expression::make_string(n, bloc); + vals->push_back(Expression::make_unary(OPERATOR_AND, s, bloc)); +@@ -4276,6 +4306,9 @@ + pf != fields->end(); + ++pf) + { ++ if (Gogo::is_sink_name(pf->field_name())) ++ return false; ++ + if (!pf->type()->compare_is_identity(gogo)) + return false; + +@@ -4530,6 +4563,20 @@ + return Type::method_function(this->all_methods_, name, is_ambiguous); + } + ++// Return a pointer to the interface method table for this type for ++// the interface INTERFACE. IS_POINTER is true if this is for a ++// pointer to THIS. ++ ++tree ++Struct_type::interface_method_table(Gogo* gogo, ++ const Interface_type* interface, ++ bool is_pointer) ++{ ++ return Type::interface_method_table(gogo, this, interface, is_pointer, ++ &this->interface_method_tables_, ++ &this->pointer_interface_method_tables_); ++} ++ + // Convert struct fields to the backend representation. This is not + // declared in types.h so that types.h doesn't have to #include + // backend.h. +@@ -4749,6 +4796,9 @@ + pf != fields->end(); + ++pf) + { ++ if (Gogo::is_sink_name(pf->field_name())) ++ continue; ++ + if (first) + first = false; + else +@@ -4840,6 +4890,9 @@ + pf != fields->end(); + ++pf, ++field_index) + { ++ if (Gogo::is_sink_name(pf->field_name())) ++ continue; ++ + // Compare one field in both P1 and P2. + Expression* f1 = Expression::make_temporary_reference(p1, bloc); + f1 = Expression::make_unary(OPERATOR_MULT, f1, bloc); +@@ -4875,14 +4928,15 @@ + void + Struct_type::do_reflection(Gogo* gogo, std::string* ret) const + { +- ret->append("struct { "); ++ ret->append("struct {"); + + for (Struct_field_list::const_iterator p = this->fields_->begin(); + p != this->fields_->end(); + ++p) + { + if (p != this->fields_->begin()) +- ret->append("; "); ++ ret->push_back(';'); ++ ret->push_back(' '); + if (p->is_anonymous()) + ret->push_back('?'); + else +@@ -4915,7 +4969,10 @@ + } + } + +- ret->append(" }"); ++ if (!this->fields_->empty()) ++ ret->push_back(' '); ++ ++ ret->push_back('}'); + } + + // Mangled name. +@@ -6815,7 +6872,8 @@ + std::string n = Gogo::message_name(p->name()); + size_t len = 100 + n.length(); + char* buf = new char[len]; +- snprintf(buf, len, _("method %s%s%s requires a pointer"), ++ snprintf(buf, len, ++ _("method %s%s%s requires a pointer receiver"), + open_quote, n.c_str(), close_quote); + reason->assign(buf); + delete[] buf; +@@ -7151,7 +7209,17 @@ + { + if (!p->name().empty()) + { +- std::string n = Gogo::unpack_hidden_name(p->name()); ++ std::string n; ++ if (!Gogo::is_hidden_name(p->name())) ++ n = p->name(); ++ else ++ { ++ n = "."; ++ std::string pkgpath = Gogo::hidden_name_pkgpath(p->name()); ++ n.append(Gogo::pkgpath_for_symbol(pkgpath)); ++ n.append(1, '.'); ++ n.append(Gogo::unpack_hidden_name(p->name())); ++ } + char buf[20]; + snprintf(buf, sizeof buf, "%u_", + static_cast(n.length())); +@@ -7704,32 +7772,9 @@ + Named_type::interface_method_table(Gogo* gogo, const Interface_type* interface, + bool is_pointer) + { +- go_assert(!interface->is_empty()); +- +- Interface_method_tables** pimt = (is_pointer +- ? &this->interface_method_tables_ +- : &this->pointer_interface_method_tables_); +- +- if (*pimt == NULL) +- *pimt = new Interface_method_tables(5); +- +- std::pair val(interface, NULL_TREE); +- std::pair ins = (*pimt)->insert(val); +- +- if (ins.second) +- { +- // This is a new entry in the hash table. +- go_assert(ins.first->second == NULL_TREE); +- ins.first->second = gogo->interface_method_table_for_type(interface, +- this, +- is_pointer); +- } +- +- tree decl = ins.first->second; +- if (decl == error_mark_node) +- return error_mark_node; +- go_assert(decl != NULL_TREE && TREE_CODE(decl) == VAR_DECL); +- return build_fold_addr_expr(decl); ++ return Type::interface_method_table(gogo, this, interface, is_pointer, ++ &this->interface_method_tables_, ++ &this->pointer_interface_method_tables_); + } + + // Return whether a named type has any hidden fields. +@@ -8358,8 +8403,17 @@ + } + if (this->in_function_ != NULL) + { ++ ret->push_back('\t'); + ret->append(Gogo::unpack_hidden_name(this->in_function_->name())); + ret->push_back('$'); ++ if (this->in_function_index_ > 0) ++ { ++ char buf[30]; ++ snprintf(buf, sizeof buf, "%u", this->in_function_index_); ++ ret->append(buf); ++ ret->push_back('$'); ++ } ++ ret->push_back('\t'); + } + ret->append(Gogo::unpack_hidden_name(this->named_object_->name())); + } +@@ -8389,6 +8443,13 @@ + { + name.append(Gogo::unpack_hidden_name(this->in_function_->name())); + name.append(1, '$'); ++ if (this->in_function_index_ > 0) ++ { ++ char buf[30]; ++ snprintf(buf, sizeof buf, "%u", this->in_function_index_); ++ name.append(buf); ++ name.append(1, '$'); ++ } + } + } + name.append(Gogo::unpack_hidden_name(no->name())); +@@ -8899,6 +8960,42 @@ + return m; + } + ++// Return a pointer to the interface method table for TYPE for the ++// interface INTERFACE. ++ ++tree ++Type::interface_method_table(Gogo* gogo, Type* type, ++ const Interface_type *interface, ++ bool is_pointer, ++ Interface_method_tables** method_tables, ++ Interface_method_tables** pointer_tables) ++{ ++ go_assert(!interface->is_empty()); ++ ++ Interface_method_tables** pimt = is_pointer ? method_tables : pointer_tables; ++ ++ if (*pimt == NULL) ++ *pimt = new Interface_method_tables(5); ++ ++ std::pair val(interface, NULL_TREE); ++ std::pair ins = (*pimt)->insert(val); ++ ++ if (ins.second) ++ { ++ // This is a new entry in the hash table. ++ go_assert(ins.first->second == NULL_TREE); ++ ins.first->second = gogo->interface_method_table_for_type(interface, ++ type, ++ is_pointer); ++ } ++ ++ tree decl = ins.first->second; ++ if (decl == error_mark_node) ++ return error_mark_node; ++ go_assert(decl != NULL_TREE && TREE_CODE(decl) == VAR_DECL); ++ return build_fold_addr_expr(decl); ++} ++ + // Look for field or method NAME for TYPE. Return an Expression for + // the field or method bound to EXPR. If there is no such field or + // method, give an appropriate error and return an error expression. +@@ -8990,7 +9087,7 @@ + Gogo::message_name(name).c_str(), ambig1.c_str(), + ambig2.c_str()); + else if (found_pointer_method) +- error_at(location, "method requires a pointer"); ++ error_at(location, "method requires a pointer receiver"); + else if (nt == NULL && st == NULL && it == NULL) + error_at(location, + ("reference to field %qs in object which " +Index: gcc/go/gofrontend/parse.h +=================================================================== +--- a/src/gcc/go/gofrontend/parse.h (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/gofrontend/parse.h (.../branches/gcc-4_7-branch) +@@ -14,6 +14,7 @@ + class Type; + class Typed_identifier; + class Typed_identifier_list; ++class Channel_type; + class Function_type; + class Block; + class Expression; +@@ -205,8 +206,11 @@ + Expression*, bool is_coloneq, + Location); + Named_object* init_var(const Typed_identifier&, Type*, Expression*, +- bool is_coloneq, bool type_from_init, bool* is_new); ++ bool is_coloneq, bool type_from_init, bool* is_new, ++ Expression_list* vars, Expression_list* vals); + Named_object* create_dummy_global(Type*, Expression*, Location); ++ void finish_init_vars(Expression_list* vars, Expression_list* vals, ++ Location); + void simple_var_decl_or_assignment(const std::string&, Location, + bool may_be_composite_lit, + Range_clause*, Type_switch*); +@@ -229,6 +233,7 @@ + bool expression_may_start_here(); + Expression* unary_expr(bool may_be_sink, bool may_be_composite_lit, + bool* is_type_switch); ++ Type* reassociate_chan_direction(Channel_type*, Location); + Expression* qualified_expr(Expression*, Location); + Expression* id_to_expression(const std::string&, Location); + void statement(Label*); +Index: gcc/go/gofrontend/expressions.cc +=================================================================== +--- a/src/gcc/go/gofrontend/expressions.cc (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/gofrontend/expressions.cc (.../branches/gcc-4_7-branch) +@@ -301,19 +301,25 @@ + // object type: a list of function pointers for each interface + // method. + Named_type* rhs_named_type = rhs_type->named_type(); ++ Struct_type* rhs_struct_type = rhs_type->struct_type(); + bool is_pointer = false; +- if (rhs_named_type == NULL) ++ if (rhs_named_type == NULL && rhs_struct_type == NULL) + { + rhs_named_type = rhs_type->deref()->named_type(); ++ rhs_struct_type = rhs_type->deref()->struct_type(); + is_pointer = true; + } + tree method_table; +- if (rhs_named_type == NULL) +- method_table = null_pointer_node; +- else ++ if (rhs_named_type != NULL) + method_table = + rhs_named_type->interface_method_table(gogo, lhs_interface_type, + is_pointer); ++ else if (rhs_struct_type != NULL) ++ method_table = ++ rhs_struct_type->interface_method_table(gogo, lhs_interface_type, ++ is_pointer); ++ else ++ method_table = null_pointer_node; + first_field_value = fold_convert_loc(location.gcc_location(), + const_ptr_type_node, method_table); + } +@@ -5184,6 +5190,9 @@ + pf != fields->end(); + ++pf, ++field_index) + { ++ if (Gogo::is_sink_name(pf->field_name())) ++ continue; ++ + if (field_index > 0) + { + if (left_temp == NULL) +@@ -5450,7 +5459,8 @@ + && (this->left_->type()->integer_type() == NULL + || (subcontext.type->integer_type() == NULL + && subcontext.type->float_type() == NULL +- && subcontext.type->complex_type() == NULL))) ++ && subcontext.type->complex_type() == NULL ++ && subcontext.type->interface_type() == NULL))) + this->report_error(("invalid context-determined non-integer type " + "for shift operand")); + +@@ -6682,38 +6692,6 @@ + this->set_args(new_args); + } + +-// A traversal class which looks for a call expression. +- +-class Find_call_expression : public Traverse +-{ +- public: +- Find_call_expression() +- : Traverse(traverse_expressions), +- found_(false) +- { } +- +- int +- expression(Expression**); +- +- bool +- found() +- { return this->found_; } +- +- private: +- bool found_; +-}; +- +-int +-Find_call_expression::expression(Expression** pexpr) +-{ +- if ((*pexpr)->call_expression() != NULL) +- { +- this->found_ = true; +- return TRAVERSE_EXIT; +- } +- return TRAVERSE_CONTINUE; +-} +- + // Lower a builtin call expression. This turns new and make into + // specific expressions. We also convert to a constant if we can. + +@@ -6734,20 +6712,6 @@ + + if (this->is_constant()) + { +- // We can only lower len and cap if there are no function calls +- // in the arguments. Otherwise we have to make the call. +- if (this->code_ == BUILTIN_LEN || this->code_ == BUILTIN_CAP) +- { +- Expression* arg = this->one_arg(); +- if (arg != NULL && !arg->is_constant()) +- { +- Find_call_expression find_call; +- Expression::traverse(&arg, &find_call); +- if (find_call.found()) +- return this; +- } +- } +- + Numeric_constant nc; + if (this->numeric_constant_value(&nc)) + return nc.expression(loc); +@@ -7064,9 +7028,43 @@ + return args->front(); + } + +-// Return whether this is constant: len of a string, or len or cap of +-// a fixed array, or unsafe.Sizeof, unsafe.Offsetof, unsafe.Alignof. ++// A traversal class which looks for a call or receive expression. + ++class Find_call_expression : public Traverse ++{ ++ public: ++ Find_call_expression() ++ : Traverse(traverse_expressions), ++ found_(false) ++ { } ++ ++ int ++ expression(Expression**); ++ ++ bool ++ found() ++ { return this->found_; } ++ ++ private: ++ bool found_; ++}; ++ ++int ++Find_call_expression::expression(Expression** pexpr) ++{ ++ if ((*pexpr)->call_expression() != NULL ++ || (*pexpr)->receive_expression() != NULL) ++ { ++ this->found_ = true; ++ return TRAVERSE_EXIT; ++ } ++ return TRAVERSE_CONTINUE; ++} ++ ++// Return whether this is constant: len of a string constant, or len ++// or cap of an array, or unsafe.Sizeof, unsafe.Offsetof, ++// unsafe.Alignof. ++ + bool + Builtin_call_expression::do_is_constant() const + { +@@ -7088,6 +7086,17 @@ + && !arg_type->points_to()->is_slice_type()) + arg_type = arg_type->points_to(); + ++ // The len and cap functions are only constant if there are no ++ // function calls or channel operations in the arguments. ++ // Otherwise we have to make the call. ++ if (!arg->is_constant()) ++ { ++ Find_call_expression find_call; ++ Expression::traverse(&arg, &find_call); ++ if (find_call.found()) ++ return false; ++ } ++ + if (arg_type->array_type() != NULL + && arg_type->array_type()->length() != NULL) + return true; +@@ -7474,7 +7483,7 @@ + if (args != NULL && args->size() == 2) + { + Type* t1 = args->front()->type(); +- Type* t2 = args->front()->type(); ++ Type* t2 = args->back()->type(); + if (!t1->is_abstract()) + arg_type = t1; + else if (!t2->is_abstract()) +Index: gcc/go/gofrontend/lex.h +=================================================================== +--- a/src/gcc/go/gofrontend/lex.h (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/go/gofrontend/lex.h (.../branches/gcc-4_7-branch) +@@ -375,6 +375,10 @@ + static int + fetch_char(const char* str, unsigned int *value); + ++ // Return whether C is a Unicode or "C" locale space character. ++ static bool ++ is_unicode_space(unsigned int c); ++ + private: + ssize_t + get_line(); +Index: gcc/ada/ChangeLog +=================================================================== +--- a/src/gcc/ada/ChangeLog (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/ada/ChangeLog (.../branches/gcc-4_7-branch) +@@ -1,3 +1,11 @@ ++2012-10-02 Eric Botcazou ++ ++ * gcc-interfaces/decl.c (elaborate_expression_1): Use the variable for ++ bounds of loop iteraration scheme only for locally defined subtypes. ++ ++ * gcc-interface/trans.c (build_return_expr): Apply the NRV optimization ++ only for BLKmode. ++ + 2012-09-20 Release Manager + + * GCC 4.7.2 released. +Index: gcc/ada/gcc-interface/decl.c +=================================================================== +--- a/src/gcc/ada/gcc-interface/decl.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/ada/gcc-interface/decl.c (.../branches/gcc-4_7-branch) +@@ -6346,6 +6346,7 @@ + use_variable = expr_variable_p + && (expr_global_p + || (!optimize ++ && definition + && Is_Itype (gnat_entity) + && Nkind (Associated_Node_For_Itype (gnat_entity)) + == N_Loop_Parameter_Specification)); +Index: gcc/ada/gcc-interface/trans.c +=================================================================== +--- a/src/gcc/ada/gcc-interface/trans.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/ada/gcc-interface/trans.c (.../branches/gcc-4_7-branch) +@@ -3123,6 +3123,7 @@ + if (optimize + && AGGREGATE_TYPE_P (operation_type) + && !TYPE_IS_FAT_POINTER_P (operation_type) ++ && TYPE_MODE (operation_type) == BLKmode + && aggregate_value_p (operation_type, current_function_decl)) + { + /* Recognize the temporary created for a return value with variable +Index: gcc/fortran/ChangeLog +=================================================================== +--- a/src/gcc/fortran/ChangeLog (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/fortran/ChangeLog (.../branches/gcc-4_7-branch) +@@ -1,3 +1,9 @@ ++2012-10-14 Janus Weil ++ ++ PR fortran/54784 ++ * trans-stmt.c (gfc_trans_allocate): Correctly determine the reference ++ to the _data component for polymorphic allocation with SOURCE. ++ + 2012-09-20 Release Manager + + * GCC 4.7.2 released. +Index: gcc/fortran/trans-stmt.c +=================================================================== +--- a/src/gcc/fortran/trans-stmt.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/fortran/trans-stmt.c (.../branches/gcc-4_7-branch) +@@ -5087,7 +5087,7 @@ + gfc_actual_arglist *actual; + gfc_expr *ppc; + gfc_code *ppc_code; +- gfc_ref *dataref; ++ gfc_ref *ref, *dataref; + + /* Do a polymorphic deep copy. */ + actual = gfc_get_actual_arglist (); +@@ -5099,13 +5099,15 @@ + actual->next->expr->ts.type = BT_CLASS; + gfc_add_data_component (actual->next->expr); + +- dataref = actual->next->expr->ref; ++ dataref = NULL; + /* Make sure we go up through the reference chain to + the _data reference, where the arrayspec is found. */ +- while (dataref->next && dataref->next->type != REF_ARRAY) +- dataref = dataref->next; ++ for (ref = actual->next->expr->ref; ref; ref = ref->next) ++ if (ref->type == REF_COMPONENT ++ && strcmp (ref->u.c.component->name, "_data") == 0) ++ dataref = ref; + +- if (dataref->u.c.component->as) ++ if (dataref && dataref->u.c.component->as) + { + int dim; + gfc_expr *temp; +Index: gcc/gcc-ar.c +=================================================================== +--- a/src/gcc/gcc-ar.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/gcc-ar.c (.../branches/gcc-4_7-branch) +@@ -42,6 +42,7 @@ + const char *err_msg; + const char **nargv; + bool is_ar = !strcmp (PERSONALITY, "ar"); ++ int exit_code = FATAL_EXIT_CODE; + + exe_name = PERSONALITY; + #ifdef CROSS_DIRECTORY_STRUCTURE +@@ -96,6 +97,20 @@ + NULL,NULL, &status, &err); + if (err_msg) + fprintf(stderr, "Error running %s: %s\n", exe_name, err_msg); ++ else if (status) ++ { ++ if (WIFSIGNALED (status)) ++ { ++ int sig = WTERMSIG (status); ++ fprintf (stderr, "%s terminated with signal %d [%s]%s\n", ++ exe_name, sig, strsignal(sig), ++ WCOREDUMP(status) ? ", core dumped" : ""); ++ } ++ else if (WIFEXITED (status)) ++ exit_code = WEXITSTATUS (status); ++ } ++ else ++ exit_code = SUCCESS_EXIT_CODE; + +- return err; ++ return exit_code; + } +Index: gcc/c-typeck.c +=================================================================== +--- a/src/gcc/c-typeck.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/c-typeck.c (.../branches/gcc-4_7-branch) +@@ -3642,7 +3642,13 @@ + "wrong type argument to unary exclamation mark"); + return error_mark_node; + } +- arg = c_objc_common_truthvalue_conversion (location, arg); ++ if (int_operands) ++ { ++ arg = c_objc_common_truthvalue_conversion (location, xarg); ++ arg = remove_c_maybe_const_expr (arg); ++ } ++ else ++ arg = c_objc_common_truthvalue_conversion (location, arg); + ret = invert_truthvalue_loc (location, arg); + /* If the TRUTH_NOT_EXPR has been folded, reset the location. */ + if (EXPR_P (ret) && EXPR_HAS_LOCATION (ret)) +@@ -4862,8 +4868,11 @@ + ret = build_c_cast (loc, type, expr); + if (type_expr) + { ++ bool inner_expr_const = true; ++ ret = c_fully_fold (ret, require_constant_value, &inner_expr_const); + ret = build2 (C_MAYBE_CONST_EXPR, TREE_TYPE (ret), type_expr, ret); +- C_MAYBE_CONST_EXPR_NON_CONST (ret) = !type_expr_const; ++ C_MAYBE_CONST_EXPR_NON_CONST (ret) = !(type_expr_const ++ && inner_expr_const); + SET_EXPR_LOCATION (ret, loc); + } + +@@ -9896,8 +9905,20 @@ + but that does not mean the operands should be + converted to ints! */ + result_type = integer_type_node; +- op0 = c_common_truthvalue_conversion (location, op0); +- op1 = c_common_truthvalue_conversion (location, op1); ++ if (op0_int_operands) ++ { ++ op0 = c_objc_common_truthvalue_conversion (location, orig_op0); ++ op0 = remove_c_maybe_const_expr (op0); ++ } ++ else ++ op0 = c_objc_common_truthvalue_conversion (location, op0); ++ if (op1_int_operands) ++ { ++ op1 = c_objc_common_truthvalue_conversion (location, orig_op1); ++ op1 = remove_c_maybe_const_expr (op1); ++ } ++ else ++ op1 = c_objc_common_truthvalue_conversion (location, op1); + converted = 1; + boolean_op = true; + } +@@ -10609,13 +10630,18 @@ + + int_const = (TREE_CODE (expr) == INTEGER_CST && !TREE_OVERFLOW (expr)); + int_operands = EXPR_INT_CONST_OPERANDS (expr); +- if (int_operands) +- expr = remove_c_maybe_const_expr (expr); ++ if (int_operands && TREE_CODE (expr) != INTEGER_CST) ++ { ++ expr = remove_c_maybe_const_expr (expr); ++ expr = build2 (NE_EXPR, integer_type_node, expr, ++ convert (TREE_TYPE (expr), integer_zero_node)); ++ expr = note_integer_operands (expr); ++ } ++ else ++ /* ??? Should we also give an error for vectors rather than leaving ++ those to give errors later? */ ++ expr = c_common_truthvalue_conversion (location, expr); + +- /* ??? Should we also give an error for vectors rather than leaving +- those to give errors later? */ +- expr = c_common_truthvalue_conversion (location, expr); +- + if (TREE_CODE (expr) == INTEGER_CST && int_operands && !int_const) + { + if (TREE_OVERFLOW (expr)) +Index: gcc/tree-ssa-pre.c +=================================================================== +--- a/src/gcc/tree-ssa-pre.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/tree-ssa-pre.c (.../branches/gcc-4_7-branch) +@@ -3063,7 +3063,7 @@ + case NARY: + { + vn_nary_op_t nary = PRE_EXPR_NARY (expr); +- tree genop[4]; ++ tree *genop = XALLOCAVEC (tree, nary->length); + unsigned i; + for (i = 0; i < nary->length; ++i) + { +Index: gcc/simplify-rtx.c +=================================================================== +--- a/src/gcc/simplify-rtx.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/simplify-rtx.c (.../branches/gcc-4_7-branch) +@@ -1,7 +1,7 @@ + /* RTL simplification functions for GNU compiler. + Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +- 2011 Free Software Foundation, Inc. ++ 2011, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -2239,7 +2239,7 @@ + neg_const_int (mode, op1)); + + /* (x - (x & y)) -> (x & ~y) */ +- if (GET_CODE (op1) == AND) ++ if (INTEGRAL_MODE_P (mode) && GET_CODE (op1) == AND) + { + if (rtx_equal_p (op0, XEXP (op1, 0))) + { +Index: gcc/lto/lto.c +=================================================================== +--- a/src/gcc/lto/lto.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/lto/lto.c (.../branches/gcc-4_7-branch) +@@ -761,6 +761,7 @@ + variant list state before fixup is broken. */ + tree tem, mv; + ++#ifdef ENABLE_CHECKING + /* Remove us from our main variant list if we are not the + variant leader. */ + if (TYPE_MAIN_VARIANT (t) != t) +@@ -768,10 +769,9 @@ + tem = TYPE_MAIN_VARIANT (t); + while (tem && TYPE_NEXT_VARIANT (tem) != t) + tem = TYPE_NEXT_VARIANT (tem); +- if (tem) +- TYPE_NEXT_VARIANT (tem) = TYPE_NEXT_VARIANT (t); +- TYPE_NEXT_VARIANT (t) = NULL_TREE; ++ gcc_assert (!tem && !TYPE_NEXT_VARIANT (t)); + } ++#endif + + /* Query our new main variant. */ + mv = GIMPLE_REGISTER_TYPE (TYPE_MAIN_VARIANT (t)); +Index: gcc/lto/ChangeLog +=================================================================== +--- a/src/gcc/lto/ChangeLog (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/lto/ChangeLog (.../branches/gcc-4_7-branch) +@@ -1,3 +1,12 @@ ++2012-09-20 Richard Guenther ++ ++ Backport from mainline ++ 2012-09-11 Jan Hubicka ++ ++ PR lto/54312 ++ * lto.c (uniquify_nodes): Remove quadratic loop checking if the ++ type is variant leader. ++ + 2012-09-20 Release Manager + + * GCC 4.7.2 released. +Index: gcc/tree-streamer-out.c +=================================================================== +--- a/src/gcc/tree-streamer-out.c (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/tree-streamer-out.c (.../branches/gcc-4_7-branch) +@@ -279,6 +279,8 @@ + bp_pack_value (bp, TYPE_NEEDS_CONSTRUCTING (expr), 1); + if (RECORD_OR_UNION_TYPE_P (expr)) + bp_pack_value (bp, TYPE_TRANSPARENT_AGGR (expr), 1); ++ else if (TREE_CODE (expr) == ARRAY_TYPE) ++ bp_pack_value (bp, TYPE_NONALIASED_COMPONENT (expr), 1); + bp_pack_value (bp, TYPE_PACKED (expr), 1); + bp_pack_value (bp, TYPE_RESTRICT (expr), 1); + bp_pack_value (bp, TYPE_CONTAINS_PLACEHOLDER_INTERNAL (expr), 2); +Index: gcc/po/es.po +=================================================================== +--- a/src/gcc/po/es.po (.../tags/gcc_4_7_2_release) ++++ b/src/gcc/po/es.po (.../branches/gcc-4_7-branch) +@@ -1,4 +1,4 @@ +-# Mensajes en español para gcc-4.7.1. ++# Mensajes en español para gcc-4.7.2. + # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + # This file is distributed under the same license as the gcc package. + # Cristian Othón Martínez Vera , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +@@ -7,10 +7,10 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: gcc 4.7.1\n" ++"Project-Id-Version: gcc 4.7.2\n" + "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" +-"POT-Creation-Date: 2012-06-13 21:42+0000\n" +-"PO-Revision-Date: 2012-06-22 13:49-0500\n" ++"POT-Creation-Date: 2012-09-19 14:50+0000\n" ++"PO-Revision-Date: 2012-09-24 13:50-0500\n" + "Last-Translator: Cristian Othón Martínez Vera \n" + "Language-Team: Spanish \n" + "Language: es\n" +@@ -28,7 +28,7 @@ + msgid "({anonymous})" + msgstr "({anónimo})" + +-#: c-parser.c:946 cp/parser.c:22268 ++#: c-parser.c:946 cp/parser.c:22263 + #, gcc-internal-format + msgid "expected end of line" + msgstr "se esperaba fin de línea" +@@ -38,8 +38,8 @@ + #: c-parser.c:7308 c-parser.c:7343 c-parser.c:7374 c-parser.c:7421 + #: c-parser.c:7602 c-parser.c:8369 c-parser.c:8439 c-parser.c:8482 + #: c-parser.c:9760 c-parser.c:9775 c-parser.c:9784 c-parser.c:9929 +-#: c-parser.c:9968 c-parser.c:2500 c-parser.c:7595 cp/parser.c:21791 +-#: cp/parser.c:22214 ++#: c-parser.c:9968 c-parser.c:2500 c-parser.c:7595 cp/parser.c:21786 ++#: cp/parser.c:22209 + #, gcc-internal-format + msgid "expected %<;%>" + msgstr "se esperaba %<;%>" +@@ -51,13 +51,13 @@ + #: c-parser.c:6703 c-parser.c:6727 c-parser.c:7893 c-parser.c:7965 + #: c-parser.c:8791 c-parser.c:8812 c-parser.c:8862 c-parser.c:9015 + #: c-parser.c:9094 c-parser.c:9178 c-parser.c:9892 c-parser.c:10716 +-#: c-parser.c:8935 c-parser.c:8960 cp/parser.c:22217 ++#: c-parser.c:8935 c-parser.c:8960 cp/parser.c:22212 + #, gcc-internal-format + msgid "expected %<(%>" + msgstr "se esperaba %<(%>" + + #: c-parser.c:1845 c-parser.c:6389 c-parser.c:6427 c-parser.c:6555 +-#: cp/parser.c:21789 cp/parser.c:22232 ++#: cp/parser.c:21784 cp/parser.c:22227 + #, gcc-internal-format + msgid "expected %<,%>" + msgstr "se esperaba %<,%>" +@@ -73,14 +73,14 @@ + #: c-parser.c:7687 c-parser.c:7708 c-parser.c:7916 c-parser.c:7969 + #: c-parser.c:8341 c-parser.c:8794 c-parser.c:8815 c-parser.c:8893 + #: c-parser.c:9022 c-parser.c:9159 c-parser.c:9242 c-parser.c:9820 +-#: c-parser.c:9937 c-parser.c:9979 c-parser.c:10725 cp/parser.c:22262 ++#: c-parser.c:9937 c-parser.c:9979 c-parser.c:10725 cp/parser.c:22257 + #, gcc-internal-format + msgid "expected %<)%>" + msgstr "se esperaba %<)%>" + + #: c-parser.c:3095 c-parser.c:3904 c-parser.c:3938 c-parser.c:5224 + #: c-parser.c:6491 c-parser.c:6760 c-parser.c:6866 c-parser.c:10628 +-#: c-parser.c:10630 cp/parser.c:22226 ++#: c-parser.c:10630 cp/parser.c:22221 + #, gcc-internal-format + msgid "expected %<]%>" + msgstr "se esperaba %<]%>" +@@ -89,25 +89,25 @@ + msgid "expected %<;%>, %<,%> or %<)%>" + msgstr "se esperaba %<;%>, %<,%> o %<)%>" + +-#: c-parser.c:3767 c-parser.c:9776 cp/parser.c:22220 cp/parser.c:24037 ++#: c-parser.c:3767 c-parser.c:9776 cp/parser.c:22215 cp/parser.c:24032 + #, gcc-internal-format + msgid "expected %<}%>" + msgstr "se esperaba %<}%>" + + #: c-parser.c:4057 c-parser.c:7936 c-parser.c:10222 c-parser.c:2318 +-#: c-parser.c:2521 c-parser.c:7490 cp/parser.c:14425 cp/parser.c:22223 ++#: c-parser.c:2521 c-parser.c:7490 cp/parser.c:14425 cp/parser.c:22218 + #, gcc-internal-format + msgid "expected %<{%>" + msgstr "se esperaba %<{%>" + + #: c-parser.c:4276 c-parser.c:4285 c-parser.c:5128 c-parser.c:5469 + #: c-parser.c:7701 c-parser.c:8076 c-parser.c:8133 c-parser.c:9148 +-#: cp/parser.c:22256 cp/parser.c:23258 ++#: cp/parser.c:22251 cp/parser.c:23253 + #, gcc-internal-format + msgid "expected %<:%>" + msgstr "se esperaba %<:%>" + +-#: c-parser.c:4824 cp/parser.c:22150 ++#: c-parser.c:4824 cp/parser.c:22145 + #, gcc-internal-format + msgid "expected %" + msgstr "se esperaba %" +@@ -116,34 +116,34 @@ + msgid "expected %<.%>" + msgstr "se esperaba %<.%>" + +-#: c-parser.c:7161 c-parser.c:7193 c-parser.c:7433 cp/parser.c:23821 +-#: cp/parser.c:23895 ++#: c-parser.c:7161 c-parser.c:7193 c-parser.c:7433 cp/parser.c:23816 ++#: cp/parser.c:23890 + #, gcc-internal-format + msgid "expected %<@end%>" + msgstr "se esperaba %<@end%>" + +-#: c-parser.c:7850 cp/parser.c:22241 ++#: c-parser.c:7850 cp/parser.c:22236 + #, gcc-internal-format + msgid "expected %<>%>" + msgstr "se esperaba %<>%>" + +-#: c-parser.c:9246 cp/parser.c:22265 ++#: c-parser.c:9246 cp/parser.c:22260 + #, gcc-internal-format + msgid "expected %<,%> or %<)%>" + msgstr "se esperaba %<,%> o %<)%>" + + #: c-parser.c:9499 c-parser.c:9530 c-parser.c:9766 c-parser.c:9918 +-#: c-parser.c:3961 cp/parser.c:22244 ++#: c-parser.c:3961 cp/parser.c:22239 + #, gcc-internal-format + msgid "expected %<=%>" + msgstr "se esperaba %<=%>" + +-#: c-parser.c:10279 c-parser.c:10269 cp/parser.c:26674 ++#: c-parser.c:10279 c-parser.c:10269 cp/parser.c:26669 + #, gcc-internal-format + msgid "expected %<#pragma omp section%> or %<}%>" + msgstr "se esperaba %<#pragma omp section%> o %<}%>" + +-#: c-parser.c:10616 cp/parser.c:22229 ++#: c-parser.c:10616 cp/parser.c:22224 + #, gcc-internal-format + msgid "expected %<[%>" + msgstr "se esperaba %<[%>" +@@ -321,12 +321,12 @@ + #. TARGET_PRINT_OPERAND must handle them. + #. We can't handle floating point constants; + #. PRINT_OPERAND must handle them. +-#: final.c:3615 config/i386/i386.c:13086 config/pdp11/pdp11.c:1689 ++#: final.c:3615 config/i386/i386.c:13180 config/pdp11/pdp11.c:1689 + #, c-format + msgid "floating constant misused" + msgstr "constante de coma flotante mal usada" + +-#: final.c:3673 config/i386/i386.c:13184 config/pdp11/pdp11.c:1730 ++#: final.c:3673 config/i386/i386.c:13278 config/pdp11/pdp11.c:1730 + #, c-format + msgid "invalid expression as operand" + msgstr "expresión inválida como operando" +@@ -1409,20 +1409,20 @@ + msgid "insn does not satisfy its constraints:" + msgstr "la insn no satisface sus restricciones:" + +-#: targhooks.c:1404 ++#: targhooks.c:1411 + #, c-format + msgid "created and used with differing settings of '%s'" + msgstr "creado y usado con diferentes opciones de '%s'" + +-#: targhooks.c:1406 ++#: targhooks.c:1413 + msgid "out of memory" + msgstr "memoria agotada" + +-#: targhooks.c:1421 ++#: targhooks.c:1428 + msgid "created and used with different settings of -fpic" + msgstr "creado y usado con diferentes opciones de -fpic" + +-#: targhooks.c:1423 ++#: targhooks.c:1430 + msgid "created and used with different settings of -fpie" + msgstr "creado y usado con diferentes opciones de -fpie" + +@@ -2022,195 +2022,195 @@ + msgid "The maximum number of RTL nodes that can be recorded as combiner's last value" + msgstr "El número máximo de nodos RTL que se pueden grabar como el último valor del combinador" + +-#: params.def:644 ++#: params.def:645 + msgid "The upper bound for sharing integer constants" + msgstr "El límite superior para compartir constantes enteras" + +-#: params.def:663 ++#: params.def:664 + msgid "Minimum number of virtual mappings to consider switching to full virtual renames" + msgstr "El número mínimo de mapeos virtuales para considerar el cambio a renombrados virtuales completos" + +-#: params.def:668 ++#: params.def:669 + msgid "Ratio between virtual mappings and virtual symbols to do full virtual renames" + msgstr "Tasa entre mapeos virtuales y símbolos virtuales para hacer renombrados virtuales completos" + +-#: params.def:673 ++#: params.def:674 + msgid "The lower bound for a buffer to be considered for stack smashing protection" + msgstr "El límite inferior para considerar un almacenamiento temporal para protección contra destrucción de pila" + +-#: params.def:691 ++#: params.def:692 + msgid "Maximum number of statements allowed in a block that needs to be duplicated when threading jumps" + msgstr "Número máximo de sentencias permitidas en un bloque que necesitan ser duplicadas al hacer hilos de saltos" + +-#: params.def:700 ++#: params.def:701 + msgid "Maximum number of fields in a structure before pointer analysis treats the structure as a single variable" + msgstr "El número máximo de campos en una estructura antes de que el análisis de punteros trate a la estructura como una sola variable" + +-#: params.def:705 ++#: params.def:706 + msgid "The maximum number of instructions ready to be issued to be considered by the scheduler during the first scheduling pass" + msgstr "El número máximo de instrucciones listas para ser ejecutadas para ser consideradas por el calendarizador durante el primer paso de calendarización" + +-#: params.def:711 ++#: params.def:712 + msgid "Maximum number of active local stores in RTL dead store elimination" + msgstr "Número máximo de almacenamientos locales activos en la eliminación de almacenamiento muerto RTL" + +-#: params.def:721 ++#: params.def:722 + msgid "The number of insns executed before prefetch is completed" + msgstr "El número de insns ejecutadas antes de completar la precarga" + +-#: params.def:728 ++#: params.def:729 + msgid "The number of prefetches that can run at the same time" + msgstr "El número de precargas que se pueden ejecutar simultánamente" + +-#: params.def:735 ++#: params.def:736 + msgid "The size of L1 cache" + msgstr "El tamaño del caché L1" + +-#: params.def:742 ++#: params.def:743 + msgid "The size of L1 cache line" + msgstr "El tamaño de la línea del caché L1" + +-#: params.def:749 ++#: params.def:750 + msgid "The size of L2 cache" + msgstr "El tamaño del caché L2" + +-#: params.def:760 ++#: params.def:761 + msgid "Whether to use canonical types" + msgstr "Decide si se usan tipos canónicos" + +-#: params.def:765 ++#: params.def:766 + msgid "Maximum length of partial antic set when performing tree pre optimization" + msgstr "Longitud máxima del conjunto antic parcial al realizar pre optimización de árbol" + +-#: params.def:775 ++#: params.def:776 + msgid "Maximum size of a SCC before SCCVN stops processing a function" + msgstr "Tamaño máxmo de un SCC antes de que SCCVN detenga el procesamiento de una función" + +-#: params.def:780 ++#: params.def:781 + msgid "Max loops number for regional RA" + msgstr "Número de bucles máximo para el RA regional" + +-#: params.def:785 ++#: params.def:786 + msgid "Max size of conflict table in MB" + msgstr "Tamaño máximo de la tabla de conflictos en MB" + +-#: params.def:790 ++#: params.def:791 + msgid "The number of registers in each class kept unused by loop invariant motion" + msgstr "El número de registros conservados sin uso en cada clase por el movimiento invariante del bucle" + +-#: params.def:798 ++#: params.def:799 + msgid "The maximum ratio between array size and switch branches for a switch conversion to take place" + msgstr "La tasa máxima entre el tamaño de la matriz y las ramificaciones switch para que tome lugar una conversión switch" + +-#: params.def:806 ++#: params.def:807 + msgid "size of tiles for loop blocking" + msgstr "tamaño de bloques para el bloqueo de bucles" + +-#: params.def:813 ++#: params.def:814 + msgid "maximum number of parameters in a SCoP" + msgstr "número máximo de parámetros en un SCoP" + +-#: params.def:820 ++#: params.def:821 + msgid "maximum number of basic blocks per function to be analyzed by Graphite" + msgstr "número máximo de bloques básicos por función para analizar con Graphite" + +-#: params.def:826 ++#: params.def:827 + msgid "Maximum number of datarefs in loop for building loop data dependencies" + msgstr "Número máximo de referencia de datos en bucles para construir dependencia de datos de bucles" + +-#: params.def:833 ++#: params.def:834 + msgid "Max basic blocks number in loop for loop invariant motion" + msgstr "Número máximo de bloques básicos en el bucle para el movimiento invariante de bucle" + +-#: params.def:839 ++#: params.def:840 + msgid "Maximum number of instructions in basic block to be considered for SLP vectorization" + msgstr "El número máximo de instrucciones en bloque básico que se consideran para vectorización SLP" + +-#: params.def:844 ++#: params.def:845 + msgid "Min. ratio of insns to prefetches to enable prefetching for a loop with an unknown trip count" + msgstr "Tasa mínima de insns a precargar para activar la precarga para un bucle con una cuenta de viajes desconocida" + +-#: params.def:850 ++#: params.def:851 + msgid "Min. ratio of insns to mem ops to enable prefetching in a loop" + msgstr "Tasa mínima de insns a ops de mem para activar la precarga en un bucle" + +-#: params.def:857 ++#: params.def:858 + msgid "Max. size of var tracking hash tables" + msgstr "Tamaño máximo de las tablas de dispersión de rastreo de variables" + +-#: params.def:865 ++#: params.def:866 + msgid "Max. recursion depth for expanding var tracking expressions" + msgstr "Profundidad máxima de recursión para expandir expresiones de rastreo de variables" + +-#: params.def:872 ++#: params.def:873 + msgid "The minimum UID to be used for a nondebug insn" + msgstr "El UID mínimo a usar para una insn que no es de depuración" + +-#: params.def:877 ++#: params.def:878 + msgid "Maximum allowed growth of size of new parameters ipa-sra replaces a pointer to an aggregate with" + msgstr "El crecimiento máximo permitido de tamaño de los parámetros nuevos ipa-sra que reemplazan un puntero a un agregado con" + +-#: params.def:883 ++#: params.def:884 + msgid "Size in bytes after which thread-local aggregates should be instrumented with the logging functions instead of save/restore pairs" + msgstr "Tamaño en bytes después del cual los agregados thread-local se deben instrumentar con las funciones de registro en lugar de pares save/restore" + +-#: params.def:890 ++#: params.def:891 + msgid "Maximum size of a list of values associated with each parameter for interprocedural constant propagation" + msgstr "Tamaño máximo de una lista de valores asociada con cada parámetro para propagación constante entre procedimientos" + +-#: params.def:896 ++#: params.def:897 + msgid "Threshold ipa-cp opportunity evaluation that is still considered beneficial to clone." + msgstr "Rango de evaluación de oportunidad ipa-cp que aún se considera benéfico para clonar." + +-#: params.def:904 ++#: params.def:905 + msgid "Number of partitions the program should be split to" + msgstr "Número de particiones en las que se debe dividir el programa" + +-#: params.def:909 ++#: params.def:910 + msgid "Minimal size of a partition for LTO (in estimated instructions)" + msgstr "Tamaño minimal de una partición para LTO (en instrucciones estimadas)" + +-#: params.def:916 ++#: params.def:917 + msgid "Maximum number of namespaces to search for alternatives when name lookup fails" + msgstr "Número máximo de espacios de nombres a buscar por alternativas cuando falla la búsqueda de nombre" + +-#: params.def:923 ++#: params.def:924 + msgid "Maximum number of conditional store pairs that can be sunk" + msgstr "El número máximo de pares de almacenamiento condicional que se pueden hundir" + +-#: params.def:931 ++#: params.def:932 + msgid "The smallest number of different values for which it is best to use a jump-table instead of a tree of conditional branches, if 0, use the default for the machine" + msgstr "El número más pequeño de valores diferentes para los cuales es mejor usar una tabla-salto en lugar de un árbol de ramificaciones condicionales; si es 0, usa el valor por defecto para la máquina" + +-#: params.def:939 ++#: params.def:940 + msgid "Allow new data races on loads to be introduced" + msgstr "Permite que se introduzcan carreras de datos nuevos en loads" + +-#: params.def:944 ++#: params.def:945 + msgid "Allow new data races on stores to be introduced" + msgstr "Permite que se introduzcan carreras de datos nuevos en stores" + +-#: params.def:949 ++#: params.def:950 + msgid "Allow new data races on packed data loads to be introduced" + msgstr "Permite que se introduzcan carreras de datos nuevos en loads de datos packed" + +-#: params.def:954 ++#: params.def:955 + msgid "Allow new data races on packed data stores to be introduced" + msgstr "Permite que se introduzcan carreras de datos nuevos en stores de datos packed" + +-#: params.def:960 ++#: params.def:961 + msgid "Set the maximum number of instructions executed in parallel in reassociated tree. If 0, use the target dependent heuristic." + msgstr "Establece el número máximo de instrucciones ejecutadas en paralelo en el árbol de reasociación. Si es 0, usa la heurística dependiente del objetivo." + +-#: params.def:966 ++#: params.def:967 + msgid "Maximum amount of similar bbs to compare a bb with" + msgstr "Cantidad máxima de bbs similares con las cuales comparar un bb" + +-#: params.def:971 ++#: params.def:972 + msgid "Maximum amount of iterations of the pass over a function" + msgstr "Cantidad máxima de iteraciones del paso sobre una función" + +-#: params.def:978 ++#: params.def:979 + msgid "Maximum number of strings for which strlen optimization pass will track string lengths" + msgstr "Número máximo de cadenas para las que el paso de optimización de strlen rastreará longitudes de cadenas" + +@@ -2543,18 +2543,18 @@ + msgstr "valor %%r inválido" + + #: config/alpha/alpha.c:5103 config/ia64/ia64.c:5249 +-#: config/rs6000/rs6000.c:15018 config/xtensa/xtensa.c:2350 ++#: config/rs6000/rs6000.c:15017 config/xtensa/xtensa.c:2350 + #, c-format + msgid "invalid %%R value" + msgstr "valor %%R inválido" + +-#: config/alpha/alpha.c:5109 config/rs6000/rs6000.c:14937 ++#: config/alpha/alpha.c:5109 config/rs6000/rs6000.c:14936 + #: config/xtensa/xtensa.c:2317 + #, c-format + msgid "invalid %%N value" + msgstr "valor %%N inválido" + +-#: config/alpha/alpha.c:5117 config/rs6000/rs6000.c:14965 ++#: config/alpha/alpha.c:5117 config/rs6000/rs6000.c:14964 + #, c-format + msgid "invalid %%P value" + msgstr "valor %%P inválido" +@@ -2569,12 +2569,12 @@ + msgid "invalid %%L value" + msgstr "valor %%L inválido" + +-#: config/alpha/alpha.c:5172 config/rs6000/rs6000.c:14919 ++#: config/alpha/alpha.c:5172 config/rs6000/rs6000.c:14918 + #, c-format + msgid "invalid %%m value" + msgstr "valor %%m inválido" + +-#: config/alpha/alpha.c:5180 config/rs6000/rs6000.c:14927 ++#: config/alpha/alpha.c:5180 config/rs6000/rs6000.c:14926 + #, c-format + msgid "invalid %%M value" + msgstr "valor %%M inválido" +@@ -2585,7 +2585,7 @@ + msgstr "valor %%U inválido" + + #: config/alpha/alpha.c:5232 config/alpha/alpha.c:5243 +-#: config/rs6000/rs6000.c:15026 ++#: config/rs6000/rs6000.c:15025 + #, c-format + msgid "invalid %%s value" + msgstr "valor %%s inválido" +@@ -2595,7 +2595,7 @@ + msgid "invalid %%C value" + msgstr "valor %%C inválido" + +-#: config/alpha/alpha.c:5291 config/rs6000/rs6000.c:14784 ++#: config/alpha/alpha.c:5291 config/rs6000/rs6000.c:14783 + #, c-format + msgid "invalid %%E value" + msgstr "valor %%E inválido" +@@ -2606,38 +2606,38 @@ + msgstr "reubicación unspec desconocida" + + #: config/alpha/alpha.c:5325 config/cr16/cr16.c:1537 +-#: config/rs6000/rs6000.c:15375 config/spu/spu.c:1744 ++#: config/rs6000/rs6000.c:15374 config/spu/spu.c:1744 + #, c-format + msgid "invalid %%xn code" + msgstr "código %%xn inválido" + +-#: config/arm/arm.c:17116 config/arm/arm.c:17134 ++#: config/arm/arm.c:17120 config/arm/arm.c:17138 + #, c-format + msgid "predicated Thumb instruction" + msgstr "instrucción de predicado Thumb" + +-#: config/arm/arm.c:17122 ++#: config/arm/arm.c:17126 + #, c-format + msgid "predicated instruction in conditional sequence" + msgstr "instrucción de predicado en una secuencia condicional" + +-#: config/arm/arm.c:17253 ++#: config/arm/arm.c:17257 + #, c-format + msgid "Unsupported operand for code '%c'" + msgstr "No se admite el operando para el código '%c'" + +-#: config/arm/arm.c:17301 ++#: config/arm/arm.c:17305 + #, c-format + msgid "invalid shift operand" + msgstr "operando de desplazamiento inválido" + +-#: config/arm/arm.c:17358 config/arm/arm.c:17380 config/arm/arm.c:17390 +-#: config/arm/arm.c:17400 config/arm/arm.c:17410 config/arm/arm.c:17449 +-#: config/arm/arm.c:17467 config/arm/arm.c:17502 config/arm/arm.c:17521 +-#: config/arm/arm.c:17536 config/arm/arm.c:17563 config/arm/arm.c:17570 +-#: config/arm/arm.c:17588 config/arm/arm.c:17595 config/arm/arm.c:17603 +-#: config/arm/arm.c:17624 config/arm/arm.c:17631 config/arm/arm.c:17756 +-#: config/arm/arm.c:17763 config/arm/arm.c:17786 config/arm/arm.c:17793 ++#: config/arm/arm.c:17362 config/arm/arm.c:17384 config/arm/arm.c:17394 ++#: config/arm/arm.c:17404 config/arm/arm.c:17414 config/arm/arm.c:17453 ++#: config/arm/arm.c:17471 config/arm/arm.c:17506 config/arm/arm.c:17525 ++#: config/arm/arm.c:17540 config/arm/arm.c:17567 config/arm/arm.c:17574 ++#: config/arm/arm.c:17592 config/arm/arm.c:17599 config/arm/arm.c:17607 ++#: config/arm/arm.c:17628 config/arm/arm.c:17635 config/arm/arm.c:17760 ++#: config/arm/arm.c:17767 config/arm/arm.c:17790 config/arm/arm.c:17797 + #: config/bfin/bfin.c:1436 config/bfin/bfin.c:1443 config/bfin/bfin.c:1450 + #: config/bfin/bfin.c:1457 config/bfin/bfin.c:1466 config/bfin/bfin.c:1473 + #: config/bfin/bfin.c:1480 config/bfin/bfin.c:1487 +@@ -2645,79 +2645,79 @@ + msgid "invalid operand for code '%c'" + msgstr "operando inválido para el código '%c'" + +-#: config/arm/arm.c:17462 ++#: config/arm/arm.c:17466 + #, c-format + msgid "instruction never executed" + msgstr "la instrucción nunca se ejecuta" + +-#: config/arm/arm.c:17805 ++#: config/arm/arm.c:17809 + #, c-format + msgid "missing operand" + msgstr "falta un operando" + +-#: config/arm/arm.c:20407 ++#: config/arm/arm.c:20411 + msgid "function parameters cannot have __fp16 type" + msgstr "los parámetros de la función no pueden tener el tipo __fp16" + +-#: config/arm/arm.c:20417 ++#: config/arm/arm.c:20421 + msgid "functions cannot return __fp16 type" + msgstr "la función no puede devolver el tipo __fp16" + +-#: config/avr/avr.c:1806 ++#: config/avr/avr.c:1816 + #, c-format + msgid "address operand requires constraint for X, Y, or Z register" + msgstr "el operando de dirección requiere una restricción para los registros X, Y, o Z" + +-#: config/avr/avr.c:1959 ++#: config/avr/avr.c:1969 + msgid "operands to %T/%t must be reg + const_int:" + msgstr "los operandos para %T/%t deben ser reg + const_int:" + +-#: config/avr/avr.c:1997 config/avr/avr.c:2052 ++#: config/avr/avr.c:2007 config/avr/avr.c:2062 + msgid "bad address, not an I/O address:" + msgstr "dirección errónea, no es una dirección de E/S:" + +-#: config/avr/avr.c:2006 ++#: config/avr/avr.c:2016 + msgid "bad address, not a constant:" + msgstr "dirección errónea, no es una constante:" + +-#: config/avr/avr.c:2024 ++#: config/avr/avr.c:2034 + msgid "bad address, not (reg+disp):" + msgstr "dirección errónea, no (reg+disp):" + +-#: config/avr/avr.c:2031 ++#: config/avr/avr.c:2041 + msgid "bad address, not post_inc or pre_dec:" + msgstr "dirección errónea, no hay post_inc o pre_dec:" + +-#: config/avr/avr.c:2042 ++#: config/avr/avr.c:2052 + msgid "internal compiler error. Bad address:" + msgstr "error interno del compilador. Dirección errónea:" + +-#: config/avr/avr.c:2072 ++#: config/avr/avr.c:2082 + msgid "internal compiler error. Unknown mode:" + msgstr "error interno del compilador. Modo desconocido:" + +-#: config/avr/avr.c:2871 config/avr/avr.c:3444 config/avr/avr.c:3730 ++#: config/avr/avr.c:2881 config/avr/avr.c:3454 config/avr/avr.c:3740 + msgid "invalid insn:" + msgstr "insn inválida:" + +-#: config/avr/avr.c:2900 config/avr/avr.c:2975 config/avr/avr.c:3018 +-#: config/avr/avr.c:3037 config/avr/avr.c:3128 config/avr/avr.c:3297 +-#: config/avr/avr.c:3507 config/avr/avr.c:3623 config/avr/avr.c:3759 +-#: config/avr/avr.c:3850 config/avr/avr.c:3972 ++#: config/avr/avr.c:2910 config/avr/avr.c:2985 config/avr/avr.c:3028 ++#: config/avr/avr.c:3047 config/avr/avr.c:3138 config/avr/avr.c:3307 ++#: config/avr/avr.c:3517 config/avr/avr.c:3633 config/avr/avr.c:3769 ++#: config/avr/avr.c:3860 config/avr/avr.c:3982 + msgid "incorrect insn:" + msgstr "insn incorrecta:" + +-#: config/avr/avr.c:3052 config/avr/avr.c:3213 config/avr/avr.c:3368 +-#: config/avr/avr.c:3576 config/avr/avr.c:3669 config/avr/avr.c:3906 +-#: config/avr/avr.c:4027 ++#: config/avr/avr.c:3062 config/avr/avr.c:3223 config/avr/avr.c:3378 ++#: config/avr/avr.c:3586 config/avr/avr.c:3679 config/avr/avr.c:3916 ++#: config/avr/avr.c:4037 + msgid "unknown move insn:" + msgstr "insn move desconocida:" + +-#: config/avr/avr.c:4441 ++#: config/avr/avr.c:4451 + msgid "bad shift insn:" + msgstr "insn shift errónea:" + +-#: config/avr/avr.c:4549 config/avr/avr.c:5030 config/avr/avr.c:5445 ++#: config/avr/avr.c:4559 config/avr/avr.c:5040 config/avr/avr.c:5455 + msgid "internal compiler error. Incorrect shift:" + msgstr "error interno del compilador. Desplazamiento incorrecto:" + +@@ -2733,7 +2733,7 @@ + + #: config/cris/cris.c:579 config/moxie/moxie.c:111 final.c:3129 final.c:3131 + #: fold-const.c:287 gcc.c:4609 gcc.c:4623 loop-iv.c:2968 loop-iv.c:2977 +-#: rtl-error.c:103 toplev.c:346 tree-ssa-loop-niter.c:1917 tree-vrp.c:6046 ++#: rtl-error.c:103 toplev.c:346 tree-ssa-loop-niter.c:1917 tree-vrp.c:6018 + #: cp/typeck.c:5347 java/expr.c:390 lto/lto-object.c:184 lto/lto-object.c:282 + #: lto/lto-object.c:339 lto/lto-object.c:363 + #, gcc-internal-format, gfc-internal-format +@@ -2963,72 +2963,72 @@ + msgid "bad output_condmove_single operand" + msgstr "operando output_condmove_single erróneo" + +-#: config/i386/i386.c:13178 ++#: config/i386/i386.c:13272 + #, c-format + msgid "invalid UNSPEC as operand" + msgstr "UNSPEC inválido como operando" + +-#: config/i386/i386.c:13801 ++#: config/i386/i386.c:13896 + #, c-format + msgid "'%%&' used without any local dynamic TLS references" + msgstr "se usó '%%&' sin ninguna referencia TLS dinámica local" + +-#: config/i386/i386.c:13892 config/i386/i386.c:13967 ++#: config/i386/i386.c:13994 config/i386/i386.c:14069 + #, c-format + msgid "invalid operand size for operand code '%c'" + msgstr "tamaño de operando inválido para el código de operando '%c'" + +-#: config/i386/i386.c:13962 ++#: config/i386/i386.c:14064 + #, c-format + msgid "invalid operand type used with operand code '%c'" + msgstr "se usó un tipo de operando inválido con el código de operando '%c'" + +-#: config/i386/i386.c:14043 config/i386/i386.c:14083 ++#: config/i386/i386.c:14145 config/i386/i386.c:14185 + #, c-format + msgid "operand is not a condition code, invalid operand code 'D'" + msgstr "el operando no es un código de condición, código de operando 'D' inválido" + +-#: config/i386/i386.c:14109 ++#: config/i386/i386.c:14211 + #, c-format + msgid "operand is neither a constant nor a condition code, invalid operand code 'C'" + msgstr "el operando no es una constante ni un código de condición, código de operando 'C' inválido" + +-#: config/i386/i386.c:14119 ++#: config/i386/i386.c:14221 + #, c-format + msgid "operand is neither a constant nor a condition code, invalid operand code 'F'" + msgstr "el operando no es una constante ni un código de condición, código de operando 'F' inválido" + +-#: config/i386/i386.c:14137 ++#: config/i386/i386.c:14239 + #, c-format + msgid "operand is neither a constant nor a condition code, invalid operand code 'c'" + msgstr "el operando no es una constante ni un código de condición, código de operando 'c' inválido" + +-#: config/i386/i386.c:14147 ++#: config/i386/i386.c:14249 + #, c-format + msgid "operand is neither a constant nor a condition code, invalid operand code 'f'" + msgstr "el operando no es una constante ni un código de condición, código de operando 'f' inválido" + +-#: config/i386/i386.c:14162 ++#: config/i386/i386.c:14264 + #, c-format + msgid "operand is not an offsettable memory reference, invalid operand code 'H'" + msgstr "el operando no es una referencia de memoria desplazable, código de operando 'H' inválido" + +-#: config/i386/i386.c:14257 ++#: config/i386/i386.c:14359 + #, c-format + msgid "operand is not a condition code, invalid operand code 'Y'" + msgstr "el operando no es un código de condición, código de operando 'Y' inválido" + +-#: config/i386/i386.c:14287 ++#: config/i386/i386.c:14389 + #, c-format + msgid "invalid operand code '%c'" + msgstr "código de operando '%c' inválido" + +-#: config/i386/i386.c:14342 ++#: config/i386/i386.c:14444 + #, c-format + msgid "invalid constraints for operand" + msgstr "restricciones inválidas para el operando" + +-#: config/i386/i386.c:23356 ++#: config/i386/i386.c:23485 + msgid "unknown insn mode" + msgstr "modo insn desconocido" + +@@ -3079,13 +3079,13 @@ + msgid "invalid operation on %<__fpreg%>" + msgstr "operación inválida en %<__fpreg%>" + +-#: config/iq2000/iq2000.c:3130 config/tilegx/tilegx.c:5131 ++#: config/iq2000/iq2000.c:3130 config/tilegx/tilegx.c:5133 + #: config/tilepro/tilepro.c:4696 + #, c-format + msgid "invalid %%P operand" + msgstr "operando %%P inválido" + +-#: config/iq2000/iq2000.c:3138 config/rs6000/rs6000.c:14955 ++#: config/iq2000/iq2000.c:3138 config/rs6000/rs6000.c:14954 + #, c-format + msgid "invalid %%p value" + msgstr "valor %%p inválido" +@@ -3164,7 +3164,7 @@ + msgstr "la dirección de post-incremento no es un registro" + + #: config/m32r/m32r.c:2321 config/m32r/m32r.c:2335 +-#: config/rs6000/rs6000.c:24534 ++#: config/rs6000/rs6000.c:24557 + msgid "bad address" + msgstr "dirección errónea" + +@@ -3299,115 +3299,115 @@ + msgid "Try running '%s' in the shell to raise its limit.\n" + msgstr "Pruebe ejecutar '%s' en el intérprete de órdenes para elevar su límite.\n" + +-#: config/rs6000/rs6000.c:2758 ++#: config/rs6000/rs6000.c:2757 + msgid "-mvsx requires hardware floating point" + msgstr "-mvsx requiere coma flotante de hardware" + +-#: config/rs6000/rs6000.c:2763 ++#: config/rs6000/rs6000.c:2762 + msgid "-mvsx and -mpaired are incompatible" + msgstr "-mvsx y -mpaired son incompatibles" + +-#: config/rs6000/rs6000.c:2768 ++#: config/rs6000/rs6000.c:2767 + msgid "-mvsx used with little endian code" + msgstr "se usó -mvsx con código little endian" + +-#: config/rs6000/rs6000.c:2770 ++#: config/rs6000/rs6000.c:2769 + msgid "-mvsx needs indexed addressing" + msgstr "-mvsx necesita direccionamiento indizado" + +-#: config/rs6000/rs6000.c:2774 ++#: config/rs6000/rs6000.c:2773 + msgid "-mvsx and -mno-altivec are incompatible" + msgstr "-mvsx y -mno-altivec son incompatibles" + +-#: config/rs6000/rs6000.c:2776 ++#: config/rs6000/rs6000.c:2775 + msgid "-mno-altivec disables vsx" + msgstr "-mno-altivec desactiva vsx" + +-#: config/rs6000/rs6000.c:7324 ++#: config/rs6000/rs6000.c:7323 + msgid "bad move" + msgstr "move erróneo" + +-#: config/rs6000/rs6000.c:14765 ++#: config/rs6000/rs6000.c:14764 + #, c-format + msgid "invalid %%c value" + msgstr "valor %%c inválido" + +-#: config/rs6000/rs6000.c:14793 ++#: config/rs6000/rs6000.c:14792 + #, c-format + msgid "invalid %%f value" + msgstr "valor %%f inválido" + +-#: config/rs6000/rs6000.c:14802 ++#: config/rs6000/rs6000.c:14801 + #, c-format + msgid "invalid %%F value" + msgstr "valor %%F inválido" + +-#: config/rs6000/rs6000.c:14811 ++#: config/rs6000/rs6000.c:14810 + #, c-format + msgid "invalid %%G value" + msgstr "valor %%G inválido" + +-#: config/rs6000/rs6000.c:14846 ++#: config/rs6000/rs6000.c:14845 + #, c-format + msgid "invalid %%j code" + msgstr "código %%j inválido" + +-#: config/rs6000/rs6000.c:14856 ++#: config/rs6000/rs6000.c:14855 + #, c-format + msgid "invalid %%J code" + msgstr "código %%J inválido" + +-#: config/rs6000/rs6000.c:14866 ++#: config/rs6000/rs6000.c:14865 + #, c-format + msgid "invalid %%k value" + msgstr "valor %%k inválido" + +-#: config/rs6000/rs6000.c:14881 config/xtensa/xtensa.c:2336 ++#: config/rs6000/rs6000.c:14880 config/xtensa/xtensa.c:2336 + #, c-format + msgid "invalid %%K value" + msgstr "valor %%K inválido" + +-#: config/rs6000/rs6000.c:14945 ++#: config/rs6000/rs6000.c:14944 + #, c-format + msgid "invalid %%O value" + msgstr "valor %%O inválido" + +-#: config/rs6000/rs6000.c:14992 ++#: config/rs6000/rs6000.c:14991 + #, c-format + msgid "invalid %%q value" + msgstr "valor %%q inválido" + +-#: config/rs6000/rs6000.c:15036 ++#: config/rs6000/rs6000.c:15035 + #, c-format + msgid "invalid %%S value" + msgstr "valor %%S inválido" + +-#: config/rs6000/rs6000.c:15076 ++#: config/rs6000/rs6000.c:15075 + #, c-format + msgid "invalid %%T value" + msgstr "valor %%T inválido" + +-#: config/rs6000/rs6000.c:15086 ++#: config/rs6000/rs6000.c:15085 + #, c-format + msgid "invalid %%u value" + msgstr "valor %%u inválido" + +-#: config/rs6000/rs6000.c:15095 config/xtensa/xtensa.c:2306 ++#: config/rs6000/rs6000.c:15094 config/xtensa/xtensa.c:2306 + #, c-format + msgid "invalid %%v value" + msgstr "valor %%v inválido" + +-#: config/rs6000/rs6000.c:15177 config/xtensa/xtensa.c:2357 ++#: config/rs6000/rs6000.c:15176 config/xtensa/xtensa.c:2357 + #, c-format + msgid "invalid %%x value" + msgstr "valor %%x inválido" + +-#: config/rs6000/rs6000.c:15323 ++#: config/rs6000/rs6000.c:15322 + #, c-format + msgid "invalid %%y value, try using the 'Z' constraint" + msgstr "valor %%y inválido, pruebe usando la restricción 'Z'" + +-#: config/rs6000/rs6000.c:26944 ++#: config/rs6000/rs6000.c:26967 + msgid "AltiVec argument passed to unprototyped function" + msgstr "Se pasó un argumento Altivec a una función sin prototipo" + +@@ -3496,25 +3496,25 @@ + msgid "invalid operand for code: '%c'" + msgstr "operando inválido para code: '%c'" + +-#: config/sh/sh.c:1031 ++#: config/sh/sh.c:1024 + #, c-format + msgid "invalid operand to %%R" + msgstr "operando inválido para %%R" + +-#: config/sh/sh.c:1058 ++#: config/sh/sh.c:1051 + #, c-format + msgid "invalid operand to %%S" + msgstr "operando inválido para %%S" + +-#: config/sh/sh.c:9154 ++#: config/sh/sh.c:9157 + msgid "created and used with different architectures / ABIs" + msgstr "creado y usado con diferentes arquitecturas / ABIs" + +-#: config/sh/sh.c:9156 ++#: config/sh/sh.c:9159 + msgid "created and used with different ABIs" + msgstr "creado y usado con diferentes ABIs" + +-#: config/sh/sh.c:9158 ++#: config/sh/sh.c:9161 + msgid "created and used with different endianness" + msgstr "creado y usado con diferente orden de bits" + +@@ -3533,13 +3533,13 @@ + msgid "invalid %%B operand" + msgstr "operando %%B inválido" + +-#: config/sparc/sparc.c:8247 config/tilegx/tilegx.c:4934 ++#: config/sparc/sparc.c:8247 config/tilegx/tilegx.c:4936 + #: config/tilepro/tilepro.c:4499 + #, c-format + msgid "invalid %%C operand" + msgstr "operando %%C inválido" + +-#: config/sparc/sparc.c:8264 config/tilegx/tilegx.c:4967 ++#: config/sparc/sparc.c:8264 config/tilegx/tilegx.c:4969 + #, c-format + msgid "invalid %%D operand" + msgstr "operando %%D inválido" +@@ -3584,57 +3584,57 @@ + msgid "xstormy16_print_operand: unknown code" + msgstr "xstormy16_print_operand: código desconocido" + +-#: config/tilegx/tilegx.c:4919 config/tilepro/tilepro.c:4484 ++#: config/tilegx/tilegx.c:4921 config/tilepro/tilepro.c:4484 + #, c-format + msgid "invalid %%c operand" + msgstr "operando %%c inválido" + +-#: config/tilegx/tilegx.c:4950 ++#: config/tilegx/tilegx.c:4952 + #, c-format + msgid "invalid %%d operand" + msgstr "operando %%d inválido" + +-#: config/tilegx/tilegx.c:5033 ++#: config/tilegx/tilegx.c:5035 + #, c-format + msgid "invalid %%H specifier" + msgstr "especificador %%H inválido" + +-#: config/tilegx/tilegx.c:5069 config/tilepro/tilepro.c:4513 ++#: config/tilegx/tilegx.c:5071 config/tilepro/tilepro.c:4513 + #, c-format + msgid "invalid %%h operand" + msgstr "operando %%h inválido" + +-#: config/tilegx/tilegx.c:5081 config/tilepro/tilepro.c:4577 ++#: config/tilegx/tilegx.c:5083 config/tilepro/tilepro.c:4577 + #, c-format + msgid "invalid %%I operand" + msgstr "operando %%I inválido" + +-#: config/tilegx/tilegx.c:5095 config/tilepro/tilepro.c:4591 ++#: config/tilegx/tilegx.c:5097 config/tilepro/tilepro.c:4591 + #, c-format + msgid "invalid %%i operand" + msgstr "operando %%i inválido" + +-#: config/tilegx/tilegx.c:5118 config/tilepro/tilepro.c:4614 ++#: config/tilegx/tilegx.c:5120 config/tilepro/tilepro.c:4614 + #, c-format + msgid "invalid %%j operand" + msgstr "operando %%j inválido" + +-#: config/tilegx/tilegx.c:5149 ++#: config/tilegx/tilegx.c:5151 + #, c-format + msgid "invalid %%%c operand" + msgstr "operando %%%c inválido" + +-#: config/tilegx/tilegx.c:5164 config/tilepro/tilepro.c:4728 ++#: config/tilegx/tilegx.c:5166 config/tilepro/tilepro.c:4728 + #, c-format + msgid "invalid %%N operand" + msgstr "operando %%N inválido" + +-#: config/tilegx/tilegx.c:5208 ++#: config/tilegx/tilegx.c:5210 + #, c-format + msgid "invalid operand for 'r' specifier" + msgstr "operando inválido para el especificador 'r'" + +-#: config/tilegx/tilegx.c:5233 config/tilepro/tilepro.c:4810 ++#: config/tilegx/tilegx.c:5235 config/tilepro/tilepro.c:4810 + #, c-format + msgid "unable to print out operand yet; code == %d (%c)" + msgstr "aún no se puede mostrar el operando; code == %d (%c)" +@@ -3948,7 +3948,7 @@ + msgid "candidates are:" + msgstr "los candidatos son:" + +-#: cp/pt.c:17843 cp/call.c:3289 ++#: cp/pt.c:17869 cp/call.c:3289 + #, gcc-internal-format + msgid "candidate is:" + msgid_plural "candidates are:" +@@ -4317,11 +4317,11 @@ + msgid "implied END DO" + msgstr "END DO implícito" + +-#: fortran/parse.c:1475 fortran/resolve.c:9395 ++#: fortran/parse.c:1475 fortran/resolve.c:9397 + msgid "assignment" + msgstr "asignación" + +-#: fortran/parse.c:1478 fortran/resolve.c:9434 fortran/resolve.c:9437 ++#: fortran/parse.c:1478 fortran/resolve.c:9436 fortran/resolve.c:9439 + msgid "pointer assignment" + msgstr "asignación de puntero" + +@@ -4329,123 +4329,123 @@ + msgid "simple IF" + msgstr "IF simple" + +-#: fortran/resolve.c:533 ++#: fortran/resolve.c:535 + msgid "module procedure" + msgstr "procedimiento módulo" + +-#: fortran/resolve.c:534 ++#: fortran/resolve.c:536 + msgid "internal function" + msgstr "función interna" + +-#: fortran/resolve.c:1973 ++#: fortran/resolve.c:1975 + msgid "elemental procedure" + msgstr "procedimiento elemental" + +-#: fortran/resolve.c:3798 ++#: fortran/resolve.c:3800 + #, c-format + msgid "Invalid context for NULL() pointer at %%L" + msgstr "Contexto inválido para el puntero NULL() en %%L" + +-#: fortran/resolve.c:3814 ++#: fortran/resolve.c:3816 + #, c-format + msgid "Operand of unary numeric operator '%s' at %%L is %s" + msgstr "El operando del operador numérico unario '%s' en %%L es %s" + +-#: fortran/resolve.c:3830 ++#: fortran/resolve.c:3832 + #, c-format + msgid "Operands of binary numeric operator '%s' at %%L are %s/%s" + msgstr "Los operandos del operador binario numérico '%s' en %%L son %s/%s" + +-#: fortran/resolve.c:3845 ++#: fortran/resolve.c:3847 + #, c-format + msgid "Operands of string concatenation operator at %%L are %s/%s" + msgstr "Los operandos del operador de concatenación de cadenas en %%L son %s/%s" + +-#: fortran/resolve.c:3864 ++#: fortran/resolve.c:3866 + #, c-format + msgid "Operands of logical operator '%s' at %%L are %s/%s" + msgstr "Los operandos del operador lógico '%s' en %%L son %s/%s" + +-#: fortran/resolve.c:3878 ++#: fortran/resolve.c:3880 + #, c-format + msgid "Operand of .not. operator at %%L is %s" + msgstr "El operando del operador .not. en %%L es %s" + +-#: fortran/resolve.c:3892 ++#: fortran/resolve.c:3894 + msgid "COMPLEX quantities cannot be compared at %L" + msgstr "Las cantidades COMPLEX no se pueden comparar en %L" + +-#: fortran/resolve.c:3921 ++#: fortran/resolve.c:3923 + #, c-format + msgid "Logicals at %%L must be compared with %s instead of %s" + msgstr "Los lógicos en %%L se deben comparar con %s en lugar de %s" + +-#: fortran/resolve.c:3927 ++#: fortran/resolve.c:3929 + #, c-format + msgid "Operands of comparison operator '%s' at %%L are %s/%s" + msgstr "Los operandos del operador de comparación '%s' en %%L son %s/%s" + +-#: fortran/resolve.c:3935 ++#: fortran/resolve.c:3937 + #, c-format + msgid "Unknown operator '%s' at %%L" + msgstr "Operador '%s' desconocido en %%L" + +-#: fortran/resolve.c:3937 ++#: fortran/resolve.c:3939 + #, c-format + msgid "Operand of user operator '%s' at %%L is %s" + msgstr "El operando del operador de usuario '%s' en %%L es %s" + +-#: fortran/resolve.c:3941 ++#: fortran/resolve.c:3943 + #, c-format + msgid "Operands of user operator '%s' at %%L are %s/%s" + msgstr "Los operandos del operador de usuario '%s' en %%L son %s/%s" + +-#: fortran/resolve.c:4029 ++#: fortran/resolve.c:4031 + #, c-format + msgid "Inconsistent ranks for operator at %%L and %%L" + msgstr "Rangos inconsistentes para el operador en %%L y %%L" + +-#: fortran/resolve.c:6401 ++#: fortran/resolve.c:6403 + msgid "Loop variable" + msgstr "Variable de ciclo" + +-#: fortran/resolve.c:6405 ++#: fortran/resolve.c:6407 + msgid "iterator variable" + msgstr "variable de iterador" + +-#: fortran/resolve.c:6410 ++#: fortran/resolve.c:6412 + msgid "Start expression in DO loop" + msgstr "Expresión de inicio en el bucle DO" + +-#: fortran/resolve.c:6414 ++#: fortran/resolve.c:6416 + msgid "End expression in DO loop" + msgstr "Expresión de fin en el bucle DO" + +-#: fortran/resolve.c:6418 ++#: fortran/resolve.c:6420 + msgid "Step expression in DO loop" + msgstr "Expresión de paso en el bucle DO" + +-#: fortran/resolve.c:6674 fortran/resolve.c:6677 ++#: fortran/resolve.c:6676 fortran/resolve.c:6679 + msgid "DEALLOCATE object" + msgstr "objeto DEALLOCATE" + +-#: fortran/resolve.c:7019 fortran/resolve.c:7021 ++#: fortran/resolve.c:7021 fortran/resolve.c:7023 + msgid "ALLOCATE object" + msgstr "objeto ALLOCATE" + +-#: fortran/resolve.c:7201 fortran/resolve.c:8434 ++#: fortran/resolve.c:7203 fortran/resolve.c:8436 + msgid "STAT variable" + msgstr "variable STAT" + +-#: fortran/resolve.c:7244 fortran/resolve.c:8446 ++#: fortran/resolve.c:7246 fortran/resolve.c:8448 + msgid "ERRMSG variable" + msgstr "variable ERRMSG" + +-#: fortran/resolve.c:8312 ++#: fortran/resolve.c:8314 + msgid "item in READ" + msgstr "elemento en READ" + +-#: fortran/resolve.c:8458 ++#: fortran/resolve.c:8460 + msgid "ACQUIRED_LOCK variable" + msgstr "variable ACQUIRED_LOCK" + +@@ -4454,7 +4454,7 @@ + msgid "Different CHARACTER lengths (%ld/%ld) in array constructor" + msgstr "Longitudes de CHARACTER diferentes (%ld/%ld) en el constructor de matriz" + +-#: fortran/trans-array.c:5070 ++#: fortran/trans-array.c:5064 + msgid "Integer overflow when calculating the amount of memory to allocate" + msgstr "Desborde entero al calcular la cantidad de memoria a reservar" + +@@ -4775,6 +4775,18 @@ + msgid "cannot use mshared and static together" + msgstr "no se pueden usar mshared y static juntos" + ++#: java/lang-specs.h:33 ++msgid "-fjni and -femit-class-files are incompatible" ++msgstr "-fjni y -femit-class-files son incompatibles" ++ ++#: java/lang-specs.h:34 ++msgid "-fjni and -femit-class-file are incompatible" ++msgstr "-fjni y -femit-class-file son incompatibles" ++ ++#: java/lang-specs.h:35 java/lang-specs.h:36 ++msgid "-femit-class-file should used along with -fsyntax-only" ++msgstr "-femit-class-file se debe usar junto con -fsyntax-only" ++ + #: config/i386/mingw-w64.h:83 config/i386/mingw32.h:116 + #: config/i386/cygwin.h:114 + msgid "shared and mdll are not compatible" +@@ -4864,26 +4876,10 @@ + msgid "objc-cpp-output is deprecated; please use objective-c-cpp-output instead" + msgstr "objc-cpp-output es obsoleto; por favor use en su lugar objective-c-cpp-output" + +-#: config/vax/netbsd-elf.h:51 +-msgid "the -shared option is not currently supported for VAX ELF" +-msgstr "la opción -shared no se admite actualmente en ELF de VAX" +- + #: fortran/lang-specs.h:55 fortran/lang-specs.h:69 + msgid "gfortran does not support -E without -cpp" + msgstr "gfortran no admite -E sin usar -cpp" + +-#: java/lang-specs.h:33 +-msgid "-fjni and -femit-class-files are incompatible" +-msgstr "-fjni y -femit-class-files son incompatibles" +- +-#: java/lang-specs.h:34 +-msgid "-fjni and -femit-class-file are incompatible" +-msgstr "-fjni y -femit-class-file son incompatibles" +- +-#: java/lang-specs.h:35 java/lang-specs.h:36 +-msgid "-femit-class-file should used along with -fsyntax-only" +-msgstr "-femit-class-file se debe usar junto con -fsyntax-only" +- + #: config/sh/sh.h:430 config/sh/sh.h:433 + msgid "SH2a does not support little-endian" + msgstr "SH2a no se admite para little-endian" +@@ -4896,6 +4892,10 @@ + msgid "objc++-cpp-output is deprecated; please use objective-c++-cpp-output instead" + msgstr "objc++-cpp-output es obsoleto; pr favor use en su lugar objective-c++-cpp-output" + ++#: config/vax/netbsd-elf.h:51 ++msgid "the -shared option is not currently supported for VAX ELF" ++msgstr "la opción -shared no se admite actualmente en ELF de VAX" ++ + #: config/vax/vax.h:50 config/vax/vax.h:51 + msgid "profiling not supported with -mg" + msgstr "el análisis de perfil no se admite con -mg" +@@ -7589,8 +7589,8 @@ + msgstr "Sigue las convenciones de llamada Renesas (anteriormente Hitachi) / SuperH" + + #: config/sh/sh.opt:274 +-msgid "Increase the IEEE compliance for floating-point code" +-msgstr "Incrementa el cumplimiento con IEEE para el código de coma flotante" ++msgid "Increase the IEEE compliance for floating-point comparisons" ++msgstr "Incrementa el cumplimiento con IEEE para las comparaciones de coma flotante" + + #: config/sh/sh.opt:278 + msgid "Enable the use of the indexed addressing mode for SHmedia32/SHcompact" +@@ -11791,224 +11791,220 @@ + msgid "Create a position independent executable" + msgstr "Genera un ejecutable independiente de posición" + +-#: go/gofrontend/expressions.cc:853 ++#: go/gofrontend/expressions.cc:855 + msgid "invalid use of type" + msgstr "uso inválido del tipo" + +-#: go/gofrontend/expressions.cc:2533 go/gofrontend/expressions.cc:2599 +-#: go/gofrontend/expressions.cc:2615 ++#: go/gofrontend/expressions.cc:2535 go/gofrontend/expressions.cc:2601 ++#: go/gofrontend/expressions.cc:2617 + msgid "constant refers to itself" + msgstr "la constante se refiere a sí misma" + +-#: go/gofrontend/expressions.cc:3900 ++#: go/gofrontend/expressions.cc:3902 + msgid "expected numeric type" + msgstr "se esperaba un tipo numérico" + +-#: go/gofrontend/expressions.cc:3905 ++#: go/gofrontend/expressions.cc:3907 + msgid "expected boolean type" + msgstr "se esperaba un tipo booleano" + +-#: go/gofrontend/expressions.cc:3911 ++#: go/gofrontend/expressions.cc:3913 + msgid "expected integer or boolean type" + msgstr "se esperaba un tipo entero o booleano" + +-#: go/gofrontend/expressions.cc:3918 ++#: go/gofrontend/expressions.cc:3920 + msgid "invalid operand for unary %<&%>" + msgstr "operando inválido para el unario %<&%>" + +-#: go/gofrontend/expressions.cc:3927 ++#: go/gofrontend/expressions.cc:3929 + msgid "expected pointer" + msgstr "se esperaba un puntero" + +-#: go/gofrontend/expressions.cc:5588 go/gofrontend/expressions.cc:5606 ++#: go/gofrontend/expressions.cc:5599 go/gofrontend/expressions.cc:5617 + msgid "incompatible types in binary expression" + msgstr "tipos incompatibles en la expresión binaria" + +-#: go/gofrontend/expressions.cc:5620 ++#: go/gofrontend/expressions.cc:5631 + msgid "shift of non-integer operand" + msgstr "desplazamiento de un operando que no es entero" + +-#: go/gofrontend/expressions.cc:5625 go/gofrontend/expressions.cc:5633 ++#: go/gofrontend/expressions.cc:5636 go/gofrontend/expressions.cc:5644 + msgid "shift count not unsigned integer" + msgstr "la cuenta de desplazamiento no es un entero sin signo" + +-#: go/gofrontend/expressions.cc:5638 ++#: go/gofrontend/expressions.cc:5649 + msgid "negative shift count" + msgstr "cuenta de desplazamiento negativa" + +-#: go/gofrontend/expressions.cc:6431 ++#: go/gofrontend/expressions.cc:6448 + msgid "object is not a method" + msgstr "el objeto no es un método" + +-#: go/gofrontend/expressions.cc:6440 ++#: go/gofrontend/expressions.cc:6457 + msgid "method type does not match object type" + msgstr "el tipo de método no coincide con el tipo de objeto" + +-#: go/gofrontend/expressions.cc:6714 ++#: go/gofrontend/expressions.cc:6731 + msgid "invalid use of %<...%> with builtin function" + msgstr "uso inválido de %<..%> con la función interna" + +-#: go/gofrontend/expressions.cc:6748 go/gofrontend/expressions.cc:6805 +-#: go/gofrontend/expressions.cc:6850 go/gofrontend/expressions.cc:7539 +-#: go/gofrontend/expressions.cc:7686 go/gofrontend/expressions.cc:7729 +-#: go/gofrontend/expressions.cc:7785 go/gofrontend/expressions.cc:8967 +-#: go/gofrontend/expressions.cc:8986 ++#: go/gofrontend/expressions.cc:6765 go/gofrontend/expressions.cc:6822 ++#: go/gofrontend/expressions.cc:6867 go/gofrontend/expressions.cc:7556 ++#: go/gofrontend/expressions.cc:7703 go/gofrontend/expressions.cc:7746 ++#: go/gofrontend/expressions.cc:7802 go/gofrontend/expressions.cc:8984 ++#: go/gofrontend/expressions.cc:9003 + msgid "not enough arguments" + msgstr "faltan argumentos" + +-#: go/gofrontend/expressions.cc:6750 go/gofrontend/expressions.cc:6807 +-#: go/gofrontend/expressions.cc:7544 go/gofrontend/expressions.cc:7669 +-#: go/gofrontend/expressions.cc:7691 go/gofrontend/expressions.cc:7734 +-#: go/gofrontend/expressions.cc:7787 go/gofrontend/expressions.cc:8662 +-#: go/gofrontend/expressions.cc:8972 go/gofrontend/expressions.cc:8993 ++#: go/gofrontend/expressions.cc:6767 go/gofrontend/expressions.cc:6824 ++#: go/gofrontend/expressions.cc:7561 go/gofrontend/expressions.cc:7686 ++#: go/gofrontend/expressions.cc:7708 go/gofrontend/expressions.cc:7751 ++#: go/gofrontend/expressions.cc:7804 go/gofrontend/expressions.cc:8679 ++#: go/gofrontend/expressions.cc:8989 go/gofrontend/expressions.cc:9010 + msgid "too many arguments" + msgstr "demasiados argumentos" + +-#: go/gofrontend/expressions.cc:6809 ++#: go/gofrontend/expressions.cc:6826 + msgid "argument 1 must be a map" + msgstr "el argumento 1 debe ser un mapa" + +-#: go/gofrontend/expressions.cc:6876 ++#: go/gofrontend/expressions.cc:6893 + msgid "invalid type for make function" + msgstr "tipo inválido para la función make" + +-#: go/gofrontend/expressions.cc:6890 ++#: go/gofrontend/expressions.cc:6907 + msgid "length required when allocating a slice" + msgstr "se requiere longitud al alojar una rebanada" + +-#: go/gofrontend/expressions.cc:6904 ++#: go/gofrontend/expressions.cc:6921 + msgid "bad size for make" + msgstr "tamaño erróneo para make" + +-#: go/gofrontend/expressions.cc:6919 ++#: go/gofrontend/expressions.cc:6936 + msgid "bad capacity when making slice" + msgstr "capacidad errónea al crear la rebanada" + +-#: go/gofrontend/expressions.cc:6930 ++#: go/gofrontend/expressions.cc:6947 + msgid "too many arguments to make" + msgstr "demasiados argumentos para make" + +-#: go/gofrontend/expressions.cc:7588 ++#: go/gofrontend/expressions.cc:7605 + msgid "argument must be array or slice or channel" + msgstr "el argumento debe ser matriz o rebanada o canal" + +-#: go/gofrontend/expressions.cc:7598 ++#: go/gofrontend/expressions.cc:7615 + msgid "argument must be string or array or slice or map or channel" + msgstr "el argumento debe ser cadena o matriz o rebanada o mapa o canal" + +-#: go/gofrontend/expressions.cc:7644 ++#: go/gofrontend/expressions.cc:7661 + msgid "unsupported argument type to builtin function" + msgstr "no se admite el tipo de argumento para la función interna" + +-#: go/gofrontend/expressions.cc:7655 ++#: go/gofrontend/expressions.cc:7672 + msgid "argument must be channel" + msgstr "el argumento debe ser canal" + +-#: go/gofrontend/expressions.cc:7657 ++#: go/gofrontend/expressions.cc:7674 + msgid "cannot close receive-only channel" + msgstr "no se puede cerrar un canal de sólo recepción" + +-#: go/gofrontend/expressions.cc:7677 ++#: go/gofrontend/expressions.cc:7694 + msgid "argument must be a field reference" + msgstr "el argumento debe ser una referencia de campo" + +-#: go/gofrontend/expressions.cc:7704 ++#: go/gofrontend/expressions.cc:7721 + msgid "left argument must be a slice" + msgstr "el argumento izquierdo debe ser una rebanada" + +-#: go/gofrontend/expressions.cc:7712 ++#: go/gofrontend/expressions.cc:7729 + msgid "element types must be the same" + msgstr "los tipos de elemento deben ser el mismo" + +-#: go/gofrontend/expressions.cc:7717 ++#: go/gofrontend/expressions.cc:7734 + msgid "first argument must be []byte" + msgstr "el primer argumento debe ser []byte" + +-#: go/gofrontend/expressions.cc:7720 ++#: go/gofrontend/expressions.cc:7737 + msgid "second argument must be slice or string" + msgstr "el segundo argumento debe ser una rebanada o una cadena" + +-#: go/gofrontend/expressions.cc:7761 ++#: go/gofrontend/expressions.cc:7778 + msgid "argument 2 has invalid type" + msgstr "el argumento 2 es de tipo inválido" + +-#: go/gofrontend/expressions.cc:7777 ++#: go/gofrontend/expressions.cc:7794 + msgid "argument must have complex type" + msgstr "el argumento debe tener tipo complejo" + +-#: go/gofrontend/expressions.cc:7795 ++#: go/gofrontend/expressions.cc:7812 + msgid "complex arguments must have identical types" + msgstr "los argumentos complejos deben tener tipos idénticos" + +-#: go/gofrontend/expressions.cc:7797 ++#: go/gofrontend/expressions.cc:7814 + msgid "complex arguments must have floating-point type" + msgstr "los argumentos complejos deben tener tipo de coma flotante" + +-#: go/gofrontend/expressions.cc:8666 ++#: go/gofrontend/expressions.cc:8683 + msgid "invalid use of %<...%> with non-slice" + msgstr "uso inválido de %<...%> con algo que no es rebanada" + +-#: go/gofrontend/expressions.cc:8920 go/gofrontend/expressions.cc:9361 ++#: go/gofrontend/expressions.cc:8937 go/gofrontend/expressions.cc:9378 + msgid "expected function" + msgstr "se esperaba función" + +-#: go/gofrontend/expressions.cc:8939 ++#: go/gofrontend/expressions.cc:8956 + msgid "incompatible type for receiver" + msgstr "tipo incompatible para el receptor" + +-#: go/gofrontend/expressions.cc:8957 ++#: go/gofrontend/expressions.cc:8974 + msgid "invalid use of %<...%> calling non-variadic function" + msgstr "uso inválido de %<...%> en la llamada a la función que no es variadic" + +-#: go/gofrontend/expressions.cc:9370 go/gofrontend/expressions.cc:9384 ++#: go/gofrontend/expressions.cc:9387 go/gofrontend/expressions.cc:9401 + msgid "number of results does not match number of values" + msgstr "el número de resultados no coincide con el número de valores" + +-#: go/gofrontend/expressions.cc:9688 go/gofrontend/expressions.cc:10110 ++#: go/gofrontend/expressions.cc:9705 go/gofrontend/expressions.cc:10127 + msgid "index must be integer" + msgstr "el índice debe ser entero" + +-#: go/gofrontend/expressions.cc:9694 go/gofrontend/expressions.cc:10114 ++#: go/gofrontend/expressions.cc:9711 go/gofrontend/expressions.cc:10131 + msgid "slice end must be integer" + msgstr "el final de la rebanada debe ser entero" + +-#: go/gofrontend/expressions.cc:9751 ++#: go/gofrontend/expressions.cc:9768 + msgid "slice of unaddressable value" + msgstr "rebanada con valor que no es direccionable" + +-#: go/gofrontend/expressions.cc:10344 ++#: go/gofrontend/expressions.cc:10361 + msgid "incompatible type for map index" + msgstr "tipo incompatibles para el índice de mapa" + +-#: go/gofrontend/expressions.cc:10692 ++#: go/gofrontend/expressions.cc:10709 + msgid "expected interface or pointer to interface" + msgstr "se esperaba interfaz o puntero a interfaz" + +-#: go/gofrontend/expressions.cc:11260 ++#: go/gofrontend/expressions.cc:11277 + msgid "too many expressions for struct" + msgstr "demasiadas expresiones para struct" + +-#: go/gofrontend/expressions.cc:11273 ++#: go/gofrontend/expressions.cc:11290 + msgid "too few expressions for struct" + msgstr "faltan expresiones para struct" + +-#: go/gofrontend/expressions.cc:12933 go/gofrontend/expressions.cc:12941 +-msgid "invalid unsafe.Pointer conversion" +-msgstr "conversión unsafe.Pointer inválida" +- +-#: go/gofrontend/expressions.cc:12946 go/gofrontend/statements.cc:1539 ++#: go/gofrontend/expressions.cc:12945 go/gofrontend/statements.cc:1539 + msgid "type assertion only valid for interface types" + msgstr "la aserción de tipo sólo es válida para los tipos de interfaz" + +-#: go/gofrontend/expressions.cc:12958 ++#: go/gofrontend/expressions.cc:12957 + msgid "impossible type assertion: type does not implement interface" + msgstr "aserción de tipo imposible: el tipo no implementa interfaz" + +-#: go/gofrontend/expressions.cc:13142 go/gofrontend/statements.cc:1387 ++#: go/gofrontend/expressions.cc:13128 go/gofrontend/statements.cc:1387 + msgid "expected channel" + msgstr "se esperaba canal" + +-#: go/gofrontend/expressions.cc:13147 go/gofrontend/statements.cc:1392 ++#: go/gofrontend/expressions.cc:13133 go/gofrontend/statements.cc:1392 + msgid "invalid receive on send-only channel" + msgstr "recepción inválida en canal de sólo envío" + +@@ -12044,19 +12040,23 @@ + msgid "expected boolean expression" + msgstr "se esperaba una expresión booleana" + +-#: go/gofrontend/statements.cc:4334 ++#: go/gofrontend/statements.cc:4198 ++msgid "cannot type switch on non-interface value" ++msgstr "no se puede cambiar el tipo en valores que no son de interfaz" ++ ++#: go/gofrontend/statements.cc:4320 + msgid "incompatible types in send" + msgstr "tipos incompatibles en send" + +-#: go/gofrontend/statements.cc:4339 ++#: go/gofrontend/statements.cc:4325 + msgid "invalid send on receive-only channel" + msgstr "envío inválido en canal de sólo recepción" + +-#: go/gofrontend/statements.cc:5226 ++#: go/gofrontend/statements.cc:5212 + msgid "too many variables for range clause with channel" + msgstr "demasiadas variables para la cláusula de rango con canal" + +-#: go/gofrontend/statements.cc:5233 ++#: go/gofrontend/statements.cc:5219 + msgid "range clause must have array, slice, string, map, or channel type" + msgstr "la cláusula de rango debe tener tipo matriz, rebanada, cadena, mapa o canal" + +@@ -12341,7 +12341,7 @@ + + #. All valid uses of __builtin_va_arg_pack () are removed during + #. inlining. +-#: builtins.c:6023 expr.c:9964 ++#: builtins.c:6023 expr.c:9965 + #, gcc-internal-format + msgid "%Kinvalid use of %<__builtin_va_arg_pack ()%>" + msgstr "%Kuso inválido de %<__builtin_va_arg_pack ()%>" +@@ -12435,13 +12435,13 @@ + #. an unprototyped function, it is compile-time undefined; + #. making it a constraint in that case was rejected in + #. DR#252. +-#: c-convert.c:101 c-typeck.c:1992 c-typeck.c:5332 c-typeck.c:10590 ++#: c-convert.c:103 c-typeck.c:1992 c-typeck.c:5332 c-typeck.c:10596 + #: cp/typeck.c:1849 cp/typeck.c:6722 cp/typeck.c:7420 fortran/convert.c:88 + #, gcc-internal-format + msgid "void value not ignored as it ought to be" + msgstr "no se descarta el valor void como debería de ser" + +-#: c-convert.c:181 fortran/convert.c:122 java/typeck.c:150 ++#: c-convert.c:182 fortran/convert.c:122 java/typeck.c:150 + #, gcc-internal-format + msgid "conversion to non-scalar type requested" + msgstr "se solicitó conversión a un tipo que no es escalar" +@@ -12816,7 +12816,7 @@ + msgid "%qE defined as wrong kind of tag" + msgstr "%qE definido como un tipo erróneo de etiqueta" + +-#: c-decl.c:3674 c-typeck.c:11016 c-family/c-common.c:4164 ++#: c-decl.c:3674 c-typeck.c:11022 c-family/c-common.c:4164 + #, gcc-internal-format + msgid "invalid use of %" + msgstr "uso inválido de %" +@@ -12944,7 +12944,7 @@ + msgid "variable %qD has initializer but incomplete type" + msgstr "la variable %qD tiene inicializador pero de tipo de dato incompleto" + +-#: c-decl.c:4138 cp/decl.c:4430 cp/decl.c:12670 ++#: c-decl.c:4138 cp/decl.c:4430 cp/decl.c:12687 + #, gcc-internal-format + msgid "inline function %q+D given attribute noinline" + msgstr "se le dió a la función incluída en línea %q+D un atributo noinline" +@@ -12954,7 +12954,7 @@ + msgid "uninitialized const member in %qT is invalid in C++" + msgstr "el miembro const sin inicializar en %qT es inválido en C++" + +-#: c-decl.c:4191 cp/init.c:2115 cp/init.c:2130 ++#: c-decl.c:4191 cp/init.c:2117 cp/init.c:2132 + #, gcc-internal-format + msgid "%qD should be initialized" + msgstr "%qD se debe inicializar" +@@ -13852,7 +13852,7 @@ + msgid "argument %qD doesn%'t match prototype" + msgstr "el argumento %qD no coincide con el prototipo" + +-#: c-decl.c:8380 cp/decl.c:13528 ++#: c-decl.c:8380 cp/decl.c:13545 + #, gcc-internal-format + msgid "no return statement in function returning non-void" + msgstr "no hay una declaración de devolución en la función que no devuelve void" +@@ -14055,7 +14055,7 @@ + msgid "unknown type name %qE" + msgstr "nombre de tipo %qE desconocido" + +-#: c-parser.c:1486 c-parser.c:8568 cp/parser.c:27380 ++#: c-parser.c:1486 c-parser.c:8568 cp/parser.c:27375 + #, gcc-internal-format + msgid "expected declaration specifiers" + msgstr "se esperaban especificadores de declaración" +@@ -14065,7 +14065,7 @@ + msgid "expected %<;%>, identifier or %<(%>" + msgstr "se esperaba %<;>, identificador o %<(%>" + +-#: c-parser.c:1529 cp/parser.c:23810 cp/parser.c:23884 ++#: c-parser.c:1529 cp/parser.c:23805 cp/parser.c:23879 + #, gcc-internal-format + msgid "prefix attributes are ignored for methods" + msgstr "se descartan los atributos de prefijo para los métodos" +@@ -14113,7 +14113,7 @@ + msgid "ISO C90 does not support %<_Static_assert%>" + msgstr "ISO C90 no admite %<_Static_assert%>" + +-#: c-parser.c:1862 c-parser.c:3383 c-parser.c:8623 cp/parser.c:27251 ++#: c-parser.c:1862 c-parser.c:3383 c-parser.c:8623 cp/parser.c:27246 + #, gcc-internal-format + msgid "expected string literal" + msgstr "se esperaba una cadena literal" +@@ -14145,8 +14145,8 @@ + #: c-parser.c:7360 c-parser.c:7368 c-parser.c:7397 c-parser.c:7410 + #: c-parser.c:7715 c-parser.c:7839 c-parser.c:8266 c-parser.c:8301 + #: c-parser.c:8354 c-parser.c:8407 c-parser.c:8423 c-parser.c:8469 +-#: c-parser.c:8748 c-parser.c:9823 c-parser.c:10626 cp/parser.c:22271 +-#: cp/parser.c:24654 cp/parser.c:24684 cp/parser.c:24754 cp/parser.c:26971 ++#: c-parser.c:8748 c-parser.c:9823 c-parser.c:10626 cp/parser.c:22266 ++#: cp/parser.c:24649 cp/parser.c:24679 cp/parser.c:24749 cp/parser.c:26966 + #, gcc-internal-format + msgid "expected identifier" + msgstr "se esperaba un identificador" +@@ -14480,77 +14480,77 @@ + msgid "no type or storage class may be specified here," + msgstr "ninguna clase de almacenamiento o tipo se puede especificar aquí," + +-#: c-parser.c:8270 c-parser.c:8327 cp/parser.c:24714 ++#: c-parser.c:8270 c-parser.c:8327 cp/parser.c:24709 + #, gcc-internal-format + msgid "unknown property attribute" + msgstr "atributo de propiedad desconocido" + +-#: c-parser.c:8291 cp/parser.c:24674 ++#: c-parser.c:8291 cp/parser.c:24669 + #, gcc-internal-format + msgid "missing %<=%> (after % attribute)" + msgstr "falta un %<=%> (después del atributo %)" + +-#: c-parser.c:8294 cp/parser.c:24677 ++#: c-parser.c:8294 cp/parser.c:24672 + #, gcc-internal-format + msgid "missing %<=%> (after % attribute)" + msgstr "falta un %<=%> (después del atributo %)" + +-#: c-parser.c:8308 cp/parser.c:24692 ++#: c-parser.c:8308 cp/parser.c:24687 + #, gcc-internal-format + msgid "the % attribute may only be specified once" + msgstr "el atributo % sólo se puede especificar una vez" + +-#: c-parser.c:8313 cp/parser.c:24698 ++#: c-parser.c:8313 cp/parser.c:24693 + #, gcc-internal-format + msgid "setter name must terminate with %<:%>" + msgstr "el nombre del setter debe terminar con %<:%>" + +-#: c-parser.c:8320 cp/parser.c:24706 ++#: c-parser.c:8320 cp/parser.c:24701 + #, gcc-internal-format + msgid "the % attribute may only be specified once" + msgstr "el atributo % sólo se puede especificar una vez" + +-#: c-parser.c:8506 cp/parser.c:27295 ++#: c-parser.c:8506 cp/parser.c:27290 + #, gcc-internal-format + msgid "%<#pragma omp barrier%> may only be used in compound statements" + msgstr "%<#pragma omp barrier%> sólo se puede usar en declaraciones compuestas" + +-#: c-parser.c:8517 cp/parser.c:27310 ++#: c-parser.c:8517 cp/parser.c:27305 + #, gcc-internal-format + msgid "%<#pragma omp flush%> may only be used in compound statements" + msgstr "%<#pragma omp flush%> sólo se puede usar en declaraciones compuestas" + +-#: c-parser.c:8528 cp/parser.c:27326 ++#: c-parser.c:8528 cp/parser.c:27321 + #, gcc-internal-format + msgid "%<#pragma omp taskwait%> may only be used in compound statements" + msgstr "%<#pragma omp taskwait%> sólo se puede usar en declaraciones compuestas" + +-#: c-parser.c:8539 cp/parser.c:27342 ++#: c-parser.c:8539 cp/parser.c:27337 + #, gcc-internal-format + msgid "%<#pragma omp taskyield%> may only be used in compound statements" + msgstr "%<#pragma omp taskyield%> sólo se puede usar en declaraciones compuestas" + +-#: c-parser.c:8552 cp/parser.c:27370 ++#: c-parser.c:8552 cp/parser.c:27365 + #, gcc-internal-format + msgid "%<#pragma omp section%> may only be used in %<#pragma omp sections%> construct" + msgstr "%<#pragma omp section%> sólo se puede usar en construcciones %<#pragma omp sections%>" + +-#: c-parser.c:8558 cp/parser.c:27285 ++#: c-parser.c:8558 cp/parser.c:27280 + #, gcc-internal-format + msgid "%<#pragma GCC pch_preprocess%> must be first" + msgstr "%<#pragma GCC pch_preprocess%> debe ser primero" + +-#: c-parser.c:8723 cp/parser.c:24962 ++#: c-parser.c:8723 cp/parser.c:24957 + #, gcc-internal-format + msgid "too many %qs clauses" + msgstr "demasiadas cláusulas %qs" + +-#: c-parser.c:8825 cp/parser.c:25077 ++#: c-parser.c:8825 cp/parser.c:25072 + #, gcc-internal-format + msgid "collapse argument needs positive constant integer expression" + msgstr "el argumento de collapse necesita una expresión entera constante positiva" + +-#: c-parser.c:8891 cp/parser.c:25128 ++#: c-parser.c:8891 cp/parser.c:25123 + #, gcc-internal-format + msgid "expected % or %" + msgstr "se esperaba % o %" +@@ -14565,42 +14565,42 @@ + msgid "% value must be positive" + msgstr "el valor de % debe ser positivo" + +-#: c-parser.c:9142 cp/parser.c:25347 ++#: c-parser.c:9142 cp/parser.c:25342 + #, gcc-internal-format + msgid "expected %<+%>, %<*%>, %<-%>, %<&%>, %<^%>, %<|%>, %<&&%>, %<||%>, % or %" + msgstr "se esperaba %<+%>, %<*%>, %<-%>, %<&%>, %<^%>, %<|%>, %<&&%>, %<||%>, % o %" + +-#: c-parser.c:9231 cp/parser.c:25432 ++#: c-parser.c:9231 cp/parser.c:25427 + #, gcc-internal-format + msgid "schedule % does not take a % parameter" + msgstr "el calendarizador % no toma un parámetro %" + +-#: c-parser.c:9235 cp/parser.c:25435 ++#: c-parser.c:9235 cp/parser.c:25430 + #, gcc-internal-format + msgid "schedule % does not take a % parameter" + msgstr "el calendarizador % no toma un parámetro %" + +-#: c-parser.c:9253 cp/parser.c:25451 ++#: c-parser.c:9253 cp/parser.c:25446 + #, gcc-internal-format + msgid "invalid schedule kind" + msgstr "género de calendarizador inválido" + +-#: c-parser.c:9381 cp/parser.c:25583 ++#: c-parser.c:9381 cp/parser.c:25578 + #, gcc-internal-format + msgid "expected %<#pragma omp%> clause" + msgstr "se esperaba una cláusula %<#pragma omp%>" + +-#: c-parser.c:9390 cp/parser.c:25592 ++#: c-parser.c:9390 cp/parser.c:25587 + #, gcc-internal-format + msgid "%qs is not valid for %qs" + msgstr "%qs no es válido para %qs" + +-#: c-parser.c:9682 cp/parser.c:25876 ++#: c-parser.c:9682 cp/parser.c:25871 + #, gcc-internal-format + msgid "invalid form of %<#pragma omp atomic%>" + msgstr "forma inválida de %<#pragma omp atomic%>" + +-#: c-parser.c:9722 c-parser.c:9740 cp/parser.c:25907 cp/parser.c:25924 ++#: c-parser.c:9722 c-parser.c:9740 cp/parser.c:25902 cp/parser.c:25919 + #, gcc-internal-format + msgid "invalid operator for %<#pragma omp atomic%>" + msgstr "operador inválido para %<#pragma omp atomic%>" +@@ -14610,7 +14610,7 @@ + msgid "expected %<(%> or end of line" + msgstr "se esperaba %<(%> o fin de línea" + +-#: c-parser.c:9882 cp/parser.c:26195 ++#: c-parser.c:9882 cp/parser.c:26190 + #, gcc-internal-format + msgid "for statement expected" + msgstr "se esperaba una declaración for" +@@ -14625,12 +14625,12 @@ + msgid "not enough perfectly nested loops" + msgstr "no hay suficientes bucles perfectamente anidados" + +-#: c-parser.c:10069 cp/parser.c:26537 ++#: c-parser.c:10069 cp/parser.c:26532 + #, gcc-internal-format + msgid "collapsed loops not perfectly nested" + msgstr "los bucles colapsados no están perfectamente anidados" + +-#: c-parser.c:10107 cp/parser.c:26380 cp/parser.c:26418 cp/pt.c:12728 ++#: c-parser.c:10107 cp/parser.c:26375 cp/parser.c:26413 cp/pt.c:12754 + #, gcc-internal-format + msgid "iteration variable %qD should not be firstprivate" + msgstr "la variable de iteración %qD no debe ser firstprivate" +@@ -14655,27 +14655,27 @@ + msgid "% %qE has incomplete type" + msgstr "% %qE tiene tipo incompleto" + +-#: c-parser.c:10773 cp/parser.c:27181 ++#: c-parser.c:10773 cp/parser.c:27176 + #, gcc-internal-format + msgid "%<__transaction_cancel%> without transactional memory support enabled" + msgstr "%<__transaction_cancel%> sin activar el soporte para memoria transaccional" + +-#: c-parser.c:10779 cp/parser.c:27187 ++#: c-parser.c:10779 cp/parser.c:27182 + #, gcc-internal-format + msgid "%<__transaction_cancel%> within a %<__transaction_relaxed%>" + msgstr "%<__transaction_cancel%> dentro de un %<__transaction_relaxed%>" + +-#: c-parser.c:10788 cp/parser.c:27196 ++#: c-parser.c:10788 cp/parser.c:27191 + #, gcc-internal-format + msgid "outer %<__transaction_cancel%> not within outer %<__transaction_atomic%>" + msgstr "%<__transaction_cancel%> más externo no está dentro del %<__transaction_atomic%> más externo" + +-#: c-parser.c:10790 cp/parser.c:27199 ++#: c-parser.c:10790 cp/parser.c:27194 + #, gcc-internal-format + msgid " or a % function" + msgstr " o una función %" + +-#: c-parser.c:10796 cp/parser.c:27205 ++#: c-parser.c:10796 cp/parser.c:27200 + #, gcc-internal-format + msgid "%<__transaction_cancel%> not within %<__transaction_atomic%>" + msgstr "%<__transaction_cancel%> no está dentro de %<__transaction_atomic%>" +@@ -15453,7 +15453,7 @@ + msgid "initialization of a flexible array member" + msgstr "inicialización de un miembro de matriz flexible" + +-#: c-typeck.c:6164 cp/typeck2.c:890 ++#: c-typeck.c:6164 cp/typeck2.c:893 + #, gcc-internal-format + msgid "char-array initialized from wide string" + msgstr "matriz de tipo char inicializada con una cadena ancha" +@@ -15659,223 +15659,223 @@ + msgid "ISO C forbids % with expression, in function returning void" + msgstr "ISO C prohíbe % con expresión, en una función que devuelve void" + +-#: c-typeck.c:8825 ++#: c-typeck.c:8831 + #, gcc-internal-format + msgid "function returns address of local variable" + msgstr "la función devuelve la dirección de una variable local" + +-#: c-typeck.c:8898 cp/semantics.c:1045 ++#: c-typeck.c:8904 cp/semantics.c:1045 + #, gcc-internal-format + msgid "switch quantity not an integer" + msgstr "la cantidad de switch no es un entero" + +-#: c-typeck.c:8911 ++#: c-typeck.c:8917 + #, gcc-internal-format + msgid "% switch expression not converted to % in ISO C" + msgstr "no se convierte la expresión de switch % a % en ISO C" + +-#: c-typeck.c:8947 c-typeck.c:8955 ++#: c-typeck.c:8953 c-typeck.c:8961 + #, gcc-internal-format + msgid "case label is not an integer constant expression" + msgstr "la etiqueta de case no es una expresion constante entera" + +-#: c-typeck.c:8961 cp/parser.c:8827 ++#: c-typeck.c:8967 cp/parser.c:8827 + #, gcc-internal-format + msgid "case label not within a switch statement" + msgstr "la etiqueta case no se encuentra dentro de una declaración switch" + +-#: c-typeck.c:8963 ++#: c-typeck.c:8969 + #, gcc-internal-format + msgid "% label not within a switch statement" + msgstr "la etiqueta % no está dentro de una declaración switch" + +-#: c-typeck.c:9046 cp/parser.c:9127 ++#: c-typeck.c:9052 cp/parser.c:9127 + #, gcc-internal-format + msgid "suggest explicit braces to avoid ambiguous %" + msgstr "se sugieren llaves explícitas para evitar un % ambiguo" + +-#: c-typeck.c:9155 cp/parser.c:9854 ++#: c-typeck.c:9161 cp/parser.c:9854 + #, gcc-internal-format + msgid "break statement not within loop or switch" + msgstr "la declaración break no está dentro de un bucle o switch" + +-#: c-typeck.c:9157 cp/parser.c:9875 ++#: c-typeck.c:9163 cp/parser.c:9875 + #, gcc-internal-format + msgid "continue statement not within a loop" + msgstr "la declaración continue no está dentro de un bucle" + +-#: c-typeck.c:9162 cp/parser.c:9865 ++#: c-typeck.c:9168 cp/parser.c:9865 + #, gcc-internal-format + msgid "break statement used with OpenMP for loop" + msgstr "se usó la declaración break en un bucle for de OpenMP" + +-#: c-typeck.c:9188 cp/cp-gimplify.c:402 ++#: c-typeck.c:9194 cp/cp-gimplify.c:402 + #, gcc-internal-format + msgid "statement with no effect" + msgstr "declaración sin efecto" + +-#: c-typeck.c:9214 ++#: c-typeck.c:9220 + #, gcc-internal-format + msgid "expression statement has incomplete type" + msgstr "la declaración de la expresión tiene tipo de dato incompleto" + +-#: c-typeck.c:9473 c-typeck.c:9508 c-typeck.c:9522 ++#: c-typeck.c:9479 c-typeck.c:9514 c-typeck.c:9528 + #, gcc-internal-format + msgid "conversion of scalar to vector involves truncation" + msgstr "la conversión de escalar a vector implica truncado" + +-#: c-typeck.c:9950 cp/typeck.c:3939 ++#: c-typeck.c:9956 cp/typeck.c:3939 + #, gcc-internal-format + msgid "right shift count is negative" + msgstr "la cuenta de desplazamiento a la derecha es negativa" + +-#: c-typeck.c:9961 cp/typeck.c:3946 ++#: c-typeck.c:9967 cp/typeck.c:3946 + #, gcc-internal-format + msgid "right shift count >= width of type" + msgstr "cuenta de desplazamiento a la derecha >= anchura del tipo" + +-#: c-typeck.c:10002 cp/typeck.c:3968 ++#: c-typeck.c:10008 cp/typeck.c:3968 + #, gcc-internal-format + msgid "left shift count is negative" + msgstr "la cuenta de desplazamiento a la izquierda es negativa" + +-#: c-typeck.c:10009 cp/typeck.c:3974 ++#: c-typeck.c:10015 cp/typeck.c:3974 + #, gcc-internal-format + msgid "left shift count >= width of type" + msgstr "cuenta de desplazamiento a la izquierda >= anchura del tipo" + +-#: c-typeck.c:10032 c-typeck.c:10169 ++#: c-typeck.c:10038 c-typeck.c:10175 + #, gcc-internal-format + msgid "comparing vectors with different element types" + msgstr "se comparan vectores con tipos de elemento diferentes" + +-#: c-typeck.c:10039 c-typeck.c:10176 ++#: c-typeck.c:10045 c-typeck.c:10182 + #, gcc-internal-format + msgid "comparing vectors with different number of elements" + msgstr "se comparan vectores con números de elementos diferentes" + +-#: c-typeck.c:10055 cp/typeck.c:4020 ++#: c-typeck.c:10061 cp/typeck.c:4020 + #, gcc-internal-format + msgid "comparing floating point with == or != is unsafe" + msgstr "no es segura la comparacion de coma flotante con == o !=" + +-#: c-typeck.c:10072 c-typeck.c:10092 ++#: c-typeck.c:10078 c-typeck.c:10098 + #, gcc-internal-format + msgid "the comparison will always evaluate as % for the address of %qD will never be NULL" + msgstr "la comparación siempre se evalúa como % para la dirección de %qD que nunca será NULL" + +-#: c-typeck.c:10078 c-typeck.c:10098 ++#: c-typeck.c:10084 c-typeck.c:10104 + #, gcc-internal-format + msgid "the comparison will always evaluate as % for the address of %qD will never be NULL" + msgstr "la comparación siempre se evalúa como % para la dirección de %qD que nunca será NULL" + +-#: c-typeck.c:10119 c-typeck.c:10219 ++#: c-typeck.c:10125 c-typeck.c:10225 + #, gcc-internal-format + msgid "comparison of pointers to disjoint address spaces" + msgstr "la comparación de punteros a espacios de direcciones discontinuos" + +-#: c-typeck.c:10126 c-typeck.c:10132 ++#: c-typeck.c:10132 c-typeck.c:10138 + #, gcc-internal-format + msgid "ISO C forbids comparison of % with function pointer" + msgstr "ISO C prohíbe la comparación de % con un puntero de función" + +-#: c-typeck.c:10139 c-typeck.c:10229 ++#: c-typeck.c:10145 c-typeck.c:10235 + #, gcc-internal-format + msgid "comparison of distinct pointer types lacks a cast" + msgstr "la comparación de diferentes tipos de puntero carece de una conversión" + +-#: c-typeck.c:10151 c-typeck.c:10156 c-typeck.c:10255 c-typeck.c:10260 ++#: c-typeck.c:10157 c-typeck.c:10162 c-typeck.c:10261 c-typeck.c:10266 + #, gcc-internal-format + msgid "comparison between pointer and integer" + msgstr "comparación entre puntero y entero" + +-#: c-typeck.c:10207 ++#: c-typeck.c:10213 + #, gcc-internal-format + msgid "comparison of complete and incomplete pointers" + msgstr "comparación de punteros completos e incompletos" + +-#: c-typeck.c:10209 ++#: c-typeck.c:10215 + #, gcc-internal-format + msgid "ISO C forbids ordered comparisons of pointers to functions" + msgstr "ISO C prohíbe la comparación entre punteros a funciones" + +-#: c-typeck.c:10214 ++#: c-typeck.c:10220 + #, gcc-internal-format + msgid "ordered comparison of pointer with null pointer" + msgstr "comparación ordenada de puntero con un puntero nulo" + +-#: c-typeck.c:10237 c-typeck.c:10240 c-typeck.c:10247 c-typeck.c:10250 ++#: c-typeck.c:10243 c-typeck.c:10246 c-typeck.c:10253 c-typeck.c:10256 + #: cp/typeck.c:4271 cp/typeck.c:4278 + #, gcc-internal-format + msgid "ordered comparison of pointer with integer zero" + msgstr "comparación ordenada de puntero con el entero cero" + +-#: c-typeck.c:10294 cp/typeck.c:4350 ++#: c-typeck.c:10300 cp/typeck.c:4350 + #, gcc-internal-format + msgid "implicit conversion from %qT to %qT to match other operand of binary expression" + msgstr "conversión implícita de %qT a %qT para coincidir con otro operando de la expresión binaria" + +-#: c-typeck.c:10578 ++#: c-typeck.c:10584 + #, gcc-internal-format + msgid "used array that cannot be converted to pointer where scalar is required" + msgstr "se usa un valor de tipo matriz que no se puede cambiar a puntero cuando se requiere un escalar" + +-#: c-typeck.c:10582 ++#: c-typeck.c:10588 + #, gcc-internal-format + msgid "used struct type value where scalar is required" + msgstr "se usa un valor de tipo struct cuando se requiere un escalar" + +-#: c-typeck.c:10586 ++#: c-typeck.c:10592 + #, gcc-internal-format + msgid "used union type value where scalar is required" + msgstr "se usa un valor de tipo union cuando se requiere un escalar" + +-#: c-typeck.c:10597 ++#: c-typeck.c:10603 + #, gcc-internal-format + msgid "used vector type where scalar is required" + msgstr "se usa un tipo vector cuando se requiere un escalar" + +-#: c-typeck.c:10751 cp/semantics.c:4202 ++#: c-typeck.c:10757 cp/semantics.c:4202 + #, gcc-internal-format + msgid "%qE has invalid type for %" + msgstr "%qE tiene tipo inválido para %" + +-#: c-typeck.c:10788 cp/semantics.c:4217 ++#: c-typeck.c:10794 cp/semantics.c:4217 + #, gcc-internal-format + msgid "%qE has invalid type for %" + msgstr "%qE tiene tipo inválido para %" + +-#: c-typeck.c:10805 cp/semantics.c:4227 ++#: c-typeck.c:10811 cp/semantics.c:4227 + #, gcc-internal-format + msgid "%qE must be % for %" + msgstr "%qE debe ser % para %" + +-#: c-typeck.c:10815 cp/semantics.c:3995 ++#: c-typeck.c:10821 cp/semantics.c:3995 + #, gcc-internal-format + msgid "%qE is not a variable in clause %qs" + msgstr "%qE no es una variable en la cláusula %qs" + +-#: c-typeck.c:10823 c-typeck.c:10845 c-typeck.c:10867 ++#: c-typeck.c:10829 c-typeck.c:10851 c-typeck.c:10873 + #, gcc-internal-format + msgid "%qE appears more than once in data clauses" + msgstr "%qE aparece más de una vez en las cláusulas de datos" + +-#: c-typeck.c:10838 cp/semantics.c:4018 ++#: c-typeck.c:10844 cp/semantics.c:4018 + #, gcc-internal-format + msgid "%qE is not a variable in clause %" + msgstr "%qE no es una variable en la cláusula %" + +-#: c-typeck.c:10860 cp/semantics.c:4040 ++#: c-typeck.c:10866 cp/semantics.c:4040 + #, gcc-internal-format + msgid "%qE is not a variable in clause %" + msgstr "%qE no es una variable en la cláusula %" + +-#: c-typeck.c:10928 cp/semantics.c:4273 ++#: c-typeck.c:10934 cp/semantics.c:4273 + #, gcc-internal-format + msgid "%qE is predetermined %qs for %qs" + msgstr "%qE está predeterminado como %qs para %qs" + +-#: c-typeck.c:11030 ++#: c-typeck.c:11036 + #, gcc-internal-format + msgid "C++ requires promoted type, not enum type, in %" + msgstr "C++ requiere un tipo promovido, no un tipo enum, en %" +@@ -16895,7 +16895,7 @@ + msgid "multiple EH personalities are supported only with assemblers supporting .cfi_personality directive" + msgstr "sólo se admiten múltiples personalidades EH con ensambladores que admiten la directiva cfi.personality" + +-#: dwarf2out.c:10710 ++#: dwarf2out.c:10713 + #, gcc-internal-format, gfc-internal-format + msgid "non-delegitimized UNSPEC %s (%d) found in variable location" + msgstr "se encontró UNSPEC %s (%d) que no está delegitimado la ubicación de variable" +@@ -17015,12 +17015,12 @@ + msgid "local frame unavailable (naked function?)" + msgstr "el marco local no está disponible (¿Función desnuda?)" + +-#: expr.c:9971 ++#: expr.c:9972 + #, gcc-internal-format + msgid "%Kcall to %qs declared with attribute error: %s" + msgstr "%Kla llamada a %qs se redeclaró con error de atributo: %s" + +-#: expr.c:9978 ++#: expr.c:9979 + #, gcc-internal-format + msgid "%Kcall to %qs declared with attribute warning: %s" + msgstr "%Kla llamada a %qs se redecló con aviso de atributo: %s" +@@ -17105,27 +17105,27 @@ + msgid "total size of local objects too large" + msgstr "el tamaño total de los objetos locales es demasiado grande" + +-#: function.c:1732 gimplify.c:5163 ++#: function.c:1732 gimplify.c:5164 + #, gcc-internal-format + msgid "impossible constraint in %" + msgstr "restricción imposible en %" + +-#: function.c:3959 ++#: function.c:3974 + #, gcc-internal-format + msgid "variable %q+D might be clobbered by % or %" + msgstr "la variable %q+D puede ser sobreescrita por % o %" + +-#: function.c:3980 ++#: function.c:3995 + #, gcc-internal-format + msgid "argument %q+D might be clobbered by % or %" + msgstr "el argumento %q+D puede ser sobreescrito por % o %" + +-#: function.c:4502 ++#: function.c:4517 + #, gcc-internal-format + msgid "function returns an aggregate" + msgstr "la función devuelve un agregado" + +-#: function.c:4896 ++#: function.c:4911 + #, gcc-internal-format + msgid "unused parameter %q+D" + msgstr "parámetro %q+D sin uso" +@@ -17554,62 +17554,62 @@ + msgid "using result of function returning %" + msgstr "se usa el resultado de una función que devuelve %" + +-#: gimplify.c:5048 ++#: gimplify.c:5049 + #, gcc-internal-format, gfc-internal-format + msgid "invalid lvalue in asm output %d" + msgstr "l-valor inválido en la salida asm %d" + +-#: gimplify.c:5164 ++#: gimplify.c:5165 + #, gcc-internal-format, gfc-internal-format + msgid "non-memory input %d must stay in memory" + msgstr "la entrada que no es de memoria %d debe permanecer en memoria" + +-#: gimplify.c:5186 ++#: gimplify.c:5187 + #, gcc-internal-format, gfc-internal-format + msgid "memory input %d is not directly addressable" + msgstr "la entrada de memoria %d no es directamente direccionable" + +-#: gimplify.c:5681 ++#: gimplify.c:5682 + #, gcc-internal-format + msgid "threadprivate variable %qE used in untied task" + msgstr "se usó la variable threadprivate %qE en una tarea sin atar" + +-#: gimplify.c:5683 gimplify.c:5745 ++#: gimplify.c:5684 gimplify.c:5746 + #, gcc-internal-format + msgid "enclosing task" + msgstr "tarea contenedora" + +-#: gimplify.c:5742 ++#: gimplify.c:5743 + #, gcc-internal-format + msgid "%qE not specified in enclosing parallel" + msgstr "no se especificó %qE en el paralelo que lo contiene" + +-#: gimplify.c:5747 ++#: gimplify.c:5748 + #, gcc-internal-format + msgid "enclosing parallel" + msgstr "paralelo contenedor" + +-#: gimplify.c:5852 ++#: gimplify.c:5853 + #, gcc-internal-format + msgid "iteration variable %qE should be private" + msgstr "la variable de iteración %qE debe ser private" + +-#: gimplify.c:5866 ++#: gimplify.c:5867 + #, gcc-internal-format + msgid "iteration variable %qE should not be firstprivate" + msgstr "la variable de iteración %qE no debe ser firstprivate" + +-#: gimplify.c:5869 ++#: gimplify.c:5870 + #, gcc-internal-format + msgid "iteration variable %qE should not be reduction" + msgstr "la variable de iteración %qE no debe ser reduction" + +-#: gimplify.c:6032 ++#: gimplify.c:6033 + #, gcc-internal-format + msgid "%s variable %qE is private in outer context" + msgstr "la variable %s %qE es private en el contexto externo" + +-#: gimplify.c:7794 ++#: gimplify.c:7795 + #, gcc-internal-format + msgid "gimplification failed" + msgstr "falló la gimplificación" +@@ -17813,48 +17813,48 @@ + msgid "function %qD redeclared as variable" + msgstr "la función %qD se redeclaró como variable" + +-#: omp-low.c:1846 ++#: omp-low.c:1847 + #, gcc-internal-format + msgid "barrier region may not be closely nested inside of work-sharing, critical, ordered, master or explicit task region" + msgstr "la región de barrera puede no estar bien anidada dentro de la región de trabajo compartido, crítica, ordenada, maestra o de tarea explícita" + +-#: omp-low.c:1851 ++#: omp-low.c:1853 + #, gcc-internal-format + msgid "work-sharing region may not be closely nested inside of work-sharing, critical, ordered, master or explicit task region" + msgstr "la región de trabajo compartido puede no estar bien anidada dentro de la región de trabajo compartido, crítica, ordenada, maestra o de tarea explícita" + +-#: omp-low.c:1869 ++#: omp-low.c:1872 + #, gcc-internal-format + msgid "master region may not be closely nested inside of work-sharing or explicit task region" + msgstr "la región maestra puede no estar bien anidada dentro de la región de trabajo compartido o de tarea explícita" + +-#: omp-low.c:1884 ++#: omp-low.c:1888 + #, gcc-internal-format + msgid "ordered region may not be closely nested inside of critical or explicit task region" + msgstr "la región ordenada puede no estar bien anidada dentro de la región crítica o de tarea explícita" + +-#: omp-low.c:1890 ++#: omp-low.c:1896 + #, gcc-internal-format + msgid "ordered region must be closely nested inside a loop region with an ordered clause" + msgstr "la región ordenada puede estar bien anidada dentro de una región de bucle con una cláusula ordenada" + +-#: omp-low.c:1905 ++#: omp-low.c:1914 + #, gcc-internal-format + msgid "critical region may not be nested inside a critical region with the same name" + msgstr "la región crítica puede no estar bien anidada dentro de una región crítica con el mismo nombre" + +-#: omp-low.c:7024 cp/decl.c:2885 cp/parser.c:9862 cp/parser.c:9882 ++#: omp-low.c:7034 cp/decl.c:2885 cp/parser.c:9862 cp/parser.c:9882 + #, gcc-internal-format + msgid "invalid exit from OpenMP structured block" + msgstr "salida inválida de un bloque estructurado OpenMP" + +-#: omp-low.c:7026 omp-low.c:7031 ++#: omp-low.c:7036 omp-low.c:7041 + #, gcc-internal-format + msgid "invalid entry to OpenMP structured block" + msgstr "entrada inválida a un bloque estructurado OpenMP" + + #. Otherwise, be vague and lazy, but efficient. +-#: omp-low.c:7034 ++#: omp-low.c:7044 + #, gcc-internal-format + msgid "invalid branch to/from an OpenMP structured block" + msgstr "ramificación inválida desde/para un bloque estructurado OpenMP" +@@ -17950,12 +17950,12 @@ + msgid "section anchors must be disabled when toplevel reorder is disabled" + msgstr "las anclas de seccions se deben desactivar cando el reordenamiento de nivel principal se desactiva" + +-#: opts.c:721 config/darwin.c:3002 config/sh/sh.c:809 ++#: opts.c:721 config/darwin.c:3002 config/sh/sh.c:797 + #, gcc-internal-format + msgid "-freorder-blocks-and-partition does not work with exceptions on this architecture" + msgstr "-freorder-blocks-and-partition no funciona con excepciones en esta arquitectura" + +-#: opts.c:736 config/sh/sh.c:817 ++#: opts.c:736 config/sh/sh.c:805 + #, gcc-internal-format + msgid "-freorder-blocks-and-partition does not support unwind info on this architecture" + msgstr "-freorder-blocks-and-partition no admite información de desenredo en esta arquitectura" +@@ -18325,8 +18325,8 @@ + msgstr "no se puede usar %qs como un registro fijo" + + #: reginfo.c:864 config/ia64/ia64.c:5753 config/ia64/ia64.c:5760 +-#: config/pa/pa.c:427 config/pa/pa.c:434 config/sh/sh.c:8761 +-#: config/sh/sh.c:8768 config/spu/spu.c:5198 config/spu/spu.c:5205 ++#: config/pa/pa.c:427 config/pa/pa.c:434 config/sh/sh.c:8764 ++#: config/sh/sh.c:8771 config/spu/spu.c:5198 config/spu/spu.c:5205 + #, gcc-internal-format, gfc-internal-format + msgid "unknown register name: %s" + msgstr "nombre de registro desconocido: %s" +@@ -18631,7 +18631,7 @@ + msgid "packed attribute is unnecessary" + msgstr "no es necesario el atributo packed" + +-#: stor-layout.c:2244 ++#: stor-layout.c:2252 + #, gcc-internal-format + msgid "alignment of array elements is greater than element size" + msgstr "la alineación de los elementos de la matriz es mayor que el tamaño de los elementos" +@@ -18651,12 +18651,12 @@ + msgid "nested function trampolines not supported on this target" + msgstr "no se admiten trampolines de funciones anidadas para este objetivo" + +-#: targhooks.c:1154 ++#: targhooks.c:1161 + #, gcc-internal-format + msgid "target attribute is not supported on this machine" + msgstr "el atributo target no se admite en esta plataforma" + +-#: targhooks.c:1164 ++#: targhooks.c:1171 + #, gcc-internal-format + msgid "#pragma GCC target is not supported for this machine" + msgstr "No se admite #pragma GCC target en este objetivo" +@@ -18846,7 +18846,7 @@ + msgid "% function call not within outer transaction or %" + msgstr "la llamada a la función % no está en una transacción más externa o %" + +-#: trans-mem.c:664 trans-mem.c:4194 ++#: trans-mem.c:664 trans-mem.c:4192 + #, gcc-internal-format + msgid "unsafe function call %qD within atomic transaction" + msgstr "llamada a función %qD insegura dentro de una transacción atómica" +@@ -18861,7 +18861,7 @@ + msgid "unsafe indirect function call within atomic transaction" + msgstr "llamada a función indirecta insegura dentro de una transacción atómica" + +-#: trans-mem.c:682 trans-mem.c:4127 ++#: trans-mem.c:682 trans-mem.c:4125 + #, gcc-internal-format + msgid "unsafe function call %qD within % function" + msgstr "llamada a función %qD insegura dentro de la función %" +@@ -18876,7 +18876,7 @@ + msgid "unsafe indirect function call within % function" + msgstr "llamada a función indirecta insegura dentro de la función %" + +-#: trans-mem.c:707 trans-mem.c:4166 ++#: trans-mem.c:707 trans-mem.c:4164 + #, gcc-internal-format + msgid "asm not allowed in atomic transaction" + msgstr "no se permite asm en una transacción atómica" +@@ -18911,7 +18911,7 @@ + msgid "outer transaction in % function" + msgstr "transacción más externa en la función %" + +-#: trans-mem.c:3792 ++#: trans-mem.c:3790 + #, gcc-internal-format + msgid "%Kasm not allowed in % function" + msgstr "%Kno se permite asm en una función %" +@@ -19531,117 +19531,117 @@ + msgid "ignoring unknown option %q.*s in %<-fdump-%s%>" + msgstr "se descarta la opción desconocida %q.*s en %<-fdump-%s%>" + +-#: tree-eh.c:4320 ++#: tree-eh.c:4319 + #, gcc-internal-format, gfc-internal-format + msgid "BB %i has multiple EH edges" + msgstr "el BB %i tiene múltiples bordes EH" + +-#: tree-eh.c:4332 ++#: tree-eh.c:4331 + #, gcc-internal-format, gfc-internal-format + msgid "BB %i can not throw but has an EH edge" + msgstr "el BB %i no puede hacer throw pero tiene un borde EH" + +-#: tree-eh.c:4340 ++#: tree-eh.c:4339 + #, gcc-internal-format, gfc-internal-format + msgid "BB %i last statement has incorrectly set lp" + msgstr "la última sentencia del BB %i tiene establecido incorrectamente lp" + +-#: tree-eh.c:4346 ++#: tree-eh.c:4345 + #, gcc-internal-format, gfc-internal-format + msgid "BB %i is missing an EH edge" + msgstr "al BB %i le falta un borde EH" + +-#: tree-eh.c:4352 ++#: tree-eh.c:4351 + #, gcc-internal-format, gfc-internal-format + msgid "Incorrect EH edge %i->%i" + msgstr "Borde EH %i->%i incorrecto" + +-#: tree-eh.c:4386 tree-eh.c:4405 ++#: tree-eh.c:4385 tree-eh.c:4404 + #, gcc-internal-format, gfc-internal-format + msgid "BB %i is missing an edge" + msgstr "al BB %i le falta un borde" + +-#: tree-eh.c:4422 ++#: tree-eh.c:4421 + #, gcc-internal-format, gfc-internal-format + msgid "BB %i too many fallthru edges" + msgstr "BB %i demasiados bordes de respaldo" + +-#: tree-eh.c:4431 ++#: tree-eh.c:4430 + #, gcc-internal-format, gfc-internal-format + msgid "BB %i has incorrect edge" + msgstr "BB %i tiene un borde incorrecto" + +-#: tree-eh.c:4437 ++#: tree-eh.c:4436 + #, gcc-internal-format, gfc-internal-format + msgid "BB %i has incorrect fallthru edge" + msgstr "BB %i tiene un borde de respaldo incorrecto" + +-#: tree-inline.c:3040 ++#: tree-inline.c:3041 + #, gcc-internal-format + msgid "function %q+F can never be copied because it receives a non-local goto" + msgstr "la función %q+F nunca se puede copiar porque recibe un goto que no es local" + +-#: tree-inline.c:3054 ++#: tree-inline.c:3055 + #, gcc-internal-format + msgid "function %q+F can never be copied because it saves address of local label in a static variable" + msgstr "la función %q+F nunca se puede copiar porque guarda direcciones de etiqueta local en una variable estática" + +-#: tree-inline.c:3094 ++#: tree-inline.c:3095 + #, gcc-internal-format + msgid "function %q+F can never be inlined because it uses alloca (override using the always_inline attribute)" + msgstr "la función %q+F nunca se puede incluir en línea porque usa alloca (forzar usando el atributo always_inline)" + +-#: tree-inline.c:3108 ++#: tree-inline.c:3109 + #, gcc-internal-format + msgid "function %q+F can never be inlined because it uses setjmp" + msgstr "la función %q+F nunca se puede incluir en línea porque usa setjmp" + +-#: tree-inline.c:3122 ++#: tree-inline.c:3123 + #, gcc-internal-format + msgid "function %q+F can never be inlined because it uses variable argument lists" + msgstr "la función %q+F nunca se puede incluir en línea porque usa listas variables de argumentos" + +-#: tree-inline.c:3134 ++#: tree-inline.c:3135 + #, gcc-internal-format + msgid "function %q+F can never be inlined because it uses setjmp-longjmp exception handling" + msgstr "la función %q+F nunca se puede incluir en línea porque usa manejo de excepciones setjmp-longjmp" + +-#: tree-inline.c:3142 ++#: tree-inline.c:3143 + #, gcc-internal-format + msgid "function %q+F can never be inlined because it uses non-local goto" + msgstr "la función %q+F nunca se puede incluir en línea porque contiene un goto que no es local" + +-#: tree-inline.c:3154 ++#: tree-inline.c:3155 + #, gcc-internal-format + msgid "function %q+F can never be inlined because it uses __builtin_return or __builtin_apply_args" + msgstr "la función %q+F nunca se puede incluir en línea porque usa __builtin_return o __builtin_apply_args" + +-#: tree-inline.c:3174 ++#: tree-inline.c:3175 + #, gcc-internal-format + msgid "function %q+F can never be inlined because it contains a computed goto" + msgstr "la función %q+F nunca se puede incluir en línea porque contiene un goto calculado" + +-#: tree-inline.c:3254 ++#: tree-inline.c:3255 + #, gcc-internal-format + msgid "function %q+F can never be inlined because it is suppressed using -fno-inline" + msgstr "la función %q+F nunca puede ser incluída en línea porque se suprime al usar -fno-inline" + +-#: tree-inline.c:3262 ++#: tree-inline.c:3263 + #, gcc-internal-format + msgid "function %q+F can never be inlined because it uses attributes conflicting with inlining" + msgstr "la función %q+F nunca puede ser incluída en línea porque utiliza atributos que generan conflictos con la inclusión en línea" + +-#: tree-inline.c:3843 ++#: tree-inline.c:3844 + #, gcc-internal-format + msgid "inlining failed in call to always_inline %q+F: %s" + msgstr "falló la inclusión en línea en la llamada a always_inline %q+F: %s" + +-#: tree-inline.c:3845 tree-inline.c:3860 ++#: tree-inline.c:3846 tree-inline.c:3861 + #, gcc-internal-format + msgid "called from here" + msgstr "llamado desde aquí" + +-#: tree-inline.c:3858 ++#: tree-inline.c:3859 + #, gcc-internal-format + msgid "inlining failed in call to %q+F: %s" + msgstr "falló la inclusión en línea en la llamada a %q+F: %s" +@@ -19677,7 +19677,7 @@ + msgstr "el tamaño del valor de devolución de %q+D es más grande que %wd bytes" + + #: tree-outof-ssa.c:784 tree-outof-ssa.c:841 tree-ssa-coalesce.c:951 +-#: tree-ssa-coalesce.c:966 tree-ssa-coalesce.c:1188 tree-ssa-live.c:1340 ++#: tree-ssa-coalesce.c:966 tree-ssa-coalesce.c:1188 tree-ssa-live.c:1337 + #, gcc-internal-format + msgid "SSA corruption" + msgstr "corrupción de SSA" +@@ -19917,72 +19917,72 @@ + msgid "vector shuffling operation will be expanded piecewise" + msgstr "la operación de ordenamiento vectorial se expandirá por piezas" + +-#: tree-vrp.c:5300 ++#: tree-vrp.c:5272 + #, gcc-internal-format + msgid "array subscript is outside array bounds" + msgstr "el subíndice de la matriz está fuera de los límites de la matriz" + +-#: tree-vrp.c:5312 tree-vrp.c:5399 ++#: tree-vrp.c:5284 tree-vrp.c:5371 + #, gcc-internal-format + msgid "array subscript is above array bounds" + msgstr "el subíndice de la matriz está por arriba de los límites de la matriz" + +-#: tree-vrp.c:5319 tree-vrp.c:5387 ++#: tree-vrp.c:5291 tree-vrp.c:5359 + #, gcc-internal-format + msgid "array subscript is below array bounds" + msgstr "el subíndice de la matriz está por debajo de los límites de la matriz" + +-#: tree-vrp.c:6028 ++#: tree-vrp.c:6000 + #, gcc-internal-format + msgid "assuming signed overflow does not occur when simplifying conditional to constant" + msgstr "se asume que el desbordamiento con signo no sucede al simplificar el condicional a constante" + +-#: tree-vrp.c:6034 ++#: tree-vrp.c:6006 + #, gcc-internal-format + msgid "assuming signed overflow does not occur when simplifying conditional" + msgstr "se asume que el desbordamiento con signo no sucede al simplificar el condicional" + +-#: tree-vrp.c:6078 ++#: tree-vrp.c:6050 + #, gcc-internal-format + msgid "comparison always false due to limited range of data type" + msgstr "la comparación siempre es falsa debido al rango limitado del tipo de datos" + +-#: tree-vrp.c:6080 ++#: tree-vrp.c:6052 + #, gcc-internal-format + msgid "comparison always true due to limited range of data type" + msgstr "la comparación siempre es verdadera debido al rango limitado del tipo de datos" + +-#: tree-vrp.c:6871 ++#: tree-vrp.c:6847 + #, gcc-internal-format + msgid "assuming signed overflow does not occur when simplifying % or %<%%%> to %<>>%> or %<&%>" + msgstr "se asume que el desbordamiento con signo no sucede al simplificar % o %<%%%> a %<>>%> o %<&%>" + +-#: tree-vrp.c:6953 ++#: tree-vrp.c:6929 + #, gcc-internal-format + msgid "assuming signed overflow does not occur when simplifying % to % or %<-X%>" + msgstr "se asume que el desbordamiento con signo no sucede al simplificar % a % o %<-X%>" + +-#: tree.c:4235 ++#: tree.c:4236 + #, gcc-internal-format + msgid "ignoring attributes applied to %qT after definition" + msgstr "se descartan los atributos aplicados al %qT después de la definición" + +-#: tree.c:5460 ++#: tree.c:5475 + #, gcc-internal-format + msgid "%q+D already declared with dllexport attribute: dllimport ignored" + msgstr "%q+D se declaró anteriormente con el atributo dllimport: se descarta dllimport" + +-#: tree.c:5472 ++#: tree.c:5487 + #, gcc-internal-format + msgid "%q+D redeclared without dllimport attribute after being referenced with dll linkage" + msgstr "%q+D se redeclara sin el atributo dllimport después de ser referenciado con enlace dllimport" + +-#: tree.c:5487 ++#: tree.c:5502 + #, gcc-internal-format + msgid "%q+D redeclared without dllimport attribute: previous dllimport ignored" + msgstr "%q+D se redeclara sin el atributo dllimport: se descarta el dllimport previo" + +-#: tree.c:5530 tree.c:5542 tree.c:5552 c-family/c-common.c:5865 ++#: tree.c:5545 tree.c:5557 tree.c:5567 c-family/c-common.c:5865 + #: c-family/c-common.c:5884 c-family/c-common.c:5902 c-family/c-common.c:5930 + #: c-family/c-common.c:5957 c-family/c-common.c:5983 c-family/c-common.c:6002 + #: c-family/c-common.c:6019 c-family/c-common.c:6043 c-family/c-common.c:6066 +@@ -19996,141 +19996,141 @@ + #: c-family/c-common.c:7523 c-family/c-common.c:7544 c-family/c-common.c:7656 + #: c-family/c-common.c:7680 c-family/c-common.c:7971 c-family/c-common.c:7994 + #: c-family/c-common.c:8033 c-family/c-common.c:8111 c-family/c-common.c:8260 +-#: config/darwin.c:1942 config/arm/arm.c:5007 config/arm/arm.c:5035 +-#: config/arm/arm.c:5052 config/avr/avr.c:6763 config/h8300/h8300.c:5418 +-#: config/h8300/h8300.c:5442 config/i386/i386.c:4939 config/i386/i386.c:31897 +-#: config/ia64/ia64.c:734 config/rs6000/rs6000.c:24321 config/spu/spu.c:4035 +-#: ada/gcc-interface/utils.c:5505 lto/lto-lang.c:215 ++#: config/darwin.c:1942 config/arm/arm.c:5011 config/arm/arm.c:5039 ++#: config/arm/arm.c:5056 config/avr/avr.c:6773 config/h8300/h8300.c:5418 ++#: config/h8300/h8300.c:5442 config/i386/i386.c:4946 config/i386/i386.c:32027 ++#: config/ia64/ia64.c:734 config/rs6000/rs6000.c:24344 config/spu/spu.c:4035 ++#: ada/gcc-interface/utils.c:5496 lto/lto-lang.c:215 + #, gcc-internal-format + msgid "%qE attribute ignored" + msgstr "se descarta el atributo %qE" + +-#: tree.c:5570 ++#: tree.c:5585 + #, gcc-internal-format + msgid "inline function %q+D declared as dllimport: attribute ignored" + msgstr "la función inline %q+D se declara como dllimport: se descarta el atributo" + +-#: tree.c:5578 ++#: tree.c:5593 + #, gcc-internal-format + msgid "function %q+D definition is marked dllimport" + msgstr "la definición de la función %q+D se marca como dllimport" + +-#: tree.c:5586 ++#: tree.c:5601 + #, gcc-internal-format + msgid "variable %q+D definition is marked dllimport" + msgstr "la definición de la variable %q+D se marca como dllimport" + +-#: tree.c:5614 ++#: tree.c:5629 + #, gcc-internal-format + msgid "external linkage required for symbol %q+D because of %qE attribute" + msgstr "se requiere enlace externo para el símbolo %q+D debido al atributo %qE" + +-#: tree.c:5628 ++#: tree.c:5643 + #, gcc-internal-format + msgid "%qE implies default visibility, but %qD has already been declared with a different visibility" + msgstr "%qE implica visibilidad por defecto, pero %qD ya se había declarado con una visibilidad diferente" + +-#: tree.c:7378 ++#: tree.c:7394 + #, gcc-internal-format + msgid "arrays of functions are not meaningful" + msgstr "las matrices de funciones no tienen significado" + +-#: tree.c:7545 ++#: tree.c:7561 + #, gcc-internal-format + msgid "function return type cannot be function" + msgstr "el tipo de devolución de función no puede ser función" + +-#: tree.c:8844 tree.c:8929 tree.c:8990 ++#: tree.c:8860 tree.c:8945 tree.c:9006 + #, gcc-internal-format, gfc-internal-format + msgid "tree check: %s, have %s in %s, at %s:%d" + msgstr "revisión de árbol: %s, se tiene %s en %s, en %s:%d" + +-#: tree.c:8881 ++#: tree.c:8897 + #, gcc-internal-format, gfc-internal-format + msgid "tree check: expected none of %s, have %s in %s, at %s:%d" + msgstr "revisión de árbol: no se esperaba ninguno de %s, se tiene %s en %s, en %s:%d" + +-#: tree.c:8894 ++#: tree.c:8910 + #, gcc-internal-format + msgid "tree check: expected class %qs, have %qs (%s) in %s, at %s:%d" + msgstr "revisión de árbol: se esperaba la clase %qs, se tiene %qs (%s) en %s, en %s:%d" + +-#: tree.c:8943 ++#: tree.c:8959 + #, gcc-internal-format + msgid "tree check: did not expect class %qs, have %qs (%s) in %s, at %s:%d" + msgstr "revisión de árbol: no se esperaba la clase %qs, se tiene %qs (%s) en %s, en %s:%d" + +-#: tree.c:8956 ++#: tree.c:8972 + #, gcc-internal-format, gfc-internal-format + msgid "tree check: expected omp_clause %s, have %s in %s, at %s:%d" + msgstr "revisión de árbol: se esperaba omp_clause %s, se tiene %s en %s, en %s:%d" + +-#: tree.c:9016 ++#: tree.c:9032 + #, gcc-internal-format + msgid "tree check: expected tree that contains %qs structure, have %qs in %s, at %s:%d" + msgstr "revisión de árbol: se esperaba un árbol que contenga la estructura %qs, se tiene %qs en %s, en %s:%d" + +-#: tree.c:9030 ++#: tree.c:9046 + #, gcc-internal-format, gfc-internal-format + msgid "tree check: accessed elt %d of tree_vec with %d elts in %s, at %s:%d" + msgstr "revisión de árbol: acceso de elt %d de tree_vec con %d elts en %s, en %s:%d" + +-#: tree.c:9043 ++#: tree.c:9059 + #, gcc-internal-format, gfc-internal-format + msgid "tree check: accessed operand %d of %s with %d operands in %s, at %s:%d" + msgstr "revisión de árbol: acceso del operando %d de %s con %d operandos en %s, en %s:%d" + +-#: tree.c:9056 ++#: tree.c:9072 + #, gcc-internal-format, gfc-internal-format + msgid "tree check: accessed operand %d of omp_clause %s with %d operands in %s, at %s:%d" + msgstr "revisión de árbol: acceso del operando %d de omp_clause %s con %d operandos en %s, en %s:%d" + +-#: tree.c:11340 ++#: tree.c:11356 + #, gcc-internal-format + msgid "%qD is deprecated (declared at %s:%d): %s" + msgstr "%qD es obsoleto (declarado en %s:%d): %s" + +-#: tree.c:11344 ++#: tree.c:11360 + #, gcc-internal-format + msgid "%qD is deprecated (declared at %s:%d)" + msgstr "%qD es obsoleto (declarado en %s:%d)" + +-#: tree.c:11369 ++#: tree.c:11385 + #, gcc-internal-format + msgid "%qE is deprecated (declared at %s:%d): %s" + msgstr "%qE es obsoleto (declarado en %s:%d): %s" + +-#: tree.c:11373 ++#: tree.c:11389 + #, gcc-internal-format + msgid "%qE is deprecated (declared at %s:%d)" + msgstr "%qE es obsoleto (declarado en %s:%d)" + +-#: tree.c:11380 ++#: tree.c:11396 + #, gcc-internal-format, gfc-internal-format + msgid "type is deprecated (declared at %s:%d): %s" + msgstr "el tipo es obsoleto (declarado en %s:%d): %s" + +-#: tree.c:11384 ++#: tree.c:11400 + #, gcc-internal-format, gfc-internal-format + msgid "type is deprecated (declared at %s:%d)" + msgstr "el tipo es obsoleto (declarado en %s:%d)" + +-#: tree.c:11393 ++#: tree.c:11409 + #, gcc-internal-format + msgid "%qE is deprecated: %s" + msgstr "%qE es obsoleto: %s" + +-#: tree.c:11396 ++#: tree.c:11412 + #, gcc-internal-format + msgid "%qE is deprecated" + msgstr "%qE es obsoleto" + +-#: tree.c:11401 ++#: tree.c:11417 + #, gcc-internal-format, gfc-internal-format + msgid "type is deprecated: %s" + msgstr "el tipo es obsoleto: %s" + +-#: tree.c:11404 ++#: tree.c:11420 + #, gcc-internal-format + msgid "type is deprecated" + msgstr "el tipo es obsoleto" +@@ -20346,12 +20346,12 @@ + msgid "no sclass for %s stab (0x%x)" + msgstr "no hay sclass para el stab %s (0x%x)" + +-#: lto-streamer.h:962 ++#: lto-streamer.h:975 + #, gcc-internal-format, gfc-internal-format + msgid "bytecode stream: expected tag %s instead of %s" + msgstr "flujo de bytecode: se esperaba la etiqueta %s en lugar de %s" + +-#: lto-streamer.h:972 ++#: lto-streamer.h:985 + #, gcc-internal-format, gfc-internal-format + msgid "bytecode stream: tag %s is not in the expected range [%s, %s]" + msgstr "flujo de bytecode: la etiqueta %s no está en el rango esperado [%s, %s]" +@@ -20366,8 +20366,8 @@ + msgid "string length %qd is greater than the length %qd ISO C%d compilers are required to support" + msgstr "la longitud de la cadena %qd es mayor que la longitud %qd, la máxima que los compiladores ISO C%d deben admitir" + +-#: c-family/c-common.c:1494 c-family/c-common.c:1506 cp/semantics.c:6646 +-#: cp/semantics.c:8030 ++#: c-family/c-common.c:1494 c-family/c-common.c:1506 cp/semantics.c:6677 ++#: cp/semantics.c:8071 + #, gcc-internal-format + msgid "overflow in constant expression" + msgstr "desbordamiento en la expresión constante" +@@ -20995,40 +20995,40 @@ + msgid "invalid vector type for attribute %qE" + msgstr "tipo de vector inválido para el atributo %qE" + +-#: c-family/c-common.c:7720 ada/gcc-interface/utils.c:5623 +-#: ada/gcc-interface/utils.c:5717 ++#: c-family/c-common.c:7720 ada/gcc-interface/utils.c:5614 ++#: ada/gcc-interface/utils.c:5708 + #, gcc-internal-format + msgid "vector size not an integral multiple of component size" + msgstr "el tamaño del vector no es un múltiplo integral del tamaño del componente" + +-#: c-family/c-common.c:7726 ada/gcc-interface/utils.c:5629 +-#: ada/gcc-interface/utils.c:5723 ++#: c-family/c-common.c:7726 ada/gcc-interface/utils.c:5620 ++#: ada/gcc-interface/utils.c:5714 + #, gcc-internal-format + msgid "zero vector size" + msgstr "vector de tamaño cero" + +-#: c-family/c-common.c:7734 ada/gcc-interface/utils.c:5637 +-#: ada/gcc-interface/utils.c:5730 ++#: c-family/c-common.c:7734 ada/gcc-interface/utils.c:5628 ++#: ada/gcc-interface/utils.c:5721 + #, gcc-internal-format + msgid "number of components of the vector not a power of two" + msgstr "el número de componentes del vector no es una potencia de dos" + +-#: c-family/c-common.c:7762 ada/gcc-interface/utils.c:5364 ++#: c-family/c-common.c:7762 ada/gcc-interface/utils.c:5355 + #, gcc-internal-format + msgid "nonnull attribute without arguments on a non-prototype" + msgstr "un atributo que no es nulo sin argumento es un atributo que no es prototipo" + +-#: c-family/c-common.c:7776 ada/gcc-interface/utils.c:5378 ++#: c-family/c-common.c:7776 ada/gcc-interface/utils.c:5369 + #, gcc-internal-format, gfc-internal-format + msgid "nonnull argument has invalid operand number (argument %lu)" + msgstr "un argumento que no es nulo tiene un número de operando inválido (argumento %lu)" + +-#: c-family/c-common.c:7798 ada/gcc-interface/utils.c:5400 ++#: c-family/c-common.c:7798 ada/gcc-interface/utils.c:5391 + #, gcc-internal-format, gfc-internal-format + msgid "nonnull argument with out-of-range operand number (argument %lu, operand %lu)" + msgstr "un argumento que no es nulo con número de operando fuera de rango (argumento %lu, operando %lu)" + +-#: c-family/c-common.c:7806 ada/gcc-interface/utils.c:5409 ++#: c-family/c-common.c:7806 ada/gcc-interface/utils.c:5400 + #, gcc-internal-format, gfc-internal-format + msgid "nonnull argument references non-pointer operand (argument %lu, operand %lu)" + msgstr "un argumento que no es nulo hace referencia a un operando que no es puntero (argumento %lu, operando %lu)" +@@ -21068,12 +21068,12 @@ + msgid "%qE attribute only applies to variadic functions" + msgstr "el atributo %qE se aplica solamente a funciones variadic" + +-#: c-family/c-common.c:8069 ada/gcc-interface/utils.c:5451 ++#: c-family/c-common.c:8069 ada/gcc-interface/utils.c:5442 + #, gcc-internal-format + msgid "requested position is not an integer constant" + msgstr "la posición solicitada no es una constante entera" + +-#: c-family/c-common.c:8077 ada/gcc-interface/utils.c:5458 ++#: c-family/c-common.c:8077 ada/gcc-interface/utils.c:5449 + #, gcc-internal-format + msgid "requested position is less than zero" + msgstr "la posición solicitada es menor a cero" +@@ -22824,229 +22824,229 @@ + msgstr "valor %qs erróneo para -mmemory-latency" + + #: config/alpha/alpha.c:6576 config/alpha/alpha.c:6579 config/s390/s390.c:9162 +-#: config/s390/s390.c:9165 config/tilegx/tilegx.c:3394 ++#: config/s390/s390.c:9165 config/tilegx/tilegx.c:3395 + #: config/tilepro/tilepro.c:3098 + #, gcc-internal-format + msgid "bad builtin fcode" + msgstr "fcode interno erróneo" + +-#: config/arm/arm.c:1512 ++#: config/arm/arm.c:1516 + #, gcc-internal-format, gfc-internal-format + msgid "switch -mcpu=%s conflicts with -march=%s switch" + msgstr "la opción -mcpu=%s genera un conflicto con la opción -march=%s" + +-#: config/arm/arm.c:1629 ++#: config/arm/arm.c:1633 + #, gcc-internal-format + msgid "target CPU does not support ARM mode" + msgstr "el CPU objetivo no tiene soporte para el modo ARM" + +-#: config/arm/arm.c:1635 ++#: config/arm/arm.c:1639 + #, gcc-internal-format + msgid "target CPU does not support interworking" + msgstr "el CPU objetivo no admite trabajo interno" + +-#: config/arm/arm.c:1641 ++#: config/arm/arm.c:1645 + #, gcc-internal-format + msgid "target CPU does not support THUMB instructions" + msgstr "el CPU objetivo no admite las instrucciones THUMB" + +-#: config/arm/arm.c:1659 ++#: config/arm/arm.c:1663 + #, gcc-internal-format + msgid "enabling backtrace support is only meaningful when compiling for the Thumb" + msgstr "habilitar el soporte de rastreo hacia atrás sólo tiene significado cuando se compila para el Thumb" + +-#: config/arm/arm.c:1662 ++#: config/arm/arm.c:1666 + #, gcc-internal-format + msgid "enabling callee interworking support is only meaningful when compiling for the Thumb" + msgstr "habilitar el soporte de trabajo interno de llamado sólo tiene significado cuando se compila para el Thumb" + +-#: config/arm/arm.c:1666 ++#: config/arm/arm.c:1670 + #, gcc-internal-format + msgid "-mapcs-stack-check incompatible with -mno-apcs-frame" + msgstr "-mapcs-stack-check es incompatible con -mno-apcs-frame" + +-#: config/arm/arm.c:1674 ++#: config/arm/arm.c:1678 + #, gcc-internal-format + msgid "-fpic and -mapcs-reent are incompatible" + msgstr "-fpic y -mapcs-reent son incompatibles" + +-#: config/arm/arm.c:1677 ++#: config/arm/arm.c:1681 + #, gcc-internal-format + msgid "APCS reentrant code not supported. Ignored" + msgstr "no se admite el código reentrante APCS. Descartado" + +-#: config/arm/arm.c:1685 ++#: config/arm/arm.c:1689 + #, gcc-internal-format + msgid "-g with -mno-apcs-frame may not give sensible debugging" + msgstr "-g con -mno-apcs-frame no permite una depuración sensible" + +-#: config/arm/arm.c:1688 ++#: config/arm/arm.c:1692 + #, gcc-internal-format + msgid "passing floating point arguments in fp regs not yet supported" + msgstr "aún no se admite el paso de argumentos de coma flotante en registros fp" + +-#: config/arm/arm.c:1691 ++#: config/arm/arm.c:1695 + #, gcc-internal-format + msgid "% is deprecated and will be removed in a future release" + msgstr "% es obsoleto y se eliminará en una versión futura" + +-#: config/arm/arm.c:1753 ++#: config/arm/arm.c:1757 + #, gcc-internal-format + msgid "iwmmxt requires an AAPCS compatible ABI for proper operation" + msgstr "iwmmxt requiere una ABI compatible con AAPCS para una operación adecuada" + +-#: config/arm/arm.c:1756 ++#: config/arm/arm.c:1760 + #, gcc-internal-format + msgid "iwmmxt abi requires an iwmmxt capable cpu" + msgstr "el abi iwmmxt requiere un cpu capaz de iwmmxt" + +-#: config/arm/arm.c:1804 ++#: config/arm/arm.c:1808 + #, gcc-internal-format + msgid "FPA is unsupported in the AAPCS" + msgstr "no se admite FPA en el AAPCS" + +-#: config/arm/arm.c:1809 ++#: config/arm/arm.c:1813 + #, gcc-internal-format + msgid "AAPCS does not support -mcaller-super-interworking" + msgstr "AAPCS no admite -mcaller-super-interworking" + +-#: config/arm/arm.c:1812 ++#: config/arm/arm.c:1816 + #, gcc-internal-format + msgid "AAPCS does not support -mcallee-super-interworking" + msgstr "AAPCS no admite -mcallee-super-interworking" + +-#: config/arm/arm.c:1819 ++#: config/arm/arm.c:1823 + #, gcc-internal-format + msgid "iWMMXt and hardware floating point" + msgstr "coma flotante iWMMXt y de hardware" + +-#: config/arm/arm.c:1823 ++#: config/arm/arm.c:1827 + #, gcc-internal-format + msgid "Thumb-2 iWMMXt" + msgstr "iWMMXt de Thumb-2" + +-#: config/arm/arm.c:1827 ++#: config/arm/arm.c:1831 + #, gcc-internal-format + msgid "__fp16 and no ldrh" + msgstr "__fp16 sin ldrh" + +-#: config/arm/arm.c:1847 ++#: config/arm/arm.c:1851 + #, gcc-internal-format + msgid "-mfloat-abi=hard and VFP" + msgstr "-mfloat-abi=hard y VFP" + +-#: config/arm/arm.c:1872 ++#: config/arm/arm.c:1876 + #, gcc-internal-format + msgid "can not use -mtp=cp15 with 16-bit Thumb" + msgstr "no se puede usar -mtp=cp15 con Thumb de 16-bit" + +-#: config/arm/arm.c:1888 ++#: config/arm/arm.c:1892 + #, gcc-internal-format + msgid "structure size boundary can only be set to 8, 32 or 64" + msgstr "el límite del tamaño de la estructura sólo se puede establecer a 8, 32 o 64" + +-#: config/arm/arm.c:1890 ++#: config/arm/arm.c:1894 + #, gcc-internal-format + msgid "structure size boundary can only be set to 8 or 32" + msgstr "el límite del tamaño de la estructura sólo se puede establecer a 8 o 32" + +-#: config/arm/arm.c:1898 ++#: config/arm/arm.c:1902 + #, gcc-internal-format + msgid "RTP PIC is incompatible with Thumb" + msgstr "El PIC de RTP es incompatible con Thumb" + +-#: config/arm/arm.c:1907 ++#: config/arm/arm.c:1911 + #, gcc-internal-format + msgid "RTP PIC is incompatible with -msingle-pic-base" + msgstr "El PIC de RTP es incompatible con -msingle-pic-base" + +-#: config/arm/arm.c:1919 ++#: config/arm/arm.c:1923 + #, gcc-internal-format + msgid "-mpic-register= is useless without -fpic" + msgstr "-mpic-register= es inútil sin -fpic" + +-#: config/arm/arm.c:1928 ++#: config/arm/arm.c:1932 + #, gcc-internal-format, gfc-internal-format + msgid "unable to use '%s' for PIC register" + msgstr "no se puede usar '%s' para registro PIC" + +-#: config/arm/arm.c:1960 ++#: config/arm/arm.c:1964 + #, gcc-internal-format + msgid "target CPU does not support unaligned accesses" + msgstr "el CPU objetivo no admite accesos sin alinear" + +-#: config/arm/arm.c:1984 ++#: config/arm/arm.c:1988 + #, gcc-internal-format + msgid "-freorder-blocks-and-partition not supported on this architecture" + msgstr "no se admite -freorder-blocks-and-partition en esta arquitectura" + +-#: config/arm/arm.c:4036 ++#: config/arm/arm.c:4040 + #, gcc-internal-format + msgid "non-AAPCS derived PCS variant" + msgstr "variante PCS derivada de un no AAPCS" + +-#: config/arm/arm.c:4038 ++#: config/arm/arm.c:4042 + #, gcc-internal-format + msgid "variadic functions must use the base AAPCS variant" + msgstr "las funciones variadic debe usar la variante AAPCS base" + +-#: config/arm/arm.c:4057 ++#: config/arm/arm.c:4061 + #, gcc-internal-format + msgid "PCS variant" + msgstr "variante PCS" + +-#: config/arm/arm.c:4252 ++#: config/arm/arm.c:4256 + #, gcc-internal-format + msgid "Thumb-1 hard-float VFP ABI" + msgstr "ABI de VFP de coma flotante dura de Thumb-1" + +-#: config/arm/arm.c:4975 config/arm/arm.c:4993 config/avr/avr.c:6783 +-#: config/avr/avr.c:6799 config/bfin/bfin.c:4636 config/bfin/bfin.c:4697 +-#: config/bfin/bfin.c:4726 config/h8300/h8300.c:5394 config/i386/i386.c:4894 +-#: config/i386/i386.c:31799 config/i386/i386.c:31850 config/i386/i386.c:31922 ++#: config/arm/arm.c:4979 config/arm/arm.c:4997 config/avr/avr.c:6793 ++#: config/avr/avr.c:6809 config/bfin/bfin.c:4636 config/bfin/bfin.c:4697 ++#: config/bfin/bfin.c:4726 config/h8300/h8300.c:5394 config/i386/i386.c:4901 ++#: config/i386/i386.c:31929 config/i386/i386.c:31980 config/i386/i386.c:32052 + #: config/m68k/m68k.c:725 config/mcore/mcore.c:3076 config/mep/mep.c:4011 + #: config/mep/mep.c:4025 config/mep/mep.c:4099 config/rl78/rl78.c:478 +-#: config/rs6000/rs6000.c:24247 config/rx/rx.c:2502 config/sh/sh.c:8902 +-#: config/sh/sh.c:8920 config/sh/sh.c:8949 config/sh/sh.c:9031 +-#: config/sh/sh.c:9054 config/spu/spu.c:3977 config/stormy16/stormy16.c:2200 ++#: config/rs6000/rs6000.c:24270 config/rx/rx.c:2502 config/sh/sh.c:8905 ++#: config/sh/sh.c:8923 config/sh/sh.c:8952 config/sh/sh.c:9034 ++#: config/sh/sh.c:9057 config/spu/spu.c:3977 config/stormy16/stormy16.c:2200 + #: config/v850/v850.c:2057 + #, gcc-internal-format + msgid "%qE attribute only applies to functions" + msgstr "el atributo %qE se aplica solamente a funciones" + +-#: config/arm/arm.c:18928 ++#: config/arm/arm.c:18932 + #, gcc-internal-format + msgid "unable to compute real location of stacked parameter" + msgstr "no se puede calcular la ubicación real del parámetro apilado" + +-#: config/arm/arm.c:20667 ++#: config/arm/arm.c:20679 + #, gcc-internal-format + msgid "argument must be a constant" + msgstr "el argumento debe ser una constante" + + #. @@@ better error message +-#: config/arm/arm.c:21036 config/arm/arm.c:21073 ++#: config/arm/arm.c:21049 config/arm/arm.c:21086 + #, gcc-internal-format + msgid "selector must be an immediate" + msgstr "el selector debe ser un inmediato" + + #. @@@ better error message +-#: config/arm/arm.c:21116 ++#: config/arm/arm.c:21129 + #, gcc-internal-format + msgid "mask must be an immediate" + msgstr "la máscara debe ser un inmediato" + +-#: config/arm/arm.c:21900 ++#: config/arm/arm.c:21913 + #, gcc-internal-format + msgid "no low registers available for popping high registers" + msgstr "no hay registros inferiores disponibles para extraer registros superiores" + +-#: config/arm/arm.c:22125 ++#: config/arm/arm.c:22138 + #, gcc-internal-format + msgid "interrupt Service Routines cannot be coded in Thumb mode" + msgstr "no se pueden codificar las Rutinas de Servicios de Interrupción en el modo Thumb" + +-#: config/arm/arm.c:24411 ++#: config/arm/arm.c:24424 + #, gcc-internal-format + msgid "the mangling of % has changed in GCC 4.4" + msgstr "la decodificación de % cambió en GCC 4.4" +@@ -23086,87 +23086,87 @@ + msgid "%qs appears to be a misspelled %s handler" + msgstr "%qs parece ser un manejador %s mal escrito" + +-#: config/avr/avr.c:733 ++#: config/avr/avr.c:743 + #, gcc-internal-format + msgid "'builtin_return_address' contains only 2 bytes of address" + msgstr "'builtin_return_address' sólo contiene 2 bytes de dirección" + +-#: config/avr/avr.c:1886 ++#: config/avr/avr.c:1896 + #, gcc-internal-format + msgid "pointer offset from symbol maybe incorrect" + msgstr "el desplazamiento del puntero desde el símbolo tal vez es incorrecto" + +-#: config/avr/avr.c:2009 ++#: config/avr/avr.c:2019 + #, gcc-internal-format + msgid "accessing data memory with program memory address" + msgstr "se accede a memoria de datos con dirección de memoria de programa" + +-#: config/avr/avr.c:2058 ++#: config/avr/avr.c:2068 + #, gcc-internal-format + msgid "accessing program memory with data memory address" + msgstr "se accede a memoria de programa con dirección de memoria de datos" + +-#: config/avr/avr.c:2464 ++#: config/avr/avr.c:2474 + #, gcc-internal-format, gfc-internal-format + msgid "fixed register %s used to pass parameter to function" + msgstr "se usó el registro fijo %s para pasar un parámetro a la función" + +-#: config/avr/avr.c:2586 ++#: config/avr/avr.c:2596 + #, gcc-internal-format + msgid "writing to address space %qs not supported" + msgstr "no se admite escribir al espacio de direcciones %qs" + +-#: config/avr/avr.c:6977 ++#: config/avr/avr.c:6987 + #, gcc-internal-format + msgid "%qT uses address space %qs beyond flash of %qs" + msgstr "%qT usa el espacio de direcciones %qs más allá del destello de %qs" + +-#: config/avr/avr.c:6980 ++#: config/avr/avr.c:6990 + #, gcc-internal-format + msgid "%s %q+D uses address space %qs beyond flash of %qs" + msgstr "%s %q+D usa el espacio de direcciones %qs más allá del destello de %qs" + +-#: config/avr/avr.c:6987 ++#: config/avr/avr.c:6997 + #, gcc-internal-format + msgid "pointer targeting address space %qs must be const in %qT" + msgstr "el espacio de direcciones %qs que apuntan a punteros debe ser const en %qT" + +-#: config/avr/avr.c:6990 ++#: config/avr/avr.c:7000 + #, gcc-internal-format + msgid "pointer targeting address space %qs must be const in %s %q+D" + msgstr "el espacio de direcciones %qs que apuntan a punteros debe ser const en %s %q+D" + +-#: config/avr/avr.c:7028 ++#: config/avr/avr.c:7038 + #, gcc-internal-format + msgid "variable %q+D located in address space %qs beyond flash of %qs" + msgstr "la variable %q+D se ubica en el espacio de direcciones %qs más allá del destello de %qs" + +-#: config/avr/avr.c:7044 ++#: config/avr/avr.c:7054 + #, gcc-internal-format + msgid "variable %q+D must be const in order to be put into read-only section by means of %qs" + msgstr "la variable %q+D debe ser const para que se ponga en la sección de sólo lectura a través de %qs" + +-#: config/avr/avr.c:7258 ++#: config/avr/avr.c:7268 + #, gcc-internal-format + msgid "only uninitialized variables can be placed in the .noinit section" + msgstr "Sólo las variables sin inicializar se pueden colocar en la sección .noinit" + +-#: config/avr/avr.c:7299 ++#: config/avr/avr.c:7309 + #, gcc-internal-format + msgid "uninitialized variable %q+D put into program memory area" + msgstr "se colocó la variable %q+D sin inicializar en el área de memoria del programa" + +-#: config/avr/avr.c:7366 ++#: config/avr/avr.c:7376 + #, gcc-internal-format + msgid "MCU %qs supported for assembler only" + msgstr "MCU %qs sólo se admite para ensamblador" + +-#: config/avr/avr.c:10628 ++#: config/avr/avr.c:10660 + #, gcc-internal-format, gfc-internal-format + msgid "%s expects a compile time integer constant" + msgstr "%s expera una constante entera en tiempo de compilación" + +-#: config/avr/avr.c:10642 ++#: config/avr/avr.c:10674 + #, gcc-internal-format, gfc-internal-format + msgid "%s expects a compile time long integer constant as first argument" + msgstr "%s espera una constante entera long en tiempo de compilación como primer argumento" +@@ -23506,411 +23506,411 @@ + msgid "can%'t set position in PCH file: %m" + msgstr "no se puede establecer la posición en el fichero PCH: %m" + +-#: config/i386/i386.c:3130 config/i386/i386.c:3434 ++#: config/i386/i386.c:3135 config/i386/i386.c:3441 + #, gcc-internal-format, gfc-internal-format + msgid "bad value (%s) for %stune=%s %s" + msgstr "valor erróneo (%s) para %stune=%s %s" + +-#: config/i386/i386.c:3133 ++#: config/i386/i386.c:3138 + #, gcc-internal-format, gfc-internal-format + msgid "%stune=x86-64%s is deprecated; use %stune=k8%s or %stune=generic%s instead as appropriate" + msgstr "%stune=x86-64%s es obsoleto; use en su lugar %stune=k8%s o %stune=generic%s como sea adecuado" + + #. rep; movq isn't available in 32-bit code. +-#: config/i386/i386.c:3163 ++#: config/i386/i386.c:3168 + #, gcc-internal-format + msgid "-mstringop-strategy=rep_8byte not supported for 32-bit code" + msgstr "no se admite -mstringop-stategy=rep_8byte para código de 32-bit" + +-#: config/i386/i386.c:3184 config/i386/i386.c:3193 config/i386/i386.c:3205 +-#: config/i386/i386.c:3216 config/i386/i386.c:3227 ++#: config/i386/i386.c:3189 config/i386/i386.c:3198 config/i386/i386.c:3210 ++#: config/i386/i386.c:3221 config/i386/i386.c:3232 + #, gcc-internal-format + msgid "code model %qs not supported in the %s bit mode" + msgstr "el modelo de código %qs no se admite en el modo de bit %s" + +-#: config/i386/i386.c:3196 config/i386/i386.c:3208 ++#: config/i386/i386.c:3201 config/i386/i386.c:3213 + #, gcc-internal-format + msgid "code model %qs not supported in x32 mode" + msgstr "el modelo de código %qs no se admite en modo x32" + +-#: config/i386/i386.c:3214 config/i386/i386.c:3223 ++#: config/i386/i386.c:3219 config/i386/i386.c:3228 + #, gcc-internal-format, gfc-internal-format + msgid "code model %s does not support PIC mode" + msgstr "el modelo de código %s no admite el modo PIC" + +-#: config/i386/i386.c:3250 ++#: config/i386/i386.c:3255 + #, gcc-internal-format + msgid "-masm=intel not supported in this configuration" + msgstr "no se admite -masm=intel en esta configuración" + +-#: config/i386/i386.c:3254 ++#: config/i386/i386.c:3259 + #, gcc-internal-format, gfc-internal-format + msgid "%i-bit mode not compiled in" + msgstr "no está compilado el modo bit-%i" + +-#: config/i386/i386.c:3266 config/i386/i386.c:3396 ++#: config/i386/i386.c:3271 config/i386/i386.c:3403 + #, gcc-internal-format + msgid "CPU you selected does not support x86-64 instruction set" + msgstr "el CPU que seleccionó no admite el conjunto de instrucciones x86-64" + +-#: config/i386/i386.c:3366 ++#: config/i386/i386.c:3373 + #, gcc-internal-format, gfc-internal-format + msgid "generic CPU can be used only for %stune=%s %s" + msgstr "el CPU generic sólo se puede usar para %stune=%s %s" + +-#: config/i386/i386.c:3369 ++#: config/i386/i386.c:3376 + #, gcc-internal-format, gfc-internal-format + msgid "bad value (%s) for %sarch=%s %s" + msgstr "valor erróneo (%s) para %sarch=%s %s" + +-#: config/i386/i386.c:3482 ++#: config/i386/i386.c:3489 + #, gcc-internal-format + msgid "-mregparm is ignored in 64-bit mode" + msgstr "se descarta -mregparm en modo de 64-bit" + +-#: config/i386/i386.c:3485 ++#: config/i386/i386.c:3492 + #, gcc-internal-format, gfc-internal-format + msgid "-mregparm=%d is not between 0 and %d" + msgstr "-mregparm=%d no está entre 0 y %d" + +-#: config/i386/i386.c:3526 ++#: config/i386/i386.c:3533 + #, gcc-internal-format, gfc-internal-format + msgid "%srtd%s is ignored in 64bit mode" + msgstr "se descarta %srtd%s en el modo de 64bit" + +-#: config/i386/i386.c:3590 ++#: config/i386/i386.c:3597 + #, gcc-internal-format + msgid "-mpreferred-stack-boundary is not supported for this target" + msgstr "no se admite -mpreferred-stack-boundary en este objetivo" + +-#: config/i386/i386.c:3593 ++#: config/i386/i386.c:3600 + #, gcc-internal-format, gfc-internal-format + msgid "-mpreferred-stack-boundary=%d is not between %d and %d" + msgstr "-mpreferred-stack-boundary=%d no está entre %d y %d" + +-#: config/i386/i386.c:3614 ++#: config/i386/i386.c:3621 + #, gcc-internal-format, gfc-internal-format + msgid "-mincoming-stack-boundary=%d is not between %d and 12" + msgstr "-mincoming-stack-boundary=%d no está entre %d y 12" + +-#: config/i386/i386.c:3628 ++#: config/i386/i386.c:3635 + #, gcc-internal-format, gfc-internal-format + msgid "%ssseregparm%s used without SSE enabled" + msgstr "se usó %ssseregparm%s sin SSE activado" + +-#: config/i386/i386.c:3636 ++#: config/i386/i386.c:3643 + #, gcc-internal-format + msgid "SSE instruction set disabled, using 387 arithmetics" + msgstr "el conjunto de instrucciones SSE está desactivado, usando la aritmética 387" + +-#: config/i386/i386.c:3641 ++#: config/i386/i386.c:3648 + #, gcc-internal-format + msgid "387 instruction set disabled, using SSE arithmetics" + msgstr "el conjunto de instrucciones 387 está desactivado, usando la aritmética SSE" + +-#: config/i386/i386.c:3685 ++#: config/i386/i386.c:3692 + #, gcc-internal-format, gfc-internal-format + msgid "unwind tables currently require either a frame pointer or %saccumulate-outgoing-args%s for correctness" + msgstr "actualmente las tablas de desenredo requieren un puntero de marco o %saccumulate-outgoing-args%s para ser correctas" + +-#: config/i386/i386.c:3698 ++#: config/i386/i386.c:3705 + #, gcc-internal-format, gfc-internal-format + msgid "stack probing requires %saccumulate-outgoing-args%s for correctness" + msgstr "actualmente la prueba de pila requiere un puntero de marco o %saccumulate-outgoing-args%s para ser correctas" + +-#: config/i386/i386.c:3779 ++#: config/i386/i386.c:3786 + #, gcc-internal-format + msgid "-mfentry isn%'t supported for 32-bit in combination with -fpic" + msgstr "-mfentry no se admite para 32-bit en combinación con -fpic" + +-#: config/i386/i386.c:3786 ++#: config/i386/i386.c:3793 + #, gcc-internal-format + msgid "-mno-fentry isn%'t compatible with SEH" + msgstr "-mno-fentry no es compatible con SEH" + +-#: config/i386/i386.c:3856 config/rs6000/rs6000.c:3331 ++#: config/i386/i386.c:3863 config/rs6000/rs6000.c:3330 + #, gcc-internal-format, gfc-internal-format + msgid "unknown option for -mrecip=%s" + msgstr "opción desconocida para -mrecip=%s" + +-#: config/i386/i386.c:4271 config/i386/i386.c:4318 ++#: config/i386/i386.c:4278 config/i386/i386.c:4325 + #, gcc-internal-format, gfc-internal-format + msgid "attribute(target(\"%s\")) is unknown" + msgstr "se desconoce attribute(target(\"%s\"))" + +-#: config/i386/i386.c:4299 ++#: config/i386/i386.c:4306 + #, gcc-internal-format, gfc-internal-format + msgid "option(\"%s\") was already specified" + msgstr "ya se había especificado option(\"%s\")" + +-#: config/i386/i386.c:4907 config/i386/i386.c:4958 ++#: config/i386/i386.c:4914 config/i386/i386.c:4965 + #, gcc-internal-format + msgid "fastcall and regparm attributes are not compatible" + msgstr "los atributos fastcall y regparm no son compatibles" + +-#: config/i386/i386.c:4912 ++#: config/i386/i386.c:4919 + #, gcc-internal-format + msgid "regparam and thiscall attributes are not compatible" + msgstr "los atributos regparam y thiscall no son compatibles" + +-#: config/i386/i386.c:4919 config/i386/i386.c:31819 ++#: config/i386/i386.c:4926 config/i386/i386.c:31949 + #, gcc-internal-format + msgid "%qE attribute requires an integer constant argument" + msgstr "el atributo %qE requiere un argumento constante entero" + +-#: config/i386/i386.c:4925 ++#: config/i386/i386.c:4932 + #, gcc-internal-format + msgid "argument to %qE attribute larger than %d" + msgstr "el argumento para el atributo %qE es más grande que %d" + +-#: config/i386/i386.c:4950 config/i386/i386.c:4993 ++#: config/i386/i386.c:4957 config/i386/i386.c:5000 + #, gcc-internal-format + msgid "fastcall and cdecl attributes are not compatible" + msgstr "los atributos fastcall y cdecl no son compatibles" + +-#: config/i386/i386.c:4954 ++#: config/i386/i386.c:4961 + #, gcc-internal-format + msgid "fastcall and stdcall attributes are not compatible" + msgstr "los atributos fastcall y stdcall no son compatibles" + +-#: config/i386/i386.c:4962 config/i386/i386.c:5011 ++#: config/i386/i386.c:4969 config/i386/i386.c:5018 + #, gcc-internal-format + msgid "fastcall and thiscall attributes are not compatible" + msgstr "los atributos fastcall y thiscall no son compatibles" + +-#: config/i386/i386.c:4972 config/i386/i386.c:4989 ++#: config/i386/i386.c:4979 config/i386/i386.c:4996 + #, gcc-internal-format + msgid "stdcall and cdecl attributes are not compatible" + msgstr "los atributos stdcall y cdecl no son compatibles" + +-#: config/i386/i386.c:4976 ++#: config/i386/i386.c:4983 + #, gcc-internal-format + msgid "stdcall and fastcall attributes are not compatible" + msgstr "los atributos stdcall y fastcall no son compatibles" + +-#: config/i386/i386.c:4980 config/i386/i386.c:5007 ++#: config/i386/i386.c:4987 config/i386/i386.c:5014 + #, gcc-internal-format + msgid "stdcall and thiscall attributes are not compatible" + msgstr "los atributos stdcall y thiscall no son compatibles" + +-#: config/i386/i386.c:4997 config/i386/i386.c:5015 ++#: config/i386/i386.c:5004 config/i386/i386.c:5022 + #, gcc-internal-format + msgid "cdecl and thiscall attributes are not compatible" + msgstr "los atributos cdecl y thiscall no son compatibles" + +-#: config/i386/i386.c:5003 ++#: config/i386/i386.c:5010 + #, gcc-internal-format + msgid "%qE attribute is used for none class-method" + msgstr "se usó el atributo %qE para clases-métodos none" + +-#: config/i386/i386.c:5229 ++#: config/i386/i386.c:5236 + #, gcc-internal-format + msgid "calling %qD with attribute sseregparm without SSE/SSE2 enabled" + msgstr "se llama a %qD con el atributo sseregparm sin activar SSE/SSE2" + +-#: config/i386/i386.c:5232 ++#: config/i386/i386.c:5239 + #, gcc-internal-format + msgid "calling %qT with attribute sseregparm without SSE/SSE2 enabled" + msgstr "se llama a %qT con el atributo sseregparm sin activar SSE/SSE2" + +-#: config/i386/i386.c:5447 ++#: config/i386/i386.c:5454 + #, gcc-internal-format + msgid "ms_hook_prologue is not compatible with nested function" + msgstr "ms_hook_prologue no es compatible con la función anidada" + +-#: config/i386/i386.c:5599 ++#: config/i386/i386.c:5606 + #, gcc-internal-format + msgid "ms_abi attribute requires -maccumulate-outgoing-args or subtarget optimization implying it" + msgstr "el atributo ms_abi requiere -maccumulate-outgoing-args o que la optimización de subobjetivo lo implique" + +-#: config/i386/i386.c:5723 ++#: config/i386/i386.c:5730 + #, gcc-internal-format + msgid "AVX vector argument without AVX enabled changes the ABI" + msgstr "el argumento de vector AVX sin AVX activado cambia la ABI" + +-#: config/i386/i386.c:5905 ++#: config/i386/i386.c:5912 + #, gcc-internal-format + msgid "the ABI of passing struct with a flexible array member has changed in GCC 4.4" + msgstr "la ABI para pasar un struct con un miembro de matriz flexible cambió en GCC 4.4" + +-#: config/i386/i386.c:6021 ++#: config/i386/i386.c:6028 + #, gcc-internal-format + msgid "the ABI of passing union with long double has changed in GCC 4.4" + msgstr "la ABI para pasar un union con long double cambió en GCC 4.4" + +-#: config/i386/i386.c:6136 ++#: config/i386/i386.c:6143 + #, gcc-internal-format + msgid "the ABI of passing structure with complex float member has changed in GCC 4.4" + msgstr "la ABI para pasar una estructura con un miembro de coma flotante compleja cambió en GCC 4.4" + +-#: config/i386/i386.c:6282 ++#: config/i386/i386.c:6289 + #, gcc-internal-format + msgid "SSE register return with SSE disabled" + msgstr "se devuelve el registro SSE con SSE desactivado" + +-#: config/i386/i386.c:6288 ++#: config/i386/i386.c:6295 + #, gcc-internal-format + msgid "SSE register argument with SSE disabled" + msgstr "argumento de registro SSE con SSE desactivado" + +-#: config/i386/i386.c:6304 ++#: config/i386/i386.c:6311 + #, gcc-internal-format + msgid "x87 register return with x87 disabled" + msgstr "se devuelve el registro x87 con x87 desactivado" + +-#: config/i386/i386.c:6683 ++#: config/i386/i386.c:6690 + #, gcc-internal-format + msgid "SSE vector argument without SSE enabled changes the ABI" + msgstr "el argumento de vector SSE sin SSE activado cambia la ABI" + +-#: config/i386/i386.c:6721 ++#: config/i386/i386.c:6728 + #, gcc-internal-format + msgid "MMX vector argument without MMX enabled changes the ABI" + msgstr "el argumento de vector MMX sin MMX activado cambia la ABI" + +-#: config/i386/i386.c:7096 ++#: config/i386/i386.c:7103 + #, gcc-internal-format, gfc-internal-format + msgid "The ABI for passing parameters with %d-byte alignment has changed in GCC 4.6" + msgstr "La ABI para pasar parámetros con alineación de %d-bytes cambió en GCC 4.6" + +-#: config/i386/i386.c:7432 ++#: config/i386/i386.c:7439 + #, gcc-internal-format + msgid "SSE vector return without SSE enabled changes the ABI" + msgstr "la devolución de vector SSE sin SSE activado cambia la ABI" + +-#: config/i386/i386.c:7442 ++#: config/i386/i386.c:7449 + #, gcc-internal-format + msgid "MMX vector return without MMX enabled changes the ABI" + msgstr "la devolución de vector MMX sin MMX activado cambia la ABI" + +-#: config/i386/i386.c:10028 ++#: config/i386/i386.c:10049 + #, gcc-internal-format + msgid "ms_hook_prologue attribute isn%'t compatible with -mfentry for 32-bit" + msgstr "el atributo ms_hook_prologue no es compatible con -mfentry para 32-bit" + +-#: config/i386/i386.c:11025 ++#: config/i386/i386.c:11084 + #, gcc-internal-format + msgid "-fsplit-stack does not support fastcall with nested function" + msgstr "-fsplit-stack no admite fastcall con funciones anidadas" + +-#: config/i386/i386.c:11039 ++#: config/i386/i386.c:11098 + #, gcc-internal-format + msgid "-fsplit-stack does not support 2 register parameters for a nested function" + msgstr "-fsplit-stack no admite 2 parámetros de registro para una función anidada" + + #. FIXME: We could make this work by pushing a register + #. around the addition and comparison. +-#: config/i386/i386.c:11050 ++#: config/i386/i386.c:11109 + #, gcc-internal-format + msgid "-fsplit-stack does not support 3 register parameters" + msgstr "-fsplit-stack no admite 3 parámetros de registro" + +-#: config/i386/i386.c:13637 ++#: config/i386/i386.c:13731 + #, gcc-internal-format + msgid "extended registers have no high halves" + msgstr "los registros extendidos no tiene mitades superiores" + +-#: config/i386/i386.c:13652 ++#: config/i386/i386.c:13746 + #, gcc-internal-format + msgid "unsupported operand size for extended register" + msgstr "no se admite el tamaño de operando para el registro extendido" + +-#: config/i386/i386.c:13899 ++#: config/i386/i386.c:14001 + #, gcc-internal-format, gfc-internal-format + msgid "non-integer operand used with operand code '%c'" + msgstr "se usó un operando que no es entero con el código de operando '%c'" + +-#: config/i386/i386.c:27790 config/i386/i386.c:28727 ++#: config/i386/i386.c:27920 config/i386/i386.c:28857 + #, gcc-internal-format + msgid "the last argument must be a 2-bit immediate" + msgstr "el tercer argumento debe ser un inmediato de 2-bit" + +-#: config/i386/i386.c:28196 ++#: config/i386/i386.c:28326 + #, gcc-internal-format + msgid "the fifth argument must be an 8-bit immediate" + msgstr "el quinto argumento debe ser un inmediato de 8-bit" + +-#: config/i386/i386.c:28291 ++#: config/i386/i386.c:28421 + #, gcc-internal-format + msgid "the third argument must be an 8-bit immediate" + msgstr "el tercer argumento debe ser un inmediato de 8-bit" + +-#: config/i386/i386.c:28699 ++#: config/i386/i386.c:28829 + #, gcc-internal-format + msgid "the last argument must be an 1-bit immediate" + msgstr "el último argumento debe ser un inmediato de 1-bit" + +-#: config/i386/i386.c:28718 ++#: config/i386/i386.c:28848 + #, gcc-internal-format + msgid "the last argument must be a 4-bit immediate" + msgstr "el último argumento debe ser un inmediato de 4-bit" + +-#: config/i386/i386.c:28736 ++#: config/i386/i386.c:28866 + #, gcc-internal-format + msgid "the last argument must be a 1-bit immediate" + msgstr "el último argumento debe ser un inmediato de 1-bit" + +-#: config/i386/i386.c:28745 ++#: config/i386/i386.c:28875 + #, gcc-internal-format + msgid "the last argument must be a 5-bit immediate" + msgstr "el tercer argumento debe ser un inmediato de 5-bit" + +-#: config/i386/i386.c:28754 ++#: config/i386/i386.c:28884 + #, gcc-internal-format + msgid "the next to last argument must be an 8-bit immediate" + msgstr "el penúltimo argumento debe ser un inmediato de 8-bit" + +-#: config/i386/i386.c:28758 config/i386/i386.c:28982 ++#: config/i386/i386.c:28888 config/i386/i386.c:29112 + #, gcc-internal-format + msgid "the last argument must be an 8-bit immediate" + msgstr "el último argumento debe ser un inmediato de 8-bit" + +-#: config/i386/i386.c:28980 ++#: config/i386/i386.c:29110 + #, gcc-internal-format + msgid "the last argument must be a 32-bit immediate" + msgstr "el último argumento debe ser un inmediato de 32-bit" + +-#: config/i386/i386.c:29048 config/rs6000/rs6000.c:10551 ++#: config/i386/i386.c:29178 config/rs6000/rs6000.c:10550 + #, gcc-internal-format + msgid "selector must be an integer constant in the range 0..%wi" + msgstr "el selector debe ser una constante entera en el rango 0..%wi" + +-#: config/i386/i386.c:29191 ++#: config/i386/i386.c:29321 + #, gcc-internal-format + msgid "%qE needs unknown isa option" + msgstr "%qE necesita la opción isa desconocida" + +-#: config/i386/i386.c:29195 ++#: config/i386/i386.c:29325 + #, gcc-internal-format + msgid "%qE needs isa option %s" + msgstr "%qE necesita la opción isa %s" + +-#: config/i386/i386.c:29366 ++#: config/i386/i386.c:29496 + #, gcc-internal-format + msgid "last argument must be an immediate" + msgstr "el último argumento debe ser un inmediato" + +-#: config/i386/i386.c:29560 ++#: config/i386/i386.c:29690 + #, gcc-internal-format + msgid "last argument must be scale 1, 2, 4, 8" + msgstr "el argumento izquierdo debe ser un escalar 1, 2, 4, 8" + +-#: config/i386/i386.c:31806 ++#: config/i386/i386.c:31936 + #, gcc-internal-format + msgid "%qE attribute only available for 32-bit" + msgstr "el atributo %qE solamente está disponible para 64-bit" + +-#: config/i386/i386.c:31827 ++#: config/i386/i386.c:31957 + #, gcc-internal-format + msgid "argument to %qE attribute is neither zero, nor one" + msgstr "el argumento del atributo %qE no es cero ni uno" + +-#: config/i386/i386.c:31861 config/i386/i386.c:31870 ++#: config/i386/i386.c:31991 config/i386/i386.c:32000 + #, gcc-internal-format + msgid "ms_abi and sysv_abi attributes are not compatible" + msgstr "los atributos ms_abi y sysv_abi no son compatibles" + +-#: config/i386/i386.c:31907 config/rs6000/rs6000.c:24330 ++#: config/i386/i386.c:32037 config/rs6000/rs6000.c:24353 + #, gcc-internal-format + msgid "%qE incompatible attribute ignored" + msgstr "se descarta el atributo incompatible %qE" +@@ -23980,13 +23980,13 @@ + msgid "%qE attribute requires a string constant argument" + msgstr "el atributo %qE requiere una constante entera como argumento" + +-#: config/ia64/ia64.c:5741 config/pa/pa.c:415 config/sh/sh.c:8750 ++#: config/ia64/ia64.c:5741 config/pa/pa.c:415 config/sh/sh.c:8753 + #: config/spu/spu.c:5187 + #, gcc-internal-format + msgid "value of -mfixed-range must have form REG1-REG2" + msgstr "el valor de -mfixed-range debe ser de la forma REG1-REG2" + +-#: config/ia64/ia64.c:5768 config/pa/pa.c:442 config/sh/sh.c:8776 ++#: config/ia64/ia64.c:5768 config/pa/pa.c:442 config/sh/sh.c:8779 + #: config/spu/spu.c:5213 + #, gcc-internal-format, gfc-internal-format + msgid "%s-%s is an empty range" +@@ -24058,7 +24058,7 @@ + msgstr "no se admite el atributo %qE para el objetivo R8C" + + #. The argument must be a constant integer. +-#: config/m32c/m32c.c:3169 config/sh/sh.c:8957 config/sh/sh.c:9063 ++#: config/m32c/m32c.c:3169 config/sh/sh.c:8960 config/sh/sh.c:9066 + #, gcc-internal-format + msgid "%qE attribute argument not an integer constant" + msgstr "el argumento del atributo %qE no es una constante entera" +@@ -24113,7 +24113,7 @@ + msgid "interrupt_thread is available only on fido" + msgstr "interrupt_thread sólo está disponible en fido" + +-#: config/m68k/m68k.c:1072 config/rs6000/rs6000.c:18607 ++#: config/m68k/m68k.c:1072 config/rs6000/rs6000.c:18606 + #, gcc-internal-format + msgid "stack limit expression is not supported" + msgstr "no se admite la expresión del límite de la pila" +@@ -24456,62 +24456,62 @@ + msgid "%qs does not support MIPS16 code" + msgstr "%qs no admite código MIPS16" + +-#: config/mips/mips.c:15623 ++#: config/mips/mips.c:15629 + #, gcc-internal-format + msgid "MIPS16 PIC for ABIs other than o32 and o64" + msgstr "PIC MIPS16 para ABIs diferentes de o32 y o64" + +-#: config/mips/mips.c:15626 ++#: config/mips/mips.c:15632 + #, gcc-internal-format + msgid "MIPS16 -mxgot code" + msgstr "código MIPS16 -mxgot" + +-#: config/mips/mips.c:15629 ++#: config/mips/mips.c:15635 + #, gcc-internal-format + msgid "hard-float MIPS16 code for ABIs other than o32 and o64" + msgstr "código MIPS16 de coma flotante hard para ABIs diferentes de o32 y o64" + +-#: config/mips/mips.c:15818 ++#: config/mips/mips.c:15824 + #, gcc-internal-format + msgid "%<-%s%> conflicts with the other architecture options, which specify a %s processor" + msgstr "%<-%s%> genera un conflicto con las otras opciones de la arquitectura, las cuales especifican un procesador %s" + +-#: config/mips/mips.c:15828 ++#: config/mips/mips.c:15834 + #, gcc-internal-format + msgid "%<-march=%s%> is not compatible with the selected ABI" + msgstr "%<-march=%s%> no es compatible con la ABI seleccionada" + +-#: config/mips/mips.c:15843 ++#: config/mips/mips.c:15849 + #, gcc-internal-format + msgid "%<-mgp64%> used with a 32-bit processor" + msgstr "se utiliza %<-mgp64%> con un procesador de 32-bit" + +-#: config/mips/mips.c:15845 ++#: config/mips/mips.c:15851 + #, gcc-internal-format + msgid "%<-mgp32%> used with a 64-bit ABI" + msgstr "se utiliza %<-mgp32%> con una ABI de 64-bit" + +-#: config/mips/mips.c:15847 ++#: config/mips/mips.c:15853 + #, gcc-internal-format + msgid "%<-mgp64%> used with a 32-bit ABI" + msgstr "se utiliza %<-mgp64%> con una ABI de 32-bit" + +-#: config/mips/mips.c:15863 config/mips/mips.c:15865 config/mips/mips.c:15956 ++#: config/mips/mips.c:15869 config/mips/mips.c:15871 config/mips/mips.c:15962 + #, gcc-internal-format, gfc-internal-format + msgid "unsupported combination: %s" + msgstr "no se admite la combinación: %s" + +-#: config/mips/mips.c:15869 ++#: config/mips/mips.c:15875 + #, gcc-internal-format + msgid "%<-mgp32%> and %<-mfp64%> can only be combined if the target supports the mfhc1 and mthc1 instructions" + msgstr "%<-mgp32%> y %<-mfp64%> sólo se pueden combinar si el objetivo admite las instrucciones mfhc1 y mthc1" + +-#: config/mips/mips.c:15872 ++#: config/mips/mips.c:15878 + #, gcc-internal-format + msgid "%<-mgp32%> and %<-mfp64%> can only be combined when using the o32 ABI" + msgstr "%<-mgp32%> y %<-mfp64%> sólo se pueden combinar al usar la ABI o32" + +-#: config/mips/mips.c:15895 config/mips/mips.c:15897 config/mips/mips.c:15910 ++#: config/mips/mips.c:15901 config/mips/mips.c:15903 config/mips/mips.c:15916 + #, gcc-internal-format + msgid "%qs is incompatible with %qs" + msgstr "%qs es incompatible con %qs" +@@ -24521,57 +24521,57 @@ + #. effort to support the combination of 32-bit GOT entries + #. and 64-bit pointers, so we treat the abicalls case as + #. an error. +-#: config/mips/mips.c:15904 ++#: config/mips/mips.c:15910 + #, gcc-internal-format + msgid "the combination of %qs and %qs is incompatible with %qs" + msgstr "la combinacion de %qs y %qs es incompatible con %qs" + +-#: config/mips/mips.c:15950 ++#: config/mips/mips.c:15956 + #, gcc-internal-format + msgid "the %qs architecture does not support branch-likely instructions" + msgstr "la arquitectura %qs no admite las instrucciones con probabilidad de ramificación" + +-#: config/mips/mips.c:15990 ++#: config/mips/mips.c:15996 + #, gcc-internal-format + msgid "%<-mno-gpopt%> needs %<-mexplicit-relocs%>" + msgstr "%<-mno-gpopt%> necesita %<-mexplicit-relocs%>" + +-#: config/mips/mips.c:15998 config/mips/mips.c:16001 ++#: config/mips/mips.c:16004 config/mips/mips.c:16007 + #, gcc-internal-format + msgid "cannot use small-data accesses for %qs" + msgstr "no se pueden usar accesos de data small para %qs" + +-#: config/mips/mips.c:16015 ++#: config/mips/mips.c:16021 + #, gcc-internal-format + msgid "%<-mips3d%> requires %<-mpaired-single%>" + msgstr "%<-mips3d%> requiere %<-mpaired-single%>" + +-#: config/mips/mips.c:16024 ++#: config/mips/mips.c:16030 + #, gcc-internal-format + msgid "%qs must be used with %qs" + msgstr "%qs se debe usar con %qs" + +-#: config/mips/mips.c:16031 ++#: config/mips/mips.c:16037 + #, gcc-internal-format + msgid "the %qs architecture does not support paired-single instructions" + msgstr "la arquitectura %qs no admite las instrucciones par-sencillo" + +-#: config/mips/mips.c:16037 ++#: config/mips/mips.c:16043 + #, gcc-internal-format + msgid "%qs requires a target that provides the %qs instruction" + msgstr "%qs requiere un objetivo que provea la instrucción %qs" + +-#: config/mips/mips.c:16142 ++#: config/mips/mips.c:16148 + #, gcc-internal-format + msgid "%qs requires branch-likely instructions" + msgstr "%qs requiere instrucciones con probabilidad de ramificación" + +-#: config/mips/mips.c:16146 ++#: config/mips/mips.c:16152 + #, gcc-internal-format + msgid "the %qs architecture does not support the synci instruction" + msgstr "la arquitectura %qs no admite la instrucción synci" + +-#: config/mips/mips.c:16596 ++#: config/mips/mips.c:16602 + #, gcc-internal-format + msgid "mips16 function profiling" + msgstr "análisis de perfil de las funciones mips16" +@@ -24852,308 +24852,308 @@ + msgid "invalid parameter combination for AltiVec intrinsic" + msgstr "combinación de parámetros inválida para el intrínseco AltiVec" + +-#: config/rs6000/rs6000.c:2436 ++#: config/rs6000/rs6000.c:2435 + #, gcc-internal-format + msgid "-mrecip requires -ffinite-math or -ffast-math" + msgstr "-recip requiere -ffinite-math o -ffast-math" + +-#: config/rs6000/rs6000.c:2438 ++#: config/rs6000/rs6000.c:2437 + #, gcc-internal-format + msgid "-mrecip requires -fno-trapping-math or -ffast-math" + msgstr "-mrecip requiere -fno-trapping-math o -ffast-math" + +-#: config/rs6000/rs6000.c:2440 ++#: config/rs6000/rs6000.c:2439 + #, gcc-internal-format + msgid "-mrecip requires -freciprocal-math or -ffast-math" + msgstr "-mrecip requiere -freciprocal-math o -ffast-math" + +-#: config/rs6000/rs6000.c:2535 ++#: config/rs6000/rs6000.c:2534 + #, gcc-internal-format + msgid "-m64 requires PowerPC64 architecture, enabling" + msgstr "-m64 requiere la arquitectura PowerPC64, activando" + +-#: config/rs6000/rs6000.c:2616 ++#: config/rs6000/rs6000.c:2615 + #, gcc-internal-format + msgid "-malign-power is not supported for 64-bit Darwin; it is incompatible with the installed C and C++ libraries" + msgstr "no se admite -malign-power para Darwin de 64-bit; es incompatible con las bibliotecas C y C++ instaladas" + +-#: config/rs6000/rs6000.c:2622 ++#: config/rs6000/rs6000.c:2621 + #, gcc-internal-format + msgid "not configured for SPE ABI" + msgstr "no se configuró para ABI SPE" + +-#: config/rs6000/rs6000.c:2710 ++#: config/rs6000/rs6000.c:2709 + #, gcc-internal-format + msgid "AltiVec not supported in this target" + msgstr "no se admite AltiVec en este objetivo" + +-#: config/rs6000/rs6000.c:2712 ++#: config/rs6000/rs6000.c:2711 + #, gcc-internal-format + msgid "SPE not supported in this target" + msgstr "no se admite SPE en este objetivo" + +-#: config/rs6000/rs6000.c:2739 ++#: config/rs6000/rs6000.c:2738 + #, gcc-internal-format + msgid "-mmultiple is not supported on little endian systems" + msgstr "no se admite -mmultiple en sistemas little endian" + +-#: config/rs6000/rs6000.c:2746 ++#: config/rs6000/rs6000.c:2745 + #, gcc-internal-format + msgid "-mstring is not supported on little endian systems" + msgstr "no se admite -mstring en sistemas little endian" + +-#: config/rs6000/rs6000.c:2852 ++#: config/rs6000/rs6000.c:2851 + #, gcc-internal-format, gfc-internal-format + msgid "unknown vectorization library ABI type (%s) for -mveclibabi= switch" + msgstr "tipo de ABI de biblioteca de vectorización desconocida (%s) para la opción -mveclibabi=" + +-#: config/rs6000/rs6000.c:2864 ++#: config/rs6000/rs6000.c:2863 + #, gcc-internal-format + msgid "target attribute or pragma changes long double size" + msgstr "el atributo o pragma target cambia el tamaño de double long" + +-#: config/rs6000/rs6000.c:2885 config/rs6000/rs6000.c:2900 ++#: config/rs6000/rs6000.c:2884 config/rs6000/rs6000.c:2899 + #, gcc-internal-format + msgid "target attribute or pragma changes AltiVec ABI" + msgstr "el atributo o pragma target cambia la ABI Altivec" + +-#: config/rs6000/rs6000.c:2917 ++#: config/rs6000/rs6000.c:2916 + #, gcc-internal-format + msgid "target attribute or pragma changes darwin64 ABI" + msgstr "el atributo o pragma target cambia la ABI darwin64" + +-#: config/rs6000/rs6000.c:2958 ++#: config/rs6000/rs6000.c:2957 + #, gcc-internal-format + msgid "target attribute or pragma changes SPE ABI" + msgstr "el atributo o pragma target cabia la ABI SPE" + +-#: config/rs6000/rs6000.c:3281 ++#: config/rs6000/rs6000.c:3280 + #, gcc-internal-format + msgid "target attribute or pragma changes single precision floating point" + msgstr "el atributo o pragma target cambia la coma flotante de precisión sencilla" + +-#: config/rs6000/rs6000.c:3284 ++#: config/rs6000/rs6000.c:3283 + #, gcc-internal-format + msgid "target attribute or pragma changes double precision floating point" + msgstr "el atributo o pragma target cambia la coma flotante de precisión doble" + +-#: config/rs6000/rs6000.c:7420 ++#: config/rs6000/rs6000.c:7419 + #, gcc-internal-format + msgid "GCC vector returned by reference: non-standard ABI extension with no compatibility guarantee" + msgstr "Se devolvió un vector GCC por referencia: extensión de ABI no estándar sin garantía de compatibilidad" + +-#: config/rs6000/rs6000.c:7561 ++#: config/rs6000/rs6000.c:7560 + #, gcc-internal-format + msgid "cannot return value in vector register because altivec instructions are disabled, use -maltivec to enable them" + msgstr "no se puede devolver un valor en el registro vector porque las instrucciones altivec están desactivadas, use -maltivec para activarlas" + +-#: config/rs6000/rs6000.c:7904 ++#: config/rs6000/rs6000.c:7903 + #, gcc-internal-format + msgid "cannot pass argument in vector register because altivec instructions are disabled, use -maltivec to enable them" + msgstr "no se puede pasar argumentos en el registro vector porque las instrucciones altivec están desactivadas, use -maltivec para activarlas" + +-#: config/rs6000/rs6000.c:8830 ++#: config/rs6000/rs6000.c:8829 + #, gcc-internal-format + msgid "GCC vector passed by reference: non-standard ABI extension with no compatibility guarantee" + msgstr "vector GCC pasado por referencia: extensión ABI que no es estándar sin garantía de compatibilidad" + +-#: config/rs6000/rs6000.c:9459 ++#: config/rs6000/rs6000.c:9458 + #, gcc-internal-format, gfc-internal-format + msgid "internal error: builtin function %s already processed" + msgstr "error interno: la función interna %s ya se procesó" + +-#: config/rs6000/rs6000.c:9832 ++#: config/rs6000/rs6000.c:9831 + #, gcc-internal-format + msgid "argument 1 must be a 5-bit signed literal" + msgstr "el argumento 1 debe ser una literal con signo de 5-bit" + +-#: config/rs6000/rs6000.c:9935 config/rs6000/rs6000.c:10952 ++#: config/rs6000/rs6000.c:9934 config/rs6000/rs6000.c:10951 + #, gcc-internal-format + msgid "argument 2 must be a 5-bit unsigned literal" + msgstr "el argumento 2 debe ser una literal sin signo de 5-bit" + +-#: config/rs6000/rs6000.c:9974 ++#: config/rs6000/rs6000.c:9973 + #, gcc-internal-format + msgid "argument 1 of __builtin_altivec_predicate must be a constant" + msgstr "el argumento 1 de __builtin_altivec_predicate debe ser una constante" + +-#: config/rs6000/rs6000.c:10026 ++#: config/rs6000/rs6000.c:10025 + #, gcc-internal-format + msgid "argument 1 of __builtin_altivec_predicate is out of range" + msgstr "el argumento 1 de __builtin_altivec_predicate está fuera de rango" + +-#: config/rs6000/rs6000.c:10283 ++#: config/rs6000/rs6000.c:10282 + #, gcc-internal-format + msgid "argument 3 must be a 4-bit unsigned literal" + msgstr "el argumento 3 debe ser una literal sin signo de 4-bit" + +-#: config/rs6000/rs6000.c:10301 ++#: config/rs6000/rs6000.c:10300 + #, gcc-internal-format + msgid "argument 3 must be a 2-bit unsigned literal" + msgstr "el argumento 3 debe ser una literal sin signo de 2-bit" + +-#: config/rs6000/rs6000.c:10313 ++#: config/rs6000/rs6000.c:10312 + #, gcc-internal-format + msgid "argument 3 must be a 1-bit unsigned literal" + msgstr "el argumento 3 debe ser una literal sin signo de 1-bit" + +-#: config/rs6000/rs6000.c:10496 ++#: config/rs6000/rs6000.c:10495 + #, gcc-internal-format + msgid "argument to %qs must be a 2-bit unsigned literal" + msgstr "el argumento para %qs debe ser una literal sin signo de 2-bit" + +-#: config/rs6000/rs6000.c:10637 ++#: config/rs6000/rs6000.c:10636 + #, gcc-internal-format + msgid "unresolved overload for Altivec builtin %qF" + msgstr "sobrecarga sin resolver para el interno Altivec %qF" + +-#: config/rs6000/rs6000.c:10743 ++#: config/rs6000/rs6000.c:10742 + #, gcc-internal-format + msgid "argument to dss must be a 2-bit unsigned literal" + msgstr "el argumento para dss debe ser una literal sin signo de 2-bit" + + # continuar aqui +-#: config/rs6000/rs6000.c:11072 ++#: config/rs6000/rs6000.c:11071 + #, gcc-internal-format + msgid "argument 1 of __builtin_paired_predicate must be a constant" + msgstr "el argumento 1 de __builtin_paired_predicate debe ser una constante" + +-#: config/rs6000/rs6000.c:11119 ++#: config/rs6000/rs6000.c:11118 + #, gcc-internal-format + msgid "argument 1 of __builtin_paired_predicate is out of range" + msgstr "el argumento 1 de __builtin_paired_predicate está fuera de rango" + +-#: config/rs6000/rs6000.c:11144 ++#: config/rs6000/rs6000.c:11143 + #, gcc-internal-format + msgid "argument 1 of __builtin_spe_predicate must be a constant" + msgstr "el argumento 1 de __builtin_spe_predicate debe ser una constante" + +-#: config/rs6000/rs6000.c:11216 ++#: config/rs6000/rs6000.c:11215 + #, gcc-internal-format + msgid "argument 1 of __builtin_spe_predicate is out of range" + msgstr "el argumento 1 de __builtin_spe_predicate está fuera de rango" + +-#: config/rs6000/rs6000.c:11298 ++#: config/rs6000/rs6000.c:11297 + #, gcc-internal-format, gfc-internal-format + msgid "Builtin function %s is only valid for the cell processor" + msgstr "La función interna %s sólo es válida para el procesador cell" + +-#: config/rs6000/rs6000.c:11300 ++#: config/rs6000/rs6000.c:11299 + #, gcc-internal-format, gfc-internal-format + msgid "Builtin function %s requires the -mvsx option" + msgstr "La función interna %s requiere la opción -mvsx" + +-#: config/rs6000/rs6000.c:11302 ++#: config/rs6000/rs6000.c:11301 + #, gcc-internal-format, gfc-internal-format + msgid "Builtin function %s requires the -maltivec option" + msgstr "La función interna %s requiere la opción -maltivec" + +-#: config/rs6000/rs6000.c:11304 ++#: config/rs6000/rs6000.c:11303 + #, gcc-internal-format, gfc-internal-format + msgid "Builtin function %s requires the -mpaired option" + msgstr "La función interna %s requiere la opción -mpaired" + +-#: config/rs6000/rs6000.c:11306 ++#: config/rs6000/rs6000.c:11305 + #, gcc-internal-format, gfc-internal-format + msgid "Builtin function %s requires the -mspe option" + msgstr "La función interna %s requiere la opción -mspe" + +-#: config/rs6000/rs6000.c:11308 ++#: config/rs6000/rs6000.c:11307 + #, gcc-internal-format, gfc-internal-format + msgid "Builtin function %s is not supported with the current options" + msgstr "La función interna %s no se admite con las opciones actuales" + +-#: config/rs6000/rs6000.c:12568 ++#: config/rs6000/rs6000.c:12567 + #, gcc-internal-format, gfc-internal-format + msgid "internal error: builtin function %s had no type" + msgstr "error interno: la función interna %s no tiene tipo" + +-#: config/rs6000/rs6000.c:12575 ++#: config/rs6000/rs6000.c:12574 + #, gcc-internal-format, gfc-internal-format + msgid "internal error: builtin function %s had an unexpected return type %s" + msgstr "error interno: la función interna %s tiene un tipo de devolución inesperado %s" + +-#: config/rs6000/rs6000.c:12591 ++#: config/rs6000/rs6000.c:12590 + #, gcc-internal-format, gfc-internal-format + msgid "internal error: builtin function %s, argument %d had unexpected argument type %s" + msgstr "error interno: función interna %s, el argumento %d tiene el tipo de argumento inesperado %s" + +-#: config/rs6000/rs6000.c:18577 ++#: config/rs6000/rs6000.c:18576 + #, gcc-internal-format + msgid "stack frame too large" + msgstr "marco de pila demasiado grande" + +-#: config/rs6000/rs6000.c:22051 ++#: config/rs6000/rs6000.c:22050 + #, gcc-internal-format + msgid "no profiling of 64-bit code for this ABI" + msgstr "no hay análisis de perfil del código de 64-bit para esta ABI" + +-#: config/rs6000/rs6000.c:24036 ++#: config/rs6000/rs6000.c:24059 + #, gcc-internal-format + msgid "You cannot take the address of a nested function if you use the -mno-pointers-to-nested-functions option." + msgstr "No se puede tomar la dirección de una función anindada si se usa la opción -mno-pointers-to-nested-functions." + +-#: config/rs6000/rs6000.c:24117 ++#: config/rs6000/rs6000.c:24140 + #, gcc-internal-format + msgid "use of % in AltiVec types is invalid" + msgstr "el uso de % en tipos AltiVec es inválido" + +-#: config/rs6000/rs6000.c:24119 ++#: config/rs6000/rs6000.c:24142 + #, gcc-internal-format + msgid "use of boolean types in AltiVec types is invalid" + msgstr "el uso de tipos booleanos en tipos AltiVec es inválido" + +-#: config/rs6000/rs6000.c:24121 ++#: config/rs6000/rs6000.c:24144 + #, gcc-internal-format + msgid "use of % in AltiVec types is invalid" + msgstr "el uso de % en tipos AltiVec es inválido" + +-#: config/rs6000/rs6000.c:24123 ++#: config/rs6000/rs6000.c:24146 + #, gcc-internal-format + msgid "use of decimal floating point types in AltiVec types is invalid" + msgstr "el uso de tipos de coma flotante decimal en tipos AltiVec es inválido" + +-#: config/rs6000/rs6000.c:24129 ++#: config/rs6000/rs6000.c:24152 + #, gcc-internal-format + msgid "use of % in AltiVec types is invalid for 64-bit code without -mvsx" + msgstr "el uso de % en tipos AltiVec es inválido para código de 64 bit sin -mvsx" + +-#: config/rs6000/rs6000.c:24132 ++#: config/rs6000/rs6000.c:24155 + #, gcc-internal-format + msgid "use of % in AltiVec types is deprecated; use %" + msgstr "el uso de % en tipos AltiVec es obsoleto; use %" + +-#: config/rs6000/rs6000.c:24137 ++#: config/rs6000/rs6000.c:24160 + #, gcc-internal-format + msgid "use of % in AltiVec types is invalid without -mvsx" + msgstr "el uso de % en tipos AltiVec es inválido sin -mvsx" + +-#: config/rs6000/rs6000.c:24140 ++#: config/rs6000/rs6000.c:24163 + #, gcc-internal-format + msgid "use of % in AltiVec types is invalid without -mvsx" + msgstr "el uso de % en tipos AltiVec es inválido sin -mvsx" + +-#: config/rs6000/rs6000.c:26979 ++#: config/rs6000/rs6000.c:27002 + #, gcc-internal-format, gfc-internal-format + msgid "emitting microcode insn %s\t[%s] #%d" + msgstr "se emite el insn de microcódigo %s\t[%s] #%d" + +-#: config/rs6000/rs6000.c:26983 ++#: config/rs6000/rs6000.c:27006 + #, gcc-internal-format, gfc-internal-format + msgid "emitting conditional microcode insn %s\t[%s] #%d" + msgstr "se emite el insn de microcódigo condicional %s\t[%s] #%d" + +-#: config/rs6000/rs6000.c:27207 ++#: config/rs6000/rs6000.c:27230 + #, gcc-internal-format, gfc-internal-format + msgid "invalid cpu \"%s\" for %s\"%s\"%s" + msgstr "cpu \"%s\" inválido para %s\"%s\"%s" + +-#: config/rs6000/rs6000.c:27210 ++#: config/rs6000/rs6000.c:27233 + #, gcc-internal-format, gfc-internal-format + msgid "%s\"%s\"%s is not allowed" + msgstr "%s\"%s\"%s no está definido" + +-#: config/rs6000/rs6000.c:27212 ++#: config/rs6000/rs6000.c:27235 + #, gcc-internal-format, gfc-internal-format + msgid "%s\"%s\"%s is invalid" + msgstr "%s\"%s\"%s es inválido" +@@ -25386,63 +25386,63 @@ + msgid "%qs uses dynamic stack allocation" + msgstr "%qs utiliza alojamiento dinámico de pila" + +-#: config/sh/sh.c:775 ++#: config/sh/sh.c:768 + #, gcc-internal-format + msgid "ignoring -fschedule-insns because of exception handling bug" + msgstr "se descarta -fschedule-insns debido a un error de manejo de excepciones" + +-#: config/sh/sh.c:796 ++#: config/sh/sh.c:784 + #, gcc-internal-format + msgid "unwind tables currently require either a frame pointer or -maccumulate-outgoing-args for correctness" + msgstr "actualmente las tablas de desenredo requieren un puntero de marco o -maccumulate-outgoing-args para ser correctas" + +-#: config/sh/sh.c:7674 ++#: config/sh/sh.c:7677 + #, gcc-internal-format + msgid "__builtin_saveregs not supported by this subtarget" + msgstr "no se admite __builtin_saveregs en este subobjetivo" + +-#: config/sh/sh.c:8838 ++#: config/sh/sh.c:8841 + #, gcc-internal-format + msgid "%qE attribute only applies to interrupt functions" + msgstr "el atributo %qE se aplica solamente a funciones de interrupción" + +-#: config/sh/sh.c:8896 ++#: config/sh/sh.c:8899 + #, gcc-internal-format + msgid "%qE attribute is supported only for SH2A" + msgstr "el atributo %qE solo se admite para SH2A" + +-#: config/sh/sh.c:8926 ++#: config/sh/sh.c:8929 + #, gcc-internal-format + msgid "attribute interrupt_handler is not compatible with -m5-compact" + msgstr "el atributo interrupt_handler no es compatible con -m5-compact" + +-#: config/sh/sh.c:8943 ++#: config/sh/sh.c:8946 + #, gcc-internal-format + msgid "%qE attribute only applies to SH2A" + msgstr "el atributo %qE solo se aplica a SH2A" + +-#: config/sh/sh.c:8965 ++#: config/sh/sh.c:8968 + #, gcc-internal-format + msgid "%qE attribute argument should be between 0 to 255" + msgstr "el argumento del atributo %qE debe estar entre 0 y 255" + + #. The argument must be a constant string. +-#: config/sh/sh.c:9038 ++#: config/sh/sh.c:9041 + #, gcc-internal-format + msgid "%qE attribute argument not a string constant" + msgstr "el argumento del atributo %qE no es una constante de cadena" + +-#: config/sh/sh.c:11618 ++#: config/sh/sh.c:11621 + #, gcc-internal-format + msgid "r0 needs to be available as a call-clobbered register" + msgstr "r0 necesita estar disponible como un registro sobreescrito por llamada" + +-#: config/sh/sh.c:11639 ++#: config/sh/sh.c:11642 + #, gcc-internal-format + msgid "need a second call-clobbered general purpose register" + msgstr "se necesita un segundo registro de propósito general sobreescrito por llamada" + +-#: config/sh/sh.c:11647 ++#: config/sh/sh.c:11650 + #, gcc-internal-format + msgid "need a call-clobbered target register" + msgstr "se necesita un registro objetivo sobreescrito por llamada" +@@ -25564,12 +25564,12 @@ + msgid "__BELOW100__ attribute not allowed with auto storage class" + msgstr "no se permite el atributo __BELOW100__ con una clase de auto almacenamiento" + +-#: config/tilegx/tilegx.c:3397 config/tilepro/tilepro.c:3101 ++#: config/tilegx/tilegx.c:3398 config/tilepro/tilepro.c:3101 + #, gcc-internal-format + msgid "bad builtin icode" + msgstr "icode interno erróneo" + +-#: config/tilegx/tilegx.c:3438 config/tilepro/tilepro.c:3127 ++#: config/tilegx/tilegx.c:3439 config/tilepro/tilepro.c:3127 + #, gcc-internal-format + msgid "operand must be an immediate of the right size" + msgstr "el operando debe ser un inmediato del tamaño correcto" +@@ -25784,38 +25784,38 @@ + msgid "-fexcess-precision=standard for Ada" + msgstr "-fexcess-precision=standard para Ada" + +-#: ada/gcc-interface/utils.c:5312 ada/gcc-interface/utils.c:5487 +-#: ada/gcc-interface/utils.c:5529 ada/gcc-interface/utils.c:5583 ++#: ada/gcc-interface/utils.c:5303 ada/gcc-interface/utils.c:5478 ++#: ada/gcc-interface/utils.c:5520 ada/gcc-interface/utils.c:5574 + #, gcc-internal-format + msgid "%qs attribute ignored" + msgstr "se descarta el atributo %qs" + +-#: ada/gcc-interface/utils.c:5430 ++#: ada/gcc-interface/utils.c:5421 + #, gcc-internal-format + msgid "%qs attribute requires prototypes with named arguments" + msgstr "el atributo %qs requiere prototipos con argumentos nombrados" + +-#: ada/gcc-interface/utils.c:5439 ++#: ada/gcc-interface/utils.c:5430 + #, gcc-internal-format + msgid "%qs attribute only applies to variadic functions" + msgstr "el atributo %qs se aplica solamente a funciones variadic" + +-#: ada/gcc-interface/utils.c:5510 ++#: ada/gcc-interface/utils.c:5501 + #, gcc-internal-format + msgid "%qE attribute has no effect" + msgstr "el atributo %qE no tiene efecto" + +-#: ada/gcc-interface/utils.c:5616 ++#: ada/gcc-interface/utils.c:5607 + #, gcc-internal-format + msgid "invalid vector type for attribute %qs" + msgstr "tipo de vector inválido para el atributo %qs" + +-#: ada/gcc-interface/utils.c:5679 ++#: ada/gcc-interface/utils.c:5670 + #, gcc-internal-format + msgid "attribute %qs applies to array types only" + msgstr "el atributo %qs solamente se aplica a tipos de matriz" + +-#: ada/gcc-interface/utils.c:5706 ++#: ada/gcc-interface/utils.c:5697 + #, gcc-internal-format + msgid "invalid element type for attribute %qs" + msgstr "tipo de elemento inválido para el atributo %qs" +@@ -26252,7 +26252,7 @@ + msgid "passing %qT chooses %qT over %qT" + msgstr "al pasar %qT se escoge %qT sobre %qT" + +-#: cp/call.c:8070 cp/name-lookup.c:5495 ++#: cp/call.c:8070 cp/name-lookup.c:5500 + #, gcc-internal-format + msgid " in call to %qD" + msgstr " en la llamada a %qD" +@@ -26312,426 +26312,426 @@ + msgid "invalid initialization of reference of type %qT from expression of type %qT" + msgstr "inicialización inválida de la referencia de tipo %qT desde una expresión de tipo %qT" + +-#: cp/class.c:296 ++#: cp/class.c:297 + #, gcc-internal-format + msgid "cannot convert from base %qT to derived type %qT via virtual base %qT" + msgstr "no se puede convertir de la base %qT al tipo derivado %qT a través de la base virtual %qT" + +-#: cp/class.c:998 ++#: cp/class.c:999 + #, gcc-internal-format + msgid "Java class %qT cannot have a destructor" + msgstr "la clase Java %qT no puede tener un destructor" + +-#: cp/class.c:1000 ++#: cp/class.c:1001 + #, gcc-internal-format + msgid "Java class %qT cannot have an implicit non-trivial destructor" + msgstr "la clase Java %qT no puede tener un destructor implícito que no es trivial" + +-#: cp/class.c:1103 ++#: cp/class.c:1104 + #, gcc-internal-format + msgid "%q+#D cannot be overloaded" + msgstr "no se puede sobrecargar %q+#D" + +-#: cp/class.c:1104 ++#: cp/class.c:1105 + #, gcc-internal-format + msgid "with %q+#D" + msgstr "con %q+#D" + +-#: cp/class.c:1173 ++#: cp/class.c:1174 + #, gcc-internal-format + msgid "conflicting access specifications for method %q+D, ignored" + msgstr "especificaciones de acceso en conflicto para el método %q+D, descartado" + +-#: cp/class.c:1176 ++#: cp/class.c:1177 + #, gcc-internal-format + msgid "conflicting access specifications for field %qE, ignored" + msgstr "especificaciones de acceso en conflicto para el campo %qE, descartado" + +-#: cp/class.c:1238 cp/class.c:1246 ++#: cp/class.c:1239 cp/class.c:1247 + #, gcc-internal-format + msgid "%q+D invalid in %q#T" + msgstr "%q+D inválido en %q#T" + +-#: cp/class.c:1239 ++#: cp/class.c:1240 + #, gcc-internal-format + msgid " because of local method %q+#D with same name" + msgstr " debido al método local %q+#D con el mismo nombre" + +-#: cp/class.c:1247 ++#: cp/class.c:1248 + #, gcc-internal-format + msgid " because of local member %q+#D with same name" + msgstr " debido al miembro local %q+#D con el mismo nombre" + +-#: cp/class.c:1291 ++#: cp/class.c:1292 + #, gcc-internal-format + msgid "cannot derive from % base %qT in derived type %qT" + msgstr "no se puede derivar de la base % %qT al tipo derivado %qT" + +-#: cp/class.c:1303 ++#: cp/class.c:1304 + #, gcc-internal-format + msgid "base class %q#T has a non-virtual destructor" + msgstr "la clase base %q#T tiene un destructor no virtual" + +-#: cp/class.c:1707 ++#: cp/class.c:1708 + #, gcc-internal-format + msgid "all member functions in class %qT are private" + msgstr "todos las funciones miembros en la clase %qT son privadas" + +-#: cp/class.c:1719 ++#: cp/class.c:1720 + #, gcc-internal-format + msgid "%q#T only defines a private destructor and has no friends" + msgstr "%q#T solamente define un destructor privado y no tiene friends" + +-#: cp/class.c:1764 ++#: cp/class.c:1765 + #, gcc-internal-format + msgid "%q#T only defines private constructors and has no friends" + msgstr "%q#T solamente define constructores privados y no tiene friends" + + # Ojo, no es impostor, sino impositor, el que impone. cfuga +-#: cp/class.c:2157 ++#: cp/class.c:2158 + #, gcc-internal-format + msgid "no unique final overrider for %qD in %qT" + msgstr "no hay un impositor único final para %qD en %qT" + +-#: cp/class.c:2524 ++#: cp/class.c:2525 + #, gcc-internal-format + msgid "%q+#D marked final, but is not virtual" + msgstr "se marca %q+#D como final, pero no es virtual" + +-#: cp/class.c:2526 ++#: cp/class.c:2527 + #, gcc-internal-format + msgid "%q+#D marked override, but does not override" + msgstr "%q+#D se marca como override, pero no hace override" + + #. Here we know it is a hider, and no overrider exists. +-#: cp/class.c:2595 ++#: cp/class.c:2596 + #, gcc-internal-format + msgid "%q+D was hidden" + msgstr "%q+D estaba escondido" + +-#: cp/class.c:2596 ++#: cp/class.c:2597 + #, gcc-internal-format + msgid " by %q+D" + msgstr " por %q+D" + +-#: cp/class.c:2639 cp/decl2.c:1359 ++#: cp/class.c:2640 cp/decl2.c:1359 + #, gcc-internal-format + msgid "%q+#D invalid; an anonymous union can only have non-static data members" + msgstr "%q+#D inválido; un union anónimo sólo puede tener miembros con datos no estáticos" + +-#: cp/class.c:2642 ++#: cp/class.c:2643 + #, gcc-internal-format + msgid "%q+#D invalid; an anonymous struct can only have non-static data members" + msgstr "%q+#D inválido; un struct anónimo sólo puede tener miembros con datos no estáticos" + +-#: cp/class.c:2650 cp/decl2.c:1365 ++#: cp/class.c:2651 cp/decl2.c:1365 + #, gcc-internal-format + msgid "private member %q+#D in anonymous union" + msgstr "miembro privado %q+#D en union anónima" + +-#: cp/class.c:2652 ++#: cp/class.c:2653 + #, gcc-internal-format + msgid "private member %q+#D in anonymous struct" + msgstr "miembro privado %q+#D en struct anónimo" + +-#: cp/class.c:2657 cp/decl2.c:1367 ++#: cp/class.c:2658 cp/decl2.c:1367 + #, gcc-internal-format + msgid "protected member %q+#D in anonymous union" + msgstr "miembro protegido %q+#D en union anónima" + +-#: cp/class.c:2659 ++#: cp/class.c:2660 + #, gcc-internal-format + msgid "protected member %q+#D in anonymous struct" + msgstr "miembro protegido %q+#D en struct anónimo" + +-#: cp/class.c:2887 ++#: cp/class.c:2904 + #, gcc-internal-format + msgid "bit-field %q+#D with non-integral type" + msgstr "campo de bits %q+#D con tipo no entero" + +-#: cp/class.c:2903 ++#: cp/class.c:2920 + #, gcc-internal-format + msgid "bit-field %q+D width not an integer constant" + msgstr "la anchura del campo de bits %q+D no es una constante entera" + +-#: cp/class.c:2908 ++#: cp/class.c:2925 + #, gcc-internal-format + msgid "negative width in bit-field %q+D" + msgstr "anchura negativa en el campo de bits %q+D" + +-#: cp/class.c:2913 ++#: cp/class.c:2930 + #, gcc-internal-format + msgid "zero width for bit-field %q+D" + msgstr "anchura cero para el campo de bits %q+D" + +-#: cp/class.c:2919 ++#: cp/class.c:2936 + #, gcc-internal-format + msgid "width of %q+D exceeds its type" + msgstr "la anchura de %q+D excede su tipo" + +-#: cp/class.c:2923 ++#: cp/class.c:2940 + #, gcc-internal-format + msgid "%q+D is too small to hold all values of %q#T" + msgstr "%q+D es demasiado pequeño para contener todos los valores de %q#T" + +-#: cp/class.c:2982 ++#: cp/class.c:2999 + #, gcc-internal-format + msgid "member %q+#D with constructor not allowed in union" + msgstr "no se permite el miembro %q+#D con constructor en la union" + +-#: cp/class.c:2985 ++#: cp/class.c:3002 + #, gcc-internal-format + msgid "member %q+#D with destructor not allowed in union" + msgstr "no se permite el miembro %q+#D con destructor en la union" + +-#: cp/class.c:2987 ++#: cp/class.c:3004 + #, gcc-internal-format + msgid "member %q+#D with copy assignment operator not allowed in union" + msgstr "no se permite el miembro %q+#D con operador de asignación de copia en la union" + +-#: cp/class.c:2991 ++#: cp/class.c:3008 + #, gcc-internal-format + msgid "unrestricted unions only available with -std=c++11 or -std=gnu++11" + msgstr "las uniones sin restricción sólo están disponibles con -std=c++11 o -std=gnu++11" + +-#: cp/class.c:3025 ++#: cp/class.c:3042 + #, gcc-internal-format + msgid "multiple fields in union %qT initialized" + msgstr "múltiples campos inicializados en la unión %qT" + +-#: cp/class.c:3109 ++#: cp/class.c:3126 + #, gcc-internal-format + msgid "%q+D may not be static because it is a member of a union" + msgstr "%q+D no debe ser static porque es el miembro de una unión" + +-#: cp/class.c:3114 ++#: cp/class.c:3131 + #, gcc-internal-format + msgid "%q+D may not have reference type %qT because it is a member of a union" + msgstr "%q+D no puede tener el tipo de referencia %qT porque es el miembro de una unión" + +-#: cp/class.c:3125 ++#: cp/class.c:3142 + #, gcc-internal-format + msgid "field %q+D invalidly declared function type" + msgstr "el campo %q+D inválidamente se declara como un tipo de función" + +-#: cp/class.c:3131 ++#: cp/class.c:3148 + #, gcc-internal-format + msgid "field %q+D invalidly declared method type" + msgstr "el campo %q+D inválidamente se declara como un tipo de método" + +-#: cp/class.c:3187 ++#: cp/class.c:3204 + #, gcc-internal-format + msgid "ignoring packed attribute because of unpacked non-POD field %q+#D" + msgstr "se descartan los atributos packed por el campo %q+#D sin empacar que no es POD" + +-#: cp/class.c:3285 ++#: cp/class.c:3302 + #, gcc-internal-format + msgid "field %q+#D with same name as class" + msgstr "campo %q+#D con el mismo nombre que la clase" + +-#: cp/class.c:3308 ++#: cp/class.c:3325 + #, gcc-internal-format + msgid "%q#T has pointer data members" + msgstr "%q#T tiene miembros punteros a datos" + +-#: cp/class.c:3313 ++#: cp/class.c:3330 + #, gcc-internal-format + msgid " but does not override %<%T(const %T&)%>" + msgstr " pero no se impone a %<%T(const %T&)%>" + +-#: cp/class.c:3315 ++#: cp/class.c:3332 + #, gcc-internal-format + msgid " or %" + msgstr " o a %" + +-#: cp/class.c:3319 ++#: cp/class.c:3336 + #, gcc-internal-format + msgid " but does not override %" + msgstr " pero no se impone a %" + +-#: cp/class.c:3790 ++#: cp/class.c:3807 + #, gcc-internal-format + msgid "offset of empty base %qT may not be ABI-compliant and maychange in a future version of GCC" + msgstr "el desplazamiento de la base vacía %qT puede no cumplir con la ABI y puede cambiar en una versión futura de GCC" + +-#: cp/class.c:3917 ++#: cp/class.c:3934 + #, gcc-internal-format + msgid "class %qT will be considered nearly empty in a future version of GCC" + msgstr "la clase %qT se considerará casi vacía en una versión futura de GCC" + +-#: cp/class.c:3999 ++#: cp/class.c:4016 + #, gcc-internal-format + msgid "initializer specified for non-virtual method %q+D" + msgstr "se especificó un inicializador para el método %q+D que no es virtual" + +-#: cp/class.c:4390 ++#: cp/class.c:4407 + #, gcc-internal-format + msgid "method overrides both % and %qE methods" + msgstr "el método anula tanto % como los métodos %qE" + +-#: cp/class.c:4411 ++#: cp/class.c:4428 + #, gcc-internal-format + msgid "method declared %qE overriding %qE method" + msgstr "el método declarado como %qE anula el método %qE" + +-#: cp/class.c:4877 cp/semantics.c:5729 ++#: cp/class.c:4894 cp/semantics.c:5729 + #, gcc-internal-format + msgid "enclosing class of constexpr non-static member function %q+#D is not a literal type" + msgstr "la clase envolvente de la función miembro que no es estática constexpr %q+#D no es un tipo literal" + +-#: cp/class.c:4902 ++#: cp/class.c:4919 + #, gcc-internal-format + msgid "%q+T is not literal because:" + msgstr "%q+T no es literal porque:" + +-#: cp/class.c:4904 ++#: cp/class.c:4921 + #, gcc-internal-format + msgid " %q+T has a non-trivial destructor" + msgstr " %q+T tiene un destructor que no es trivial" + +-#: cp/class.c:4909 ++#: cp/class.c:4926 + #, gcc-internal-format + msgid " %q+T is not an aggregate, does not have a trivial default constructor, and has no constexpr constructor that is not a copy or move constructor" + msgstr " %q+T no es un agregado, no tiene un constructor trivial por defecto y no tiene un constructor constexpr que no es un constructor copy o move" + +-#: cp/class.c:4945 ++#: cp/class.c:4962 + #, gcc-internal-format + msgid " base class %qT of %q+T is non-literal" + msgstr " la clase base %qT de %q+T no es literal" + +-#: cp/class.c:4959 ++#: cp/class.c:4976 + #, gcc-internal-format + msgid " non-static data member %q+D has non-literal type" + msgstr " el dato miembro que no es estático %q+D tiene un tipo que no es literal" + +-#: cp/class.c:5071 ++#: cp/class.c:5089 + #, gcc-internal-format + msgid "non-static reference %q+#D in class without a constructor" + msgstr "referencia %q+#D que no es static en una clase sin un constructor" + +-#: cp/class.c:5076 ++#: cp/class.c:5094 + #, gcc-internal-format + msgid "non-static const member %q+#D in class without a constructor" + msgstr "miembro const %q+#D que no es static en una clase sin un constructor" + + #. If the function is defaulted outside the class, we just + #. give the synthesis error. +-#: cp/class.c:5102 ++#: cp/class.c:5120 + #, gcc-internal-format + msgid "%q+D declared to take const reference, but implicit declaration would take non-const" + msgstr "se declaró %q+D para tomar referencia const, pero la declaración implícita tomaría algo que no es const" + +-#: cp/class.c:5105 ++#: cp/class.c:5123 + #, gcc-internal-format + msgid "%q+D declared to take non-const reference cannot be defaulted in the class body" + msgstr "se declaró %q+D para tomar referencia que no es const y no se puede definir por omisión en el cuerpo de clase" + +-#: cp/class.c:5329 ++#: cp/class.c:5347 + #, gcc-internal-format + msgid "offset of virtual base %qT is not ABI-compliant and may change in a future version of GCC" + msgstr "el desplazamiento de la base virtual %qT no cumple con la ABI y puede cambiar en una versión futura de GCC" + +-#: cp/class.c:5430 ++#: cp/class.c:5448 + #, gcc-internal-format + msgid "direct base %qT inaccessible in %qT due to ambiguity" + msgstr "base directa %qT inaccesible en %qT debido a ambigüedad" + +-#: cp/class.c:5442 ++#: cp/class.c:5460 + #, gcc-internal-format + msgid "virtual base %qT inaccessible in %qT due to ambiguity" + msgstr "base virtual %qT inaccesible en %qT debido a ambigüedad" + +-#: cp/class.c:5628 ++#: cp/class.c:5646 + #, gcc-internal-format + msgid "size assigned to %qT may not be ABI-compliant and may change in a future version of GCC" + msgstr "el tamaño asignado a %qT puede no cumplir con la ABI y puede cambiar en una versión futura de GCC" + +-#: cp/class.c:5668 ++#: cp/class.c:5686 + #, gcc-internal-format + msgid "the offset of %qD may not be ABI-compliant and may change in a future version of GCC" + msgstr "el desplazamiento de %qD tal vez no cumple con la ABI y puede cambiar en una versión futura de GCC" + +-#: cp/class.c:5696 ++#: cp/class.c:5714 + #, gcc-internal-format + msgid "offset of %q+D is not ABI-compliant and may change in a future version of GCC" + msgstr "el desplazamiento de %q+D no cumple con la ABI y puede cambiar en una versión futura de GCC" + +-#: cp/class.c:5706 ++#: cp/class.c:5724 + #, gcc-internal-format + msgid "%q+D contains empty classes which may cause base classes to be placed at different locations in a future version of GCC" + msgstr "%q+D contiene clases vacías las cuales pueden causar que las clases base se coloquen en diferentes ubicaciones en una versión futura de GCC" + +-#: cp/class.c:5794 ++#: cp/class.c:5812 + #, gcc-internal-format + msgid "layout of classes derived from empty class %qT may change in a future version of GCC" + msgstr "la disposición de clases derivadas de la clase vacía %qT puede cambiar en una versión futura de GCC" + +-#: cp/class.c:5963 cp/decl.c:11829 cp/parser.c:18586 ++#: cp/class.c:5980 cp/decl.c:11840 cp/parser.c:18573 + #, gcc-internal-format + msgid "redefinition of %q#T" + msgstr "redefinición de %q#T" + +-#: cp/class.c:6114 ++#: cp/class.c:6123 + #, gcc-internal-format + msgid "%q#T has virtual functions and accessible non-virtual destructor" + msgstr "%q#T tiene funciones virtuales y destructor no virtual accesible" + +-#: cp/class.c:6140 ++#: cp/class.c:6149 + #, gcc-internal-format + msgid "type transparent class %qT does not have any fields" + msgstr "la clase transparente tipo %qT no tiene ningún campo" + +-#: cp/class.c:6146 ++#: cp/class.c:6155 + #, gcc-internal-format + msgid "type transparent class %qT has base classes" + msgstr "la clase transparente tipo %qT tiene clases base" + +-#: cp/class.c:6150 ++#: cp/class.c:6159 + #, gcc-internal-format + msgid "type transparent class %qT has virtual functions" + msgstr "la clase transparente tipo %qT tiene funciones virtuales" + +-#: cp/class.c:6252 ++#: cp/class.c:6300 + #, gcc-internal-format + msgid "trying to finish struct, but kicked out due to previous parse errors" + msgstr "se trató de terminar struct, pero fue sacado debido a errores previos de decodificación" + +-#: cp/class.c:6758 ++#: cp/class.c:6810 + #, gcc-internal-format + msgid "language string %<\"%E\"%> not recognized" + msgstr "no se reconoce la cadena de lenguaje %<\"%E\"%>" + +-#: cp/class.c:6848 ++#: cp/class.c:6900 + #, gcc-internal-format + msgid "cannot resolve overloaded function %qD based on conversion to type %qT" + msgstr "no se puede resolver la función sobrecargada %qD basándose en la conversión al tipo %qT" + +-#: cp/class.c:6972 ++#: cp/class.c:7024 + #, gcc-internal-format + msgid "no matches converting function %qD to type %q#T" + msgstr "no hay coincidencias al convertir la función %qD al tipo %q#T" + +-#: cp/class.c:6995 ++#: cp/class.c:7047 + #, gcc-internal-format + msgid "converting overloaded function %qD to type %q#T is ambiguous" + msgstr "la conversión de la función sobrecargada %qD al tipo %q#T es ambigua" + +-#: cp/class.c:7022 ++#: cp/class.c:7074 + #, gcc-internal-format + msgid "assuming pointer to member %qD" + msgstr "asumiendo el puntero a miembro %qD" + +-#: cp/class.c:7025 ++#: cp/class.c:7077 + #, gcc-internal-format + msgid "(a pointer to member can only be formed with %<&%E%>)" + msgstr "(un puntero a miembro solamente se puede formar con %<&%E%>)" + +-#: cp/class.c:7087 cp/class.c:7121 ++#: cp/class.c:7139 cp/class.c:7173 + #, gcc-internal-format + msgid "not enough type information" + msgstr "no hay suficiente información de tipo" + +-#: cp/class.c:7104 cp/cvt.c:169 cp/cvt.c:194 cp/cvt.c:244 ++#: cp/class.c:7156 cp/cvt.c:169 cp/cvt.c:194 cp/cvt.c:244 + #, gcc-internal-format + msgid "cannot convert %qE from type %qT to type %qT" + msgstr "no se puede convertir %qE desde el tipo %qT al tipo %qT" +@@ -26741,12 +26741,12 @@ + #. A name N used in a class S shall refer to the same declaration + #. in its context and when re-evaluated in the completed scope of + #. S. +-#: cp/class.c:7415 cp/decl.c:1287 ++#: cp/class.c:7467 cp/decl.c:1287 + #, gcc-internal-format + msgid "declaration of %q#D" + msgstr "la declaración de %q#D" + +-#: cp/class.c:7416 ++#: cp/class.c:7468 + #, gcc-internal-format + msgid "changes meaning of %qD from %q+#D" + msgstr "cambia el significado de %qD a partir de %q+#D" +@@ -26766,7 +26766,7 @@ + msgid "conversion of %qE from %qT to %qT is ambiguous" + msgstr "la conversión de %qE desde %qT a %qT es ambigua" + +-#: cp/cvt.c:204 cp/decl.c:10586 cp/typeck.c:4101 ++#: cp/cvt.c:204 cp/decl.c:10584 cp/typeck.c:4101 + #, gcc-internal-format + msgid "zero as null pointer constant" + msgstr "cero como constante de puntero nulo" +@@ -27669,7 +27669,7 @@ + msgid "name used in a GNU-style designated initializer for an array" + msgstr "se usó un nombre en un inicializador designado de estilo GNU para una matriz" + +-#: cp/decl.c:4698 cp/typeck2.c:1084 cp/typeck2.c:1189 ++#: cp/decl.c:4698 cp/typeck2.c:1087 cp/typeck2.c:1192 + #, gcc-internal-format + msgid "non-trivial designated initializers not supported" + msgstr "no se admiten los inicializadores designados como no triviales" +@@ -27762,8 +27762,8 @@ + msgid "C99 designator %qE outside aggregate initializer" + msgstr "asignador C99 %qE fuera del inicializador agregado" + +-#: cp/decl.c:5195 cp/decl.c:5380 cp/typeck2.c:1071 cp/typeck2.c:1270 +-#: cp/typeck2.c:1299 cp/typeck2.c:1346 ++#: cp/decl.c:5195 cp/decl.c:5380 cp/typeck2.c:1074 cp/typeck2.c:1273 ++#: cp/typeck2.c:1302 cp/typeck2.c:1349 + #, gcc-internal-format + msgid "too many initializers for %qT" + msgstr "demasiados inicializadores para %qT" +@@ -28294,7 +28294,7 @@ + msgstr "el tipo %qT no es derivado del tipo %T" + + # FIXME traducción +-#: cp/decl.c:8519 cp/decl.c:8611 cp/decl.c:8620 cp/decl.c:9963 ++#: cp/decl.c:8519 cp/decl.c:8611 cp/decl.c:8620 cp/decl.c:9961 + #, gcc-internal-format + msgid "declaration of %qD as non-function" + msgstr "la declaración de %qD como algo que no es función" +@@ -28605,374 +28605,369 @@ + + #: cp/decl.c:9497 + #, gcc-internal-format +-msgid "both % and % cannot be used here" +-msgstr "no se pueden usar aquí % ni %" +- +-#: cp/decl.c:9499 +-#, gcc-internal-format + msgid "both % and % cannot be used here" + msgstr "no se pueden usar aquí % ni %" + +-#: cp/decl.c:9511 ++#: cp/decl.c:9509 + #, gcc-internal-format + msgid "template-id %qD used as a declarator" + msgstr "el id de plantilla %qD se usa como un declarador" + +-#: cp/decl.c:9562 ++#: cp/decl.c:9560 + #, gcc-internal-format + msgid "member functions are implicitly friends of their class" + msgstr "las funciones miembros son implícitamente friends de su clase" + +-#: cp/decl.c:9567 ++#: cp/decl.c:9565 + #, gcc-internal-format + msgid "extra qualification %<%T::%> on member %qs" + msgstr "calificación extra %<%T::%> en el miembro %qs" + +-#: cp/decl.c:9597 ++#: cp/decl.c:9595 + #, gcc-internal-format + msgid "cannot define member function %<%T::%s%> within %<%T%>" + msgstr "no se puede definir la función miembro %<%T::%s%> dentro de %<%T%>" + +-#: cp/decl.c:9599 ++#: cp/decl.c:9597 + #, gcc-internal-format + msgid "cannot declare member function %<%T::%s%> within %<%T%>" + msgstr "no se puede declarar la función miembro %<%T::%s%> dentro de %<%T%>" + +-#: cp/decl.c:9608 ++#: cp/decl.c:9606 + #, gcc-internal-format + msgid "cannot declare member %<%T::%s%> within %qT" + msgstr "no se puede declarar el miembro %<%T::%s%> dentro de %qT" + +-#: cp/decl.c:9634 ++#: cp/decl.c:9632 + #, gcc-internal-format + msgid "non-parameter %qs cannot be a parameter pack" + msgstr "%qs que no es parámetro no puede ser un paquete de parámetro" + +-#: cp/decl.c:9644 ++#: cp/decl.c:9642 + #, gcc-internal-format + msgid "size of array %qs is too large" + msgstr "el tamaño de la matriz %qs es demasiado grande" + +-#: cp/decl.c:9655 ++#: cp/decl.c:9653 + #, gcc-internal-format + msgid "data member may not have variably modified type %qT" + msgstr "los datos miembro pueden no tener el tipo modificado variablemente %qT" + +-#: cp/decl.c:9657 ++#: cp/decl.c:9655 + #, gcc-internal-format + msgid "parameter may not have variably modified type %qT" + msgstr "el parámetro puede no tener el tipo modificado variablemente %qT" + + #. [dcl.fct.spec] The explicit specifier shall only be used in + #. declarations of constructors within a class definition. +-#: cp/decl.c:9665 ++#: cp/decl.c:9663 + #, gcc-internal-format + msgid "only declarations of constructors can be %" + msgstr "solamente las declaraciones de constructores pueden ser %" + +-#: cp/decl.c:9673 ++#: cp/decl.c:9671 + #, gcc-internal-format + msgid "non-member %qs cannot be declared %" + msgstr "el no-miembro %qs no se puede declarar %" + +-#: cp/decl.c:9678 ++#: cp/decl.c:9676 + #, gcc-internal-format + msgid "non-object member %qs cannot be declared %" + msgstr "el miembro que no es objeto %qs no se puede declarar %" + +-#: cp/decl.c:9684 ++#: cp/decl.c:9682 + #, gcc-internal-format + msgid "function %qs cannot be declared %" + msgstr "la función %qs no se puede declarar %" + +-#: cp/decl.c:9689 ++#: cp/decl.c:9687 + #, gcc-internal-format + msgid "static %qs cannot be declared %" + msgstr "static %qs no se puede declarar %" + +-#: cp/decl.c:9694 ++#: cp/decl.c:9692 + #, gcc-internal-format + msgid "const %qs cannot be declared %" + msgstr "const %qs no se puede declarar %" + +-#: cp/decl.c:9699 ++#: cp/decl.c:9697 + #, gcc-internal-format + msgid "reference %qs cannot be declared %" + msgstr "la referencia %qs no se puede declarar %" + +-#: cp/decl.c:9734 ++#: cp/decl.c:9732 + #, gcc-internal-format + msgid "typedef declared %" + msgstr "la definición de tipo se declaró %" + +-#: cp/decl.c:9744 ++#: cp/decl.c:9742 + #, gcc-internal-format + msgid "typedef name may not be a nested-name-specifier" + msgstr "el nombre del typedef puede no ser un especificador-de-nombre-anidado" + +-#: cp/decl.c:9762 ++#: cp/decl.c:9760 + #, gcc-internal-format + msgid "ISO C++ forbids nested type %qD with same name as enclosing class" + msgstr "ISO C++ prohíbe el tipo anidado %qD con el mismo nombre que la clase que lo contiene" + +-#: cp/decl.c:9864 ++#: cp/decl.c:9862 + #, gcc-internal-format + msgid "qualified function types cannot be used to declare static member functions" + msgstr "los tipos de función calificados no se pueden usar para declarar una función miembro estática" + +-#: cp/decl.c:9866 ++#: cp/decl.c:9864 + #, gcc-internal-format + msgid "qualified function types cannot be used to declare free functions" + msgstr "los tipos de función calificados no se pueden usar para declarar funciones libres" + +-#: cp/decl.c:9893 ++#: cp/decl.c:9891 + #, gcc-internal-format + msgid "type qualifiers specified for friend class declaration" + msgstr "se especificaron calificadores de tipo para la declaración de clase friend" + +-#: cp/decl.c:9898 ++#: cp/decl.c:9896 + #, gcc-internal-format + msgid "% specified for friend class declaration" + msgstr "se especificó % para la declaración de clase friend" + +-#: cp/decl.c:9906 ++#: cp/decl.c:9904 + #, gcc-internal-format + msgid "template parameters cannot be friends" + msgstr "los parámetros de la plantilla no pueden ser friends" + +-#: cp/decl.c:9908 ++#: cp/decl.c:9906 + #, gcc-internal-format + msgid "friend declaration requires class-key, i.e. %" + msgstr "la declaración friend requere una llave de clase, p.e. %" + +-#: cp/decl.c:9912 ++#: cp/decl.c:9910 + #, gcc-internal-format + msgid "friend declaration requires class-key, i.e. %" + msgstr "la declaración friend requiere una llave de clase, p.e. %" + +-#: cp/decl.c:9925 ++#: cp/decl.c:9923 + #, gcc-internal-format + msgid "trying to make class %qT a friend of global scope" + msgstr "se intenta hacer que la clase %qT sea un friend de ámbito global" + +-#: cp/decl.c:9943 ++#: cp/decl.c:9941 + #, gcc-internal-format + msgid "invalid qualifiers on non-member function type" + msgstr "calificadores inválidos en el tipo de función que no es miembro" + +-#: cp/decl.c:9953 ++#: cp/decl.c:9951 + #, gcc-internal-format + msgid "abstract declarator %qT used as declaration" + msgstr "el declarador abstracto %qT se usó como declaración" + +-#: cp/decl.c:9982 ++#: cp/decl.c:9980 + #, gcc-internal-format + msgid "cannot use %<::%> in parameter declaration" + msgstr "no se puede usar %<::%> en la declaración de parámetros" + +-#: cp/decl.c:9986 ++#: cp/decl.c:9984 + #, gcc-internal-format + msgid "parameter declared %" + msgstr "el parámetro se declaró %" + +-#: cp/decl.c:10028 ++#: cp/decl.c:10026 + #, gcc-internal-format + msgid "non-static data member declared %" + msgstr "se declaró el miembro dato que no es static como %" + + #. Something like struct S { int N::j; }; +-#: cp/decl.c:10050 ++#: cp/decl.c:10048 + #, gcc-internal-format + msgid "invalid use of %<::%>" + msgstr "uso inválido de %<::%>" + +-#: cp/decl.c:10072 ++#: cp/decl.c:10070 + #, gcc-internal-format + msgid "declaration of function %qD in invalid context" + msgstr "declaración de la función %qD en un contexto inválido" + +-#: cp/decl.c:10081 ++#: cp/decl.c:10079 + #, gcc-internal-format + msgid "function %qD declared virtual inside a union" + msgstr "la función %qD se declaró virtual dentro de un union" + +-#: cp/decl.c:10090 ++#: cp/decl.c:10088 + #, gcc-internal-format + msgid "%qD cannot be declared virtual, since it is always static" + msgstr "%qD no se puede declarar virtual, ya que siempre es static" + +-#: cp/decl.c:10106 ++#: cp/decl.c:10104 + #, gcc-internal-format + msgid "expected qualified name in friend declaration for destructor %qD" + msgstr "se esperaba un nombre calificado en la declaración friend para el destructor %qD" + +-#: cp/decl.c:10113 ++#: cp/decl.c:10111 + #, gcc-internal-format + msgid "declaration of %qD as member of %qT" + msgstr "declaración de %qD como miembro de %qT" + +-#: cp/decl.c:10119 ++#: cp/decl.c:10117 + #, gcc-internal-format + msgid "a destructor cannot be %" + msgstr "un destructor no puede ser %" + +-#: cp/decl.c:10125 ++#: cp/decl.c:10123 + #, gcc-internal-format + msgid "expected qualified name in friend declaration for constructor %qD" + msgstr "se esperaba un nombre calificado en la declaración friend para el constructor %qD" + +-#: cp/decl.c:10171 ++#: cp/decl.c:10169 + #, gcc-internal-format + msgid "field %qD has incomplete type" + msgstr "el campo %qD tiene tipo de dato incompleto" + +-#: cp/decl.c:10173 ++#: cp/decl.c:10171 + #, gcc-internal-format + msgid "name %qT has incomplete type" + msgstr "el nombre %qT tiene tipo de dato incompleto" + +-#: cp/decl.c:10182 ++#: cp/decl.c:10180 + #, gcc-internal-format + msgid " in instantiation of template %qT" + msgstr " en la instanciación de la plantilla %qT" + +-#: cp/decl.c:10191 ++#: cp/decl.c:10189 + #, gcc-internal-format + msgid "%qE is neither function nor member function; cannot be declared friend" + msgstr "%qE no es ni función ni función miembro; no se puede declarar friend" + +-#: cp/decl.c:10243 ++#: cp/decl.c:10241 + #, gcc-internal-format + msgid "constexpr static data member %qD must have an initializer" + msgstr "el miembro dato static constexpr %qD debe tener un inicializador" + +-#: cp/decl.c:10252 ++#: cp/decl.c:10250 + #, gcc-internal-format + msgid "non-static data member %qE declared %" + msgstr "se declaró el miembro dato que no es static %qE como %" + +-#: cp/decl.c:10302 ++#: cp/decl.c:10300 + #, gcc-internal-format + msgid "storage class % invalid for function %qs" + msgstr "la clase de almacenamiento % es inválida para la función %qs" + +-#: cp/decl.c:10304 ++#: cp/decl.c:10302 + #, gcc-internal-format + msgid "storage class % invalid for function %qs" + msgstr "la clase de almacenamiento % es inválida para la función %qs" + +-#: cp/decl.c:10306 ++#: cp/decl.c:10304 + #, gcc-internal-format + msgid "storage class %<__thread%> invalid for function %qs" + msgstr "la clase de almacenamiento %<__thread%> es inválida para la función %qs" + +-#: cp/decl.c:10309 ++#: cp/decl.c:10307 + #, gcc-internal-format + msgid "virt-specifiers in %qs not allowed outside a class definition" + msgstr "no se permiten los especificadores-virt en %qs fuera de una definición de clase" + +-#: cp/decl.c:10320 ++#: cp/decl.c:10318 + #, gcc-internal-format + msgid "% specified invalid for function %qs declared out of global scope" + msgstr "el especificador % es inválido para la función %qs declarada fuera del ámbito global" + +-#: cp/decl.c:10324 ++#: cp/decl.c:10322 + #, gcc-internal-format + msgid "% specifier invalid for function %qs declared out of global scope" + msgstr "el especificador % es inválido para la función %qs declarada fuera del ámbito global" + +-#: cp/decl.c:10332 ++#: cp/decl.c:10330 + #, gcc-internal-format + msgid "virtual non-class function %qs" + msgstr "función virtual %qs que no es clase" + +-#: cp/decl.c:10339 ++#: cp/decl.c:10337 + #, gcc-internal-format + msgid "%qs defined in a non-class scope" + msgstr "se definió %qs en un ámbito que no es una clase" + +-#: cp/decl.c:10340 ++#: cp/decl.c:10338 + #, gcc-internal-format + msgid "%qs declared in a non-class scope" + msgstr "se declaró %qs en un ámbito que no es una clase" + +-#: cp/decl.c:10368 ++#: cp/decl.c:10366 + #, gcc-internal-format + msgid "cannot declare member function %qD to have static linkage" + msgstr "no se puede declarar que la función miembro %qD tenga enlace estático" + + #. FIXME need arm citation +-#: cp/decl.c:10375 ++#: cp/decl.c:10373 + #, gcc-internal-format + msgid "cannot declare static function inside another function" + msgstr "no se puede declarar una función static dentro de otra función" + +-#: cp/decl.c:10405 ++#: cp/decl.c:10403 + #, gcc-internal-format + msgid "% may not be used when defining (as opposed to declaring) a static data member" + msgstr "% puede no ser utilizado cuando se define (opuesto a la declaración) un dato miembro static" + +-#: cp/decl.c:10412 ++#: cp/decl.c:10410 + #, gcc-internal-format + msgid "static member %qD declared %" + msgstr "se declaró el miembro static %qD como %" + +-#: cp/decl.c:10418 ++#: cp/decl.c:10416 + #, gcc-internal-format + msgid "cannot explicitly declare member %q#D to have extern linkage" + msgstr "no se puede declarar explícitamente que el miembro %q#D tenga un enlace externo" + +-#: cp/decl.c:10425 ++#: cp/decl.c:10423 + #, gcc-internal-format + msgid "declaration of constexpr variable %qD is not a definition" + msgstr "la declaración de la variable constexpr %qD no es una definición" + +-#: cp/decl.c:10438 ++#: cp/decl.c:10436 + #, gcc-internal-format + msgid "%qs initialized and declared %" + msgstr "%qs inicializado y declarado como %" + +-#: cp/decl.c:10442 ++#: cp/decl.c:10440 + #, gcc-internal-format + msgid "%qs has both % and initializer" + msgstr "%qs tiene % e inicializador al mismo tiempo" + +-#: cp/decl.c:10570 ++#: cp/decl.c:10568 + #, gcc-internal-format + msgid "default argument for %q#D has type %qT" + msgstr "el argumento por defecto de %q#D tiene tipo %qT" + +-#: cp/decl.c:10573 ++#: cp/decl.c:10571 + #, gcc-internal-format + msgid "default argument for parameter of type %qT has type %qT" + msgstr "el argumento por defecto para el parámetro del tipo %qT tiene el tipo %qT" + +-#: cp/decl.c:10601 ++#: cp/decl.c:10599 + #, gcc-internal-format + msgid "default argument %qE uses %qD" + msgstr "el argumento por defecto %qE usa %qD" + +-#: cp/decl.c:10603 ++#: cp/decl.c:10601 + #, gcc-internal-format + msgid "default argument %qE uses local variable %qD" + msgstr "el argumento por defecto %qE usa la variable local %qD" + +-#: cp/decl.c:10691 ++#: cp/decl.c:10689 + #, gcc-internal-format + msgid "parameter %qD has Java class type" + msgstr "el parámetro %qD tiene tipo de clase Java" + +-#: cp/decl.c:10719 ++#: cp/decl.c:10717 + #, gcc-internal-format + msgid "parameter %qD invalidly declared method type" + msgstr "el parámetro %qD se declaró inválidamente como tipo de método" + +-#: cp/decl.c:10744 ++#: cp/decl.c:10742 + #, gcc-internal-format + msgid "parameter %qD includes pointer to array of unknown bound %qT" + msgstr "el parámetro %qD incluye un puntero a matriz %qT de límite desconocido" + +-#: cp/decl.c:10746 ++#: cp/decl.c:10744 + #, gcc-internal-format + msgid "parameter %qD includes reference to array of unknown bound %qT" + msgstr "el parámetro %qD incluye una referencia a matriz %qT de límite desconocido" +@@ -28992,170 +28987,170 @@ + #. or implicitly defined), there's no need to worry about their + #. existence. Theoretically, they should never even be + #. instantiated, but that's hard to forestall. +-#: cp/decl.c:10987 ++#: cp/decl.c:10998 + #, gcc-internal-format + msgid "invalid constructor; you probably meant %<%T (const %T&)%>" + msgstr "constructor inválido; tal vez quiso decir %<%T (const %T&)%>" + +-#: cp/decl.c:11109 ++#: cp/decl.c:11120 + #, gcc-internal-format + msgid "%qD may not be declared within a namespace" + msgstr "%qD no se puede declarar dentro de un espacio de nombres" + +-#: cp/decl.c:11114 ++#: cp/decl.c:11125 + #, gcc-internal-format + msgid "%qD may not be declared as static" + msgstr "%qD no se puede declarar como static" + +-#: cp/decl.c:11140 ++#: cp/decl.c:11151 + #, gcc-internal-format + msgid "%qD must be a nonstatic member function" + msgstr "%qD debe ser una función miembro que no sea static" + +-#: cp/decl.c:11149 ++#: cp/decl.c:11160 + #, gcc-internal-format + msgid "%qD must be either a non-static member function or a non-member function" + msgstr "%qD debe ser una función miembro que no sea static o una función que no sea miembro" + +-#: cp/decl.c:11171 ++#: cp/decl.c:11182 + #, gcc-internal-format + msgid "%qD must have an argument of class or enumerated type" + msgstr "%qD debe tener un argumento de tipo clase o enumerado" + +-#: cp/decl.c:11200 ++#: cp/decl.c:11211 + #, gcc-internal-format + msgid "conversion to a reference to void will never use a type conversion operator" + msgstr "la conversión a una referencia a void nunca usará un operador de conversión de tipo" + +-#: cp/decl.c:11202 ++#: cp/decl.c:11213 + #, gcc-internal-format + msgid "conversion to void will never use a type conversion operator" + msgstr "la conversión a void nunca usará un operador de conversión de tipo" + +-#: cp/decl.c:11209 ++#: cp/decl.c:11220 + #, gcc-internal-format + msgid "conversion to a reference to the same type will never use a type conversion operator" + msgstr "la conversión a una referencia al mismo tipo nunca usará un operador de conversión de tipo" + +-#: cp/decl.c:11211 ++#: cp/decl.c:11222 + #, gcc-internal-format + msgid "conversion to the same type will never use a type conversion operator" + msgstr "la conversión al mismo tipo nunca usará un operador de conversión de tipo" + +-#: cp/decl.c:11219 ++#: cp/decl.c:11230 + #, gcc-internal-format + msgid "conversion to a reference to a base class will never use a type conversion operator" + msgstr "la conversión a una referencia a una clase base nunca usará un operador de conversión de tipo" + +-#: cp/decl.c:11221 ++#: cp/decl.c:11232 + #, gcc-internal-format + msgid "conversion to a base class will never use a type conversion operator" + msgstr "la conversión a una clase base nunca usará un operador de conversión de tipo" + + #. 13.4.0.3 +-#: cp/decl.c:11230 ++#: cp/decl.c:11241 + #, gcc-internal-format + msgid "ISO C++ prohibits overloading operator ?:" + msgstr "ISO C++ prohíbe la sobrecarga del operador ?:" + +-#: cp/decl.c:11235 ++#: cp/decl.c:11246 + #, gcc-internal-format + msgid "%qD must not have variable number of arguments" + msgstr "%qD no debe tener un número variable de argumentos" + +-#: cp/decl.c:11286 ++#: cp/decl.c:11297 + #, gcc-internal-format + msgid "postfix %qD must take % as its argument" + msgstr "el postfijo %qD debe tomar % como su argumento" + +-#: cp/decl.c:11289 ++#: cp/decl.c:11300 + #, gcc-internal-format + msgid "postfix %qD must take % as its second argument" + msgstr "el postfijo %qD debe tomar % como su segundo argumento" + +-#: cp/decl.c:11297 ++#: cp/decl.c:11308 + #, gcc-internal-format + msgid "%qD must take either zero or one argument" + msgstr "%qD debe tomar cero o un argumentos" + +-#: cp/decl.c:11299 ++#: cp/decl.c:11310 + #, gcc-internal-format + msgid "%qD must take either one or two arguments" + msgstr "%qD debe tomar uno o dos argumentos" + + # En esta traducción se emplea 'devolver' por 'return'. Si embargo, aquí + # se cambió por cacofonía: no es agradable escuchar 'debe devolver'. cfuga +-#: cp/decl.c:11321 ++#: cp/decl.c:11332 + #, gcc-internal-format + msgid "prefix %qD should return %qT" + msgstr "el prefijo %qD debe regresar %qT" + +-#: cp/decl.c:11327 ++#: cp/decl.c:11338 + #, gcc-internal-format + msgid "postfix %qD should return %qT" + msgstr "el postfijo %qD debe regresar %qT" + +-#: cp/decl.c:11336 ++#: cp/decl.c:11347 + #, gcc-internal-format + msgid "%qD must take %" + msgstr "%qD debe tomar %" + +-#: cp/decl.c:11338 cp/decl.c:11347 ++#: cp/decl.c:11349 cp/decl.c:11358 + #, gcc-internal-format + msgid "%qD must take exactly one argument" + msgstr "%qD debe tomar un argumento exactamente" + +-#: cp/decl.c:11349 ++#: cp/decl.c:11360 + #, gcc-internal-format + msgid "%qD must take exactly two arguments" + msgstr "%qD debe tomar dos argumentos exactamente" + +-#: cp/decl.c:11358 ++#: cp/decl.c:11369 + #, gcc-internal-format + msgid "user-defined %qD always evaluates both arguments" + msgstr "el %qD definido por el usuario siempre evalúa ambos argumentos" + +-#: cp/decl.c:11372 ++#: cp/decl.c:11383 + #, gcc-internal-format + msgid "%qD should return by value" + msgstr "%qD debe devolver por valor" + +-#: cp/decl.c:11383 cp/decl.c:11388 ++#: cp/decl.c:11394 cp/decl.c:11399 + #, gcc-internal-format + msgid "%qD cannot have default arguments" + msgstr "%qD no puede tener argumentos por defecto" + +-#: cp/decl.c:11449 ++#: cp/decl.c:11460 + #, gcc-internal-format + msgid "using template type parameter %qT after %qs" + msgstr "usando el parámetro de tipo plantilla %qT después de %qs" + +-#: cp/decl.c:11471 ++#: cp/decl.c:11482 + #, gcc-internal-format + msgid "using alias template specialization %qT after %qs" + msgstr "se usa especialización de plantilla %qT alias después de %qs" + +-#: cp/decl.c:11474 ++#: cp/decl.c:11485 + #, gcc-internal-format + msgid "using typedef-name %qD after %qs" + msgstr "se usó el nombre de definición de tipo %qD después de %qs" + +-#: cp/decl.c:11476 ++#: cp/decl.c:11487 + #, gcc-internal-format + msgid "%qD has a previous declaration here" + msgstr "%qD tiene una declaración previa aquí" + +-#: cp/decl.c:11484 ++#: cp/decl.c:11495 + #, gcc-internal-format + msgid "%qT referred to as %qs" + msgstr "se refirió a %qT como %qs" + +-#: cp/decl.c:11485 cp/decl.c:11492 ++#: cp/decl.c:11496 cp/decl.c:11503 + #, gcc-internal-format + msgid "%q+T has a previous declaration here" + msgstr "%q+T tiene una declaración previa aquí" + +-#: cp/decl.c:11491 ++#: cp/decl.c:11502 + #, gcc-internal-format + msgid "%qT referred to as enum" + msgstr "se refirió a %qT como un enum" +@@ -29167,90 +29162,90 @@ + #. void f(class C); // No template header here + #. + #. then the required template argument is missing. +-#: cp/decl.c:11506 ++#: cp/decl.c:11517 + #, gcc-internal-format + msgid "template argument required for %<%s %T%>" + msgstr "se requiere un argumento de plantilla para %<%s %T%>" + +-#: cp/decl.c:11554 cp/name-lookup.c:3052 ++#: cp/decl.c:11565 cp/name-lookup.c:3057 + #, gcc-internal-format + msgid "%qD has the same name as the class in which it is declared" + msgstr "%qD tiene el mismo nombre que la clase en la cual se declaró" + +-#: cp/decl.c:11584 cp/name-lookup.c:2551 cp/name-lookup.c:3376 +-#: cp/name-lookup.c:3421 cp/parser.c:5060 cp/parser.c:20517 ++#: cp/decl.c:11595 cp/name-lookup.c:2556 cp/name-lookup.c:3381 ++#: cp/name-lookup.c:3426 cp/parser.c:5060 cp/parser.c:20512 + #, gcc-internal-format + msgid "reference to %qD is ambiguous" + msgstr "la referencia a %qD es ambigua" + +-#: cp/decl.c:11696 ++#: cp/decl.c:11707 + #, gcc-internal-format + msgid "use of enum %q#D without previous declaration" + msgstr "uso del enum %q#D sin declaración previa" + +-#: cp/decl.c:11717 ++#: cp/decl.c:11728 + #, gcc-internal-format + msgid "redeclaration of %qT as a non-template" + msgstr "redeclaración de %qT como algo que no es plantilla" + +-#: cp/decl.c:11718 ++#: cp/decl.c:11729 + #, gcc-internal-format + msgid "previous declaration %q+D" + msgstr "declaración previa de %q+D" + +-#: cp/decl.c:11852 ++#: cp/decl.c:11863 + #, gcc-internal-format + msgid "derived union %qT invalid" + msgstr "union derivada %qT inválida" + +-#: cp/decl.c:11861 ++#: cp/decl.c:11872 + #, gcc-internal-format + msgid "Java class %qT cannot have multiple bases" + msgstr "la clase Java %qT no puede tener bases múltiples" + +-#: cp/decl.c:11872 ++#: cp/decl.c:11883 + #, gcc-internal-format + msgid "Java class %qT cannot have virtual bases" + msgstr "la clase Java %qT no puede tener bases virtuales" + + # No me gusta mucho esta traducción. Creo que es mejor + # "el tipo base %qT no es de tipo struct o clase". cfuga +-#: cp/decl.c:11892 ++#: cp/decl.c:11903 + #, gcc-internal-format + msgid "base type %qT fails to be a struct or class type" + msgstr "el tipo base %qT falla en ser un tipo struct o clase" + +-#: cp/decl.c:11925 ++#: cp/decl.c:11936 + #, gcc-internal-format + msgid "recursive type %qT undefined" + msgstr "tipo recursivo %qT sin definir" + +-#: cp/decl.c:11927 ++#: cp/decl.c:11938 + #, gcc-internal-format + msgid "duplicate base type %qT invalid" + msgstr "tipo base duplicado %qT inválido" + +-#: cp/decl.c:12051 ++#: cp/decl.c:12062 + #, gcc-internal-format + msgid "scoped/unscoped mismatch in enum %q#T" + msgstr "no coinciden scoped/unscoped en el enum %q#T" + +-#: cp/decl.c:12054 cp/decl.c:12062 cp/decl.c:12074 cp/parser.c:14523 ++#: cp/decl.c:12065 cp/decl.c:12073 cp/decl.c:12085 cp/parser.c:14523 + #, gcc-internal-format + msgid "previous definition here" + msgstr "la definición previa está aquí" + +-#: cp/decl.c:12059 ++#: cp/decl.c:12070 + #, gcc-internal-format + msgid "underlying type mismatch in enum %q#T" + msgstr "no coincide el tipo subyacente en el enum %q#T" + +-#: cp/decl.c:12071 ++#: cp/decl.c:12082 + #, gcc-internal-format + msgid "different underlying type in enum %q#T" + msgstr "tipos subyacentes diferentes en el enum %q#T" + +-#: cp/decl.c:12138 ++#: cp/decl.c:12149 + #, gcc-internal-format + msgid "underlying type %<%T%> of %<%T%> must be an integral type" + msgstr "el tipo subyacente %<%T%> de %<%T%> debe ser un tipo integral" +@@ -29259,72 +29254,72 @@ + #. + #. IF no integral type can represent all the enumerator values, the + #. enumeration is ill-formed. +-#: cp/decl.c:12272 ++#: cp/decl.c:12283 + #, gcc-internal-format + msgid "no integral type can represent all of the enumerator values for %qT" + msgstr "ningún tipo integral puede representar todos los valores de enumerador de %qT" + +-#: cp/decl.c:12407 ++#: cp/decl.c:12424 + #, gcc-internal-format + msgid "enumerator value for %qD is not an integer constant" + msgstr "el valor de enumerador para %qD no es una constante entera" + +-#: cp/decl.c:12457 ++#: cp/decl.c:12474 + #, gcc-internal-format + msgid "incremented enumerator value is too large for %" + msgstr "el valor del enumerador incrementado es demasiado grande para %" + +-#: cp/decl.c:12469 ++#: cp/decl.c:12486 + #, gcc-internal-format + msgid "overflow in enumeration values at %qD" + msgstr "desbordamiento en valores de enumeración en %qD" + +-#: cp/decl.c:12489 ++#: cp/decl.c:12506 + #, gcc-internal-format + msgid "enumerator value %E is too large for underlying type %<%T%>" + msgstr "el valor de enumerador %E es demasiado grande para el tipo subyacente %<%T%>" + +-#: cp/decl.c:12586 ++#: cp/decl.c:12603 + #, gcc-internal-format + msgid "return type %q#T is incomplete" + msgstr "el tipo de devolución %q#T es un tipo de dato incompleto" + +-#: cp/decl.c:12588 ++#: cp/decl.c:12605 + #, gcc-internal-format + msgid "return type has Java class type %q#T" + msgstr "el tipo de devolución tiene tipo de clase Java %q#T" + +-#: cp/decl.c:12712 cp/typeck.c:7909 ++#: cp/decl.c:12729 cp/typeck.c:7909 + #, gcc-internal-format + msgid "% should return a reference to %<*this%>" + msgstr "% debe devolver una referencia a %<*this%>" + +-#: cp/decl.c:12807 ++#: cp/decl.c:12824 + #, gcc-internal-format + msgid "no previous declaration for %q+D" + msgstr "no hay declaración previa para %q+D" + +-#: cp/decl.c:13022 ++#: cp/decl.c:13039 + #, gcc-internal-format + msgid "invalid function declaration" + msgstr "declaración de función inválida" + +-#: cp/decl.c:13106 ++#: cp/decl.c:13123 + #, gcc-internal-format + msgid "parameter %qD declared void" + msgstr "el parámetro %qD se declaró void" + +-#: cp/decl.c:13559 ++#: cp/decl.c:13576 + #, gcc-internal-format + msgid "parameter %q+D set but not used" + msgstr "se define el parámetro %q+D pero no se usa" + +-#: cp/decl.c:13654 ++#: cp/decl.c:13671 + #, gcc-internal-format + msgid "invalid member function declaration" + msgstr "declaración de la función miembro inválida" + +-#: cp/decl.c:13668 ++#: cp/decl.c:13685 + #, gcc-internal-format + msgid "%qD is already defined in class %qT" + msgstr "%qD ya se definió en la clase %qT" +@@ -29672,7 +29667,7 @@ + msgid "throwing NULL, which has integral, not pointer type" + msgstr "arrojando NULL, que tiene un tipo integral, que no es puntero" + +-#: cp/except.c:743 cp/init.c:2308 ++#: cp/except.c:743 cp/init.c:2310 + #, gcc-internal-format + msgid "%qD should never be overloaded" + msgstr "%qD nunca se debe sobrecargar" +@@ -29931,152 +29926,152 @@ + msgid "bad array initializer" + msgstr "inicializador de matriz erróneo" + +-#: cp/init.c:1778 cp/semantics.c:2780 ++#: cp/init.c:1780 cp/semantics.c:2780 + #, gcc-internal-format + msgid "%qT is not a class type" + msgstr "%qT no es un tipo de clase" + +-#: cp/init.c:1832 ++#: cp/init.c:1834 + #, gcc-internal-format + msgid "incomplete type %qT does not have member %qD" + msgstr "el tipo incompleto %qT no tiene al miembro %qD" + +-#: cp/init.c:1845 ++#: cp/init.c:1847 + #, gcc-internal-format + msgid "invalid pointer to bit-field %qD" + msgstr "puntero inválido al campo de bits %qD" + +-#: cp/init.c:1922 ++#: cp/init.c:1924 + #, gcc-internal-format + msgid "invalid use of non-static member function %qD" + msgstr "uso inválido de la función miembro no static %qD" + +-#: cp/init.c:1928 ++#: cp/init.c:1930 + #, gcc-internal-format + msgid "invalid use of non-static data member %qD" + msgstr "uso inválido del dato miembro no static %qD" + +-#: cp/init.c:2110 ++#: cp/init.c:2112 + #, gcc-internal-format + msgid "uninitialized reference member in %q#T using % without new-initializer" + msgstr "un miembro referencia sin inicializar en %q#T usa % sin un inicializador new" + +-#: cp/init.c:2113 ++#: cp/init.c:2115 + #, gcc-internal-format + msgid "uninitialized reference member in %q#T" + msgstr "miembro referencia sin inicializar en %q#T" + +-#: cp/init.c:2125 ++#: cp/init.c:2127 + #, gcc-internal-format + msgid "uninitialized const member in %q#T using % without new-initializer" + msgstr "un miembro const sin inicializar en %q#T usa % sin un inicializador new" + +-#: cp/init.c:2128 ++#: cp/init.c:2130 + #, gcc-internal-format + msgid "uninitialized const member in %q#T" + msgstr "miembro const sin inicializar en %q#T" + +-#: cp/init.c:2225 ++#: cp/init.c:2227 + #, gcc-internal-format + msgid "invalid type % for new" + msgstr "tipo % inválido para new" + +-#: cp/init.c:2268 ++#: cp/init.c:2270 + #, gcc-internal-format + msgid "uninitialized const in % of %q#T" + msgstr "const sin inicializar en % de %q#T" + +-#: cp/init.c:2302 ++#: cp/init.c:2304 + #, gcc-internal-format + msgid "call to Java constructor with %qs undefined" + msgstr "llamado a constructor Java con %qs sin definir" + +-#: cp/init.c:2318 ++#: cp/init.c:2320 + #, gcc-internal-format + msgid "Java class %q#T object allocated using placement new" + msgstr "se aloja el objeto de clase Java %q#T usando una ubicación new" + +-#: cp/init.c:2348 ++#: cp/init.c:2350 + #, gcc-internal-format + msgid "no suitable %qD found in class %qT" + msgstr "no se encontró un %qD adecuado en la clase %qT" + +-#: cp/init.c:2355 cp/search.c:1107 ++#: cp/init.c:2357 cp/search.c:1107 + #, gcc-internal-format + msgid "request for member %qD is ambiguous" + msgstr "la petición para el miembro %qD es ambigua" + +-#: cp/init.c:2563 ++#: cp/init.c:2565 + #, gcc-internal-format + msgid "non-constant array size in new, unable to verify length of initializer-list" + msgstr "tamaño de matriz no constante en new, no se puede verificar la longitud de la lista del inicializador" + +-#: cp/init.c:2574 ++#: cp/init.c:2576 + #, gcc-internal-format + msgid "parenthesized initializer in array new" + msgstr "inicializador entre paréntesis en la matriz new" + +-#: cp/init.c:2808 ++#: cp/init.c:2810 + #, gcc-internal-format + msgid "size in array new must have integral type" + msgstr "el tamaño de la matriz nueva debe tener un tipo integral" + +-#: cp/init.c:2822 ++#: cp/init.c:2824 + #, gcc-internal-format + msgid "new cannot be applied to a reference type" + msgstr "new no se puede aplicar a un tipo de referencia" + +-#: cp/init.c:2831 ++#: cp/init.c:2833 + #, gcc-internal-format + msgid "new cannot be applied to a function type" + msgstr "new no se puede aplicar a un tipo de función" + +-#: cp/init.c:2875 ++#: cp/init.c:2877 + #, gcc-internal-format + msgid "call to Java constructor, while % undefined" + msgstr "llamado a constructor Java, mientras % está indefinido" + +-#: cp/init.c:2893 ++#: cp/init.c:2895 + #, gcc-internal-format + msgid "can%'t find % in %qT" + msgstr "no se puede encontrar % en %qT" + +-#: cp/init.c:3382 ++#: cp/init.c:3384 + #, gcc-internal-format + msgid "initializer ends prematurely" + msgstr "el inicializador termina prematuramente" + +-#: cp/init.c:3446 ++#: cp/init.c:3448 + #, gcc-internal-format + msgid "cannot initialize multi-dimensional array with initializer" + msgstr "no se pueden inicializar matrices multidimensionales con el inicializador" + +-#: cp/init.c:3620 ++#: cp/init.c:3622 + #, gcc-internal-format + msgid "possible problem detected in invocation of delete operator:" + msgstr "se detectó un posible problema en la invocación del operador delete:" + +-#: cp/init.c:3624 ++#: cp/init.c:3626 + #, gcc-internal-format + msgid "neither the destructor nor the class-specific operator delete will be called, even if they are declared when the class is defined" + msgstr "no se llamará ni al destructor ni al operador delete específico de la clase, aún si se declaran cuando se defina la clase" + +-#: cp/init.c:3640 ++#: cp/init.c:3642 + #, gcc-internal-format + msgid "deleting object of abstract class type %qT which has non-virtual destructor will cause undefined behaviour" + msgstr "si borra un objeto de tipo de clase abstracta %qT que tiene un destructor que no es virtual, puede causar conducta indefinida" + +-#: cp/init.c:3645 ++#: cp/init.c:3647 + #, gcc-internal-format + msgid "deleting object of polymorphic class type %qT which has non-virtual destructor might cause undefined behaviour" + msgstr "si borra un objeto de tipo de clase polimórfica %qT que tiene un destructor que no es virtual, puede causar conducta indefinida" + +-#: cp/init.c:3667 ++#: cp/init.c:3669 + #, gcc-internal-format + msgid "unknown array size in delete" + msgstr "tamaño de matriz desconocida en delete" + +-#: cp/init.c:3936 ++#: cp/init.c:3938 + #, gcc-internal-format + msgid "type to vector delete is neither pointer or array type" + msgstr "el tipo de vector delete no es del tipo puntero ni matriz" +@@ -30166,12 +30161,12 @@ + msgid "string literal in function template signature" + msgstr "literal de cadena en la firma de plantilla de función" + +-#: cp/mangle.c:3244 ++#: cp/mangle.c:3249 + #, gcc-internal-format + msgid "the mangled name of %qD will change in a future version of GCC" + msgstr "el nombre revuelto de %qD cambiará en una versión futura de GCC" + +-#: cp/mangle.c:3388 ++#: cp/mangle.c:3393 + #, gcc-internal-format + msgid "-fabi-version=6 (or =0) avoids this error with a change in mangling" + msgstr "-fabi-version=6 (o =0) evita este error con un cambio en la decodificación" +@@ -30181,12 +30176,12 @@ + msgid "generic thunk code fails for method %q#D which uses %<...%>" + msgstr "el código de thunk genérico falló para el método %q#D que utiliza %<...%>" + +-#: cp/method.c:664 cp/method.c:1003 ++#: cp/method.c:664 cp/method.c:1002 + #, gcc-internal-format + msgid "non-static const member %q#D, can%'t use default assignment operator" + msgstr "el miembro const %q#D que no es static, no puede usar el operador de asignación por defecto" + +-#: cp/method.c:670 cp/method.c:1009 ++#: cp/method.c:670 cp/method.c:1008 + #, gcc-internal-format + msgid "non-static reference member %q#D, can%'t use default assignment operator" + msgstr "el miembro de referencia %q#D que no es static, no puede usar el operador de asignación por defecto" +@@ -30201,98 +30196,98 @@ + msgid "union member %q+D with non-trivial %qD" + msgstr "miembro union %q+D con %qD que no es trivial" + +-#: cp/method.c:964 ++#: cp/method.c:963 + #, gcc-internal-format + msgid "defaulted constructor calls non-constexpr %q+D" + msgstr "un constructor por defecto llama a %q+D que no es constexpr" + +-#: cp/method.c:1025 ++#: cp/method.c:1024 + #, gcc-internal-format + msgid "initializer for %q+#D is invalid" + msgstr "el inicializador para %q+#D es inválido" + +-#: cp/method.c:1048 ++#: cp/method.c:1047 + #, gcc-internal-format + msgid "uninitialized non-static const member %q#D" + msgstr "miembro const que no es estático %q#D sin inicializar" + +-#: cp/method.c:1055 ++#: cp/method.c:1054 + #, gcc-internal-format + msgid "uninitialized non-static reference member %q#D" + msgstr "miembro referencia que no es estático %q#D sin inicializar" + +-#: cp/method.c:1071 ++#: cp/method.c:1070 + #, gcc-internal-format + msgid "defaulted default constructor does not initialize %q+#D" + msgstr "el constructor por defecto en efecto no inicializa %q+#D" + + #. A trivial constructor doesn't have any NSDMI. +-#: cp/method.c:1220 ++#: cp/method.c:1223 + #, gcc-internal-format + msgid "defaulted default constructor does not initialize any non-static data member" + msgstr "el constructor por defecto en efecto no inicializa ningún dato miembro que no es static" + +-#: cp/method.c:1298 ++#: cp/method.c:1304 + #, gcc-internal-format + msgid "%qT has virtual bases, default move assignment operator cannot be generated" + msgstr "%qT tiene bases virtuales, no se puede generar el operador de asignación move por defecto" + +-#: cp/method.c:1388 ++#: cp/method.c:1395 + #, gcc-internal-format + msgid "a lambda closure type has a deleted default constructor" + msgstr "un tipo de conclusión lambda tiene un constructor por defecto borrado" + +-#: cp/method.c:1391 ++#: cp/method.c:1398 + #, gcc-internal-format + msgid "a lambda closure type has a deleted copy assignment operator" + msgstr "un tipo de conclusión lambda tiene un operador de asignación por copia borrado" + +-#: cp/method.c:1401 ++#: cp/method.c:1408 + #, gcc-internal-format + msgid "%q+#D is implicitly declared as deleted because %qT declares a move constructor or move assignment operator" + msgstr "%q+#D se declara implícitamente como deleted porque %qT declara un constructor move o un operador de asignación move" + +-#: cp/method.c:1411 ++#: cp/method.c:1418 + #, gcc-internal-format + msgid "%q+#D is implicitly deleted because the default definition would be ill-formed:" + msgstr "%q+#D es implícitamente deleted por que la definición por defecto estaría mal formada:" + +-#: cp/method.c:1621 ++#: cp/method.c:1630 + #, gcc-internal-format + msgid "defaulted declaration %q+D" + msgstr "declaración definida por defecto %q+D" + +-#: cp/method.c:1623 ++#: cp/method.c:1632 + #, gcc-internal-format + msgid "does not match expected signature %qD" + msgstr "no coincide la firma esperada %qD" + +-#: cp/method.c:1637 ++#: cp/method.c:1646 + #, gcc-internal-format + msgid "function %q+D defaulted on its first declaration with an exception-specification that differs from the implicit declaration %q#D" + msgstr "la función %q+D definida por defecto en su primera declaración tiene una excepción de especificación que difiere de la declaración implícita %q#D" + +-#: cp/method.c:1658 ++#: cp/method.c:1667 + #, gcc-internal-format + msgid "explicitly defaulted function %q+D cannot be declared as constexpr because the implicit declaration is not constexpr:" + msgstr "la función %q+D explícitamente por defecto no se puede declarar como constexpr porque la declaración implícita no es constexpr:" + +-#: cp/method.c:1680 ++#: cp/method.c:1689 + #, gcc-internal-format + msgid "a template cannot be defaulted" + msgstr "una plantilla no se puede definir por defecto" + +-#: cp/method.c:1708 ++#: cp/method.c:1717 + #, gcc-internal-format + msgid "%qD cannot be defaulted" + msgstr "%qD no se puede definir por defecto" + +-#: cp/method.c:1717 ++#: cp/method.c:1726 + #, gcc-internal-format + msgid "defaulted function %q+D with default argument" + msgstr "función definida por defecto %q+D con argumento por defecto" + +-#: cp/method.c:1805 ++#: cp/method.c:1818 + #, gcc-internal-format + msgid "vtable layout for class %qT may not be ABI-compliantand may change in a future version of GCC due to implicit virtual destructor" + msgstr "la disposición vtable para la clase %qT puede no cumplir con la ABI y puede cambiar en una versión futura de GCC debido al destructor virtual implícito" +@@ -30429,154 +30424,154 @@ + msgid "%s %s %p %d\n" + msgstr "%s %s %p %d\n" + +-#: cp/name-lookup.c:2252 ++#: cp/name-lookup.c:2257 + #, gcc-internal-format + msgid "%q#D hides constructor for %q#T" + msgstr "%q#D esconde el destructor para %q#T" + +-#: cp/name-lookup.c:2269 ++#: cp/name-lookup.c:2274 + #, gcc-internal-format + msgid "%q#D conflicts with previous using declaration %q#D" + msgstr "%q#D genera un conflicto con la declaración previa en uso %q#D" + +-#: cp/name-lookup.c:2292 ++#: cp/name-lookup.c:2297 + #, gcc-internal-format + msgid "previous non-function declaration %q+#D" + msgstr "la declaración previa %q+#D que no es función" + +-#: cp/name-lookup.c:2293 ++#: cp/name-lookup.c:2298 + #, gcc-internal-format + msgid "conflicts with function declaration %q#D" + msgstr "genera un conflicto con la declaración de la función %q#D" + + #. It's a nested name with template parameter dependent scope. + #. This can only be using-declaration for class member. +-#: cp/name-lookup.c:2383 cp/name-lookup.c:2408 ++#: cp/name-lookup.c:2388 cp/name-lookup.c:2413 + #, gcc-internal-format + msgid "%qT is not a namespace" + msgstr "%qT no es un espacio de nombres" + + #. 7.3.3/5 + #. A using-declaration shall not name a template-id. +-#: cp/name-lookup.c:2393 ++#: cp/name-lookup.c:2398 + #, gcc-internal-format + msgid "a using-declaration cannot specify a template-id. Try %" + msgstr "una declaración de uso no puede especificar un id de plantilla. Intente %" + +-#: cp/name-lookup.c:2400 ++#: cp/name-lookup.c:2405 + #, gcc-internal-format + msgid "namespace %qD not allowed in using-declaration" + msgstr "no se permite el espacio de nombres %qD en la declaración using" + +-#: cp/name-lookup.c:2436 ++#: cp/name-lookup.c:2441 + #, gcc-internal-format + msgid "%qD not declared" + msgstr "no se declaró %qD" + +-#: cp/name-lookup.c:2472 cp/name-lookup.c:2509 cp/name-lookup.c:2543 +-#: cp/name-lookup.c:2558 ++#: cp/name-lookup.c:2477 cp/name-lookup.c:2514 cp/name-lookup.c:2548 ++#: cp/name-lookup.c:2563 + #, gcc-internal-format + msgid "%qD is already declared in this scope" + msgstr "%qD ya se declaró en este ámbito" + +-#: cp/name-lookup.c:3201 ++#: cp/name-lookup.c:3206 + #, gcc-internal-format + msgid "using-declaration for non-member at class scope" + msgstr "declaración de uso para un no miembro en el ámbito de la clase" + +-#: cp/name-lookup.c:3208 ++#: cp/name-lookup.c:3213 + #, gcc-internal-format + msgid "%<%T::%D%> names destructor" + msgstr "%<%T::%D%> nombra al destructor" + +-#: cp/name-lookup.c:3213 ++#: cp/name-lookup.c:3218 + #, gcc-internal-format + msgid "%<%T::%D%> names constructor" + msgstr "%<%T::%D%> nombra al constructor" + +-#: cp/name-lookup.c:3218 ++#: cp/name-lookup.c:3223 + #, gcc-internal-format + msgid "%<%T::%D%> names constructor in %qT" + msgstr "%<%T::%D%> nombra al constructor en %qT" + +-#: cp/name-lookup.c:3268 ++#: cp/name-lookup.c:3273 + #, gcc-internal-format + msgid "no members matching %<%T::%D%> in %q#T" + msgstr "no hay miembros que coincidan con %<%T::%D%> en %q#T" + +-#: cp/name-lookup.c:3355 ++#: cp/name-lookup.c:3360 + #, gcc-internal-format + msgid "declaration of %qD not in a namespace surrounding %qD" + msgstr "la declaración de %qD no está en un espacio de nombres alrededor de %qD" + +-#: cp/name-lookup.c:3363 ++#: cp/name-lookup.c:3368 + #, gcc-internal-format + msgid "explicit qualification in declaration of %qD" + msgstr "calificación explícita en la declaración de %qD" + +-#: cp/name-lookup.c:3446 ++#: cp/name-lookup.c:3451 + #, gcc-internal-format + msgid "%qD should have been declared inside %qD" + msgstr "%qD se debería declarar dentro de %qD" + +-#: cp/name-lookup.c:3490 ++#: cp/name-lookup.c:3495 + #, gcc-internal-format + msgid "%qD attribute requires a single NTBS argument" + msgstr "el atributo %qD requiere un solo argumento NTBS" + +-#: cp/name-lookup.c:3497 ++#: cp/name-lookup.c:3502 + #, gcc-internal-format + msgid "%qD attribute is meaningless since members of the anonymous namespace get local symbols" + msgstr "el atributo %qD no tiene signifcado porque los miembros del espacio de nombres anónimo tiene símbolos locales" + +-#: cp/name-lookup.c:3505 cp/name-lookup.c:3894 ++#: cp/name-lookup.c:3510 cp/name-lookup.c:3899 + #, gcc-internal-format + msgid "%qD attribute directive ignored" + msgstr "se descarta la directiva de atributo %qD" + +-#: cp/name-lookup.c:3550 ++#: cp/name-lookup.c:3555 + #, gcc-internal-format + msgid "namespace alias %qD not allowed here, assuming %qD" + msgstr "no se permite aquí el alias del espacio de nombres %qD, se asume que es %qD" + +-#: cp/name-lookup.c:3882 ++#: cp/name-lookup.c:3887 + #, gcc-internal-format + msgid "strong using only meaningful at namespace scope" + msgstr "el uso de strong solamente tiene significado en el ámbito de espacio de nombres" + +-#: cp/name-lookup.c:3886 ++#: cp/name-lookup.c:3891 + #, gcc-internal-format + msgid "current namespace %qD does not enclose strongly used namespace %qD" + msgstr "el espacio de nombres actual %qD no contiene al espacio de nombres %qD usado con frecuencia" + +-#: cp/name-lookup.c:4224 ++#: cp/name-lookup.c:4229 + #, gcc-internal-format + msgid "maximum limit of %d namespaces searched for %qE" + msgstr "límite máximo de %d espacios de nombres buscados para %qE" + +-#: cp/name-lookup.c:4234 ++#: cp/name-lookup.c:4239 + #, gcc-internal-format + msgid "suggested alternative:" + msgid_plural "suggested alternatives:" + msgstr[0] "alternativa sugerida:" + msgstr[1] "alternativas sugeridas:" + +-#: cp/name-lookup.c:4238 ++#: cp/name-lookup.c:4243 + #, gcc-internal-format + msgid " %qE" + msgstr " %qE" + +-#: cp/name-lookup.c:5494 ++#: cp/name-lookup.c:5499 + #, gcc-internal-format + msgid "argument dependent lookup finds %q+D" + msgstr "la búsqueda dependiente del argumento encuentra %q+D" + +-#: cp/name-lookup.c:5990 ++#: cp/name-lookup.c:5995 + #, gcc-internal-format + msgid "XXX entering pop_everything ()\n" + msgstr "XXX entrando a pop_everything ()\n" + +-#: cp/name-lookup.c:5999 ++#: cp/name-lookup.c:6004 + #, gcc-internal-format + msgid "XXX leaving pop_everything ()\n" + msgstr "XXX saliendo de pop_everything ()\n" +@@ -30706,7 +30701,7 @@ + msgid "floating-point literal cannot appear in a constant-expression" + msgstr "una literal de coma flotante no puede aparecer en una expresión constante" + +-#: cp/parser.c:2645 cp/pt.c:13536 ++#: cp/parser.c:2645 cp/pt.c:13562 + #, gcc-internal-format + msgid "a cast to a type other than an integral or enumeration type cannot appear in a constant-expression" + msgstr "una conversión a un tipo diferente de un tipo integral o de enumeración no puede aparecer en una expresión constante" +@@ -30934,7 +30929,7 @@ + msgid "literal operator suffixes not preceded by %<_%> are reserved for future standardization" + msgstr "los sufijos de operador literal que no están precedidos por %<_%> están reservados para estandarización futura" + +-#: cp/parser.c:4841 cp/parser.c:16238 ++#: cp/parser.c:4841 cp/parser.c:16241 + #, gcc-internal-format + msgid "expected unqualified-id" + msgstr "se esperaba un id sin calificar" +@@ -31126,7 +31121,7 @@ + msgid "compound-statement in constexpr function" + msgstr "declaración compuesta en una función constexpr" + +-#: cp/parser.c:9160 cp/parser.c:22274 ++#: cp/parser.c:9160 cp/parser.c:22269 + #, gcc-internal-format + msgid "expected selection-statement" + msgstr "se esperaba una declaración de selección" +@@ -31156,7 +31151,7 @@ + msgid "inconsistent begin/end types in range-based % statement: %qT and %qT" + msgstr "tipos begin/end inconsistentes para la declaración % basada en rango: %qT y %qT" + +-#: cp/parser.c:9749 cp/parser.c:22277 ++#: cp/parser.c:9749 cp/parser.c:22272 + #, gcc-internal-format + msgid "expected iteration-statement" + msgstr "se esperaba una declaración de iteración" +@@ -31172,12 +31167,12 @@ + msgid "ISO C++ forbids computed gotos" + msgstr "ISO C++ prohíbe los gotos calculados" + +-#: cp/parser.c:9931 cp/parser.c:22280 ++#: cp/parser.c:9931 cp/parser.c:22275 + #, gcc-internal-format + msgid "expected jump-statement" + msgstr "se esperaba una declaración de salto" + +-#: cp/parser.c:10063 cp/parser.c:18871 ++#: cp/parser.c:10063 cp/parser.c:18866 + #, gcc-internal-format + msgid "extra %<;%>" + msgstr "<;%> extra" +@@ -31214,7 +31209,7 @@ + msgid "class definition may not be declared a friend" + msgstr "la definición de clase no se puede declarar como friend" + +-#: cp/parser.c:10847 cp/parser.c:19243 ++#: cp/parser.c:10847 cp/parser.c:19238 + #, gcc-internal-format + msgid "templates may not be %" + msgstr "las plantillas no pueden ser %" +@@ -31290,12 +31285,12 @@ + msgid "keyword % not implemented, and will be ignored" + msgstr "no se admite la palabra clave %, y se descartará" + +-#: cp/parser.c:12115 cp/parser.c:12213 cp/parser.c:12320 cp/parser.c:17340 ++#: cp/parser.c:12115 cp/parser.c:12213 cp/parser.c:12320 cp/parser.c:17343 + #, gcc-internal-format + msgid "template parameter pack %qD cannot have a default argument" + msgstr "el paquete de parámetros plantilla %qD no puede tener un argumento por defecto" + +-#: cp/parser.c:12119 cp/parser.c:17348 ++#: cp/parser.c:12119 cp/parser.c:17351 + #, gcc-internal-format + msgid "template parameter pack cannot have a default argument" + msgstr "el paquete de parámetros plantilla no puede tener un argumento por defecto" +@@ -31310,7 +31305,7 @@ + msgid "expected template-id" + msgstr "se esperaba un id de plantilla" + +-#: cp/parser.c:12453 cp/parser.c:22238 ++#: cp/parser.c:12453 cp/parser.c:22233 + #, gcc-internal-format + msgid "expected %<<%>" + msgstr "se esperaba %<<%>" +@@ -31437,12 +31432,12 @@ + msgid "cannot add an enumerator list to a template instantiation" + msgstr "no se puede agregar una lista de enumerador a una instanciación de plantilla" + +-#: cp/parser.c:14493 cp/parser.c:18444 ++#: cp/parser.c:14493 cp/parser.c:18431 + #, gcc-internal-format + msgid "declaration of %qD in namespace %qD which does not enclose %qD" + msgstr "la declaración de %qD en el espacio de nombres %qD el cual no incluye a %qD" + +-#: cp/parser.c:14498 cp/parser.c:18449 ++#: cp/parser.c:14498 cp/parser.c:18436 + #, gcc-internal-format + msgid "declaration of %qD in %qD which does not enclose %qD" + msgstr "la declaración de %qD en %qD la cual no incluye a %qD" +@@ -31487,73 +31482,73 @@ + msgid "access declarations are deprecated in favour of using-declarations; suggestion: add the % keyword" + msgstr "las declaraciones access son obsoletas en favor de las declaraciones using: sugerencia: use la palabra clave %" + +-#: cp/parser.c:15094 ++#: cp/parser.c:15097 + #, gcc-internal-format + msgid "types may not be defined in alias template declarations" + msgstr "no se pueden definir tipos en declaraciones de plantilla alias" + +-#: cp/parser.c:15541 ++#: cp/parser.c:15544 + #, gcc-internal-format + msgid "a function-definition is not allowed here" + msgstr "una definición de función no se permite aquí" + +-#: cp/parser.c:15553 ++#: cp/parser.c:15556 + #, gcc-internal-format + msgid "an asm-specification is not allowed on a function-definition" + msgstr "no se permite una especificación-asm en una definición-de-función" + +-#: cp/parser.c:15557 ++#: cp/parser.c:15560 + #, gcc-internal-format + msgid "attributes are not allowed on a function-definition" + msgstr "no se permiten atributos en una definición-de-función" + +-#: cp/parser.c:15594 ++#: cp/parser.c:15597 + #, gcc-internal-format + msgid "expected constructor, destructor, or type conversion" + msgstr "se esperaba un constructor, un destructor, o una conversión de tipo" + + #. Anything else is an error. +-#: cp/parser.c:15629 cp/parser.c:17509 ++#: cp/parser.c:15632 cp/parser.c:17512 + #, gcc-internal-format + msgid "expected initializer" + msgstr "se esperaba un inicializador" + +-#: cp/parser.c:15649 ++#: cp/parser.c:15652 + #, gcc-internal-format + msgid "invalid type in declaration" + msgstr "tipo inválido en la declaración" + +-#: cp/parser.c:15725 ++#: cp/parser.c:15728 + #, gcc-internal-format + msgid "initializer provided for function" + msgstr "se proporcionó un inicializador para la función" + +-#: cp/parser.c:15757 ++#: cp/parser.c:15760 + #, gcc-internal-format + msgid "attributes after parenthesized initializer ignored" + msgstr "se descartan los atributos después del inicializador entre paréntesis" + +-#: cp/parser.c:16161 ++#: cp/parser.c:16164 + #, gcc-internal-format + msgid "array bound is not an integer constant" + msgstr "el límite de la matriz no es una constante entera" + +-#: cp/parser.c:16282 ++#: cp/parser.c:16285 + #, gcc-internal-format + msgid "cannot define member of dependent typedef %qT" + msgstr "no se puede definir el miembro de la definición de tipo dependiente %qT" + +-#: cp/parser.c:16286 ++#: cp/parser.c:16289 + #, gcc-internal-format + msgid "%<%T::%E%> is not a type" + msgstr "%<%T::%E%> no es un tipo" + +-#: cp/parser.c:16314 ++#: cp/parser.c:16317 + #, gcc-internal-format + msgid "invalid use of constructor as a template" + msgstr "uso inválido del constructor como una plantilla" + +-#: cp/parser.c:16316 ++#: cp/parser.c:16319 + #, gcc-internal-format + msgid "use %<%T::%D%> instead of %<%T::%D%> to name the constructor in a qualified name" + msgstr "use %<%T::%D%> en lugar de %<%T::%D%> para nombrar el constructor en un nombre calificado" +@@ -31562,247 +31557,247 @@ + #. here because we do not have enough + #. information about its original syntactic + #. form. +-#: cp/parser.c:16333 ++#: cp/parser.c:16336 + #, gcc-internal-format + msgid "invalid declarator" + msgstr "declarador inválido" + +-#: cp/parser.c:16399 ++#: cp/parser.c:16402 + #, gcc-internal-format + msgid "expected declarator" + msgstr "se esperaba un declarador" + +-#: cp/parser.c:16494 ++#: cp/parser.c:16497 + #, gcc-internal-format + msgid "%qD is a namespace" + msgstr "%qD es un espacio de nombres" + +-#: cp/parser.c:16496 ++#: cp/parser.c:16499 + #, gcc-internal-format + msgid "cannot form pointer to member of non-class %q#T" + msgstr "no se puede formar un puntero al miembro de %q#T que no es clase" + +-#: cp/parser.c:16513 ++#: cp/parser.c:16516 + #, gcc-internal-format + msgid "expected ptr-operator" + msgstr "se esperaba un operador puntero" + +-#: cp/parser.c:16572 ++#: cp/parser.c:16575 + #, gcc-internal-format + msgid "duplicate cv-qualifier" + msgstr "calificador-cv duplicado" + +-#: cp/parser.c:16630 ++#: cp/parser.c:16633 + #, gcc-internal-format + msgid "duplicate virt-specifier" + msgstr "especificador-virt duplicado" + +-#: cp/parser.c:16792 cp/typeck2.c:450 cp/typeck2.c:1670 ++#: cp/parser.c:16795 cp/typeck2.c:450 cp/typeck2.c:1673 + #, gcc-internal-format + msgid "invalid use of %" + msgstr "uso inválido de %" + +-#: cp/parser.c:16811 ++#: cp/parser.c:16814 + #, gcc-internal-format + msgid "types may not be defined in template arguments" + msgstr "no se pueden definir tipos en argumentos de plantilla" + +-#: cp/parser.c:16892 ++#: cp/parser.c:16895 + #, gcc-internal-format + msgid "expected type-specifier" + msgstr "se esperaba un especificador de tipo" + +-#: cp/parser.c:17136 ++#: cp/parser.c:17139 + #, gcc-internal-format + msgid "expected %<,%> or %<...%>" + msgstr "se esperaba %<,%> o %<...%>" + +-#: cp/parser.c:17193 ++#: cp/parser.c:17196 + #, gcc-internal-format + msgid "types may not be defined in parameter types" + msgstr "no se pueden definir tipos en tipos de parámetro" + +-#: cp/parser.c:17319 ++#: cp/parser.c:17322 + #, gcc-internal-format + msgid "deprecated use of default argument for parameter of non-function" + msgstr "uso obsoleto del argumento por defecto para el parámetro de una no función" + +-#: cp/parser.c:17323 ++#: cp/parser.c:17326 + #, gcc-internal-format + msgid "default arguments are only permitted for function parameters" + msgstr "los argumentos por defecto sólo se permiten para parámetros de función" + +-#: cp/parser.c:17342 ++#: cp/parser.c:17345 + #, gcc-internal-format + msgid "parameter pack %qD cannot have a default argument" + msgstr "el paquete de parámetros %qD no puede tener un argumento por defecto" + +-#: cp/parser.c:17350 ++#: cp/parser.c:17353 + #, gcc-internal-format + msgid "parameter pack cannot have a default argument" + msgstr "el paquete de parámetros no puede tener un argumento por defecto" + +-#: cp/parser.c:17637 ++#: cp/parser.c:17640 + #, gcc-internal-format + msgid "ISO C++ does not allow designated initializers" + msgstr "ISO C++ no permite inicializadores designados" + +-#: cp/parser.c:17651 ++#: cp/parser.c:17654 + #, gcc-internal-format + msgid "ISO C++ does not allow C99 designated initializers" + msgstr "ISO C++ no permite inicializadores designados de C99" + +-#: cp/parser.c:17755 cp/parser.c:17879 ++#: cp/parser.c:17758 cp/parser.c:17882 + #, gcc-internal-format + msgid "expected class-name" + msgstr "se esperaba un nombre de clase" + +-#: cp/parser.c:18067 ++#: cp/parser.c:18056 + #, gcc-internal-format + msgid "expected %<;%> after class definition" + msgstr "se esperaba %<;%> después de la definición de clase" + +-#: cp/parser.c:18069 ++#: cp/parser.c:18058 + #, gcc-internal-format + msgid "expected %<;%> after struct definition" + msgstr "se esperaba %<;%> después de la definición de struct" + +-#: cp/parser.c:18071 ++#: cp/parser.c:18060 + #, gcc-internal-format + msgid "expected %<;%> after union definition" + msgstr "se esperaba %<;%> después de la definición de union" + +-#: cp/parser.c:18392 ++#: cp/parser.c:18379 + #, gcc-internal-format + msgid "expected %<{%> or %<:%>" + msgstr "se esperaba %<{%> o %<:%>" + +-#: cp/parser.c:18403 ++#: cp/parser.c:18390 + #, gcc-internal-format + msgid "cannot specify % for a class" + msgstr "no se puede especificar % para una clase" + +-#: cp/parser.c:18411 ++#: cp/parser.c:18398 + #, gcc-internal-format + msgid "global qualification of class name is invalid" + msgstr "la calificación global del nombre de clase es inválida" + +-#: cp/parser.c:18418 ++#: cp/parser.c:18405 + #, gcc-internal-format + msgid "qualified name does not name a class" + msgstr "el nombre calificado no nombra una clase" + +-#: cp/parser.c:18430 ++#: cp/parser.c:18417 + #, gcc-internal-format + msgid "invalid class name in declaration of %qD" + msgstr "nombre de clase inválido en la declaración de %qD" + +-#: cp/parser.c:18463 ++#: cp/parser.c:18450 + #, gcc-internal-format + msgid "extra qualification not allowed" + msgstr "no se permite la calificación extra" + +-#: cp/parser.c:18475 ++#: cp/parser.c:18462 + #, gcc-internal-format + msgid "an explicit specialization must be preceded by %