* config/gthr.m4: New. Define GCC_AC_THREAD_HEADER.
	    * libgcc/configure: Regenerate.
	    * libgcc/configure.ac: Replace code with GCC_AC_THREAD_HEADER use.
	    * libstdc++-v3/Makefile.in: Regenerate.
	    * libstdc++-v3/acinclude.m4: Replace code with GCC_AC_THREAD_HEADER use.
	    * libstdc++-v3/configure: Regenerate.
	    * libstdc++-v3/doc/Makefile.in: Regenerate.
	    * libstdc++-v3/include/Makefile.am: Regenerate.
	    * libstdc++-v3/include/Makefile.in: Rename variable.
	    * libstdc++-v3/libsupc++/Makefile.in: Regenerate.
	    * libstdc++-v3/po/Makefile.in: Regenerate.
	    * libstdc++-v3/python/Makefile.in: Regenerate.
	    * libstdc++-v3/src/Makefile.in: Regenerate.
	    * libstdc++-v3/src/c++11/Makefile.in: Regenerate.
	    * libstdc++-v3/src/c++98/Makefile.in: Regenerate.
	    * libstdc++-v3/testsuite/Makefile.in: Regenerate.
From-SVN: r192458
+2012-10-15  Pavel Chupin  <pavel.v.chupin@intel.com>
+
+       * gthr.m4: New. Define GCC_AC_THREAD_HEADER.
+
 2012-09-19  Steve Ellcey  <sellcey@mips.com>
 
        * mt-sde: Change -mcode-xonly to -mcode-readable=pcrel.
 
--- /dev/null
+dnl Copyright (C) 2012 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl Define header location by thread model
+
+dnl usage: GCC_AC_THREAD_HEADER([thread_model])
+AC_DEFUN([GCC_AC_THREAD_HEADER],
+[
+case $1 in
+    aix)       thread_header=config/rs6000/gthr-aix.h ;;
+    dce)       thread_header=config/pa/gthr-dce.h ;;
+    lynx)      thread_header=config/gthr-lynx.h ;;
+    mipssde)   thread_header=config/mips/gthr-mipssde.h ;;
+    posix)     thread_header=gthr-posix.h ;;
+    rtems)     thread_header=config/gthr-rtems.h ;;
+    single)    thread_header=gthr-single.h ;;
+    tpf)       thread_header=config/s390/gthr-tpf.h ;;
+    vxworks)   thread_header=config/gthr-vxworks.h ;;
+    win32)     thread_header=config/i386/gthr-win32.h ;;
+esac
+AC_SUBST(thread_header)
+])
+
 
+2012-10-15  Pavel Chupin  <pavel.v.chupin@intel.com>
+
+       * configure: Regenerate.
+       * configure.ac: Replace code with GCC_AC_THREAD_HEADER use.
+
 2012-10-10  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/sfp-exceptions.c (__sfp_handle_exceptions): Emit SSE
 
 asm_hidden_op
 extra_parts
 cpu_type
+thread_header
 tm_defines
 tm_file
 tmake_file
 
 
 # Map from thread model to thread header.
+
 case $target_thread_file in
     aix)       thread_header=config/rs6000/gthr-aix.h ;;
     dce)       thread_header=config/pa/gthr-dce.h ;;
     win32)     thread_header=config/i386/gthr-win32.h ;;
 esac
 
+
+
 # Substitute configuration variables
 
 
 
 sinclude(../config/picflag.m4)
 sinclude(../config/dfp.m4)
 sinclude(../config/unwind_ipinfo.m4)
+sinclude(../config/gthr.m4)
 
 AC_PREREQ(2.64)
 AC_INIT([GNU C Runtime Library], 1.0,,[libgcc])
 AC_SUBST(tm_defines)
 
 # Map from thread model to thread header.
