Index: ChangeLog.tm =================================================================== --- ChangeLog.tm (.../trunk) (revision 0) +++ ChangeLog.tm (.../branches/transactional-memory) (revision 180773) @@ -0,0 +1,89 @@ +2011-11-02 Aldy Hernandez + + * Merge from mainline rev 180744. + +2011-09-14 Aldy Hernandez + + * Merge from mainline rev 178608. + +2010-04-19 Aldy Hernandez + + * libstdc++-v3/testsuite/util/testsuite_abi.cc (check_version): + Add CXXABI_TM_1. + +2010-04-14 Aldy Hernandez + + * Merge from mainline rev 158257. + +2010-03-31 Richard Henderson + + * Makefile.in: Rebuild. + +2010-02-10 Aldy Hernandez + + * Merge from mainline rev 156607. + +2009-11-13 Richard Henderson + + * Makefile.def (lang_env_dependencies): libitm is c++. + * Makefile.in: Rebuild. + +2009-11-03 Richard Henderson + + * config/mmap.m4: New file. + +2009-10-28 Richard Henderson + + * contrib/gcc_update: Add libitm to touch data. + +2009-10-28 Richard Henderson + + * Merge from mainline rev 153678. + +2009-10-14 Richard Henderson + + * Merge from mainline rev 152728. + +2009-10-13 Richard Henderson + + * Merge from mainline rev 152433. + +2009-09-09 Aldy Hernandez + + * Merge from mainline rev 150253:151506. + +2009-07-31 Richard Henderson + + * Merge from mainline rev 150253. + +2009-07-22 Richard Henderson + + * libstdc++-v3/libsupc++/eh_tm.cc: New file. + * libstdc++-v3/libsupc++/unwind-cxx.h (__cxa_tm_cleanup): Declare. + * libstdc++-v3/config/abi/pre/gnu.ver: Export __cxa_tm_cleanup. + * libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver: Likewise. + * libstdc++-v3/libsupc++/Makefile.am (sources): Add eh_tm.cc. + * libstdc++-v3/libsupc++/Makefile.in: Rebuild. + +2009-07-17 Richard Henderson + + * Merge from mainline rev 149731. + +2009-06-26 Richard Henderson + + * Merge from mainline rev 148984. + +2009-06-18 Richard Henderson + + * Merge from mainline rev 148549. + +2008-11-21 Richard Henderson + + * Makefile.def: Add libitm target module. + * configure.ac: Likewise. + * Makefile.in, configure: Rebuild. + +2008-10-27 Richard Henderson + + Merge from mainline rev 141397. + Index: Makefile.def =================================================================== --- Makefile.def (.../trunk) (revision 180744) +++ Makefile.def (.../branches/transactional-memory) (revision 180773) @@ -139,6 +139,7 @@ target_modules = { module= boehm-gc; }; target_modules = { module= rda; }; target_modules = { module= libada; }; target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; }; +target_modules = { module= libitm; lib_path=.libs; }; // These are (some of) the make targets to be done in each subdirectory. // Not all; these are the ones which don't have special options. @@ -470,6 +471,7 @@ dependencies = { module=all-m4; on=all-b // environment (e.g. on libstdc++). By default target modules depend // on libgcc and newlib/libgloss. lang_env_dependencies = { module=libjava; cxx=true; }; +lang_env_dependencies = { module=libitm; cxx=true; }; lang_env_dependencies = { module=newlib; no_c=true; }; lang_env_dependencies = { module=libgloss; no_c=true; }; lang_env_dependencies = { module=libgcc; no_gcc=true; no_c=true; }; Index: configure.ac =================================================================== --- configure.ac (.../trunk) (revision 180744) +++ configure.ac (.../branches/transactional-memory) (revision 180773) @@ -154,6 +154,7 @@ target_libraries="target-libgcc \ target-libgloss \ target-newlib \ target-libgomp \ + target-libitm \ target-libstdc++-v3 \ target-libmudflap \ target-libssp \ @@ -492,6 +493,24 @@ if test x$enable_libgomp = x ; then esac fi +# Disable libitm on non POSIX hosted systems. +if test x$enable_libitm = x ; then + # Enable libitm by default on hosted POSIX systems. + case "${target}" in + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + ;; + *-*-netbsd* | *-*-freebsd* | *-*-openbsd*) + ;; + *-*-solaris2* | *-*-sysv4* | *-*-irix6* | *-*-osf* | *-*-hpux11*) + ;; + *-*-darwin* | *-*-aix*) + ;; + *) + noconfigdirs="$noconfigdirs target-libitm" + ;; + esac +fi + # Disable libssp for some systems. case "${target}" in avr-*-*) Index: configure =================================================================== --- configure (.../trunk) (revision 180744) +++ configure (.../branches/transactional-memory) (revision 180773) @@ -2681,6 +2681,7 @@ target_libraries="target-libgcc \ target-libgloss \ target-newlib \ target-libgomp \ + target-libitm \ target-libstdc++-v3 \ target-libmudflap \ target-libssp \ @@ -3056,6 +3057,24 @@ if test x$enable_libgomp = x ; then esac fi +# Disable libitm on non POSIX hosted systems. +if test x$enable_libitm = x ; then + # Enable libitm by default on hosted POSIX systems. + case "${target}" in + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + ;; + *-*-netbsd* | *-*-freebsd* | *-*-openbsd*) + ;; + *-*-solaris2* | *-*-sysv4* | *-*-irix6* | *-*-osf* | *-*-hpux11*) + ;; + *-*-darwin* | *-*-aix*) + ;; + *) + noconfigdirs="$noconfigdirs target-libitm" + ;; + esac +fi + # Disable libssp for some systems. case "${target}" in avr-*-*)