-case $target_thread_file in
-    aix)       thread_header=config/rs6000/gthr-aix.h ;;
-    dce)       thread_header=config/pa/gthr-dce.h ;;
-    lynx)      thread_header=config/gthr-lynx.h ;;
-    mipssde)   thread_header=config/mips/gthr-mipssde.h ;;
-    posix)     thread_header=gthr-posix.h ;;
-    rtems)     thread_header=config/gthr-rtems.h ;;
-    single)    thread_header=gthr-single.h ;;
-    tpf)       thread_header=config/s390/gthr-tpf.h ;;
-    vxworks)   thread_header=config/gthr-vxworks.h ;;
-    win32)     thread_header=config/i386/gthr-win32.h ;;
-esac
+GCC_AC_THREAD_HEADER([$target_thread_file])
 
 # Substitute configuration variables
 AC_SUBST(cpu_type)
 
+2012-10-15  Pavel Chupin  <pavel.v.chupin@intel.com>
+
+       * Makefile.in: Regenerate.
+       * acinclude.m4: Replace code with GCC_AC_THREAD_HEADER use.
+       * configure: Regenerate.
+       * doc/Makefile.in: Regenerate.
+       * include/Makefile.am: Regenerate.
+       * include/Makefile.in: Rename variable.
+       * libsupc++/Makefile.in: Regenerate.
+       * po/Makefile.in: Regenerate.
+       * python/Makefile.in: Regenerate.
+       * src/Makefile.in: Regenerate.
+       * src/c++11/Makefile.in: Regenerate.
+       * src/c++98/Makefile.in: Regenerate.
+       * testsuite/Makefile.in: Regenerate.
+
 2012-10-14  Jason Merrill  <jason@redhat.com>
 
        PR target/54908
 
        $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/crossconfig.m4 \
        $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/../config/gc++filt.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+thread_header = @thread_header@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 dnl namespace are complex and fragile enough as it is).  We must also
 dnl add a relative path so that -I- is supported properly.
 dnl
+dnl Substs:
+dnl  thread_header
+dnl
 AC_DEFUN([GLIBCXX_ENABLE_THREADS], [
   AC_MSG_CHECKING([for thread model used by GCC])
   target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'`
   AC_MSG_RESULT([$target_thread_file])
+  GCC_AC_THREAD_HEADER([$target_thread_file])
 ])
 
 
 # Macros from the top-level gcc directory.
 m4_include([../config/gc++filt.m4])
 m4_include([../config/tls.m4])
+m4_include([../config/gthr.m4])
 
 CSTDIO_H
 SECTION_FLAGS
 WERROR
+thread_header
 glibcxx_PCHFLAGS
 GLIBCXX_BUILD_PCH_FALSE
 GLIBCXX_BUILD_PCH_TRUE
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11515 "configure"
+#line 11516 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11621 "configure"
+#line 11622 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
     #
     # Fake what AC_TRY_COMPILE does.  XXX Look at redoing this new-style.
     cat > conftest.$ac_ext << EOF
-#line 15035 "configure"
+#line 15036 "configure"
 struct S { ~S(); };
 void bar();
 void foo()
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $target_thread_file" >&5
 $as_echo "$target_thread_file" >&6; }
 
+case $target_thread_file in
+    aix)       thread_header=config/rs6000/gthr-aix.h ;;
+    dce)       thread_header=config/pa/gthr-dce.h ;;
+    lynx)      thread_header=config/gthr-lynx.h ;;
+    mipssde)   thread_header=config/mips/gthr-mipssde.h ;;
+    posix)     thread_header=gthr-posix.h ;;
+    rtems)     thread_header=config/gthr-rtems.h ;;
+    single)    thread_header=gthr-single.h ;;
+    tpf)       thread_header=config/s390/gthr-tpf.h ;;
+    vxworks)   thread_header=config/gthr-vxworks.h ;;
+    win32)     thread_header=config/i386/gthr-win32.h ;;
+esac
+
+
+
 
 
   ac_ext=cpp
   # Fake what AC_TRY_COMPILE does.
 
     cat > conftest.$ac_ext << EOF
-#line 15370 "configure"
+#line 15386 "configure"
 int main()
 {
   typedef bool atomic_type;
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15405 "configure"
+#line 15421 "configure"
 int main()
 {
   typedef short atomic_type;
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15440 "configure"
+#line 15456 "configure"
 int main()
 {
   // NB: _Atomic_word not necessarily int.
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15476 "configure"
+#line 15492 "configure"
 int main()
 {
   typedef long long atomic_type;
   # unnecessary for this test.
 
     cat > conftest.$ac_ext << EOF
-#line 15555 "configure"
+#line 15571 "configure"
 int main()
 {
   _Decimal32 d1;
   # unnecessary for this test.
 
     cat > conftest.$ac_ext << EOF
-#line 15597 "configure"
+#line 15613 "configure"
 template<typename T1, typename T2>
   struct same
   { typedef T2 type; };
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15631 "configure"
+#line 15647 "configure"
 template<typename T1, typename T2>
   struct same
   { typedef T2 type; };
 
        $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/crossconfig.m4 \
        $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/../config/gc++filt.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+thread_header = @thread_header@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
            -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \
            < $< > $@
 
-${host_builddir}/gthr-default.h: ${toplevel_builddir}/libgcc/gthr-default.h \
+${host_builddir}/gthr-default.h: ${toplevel_srcdir}/libgcc/${thread_header} \
                                   stamp-${host_alias}
        sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
            -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
 
        $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/crossconfig.m4 \
        $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/../config/gc++filt.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+thread_header = @thread_header@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
            -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \
            < $< > $@
 
-${host_builddir}/gthr-default.h: ${toplevel_builddir}/libgcc/gthr-default.h \
+${host_builddir}/gthr-default.h: ${toplevel_srcdir}/libgcc/${thread_header} \
                                   stamp-${host_alias}
        sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
            -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
 
        $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/crossconfig.m4 \
        $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/../config/gc++filt.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
        "$(DESTDIR)$(stddir)"
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES)
 libsupc___la_LIBADD =
-am__objects_1 = array_type_info.lo atexit_arm.lo atexit_thread.lo bad_alloc.lo \
-       bad_cast.lo bad_typeid.lo class_type_info.lo del_op.lo \
-       del_opnt.lo del_opv.lo del_opvnt.lo dyncast.lo eh_alloc.lo \
-       eh_arm.lo eh_aux_runtime.lo eh_call.lo eh_catch.lo \
+am__objects_1 = array_type_info.lo atexit_arm.lo atexit_thread.lo \
+       bad_alloc.lo bad_cast.lo bad_typeid.lo class_type_info.lo \
+       del_op.lo del_opnt.lo del_opv.lo del_opvnt.lo dyncast.lo \
+       eh_alloc.lo eh_arm.lo eh_aux_runtime.lo eh_call.lo eh_catch.lo \
        eh_exception.lo eh_globals.lo eh_personality.lo eh_ptr.lo \
        eh_term_handler.lo eh_terminate.lo eh_tm.lo eh_throw.lo \
        eh_type.lo eh_unex_handler.lo enum_type_info.lo \
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+thread_header = @thread_header@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
        $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/crossconfig.m4 \
        $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/../config/gc++filt.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+thread_header = @thread_header@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
        $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/crossconfig.m4 \
        $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/../config/gc++filt.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+thread_header = @thread_header@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
        $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/crossconfig.m4 \
        $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/../config/gc++filt.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+thread_header = @thread_header@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
        $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/crossconfig.m4 \
        $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/../config/gc++filt.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+thread_header = @thread_header@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
        $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/crossconfig.m4 \
        $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/../config/gc++filt.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+thread_header = @thread_header@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
        $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/crossconfig.m4 \
        $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/../config/gc++filt.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+thread_header = @thread_header@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@