[tbb] 01/01: Import Debian changes 2017~U7-1~exp1

Steven Capper capper-guest at moszumanska.debian.org
Sun Jul 23 11:42:19 UTC 2017


This is an automated email from the git hooks/post-receive script.

capper-guest pushed a commit to annotated tag debian/2017_U7-1_exp1
in repository tbb.

commit c44172e5ab21b0b9363aefb4be7d8919d4e0ef53
Merge: 95da3e7 1713448
Author: Steve Capper <steven.capper at gmail.com>
Date:   Sat Jul 8 10:45:31 2017 +0100

    Import Debian changes 2017~U7-1~exp1
    
    tbb (2017~U7-1~exp1) experimental; urgency=medium
    
      * Upgrade to latest upstream version of TBB.
        + This now builds with gcc 7. Targets: #853679
        + This supports s390x. Targets: #809663
      * Update copyright file to Apache 2.0 to match new upstream version.
      * Fix -march logic in i386 building. Targets: #855088
      * Fix watch file to point to new upstream on github. Targets: #866678

 .gitattributes                                     |    45 +
 .gitignore                                         |    86 +
 CHANGES                                            |   476 +-
 COPYING                                            |   353 -
 LICENSE                                            |   201 +
 Makefile                                           |    34 +-
 README.md                                          |    30 +
 build/AIX.gcc.inc                                  |    30 +-
 build/AIX.inc                                      |    30 +-
 build/FreeBSD.clang.inc                            |    44 +-
 build/FreeBSD.gcc.inc                              |    37 +-
 build/FreeBSD.inc                                  |    38 +-
 build/Makefile.rml                                 |    42 +-
 build/Makefile.tbb                                 |    40 +-
 build/Makefile.tbbmalloc                           |    44 +-
 build/Makefile.tbbproxy                            |    36 +-
 build/Makefile.test                                |    76 +-
 build/SunOS.gcc.inc                                |    32 +-
 build/SunOS.inc                                    |    30 +-
 build/SunOS.suncc.inc                              |    32 +-
 build/android.clang.inc                            |   118 +
 build/android.gcc.inc                              |    62 +-
 build/android.icc.inc                              |   120 +
 build/android.inc                                  |    67 +-
 build/android.linux.inc                            |    39 +-
 build/android.linux.launcher.sh                    |    41 +-
 build/android.macos.inc                            |    39 +-
 build/android.windows.inc                          |    39 +-
 build/big_iron.inc                                 |    30 +-
 build/common.inc                                   |    63 +-
 build/common_rules.inc                             |    38 +-
 build/detect.js                                    |   331 +-
 build/generate_tbbvars.bat                         |    42 +-
 build/generate_tbbvars.sh                          |    40 +-
 build/index.html                                   |   132 +-
 build/ios.clang.inc                                |    23 +
 build/ios.macos.inc                                |    36 +
 build/linux.clang.inc                              |    43 +-
 build/linux.gcc.inc                                |    60 +-
 build/linux.icc.inc                                |    55 +-
 build/linux.inc                                    |    52 +-
 build/linux.pathcc.inc                             |    35 +-
 build/linux.xl.inc                                 |    30 +-
 build/macos.clang.inc                              |    51 +-
 build/macos.gcc.inc                                |    30 +-
 build/macos.icc.inc                                |    62 +-
 build/macos.inc                                    |    66 +-
 build/mic.icc.inc                                  |    56 +-
 build/mic.linux.inc                                |    30 +-
 build/mic.linux.launcher.sh                        |    40 +-
 build/mic.offload.inc                              |    53 +-
 build/test_launcher.bat                            |    30 +-
 build/test_launcher.sh                             |    37 +-
 build/version_info_aix.sh                          |    34 +-
 build/version_info_android.sh                      |    36 +-
 build/version_info_linux.sh                        |    34 +-
 build/version_info_macos.sh                        |    34 +-
 build/version_info_sunos.sh                        |    34 +-
 build/version_info_windows.js                      |    77 +-
 build/vs2010/index.html                            |    30 -
 build/vs2010/makefile.sln                          |    78 -
 build/vs2010/tbb.vcxproj                           |   712 -
 build/vs2010/tbbmalloc.vcxproj                     |   584 -
 build/vs2010/tbbmalloc_proxy.vcxproj               |   421 -
 build/vs2012/index.html                            |    30 +
 build/vs2012/makefile.sln                          |    78 +
 build/vs2012/tbb.vcxproj                           |   696 +
 build/vs2012/tbbmalloc.vcxproj                     |   558 +
 build/vs2012/tbbmalloc_proxy.vcxproj               |   425 +
 build/{vs2010 => vs2012}/version_string.ver        |     0
 build/windows.cl.inc                               |    53 +-
 build/windows.gcc.inc                              |    46 +-
 build/windows.icl.inc                              |    48 +-
 build/windows.inc                                  |    34 +-
 build/xbox360.cl.inc                               |    85 -
 build/xbox360.inc                                  |    72 -
 cmake/README.rst                                   |   285 +
 cmake/TBBBuild.cmake                               |   197 +
 cmake/TBBGet.cmake                                 |   298 +
 cmake/TBBMakeConfig.cmake                          |   162 +
 cmake/templates/TBBConfig.cmake.in                 |    89 +
 cmake/templates/TBBConfigForSource.cmake.in        |    82 +
 cmake/templates/TBBConfigVersion.cmake.in          |    28 +
 debian/changelog                                   |    11 +
 debian/control                                     |     6 +-
 debian/copyright                                   |    40 +-
 debian/patches/adddebug.patch                      |    19 +-
 debian/patches/buildi386.patch                     |    22 +-
 debian/patches/failonbadtests.patch                |     6 +-
 debian/patches/fixnonlinux.patch                   |    22 +-
 debian/patches/gcc-atomic-always.patch             |     8 +-
 debian/patches/gcc-atomic-detection.patch          |    18 +-
 debian/patches/removejsquery.patch                 |    36 +
 debian/patches/series                              |     3 +-
 debian/patches/tweak-64bits-s390-hppa.patch        |    10 +-
 debian/watch                                       |     8 +-
 doc/Release_Notes.txt                              |   143 +-
 doc/html/a00001.html                               |     4 +-
 doc/html/a00002.html                               |    29 +-
 doc/html/a00003.html                               |    20 +-
 doc/html/a00004.html                               |    22 +-
 doc/html/a00005.html                               |    24 +-
 doc/html/a00006.html                               |    24 +-
 doc/html/a00007.html                               |    22 +-
 doc/html/a00008.html                               |    37 +-
 doc/html/a00009.html                               |   102 +-
 doc/html/{a00010.png => a00009.png}                |   Bin
 doc/html/a00010.html                               |    96 +-
 doc/html/a00011.html                               |    79 +-
 doc/html/{a00012.png => a00011.png}                |   Bin
 doc/html/a00012.html                               |    92 +-
 doc/html/a00012.png                                |   Bin 1067 -> 843 bytes
 doc/html/a00013.html                               |   110 +-
 doc/html/a00013.png                                |   Bin 843 -> 1567 bytes
 doc/html/a00014.html                               |    97 +-
 doc/html/a00014.png                                |   Bin 1567 -> 0 bytes
 doc/html/a00015.html                               |    51 +-
 doc/html/{a00018.png => a00015.png}                |   Bin
 doc/html/a00016.html                               |    57 +-
 doc/html/a00016.png                                |   Bin 1259 -> 688 bytes
 doc/html/a00017.html                               |   153 +-
 doc/html/a00017.png                                |   Bin 3777 -> 0 bytes
 doc/html/a00018.html                               |    42 +-
 doc/html/a00018.png                                |   Bin 595 -> 490 bytes
 doc/html/a00019.html                               |    44 +-
 doc/html/a00019.png                                |   Bin 688 -> 0 bytes
 doc/html/a00020.html                               |    43 +-
 doc/html/a00020.png                                |   Bin 490 -> 2213 bytes
 doc/html/a00021.html                               |    54 +-
 doc/html/{a00023.png => a00021.png}                |   Bin
 doc/html/a00022.html                               |   293 +-
 doc/html/a00022.png                                |   Bin 2213 -> 0 bytes
 doc/html/a00023.html                               |   114 +-
 doc/html/a00024.html                               |   318 +-
 doc/html/a00025.html                               |    80 +-
 doc/html/a00026.html                               |   103 +-
 doc/html/{a00029.png => a00026.png}                |   Bin
 doc/html/a00027.html                               |   103 +-
 doc/html/a00028.html                               |   262 +-
 doc/html/a00028.png                                |   Bin 1875 -> 0 bytes
 doc/html/a00029.html                               |    58 +-
 doc/html/a00030.html                               |   574 +-
 doc/html/a00030.png                                |   Bin 5237 -> 1101 bytes
 doc/html/a00031.html                               |    54 +-
 doc/html/a00031.png                                |   Bin 1158 -> 1102 bytes
 doc/html/a00032.html                               |   239 +-
 doc/html/{a00035.png => a00032.png}                |   Bin
 doc/html/a00033.html                               |    80 +-
 doc/html/a00034.html                               |    32 +-
 doc/html/a00035.html                               |   361 +-
 doc/html/a00035.png                                |   Bin 835 -> 766 bytes
 doc/html/a00036.html                               |  1071 +-
 doc/html/{a00043.png => a00036.png}                |   Bin
 doc/html/a00037.html                               |    46 +-
 doc/html/{a00044.png => a00037.png}                |   Bin
 doc/html/a00038.html                               |   631 +-
 doc/html/a00038.png                                |   Bin 1890 -> 0 bytes
 doc/html/a00039.html                               |   232 +-
 doc/html/a00039.png                                |   Bin 1634 -> 872 bytes
 doc/html/a00040.html                               |   175 +-
 doc/html/a00040.png                                |   Bin 1636 -> 2163 bytes
 doc/html/a00041.html                               |    55 +-
 doc/html/a00042.html                               |   437 +-
 doc/html/a00042.png                                |   Bin 766 -> 2174 bytes
 doc/html/a00043.html                               |  1111 +-
 doc/html/a00043.png                                |   Bin 1052 -> 2109 bytes
 doc/html/a00044.html                               |   118 +-
 doc/html/a00044.png                                |   Bin 1068 -> 2095 bytes
 doc/html/a00045.html                               |   596 +-
 doc/html/a00046.html                               |   834 +-
 doc/html/a00046.png                                |   Bin 872 -> 1057 bytes
 doc/html/a00047.html                               |   179 +-
 doc/html/a00047.png                                |   Bin 2163 -> 1888 bytes
 doc/html/a00048.html                               |    70 +-
 doc/html/a00049.html                               |   355 +-
 doc/html/a00049.png                                |   Bin 2174 -> 1525 bytes
 doc/html/a00050.html                               |   134 +-
 doc/html/a00050.png                                |   Bin 2109 -> 621 bytes
 doc/html/a00051.html                               |   144 +-
 doc/html/a00051.png                                |   Bin 2095 -> 1262 bytes
 doc/html/a00052.html                               |    63 +-
 doc/html/a00053.html                               |   805 +-
 doc/html/a00053.png                                |   Bin 1057 -> 1009 bytes
 doc/html/a00054.html                               |    98 +-
 doc/html/a00054.png                                |   Bin 1888 -> 0 bytes
 doc/html/a00055.html                               |    29 +-
 doc/html/a00056.html                               |   150 +-
 doc/html/a00056.png                                |   Bin 2359 -> 0 bytes
 doc/html/a00057.html                               |   241 +-
 doc/html/a00057.png                                |   Bin 1010 -> 1053 bytes
 doc/html/a00058.html                               |   235 +-
 doc/html/a00058.png                                |   Bin 621 -> 1259 bytes
 doc/html/a00059.html                               |   132 +-
 doc/html/{a00062.png => a00059.png}                |   Bin
 doc/html/a00060.html                               |    72 +-
 doc/html/a00060.png                                |   Bin 1053 -> 0 bytes
 doc/html/a00061.html                               |   206 +-
 doc/html/a00061.png                                |   Bin 1259 -> 0 bytes
 doc/html/a00062.html                               |   107 +-
 doc/html/a00062.png                                |   Bin 757 -> 574 bytes
 doc/html/a00063.html                               |   115 +-
 doc/html/a00064.html                               |    40 +-
 doc/html/a00065.html                               |    48 +-
 doc/html/a00065.png                                |   Bin 574 -> 839 bytes
 doc/html/a00066.html                               |   106 +-
 doc/html/a00067.html                               |    69 +-
 doc/html/a00068.html                               |   137 +-
 doc/html/a00068.png                                |   Bin 2810 -> 0 bytes
 doc/html/a00069.html                               |    57 +-
 doc/html/a00069.png                                |   Bin 0 -> 1045 bytes
 doc/html/a00070.html                               |   337 +-
 doc/html/a00070.png                                |   Bin 596 -> 0 bytes
 doc/html/a00071.html                               |   100 +-
 doc/html/{a00074.png => a00071.png}                |   Bin
 doc/html/a00072.html                               |   110 +-
 doc/html/a00072.png                                |   Bin 14405 -> 0 bytes
 doc/html/a00073.html                               |    68 +-
 doc/html/{a00086.png => a00073.png}                |   Bin
 doc/html/a00074.html                               |    45 +-
 doc/html/a00074.png                                |   Bin 495 -> 952 bytes
 doc/html/a00075.html                               |    52 +-
 doc/html/a00075.png                                |   Bin 1382 -> 0 bytes
 doc/html/a00076.html                               |    63 +-
 doc/html/a00076.png                                |   Bin 995 -> 671 bytes
 doc/html/a00077.html                               |   153 +-
 doc/html/a00077.png                                |   Bin 1042 -> 0 bytes
 doc/html/a00078.html                               |   104 +-
 doc/html/a00078.png                                |   Bin 1119 -> 0 bytes
 doc/html/a00079.html                               |    74 +-
 doc/html/a00079.png                                |   Bin 1168 -> 0 bytes
 doc/html/a00080.html                               |    55 +-
 doc/html/a00080.png                                |   Bin 1214 -> 489 bytes
 doc/html/a00081.html                               |   204 +-
 doc/html/a00081.png                                |   Bin 1263 -> 960 bytes
 doc/html/a00082.html                               |   140 +-
 doc/html/a00082.png                                |   Bin 1307 -> 680 bytes
 doc/html/a00083.html                               |    82 +-
 doc/html/a00083.png                                |   Bin 1330 -> 1052 bytes
 doc/html/a00084.html                               |    75 +-
 doc/html/a00084.png                                |   Bin 1358 -> 704 bytes
 doc/html/a00085.html                               |    86 +-
 doc/html/{a00102.png => a00085.png}                |   Bin
 doc/html/a00086.html                               |    37 +-
 doc/html/a00087.html                               |   100 +-
 doc/html/a00087.png                                |   Bin 0 -> 1152 bytes
 doc/html/a00088.html                               |   104 +-
 doc/html/a00088.png                                |   Bin 1710 -> 1136 bytes
 doc/html/a00089.html                               |   154 +-
 doc/html/a00089.png                                |   Bin 1729 -> 0 bytes
 doc/html/a00090.html                               |   107 +-
 doc/html/a00090.png                                |   Bin 1762 -> 0 bytes
 doc/html/a00091.html                               |   343 +-
 doc/html/a00091.png                                |   Bin 1877 -> 0 bytes
 doc/html/a00092.html                               |    51 +-
 doc/html/a00092.png                                |   Bin 671 -> 696 bytes
 doc/html/a00093.html                               |   173 +-
 doc/html/a00093.png                                |   Bin 0 -> 644 bytes
 doc/html/a00094.html                               |   127 +-
 doc/html/a00094.png                                |   Bin 0 -> 1132 bytes
 doc/html/a00095.html                               |    54 +-
 doc/html/a00096.html                               |    45 +-
 doc/html/a00096.png                                |   Bin 489 -> 1396 bytes
 doc/html/a00097.html                               |   192 +-
 doc/html/a00097.png                                |   Bin 960 -> 1388 bytes
 doc/html/a00098.html                               |   116 +-
 doc/html/a00098.png                                |   Bin 3820 -> 1267 bytes
 doc/html/a00099.html                               |   151 +-
 doc/html/a00099.png                                |   Bin 680 -> 854 bytes
 doc/html/a00100.html                               |    78 +-
 doc/html/a00100.png                                |   Bin 1052 -> 0 bytes
 doc/html/a00101.html                               |   112 +-
 doc/html/a00101.png                                |   Bin 704 -> 1150 bytes
 doc/html/a00102.html                               |   132 +-
 doc/html/a00102.png                                |   Bin 724 -> 612 bytes
 doc/html/a00103.html                               |    95 +-
 doc/html/a00104.html                               |   279 +-
 doc/html/a00104.png                                |   Bin 2529 -> 0 bytes
 doc/html/a00105.html                               |    55 +-
 doc/html/a00105.png                                |   Bin 625 -> 0 bytes
 doc/html/a00106.html                               |   138 +-
 doc/html/a00106.png                                |   Bin 612 -> 754 bytes
 doc/html/a00107.html                               |   127 +-
 doc/html/{a00112.png => a00107.png}                |   Bin
 doc/html/a00108.html                               |   190 +-
 doc/html/{a00113.png => a00108.png}                |   Bin
 doc/html/a00109.html                               |   391 +-
 doc/html/a00109.png                                |   Bin 4089 -> 0 bytes
 doc/html/a00110.html                               |   388 +-
 doc/html/a00110.png                                |   Bin 4406 -> 0 bytes
 doc/html/a00111.html                               |    65 +-
 doc/html/a00111.png                                |   Bin 754 -> 0 bytes
 doc/html/a00112.html                               |    71 +-
 doc/html/a00113.html                               |   185 +-
 doc/html/a00114.html                               |    19 +-
 doc/html/a00115.html                               |    18 +-
 doc/html/a00116.html                               |    19 +-
 doc/html/a00117.html                               |    17 +-
 doc/html/a00118.html                               |    19 +-
 doc/html/a00119.html                               |   193 +-
 doc/html/a00119.png                                |   Bin 0 -> 978 bytes
 doc/html/a00120.html                               |    48 +-
 doc/html/a00120.png                                |   Bin 0 -> 1039 bytes
 doc/html/a00121.html                               |   117 +-
 doc/html/{a00125.png => a00121.png}                |   Bin
 doc/html/a00122.html                               |    23 +-
 doc/html/a00123.html                               |    23 +-
 doc/html/a00124.html                               |   136 +-
 doc/html/a00124.png                                |   Bin 4592 -> 0 bytes
 doc/html/a00125.html                               |   317 +-
 doc/html/a00125.png                                |   Bin 766 -> 616 bytes
 doc/html/a00126.html                               |   101 +-
 doc/html/a00127.html                               |    44 +-
 doc/html/a00128.html                               |   290 +-
 doc/html/a00128.png                                |   Bin 616 -> 622 bytes
 doc/html/a00129.html                               |   119 +-
 doc/html/{a00138.png => a00129.png}                |   Bin
 doc/html/a00130.html                               |   106 +-
 doc/html/{a00134.png => a00130.png}                |   Bin
 doc/html/a00131.html                               |    12 +-
 doc/html/a00132.html                               |    99 +-
 doc/html/a00132.png                                |   Bin 622 -> 798 bytes
 doc/html/a00133.html                               |    70 +-
 doc/html/a00133.png                                |   Bin 798 -> 645 bytes
 doc/html/a00134.html                               |   163 +-
 doc/html/a00134.png                                |   Bin 594 -> 655 bytes
 doc/html/a00135.html                               |   175 +-
 doc/html/a00135.png                                |   Bin 655 -> 542 bytes
 doc/html/a00136.html                               |     8 +-
 doc/html/a00137.html                               |    12 +-
 doc/html/a00138.html                               |    63 +-
 doc/html/a00138.png                                |   Bin 604 -> 839 bytes
 doc/html/a00139.html                               |   172 +-
 doc/html/a00139.png                                |   Bin 645 -> 903 bytes
 doc/html/a00140.html                               |   154 +-
 doc/html/a00140.png                                |   Bin 542 -> 729 bytes
 doc/html/a00141.html                               |   203 +-
 doc/html/a00141.png                                |   Bin 839 -> 777 bytes
 doc/html/a00142.html                               |   146 +-
 doc/html/a00142.png                                |   Bin 4584 -> 961 bytes
 doc/html/a00143.html                               |   348 +-
 doc/html/a00143.png                                |   Bin 4401 -> 0 bytes
 doc/html/a00144.html                               |   497 +-
 doc/html/a00144.png                                |   Bin 1770 -> 656 bytes
 doc/html/a00145.html                               |   181 +-
 doc/html/a00145.png                                |   Bin 729 -> 891 bytes
 doc/html/a00146.html                               |   216 +-
 doc/html/a00146.png                                |   Bin 777 -> 1324 bytes
 doc/html/a00147.html                               |   129 +-
 doc/html/a00147.png                                |   Bin 5227 -> 0 bytes
 doc/html/a00148.html                               |    81 +-
 doc/html/a00148.png                                |   Bin 961 -> 538 bytes
 doc/html/a00149.html                               |    28 +-
 doc/html/{a00155.png => a00149.png}                |   Bin
 doc/html/a00150.html                               |   345 +-
 doc/html/a00150.png                                |   Bin 656 -> 565 bytes
 doc/html/a00151.html                               |   270 +-
 doc/html/a00151.png                                |   Bin 891 -> 906 bytes
 doc/html/a00152.html                               |   173 +-
 doc/html/a00152.png                                |   Bin 1324 -> 906 bytes
 doc/html/a00153.html                               |   116 +-
 doc/html/a00154.html                               |    71 +-
 doc/html/a00154.png                                |   Bin 538 -> 0 bytes
 doc/html/a00155.html                               |   176 +-
 doc/html/a00155.png                                |   Bin 620 -> 1423 bytes
 doc/html/a00156.html                               |   164 +-
 doc/html/a00156.png                                |   Bin 565 -> 0 bytes
 doc/html/a00157.html                               |   282 +-
 doc/html/a00157.png                                |   Bin 906 -> 0 bytes
 doc/html/a00158.html                               |   163 +-
 doc/html/a00158.png                                |   Bin 906 -> 757 bytes
 doc/html/a00159.html                               |   136 +-
 doc/html/{a00166.png => a00159.png}                |   Bin
 doc/html/a00160.html                               |    80 +-
 doc/html/{a00167.png => a00160.png}                |   Bin
 doc/html/a00161.html                               |   207 +-
 doc/html/a00161.png                                |   Bin 1423 -> 857 bytes
 doc/html/a00162.html                               |    85 +-
 doc/html/{a00169.png => a00162.png}                |   Bin
 doc/html/a00163.html                               |    60 +-
 doc/html/a00164.html                               |   222 +-
 doc/html/a00164.png                                |   Bin 0 -> 2094 bytes
 doc/html/a00165.html                               |   171 +-
 doc/html/a00165.png                                |   Bin 757 -> 916 bytes
 doc/html/a00166.html                               |    57 +-
 doc/html/a00167.html                               |    70 +-
 doc/html/a00168.html                               |    62 +-
 doc/html/a00168.png                                |   Bin 857 -> 468 bytes
 doc/html/a00169.html                               |    91 +-
 doc/html/a00169.png                                |   Bin 1409 -> 638 bytes
 doc/html/a00170.html                               |    77 +-
 doc/html/{a00178.png => a00170.png}                |   Bin
 doc/html/a00171.html                               |    69 -
 doc/html/a00172.html                               |    66 -
 doc/html/a00173.html                               |    81 -
 doc/html/a00173.png                                |   Bin 468 -> 0 bytes
 doc/html/a00174.html                               |    91 -
 doc/html/a00174.png                                |   Bin 1711 -> 0 bytes
 doc/html/a00175.html                               |    56 -
 doc/html/a00176.html                               |   325 -
 doc/html/a00176.png                                |   Bin 2522 -> 0 bytes
 doc/html/a00177.html                               |   133 -
 doc/html/a00177.png                                |   Bin 638 -> 0 bytes
 doc/html/a00178.html                               |   102 -
 doc/html/a00188.html                               |   156 +
 doc/html/a00193.html                               |    99 +
 doc/html/a00196.html                               |   271 -
 doc/html/a00198.html                               |    99 -
 doc/html/a00212.html                               |   194 +
 doc/html/a00217.html                               |   191 -
 doc/html/a00230.html                               |   116 +
 doc/html/a00233.html                               |   681 +
 doc/html/a00237.html                               |   113 -
 doc/html/a00240.html                               |   692 -
 doc/html/a00252.html                               |  2187 +++
 doc/html/a00253.html                               |    67 +
 doc/html/a00254.html                               |   382 +
 doc/html/a00255.html                               |  1987 +--
 doc/html/a00256.html                               |    25 +-
 doc/html/a00257.html                               |   342 +-
 doc/html/a00258.html                               |   125 -
 doc/html/a00259.html                               |    31 +-
 doc/html/a00260.html                               |    43 +-
 doc/html/a00261.html                               |    58 +
 doc/html/a00262.html                               |    15 +-
 doc/html/a00263.html                               |    21 +-
 doc/html/a00264.html                               |    25 +-
 doc/html/a00265.html                               |    24 +-
 doc/html/a00266.html                               |    26 +-
 doc/html/a00267.html                               |    42 +-
 doc/html/a00268.html                               |    21 +-
 doc/html/a00269.html                               |    25 +-
 doc/html/a00270.html                               |    28 +-
 doc/html/a00271.html                               |    21 +-
 doc/html/a00272.html                               |    45 +-
 doc/html/a00273.html                               |    87 +-
 doc/html/a00274.html                               |    22 +-
 doc/html/a00275.html                               |    27 +-
 doc/html/a00276.html                               |    49 +-
 doc/html/a00277.html                               |    90 +-
 doc/html/a00278.html                               |    18 +-
 doc/html/a00279.html                               |    29 +-
 doc/html/a00280.html                               |    23 +-
 doc/html/a00281.html                               |    13 +-
 doc/html/a00282.html                               |    15 +-
 doc/html/a00283.html                               |    17 +-
 doc/html/a00284.html                               |    21 +-
 doc/html/a00285.html                               |    22 +-
 doc/html/a00286.html                               |    21 +-
 doc/html/a00287.html                               |    14 +-
 doc/html/a00288.html                               |    19 +-
 doc/html/a00289.html                               |    19 +-
 doc/html/a00290.html                               |    28 +-
 doc/html/a00291.html                               |    32 +-
 doc/html/a00292.html                               |    20 +-
 doc/html/a00293.html                               |    33 +-
 doc/html/a00294.html                               |    15 +-
 doc/html/a00295.html                               |    19 +-
 doc/html/a00296.html                               |    21 +-
 doc/html/a00297.html                               |    24 +-
 doc/html/a00298.html                               |    34 +-
 doc/html/a00299.html                               |    26 +-
 doc/html/a00300.html                               |    22 +-
 doc/html/a00301.html                               |    14 +-
 doc/html/a00302.html                               |    32 +-
 doc/html/a00303.html                               |    27 +-
 doc/html/a00304.html                               |    36 +-
 doc/html/a00305.html                               |    42 +-
 doc/html/a00306.html                               |    14 +-
 doc/html/a00307.html                               |    26 +-
 doc/html/a00308.html                               |    21 +-
 doc/html/a00309.html                               |    31 +-
 doc/html/a00310.html                               |    32 +-
 doc/html/a00311.html                               |    13 +-
 doc/html/a00312.html                               |    12 +-
 doc/html/a00313.html                               |    11 +-
 doc/html/a00314.html                               |    21 +-
 doc/html/a00315.html                               |    10 +-
 doc/html/a00316.html                               |    13 +-
 doc/html/a00317.html                               |    10 +-
 doc/html/a00318.html                               |    17 +-
 doc/html/a00319.html                               |    22 +-
 doc/html/a00320.html                               |    23 +-
 doc/html/a00321.html                               |    13 +-
 doc/html/a00322.html                               |    18 +-
 doc/html/a00323.html                               |    40 +-
 doc/html/a00324.html                               |    54 +-
 doc/html/a00325.html                               |    58 +-
 doc/html/a00326.html                               |    15 +-
 doc/html/a00327.html                               |    22 +-
 doc/html/a00328.html                               |    44 +-
 doc/html/a00329.html                               |    41 +-
 doc/html/a00330.html                               |    70 +-
 doc/html/a00331.html                               |    54 +-
 doc/html/a00332.html                               |    29 +-
 doc/html/a00333.html                               |    52 +-
 doc/html/a00334.html                               |    56 +-
 doc/html/a00335.html                               |    54 +-
 doc/html/a00336.html                               |    32 +-
 doc/html/a00337.html                               |    29 +-
 doc/html/a00338.html                               |    43 +-
 doc/html/a00339.html                               |    50 +-
 doc/html/a00340.html                               |    85 +-
 doc/html/a00341.html                               |    71 +-
 doc/html/a00342.html                               |    57 +-
 doc/html/a00343.html                               |   120 +-
 doc/html/a00344.html                               |    22 +-
 doc/html/a00345.html                               |    60 +
 doc/html/a00346.html                               |   109 +-
 doc/html/a00347.html                               |   112 +-
 doc/html/a00348.html                               |   121 +-
 doc/html/a00349.html                               |    20 +-
 doc/html/a00350.html                               |    20 +-
 doc/html/a00351.html                               |    22 +-
 doc/html/a00352.html                               |    22 +-
 doc/html/a00353.html                               |    33 +-
 doc/html/a00354.html                               |    36 +-
 doc/html/a00355.html                               |   101 +-
 doc/html/a00356.html                               |    24 +-
 doc/html/a00357.html                               |    15 +-
 doc/html/a00358.html                               |    18 +-
 doc/html/a00359.html                               |    18 +-
 doc/html/a00360.html                               |    26 +-
 doc/html/a00361.html                               |    24 +-
 doc/html/a00362.html                               |    57 +-
 doc/html/a00363.html                               |    36 +-
 doc/html/a00364.html                               |    57 +-
 doc/html/a00365.html                               |    63 +-
 doc/html/a00366.html                               |    25 +-
 doc/html/a00367.html                               |    40 +-
 doc/html/a00368.html                               |   122 +-
 doc/html/a00369.html                               |    32 +-
 doc/html/a00370.html                               |    14 +-
 doc/html/a00371.html                               |    17 +-
 doc/html/a00372.html                               |    14 +-
 doc/html/a00373.html                               |    21 +-
 doc/html/a00374.html                               |    27 +-
 doc/html/a00375.html                               |    39 +-
 doc/html/a00376.html                               |    22 +-
 doc/html/a00377.html                               |    16 +-
 doc/html/a00378.html                               |    78 +-
 doc/html/a00379.html                               |    52 +-
 doc/html/a00380.html                               |    42 +-
 doc/html/a00381.html                               |    36 +-
 doc/html/a00382.html                               |    46 +-
 doc/html/a00383.html                               |    23 +-
 doc/html/a00384.html                               |    15 +-
 doc/html/a00385.html                               |    15 +-
 doc/html/a00386.html                               |    12 +-
 doc/html/a00387.html                               |    18 +-
 doc/html/a00388.html                               |    33 +-
 doc/html/a00389.html                               |    26 +-
 doc/html/a00390.html                               |    24 +-
 doc/html/a00391.html                               |    23 +-
 doc/html/a00392.html                               |    46 +-
 doc/html/a00393.html                               |    43 +-
 doc/html/a00394.html                               |    39 +-
 doc/html/a00395.html                               |    18 +-
 doc/html/a00396.html                               |    21 +-
 doc/html/a00397.html                               |    10 +-
 doc/html/a00398.html                               |    21 +-
 doc/html/a00399.html                               |    19 +-
 doc/html/a00400.html                               |    15 +-
 doc/html/a00401.html                               |    19 +-
 doc/html/a00402.html                               |    29 +-
 doc/html/a00403.html                               |    29 +-
 doc/html/a00404.html                               |    26 +-
 doc/html/a00405.html                               |    38 +-
 doc/html/a00406.html                               |    22 +-
 doc/html/a00407.html                               |    49 +-
 doc/html/a00408.html                               |    63 -
 doc/html/a00409.html                               |    65 -
 doc/html/a00410.html                               |    58 -
 doc/html/a00411.html                               |    57 -
 doc/html/a00412.html                               |    67 -
 doc/html/a00413.html                               |    65 -
 doc/html/a00414.html                               |    61 -
 doc/html/a00415.html                               |    58 -
 doc/html/a00416.html                               |    61 -
 doc/html/a00417.html                               |    62 -
 doc/html/a00418.html                               |    63 -
 doc/html/a00419.html                               |    75 -
 doc/html/a00420.html                               |    66 -
 doc/html/a00421.html                               |    83 -
 doc/html/annotated.html                            |   335 +-
 doc/html/classes.html                              |   121 +-
 doc/html/dir_525f2cc589630bacbdc3bb450847427e.html |     2 +-
 doc/html/dir_63fb2cc293d133785b96e521fa051167.html |     2 +-
 doc/html/dir_87119f26c7695cbc270003e99bc7f49f.html |   122 +-
 doc/html/dir_b9976680b2be72d2d0b8fca1c31202a2.html |     2 +-
 doc/html/files.html                                |     8 +-
 doc/html/functions.html                            |    63 +-
 doc/html/functions_0x62.html                       |    31 +-
 doc/html/functions_0x63.html                       |    77 +-
 doc/html/functions_0x64.html                       |    46 +-
 doc/html/functions_0x65.html                       |    81 +-
 doc/html/functions_0x66.html                       |    24 +-
 doc/html/functions_0x67.html                       |    24 +-
 doc/html/functions_0x68.html                       |     4 +-
 doc/html/functions_0x69.html                       |    66 +-
 doc/html/functions_0x6a.html                       |     4 +-
 doc/html/functions_0x6c.html                       |    25 +-
 doc/html/functions_0x6d.html                       |    39 +-
 doc/html/functions_0x6e.html                       |    14 +-
 doc/html/functions_0x6f.html                       |    68 +-
 doc/html/functions_0x70.html                       |    36 +-
 doc/html/functions_0x71.html                       |     9 +-
 doc/html/functions_0x72.html                       |   100 +-
 doc/html/functions_0x73.html                       |    80 +-
 doc/html/functions_0x74.html                       |    95 +-
 doc/html/functions_0x75.html                       |    16 +-
 doc/html/functions_0x76.html                       |    14 +-
 doc/html/functions_0x77.html                       |    14 +-
 doc/html/functions_0x7e.html                       |    74 +-
 doc/html/functions_enum.html                       |    10 +-
 doc/html/functions_eval.html                       |    20 +-
 doc/html/functions_func.html                       |    56 +-
 doc/html/functions_func_0x62.html                  |    28 +-
 doc/html/functions_func_0x63.html                  |    69 +-
 doc/html/functions_func_0x64.html                  |    35 +-
 doc/html/functions_func_0x65.html                  |    58 +-
 doc/html/functions_func_0x66.html                  |    16 +-
 doc/html/functions_func_0x67.html                  |    24 +-
 doc/html/functions_func_0x68.html                  |     4 +-
 doc/html/functions_func_0x69.html                  |    51 +-
 doc/html/functions_func_0x6a.html                  |     4 +-
 doc/html/functions_func_0x6c.html                  |    25 +-
 doc/html/functions_func_0x6d.html                  |    29 +-
 doc/html/functions_func_0x6e.html                  |    10 +-
 doc/html/functions_func_0x6f.html                  |    60 +-
 doc/html/functions_func_0x70.html                  |    27 +-
 doc/html/functions_func_0x71.html                  |     9 +-
 doc/html/functions_func_0x72.html                  |    90 +-
 doc/html/functions_func_0x73.html                  |    62 +-
 doc/html/functions_func_0x74.html                  |    92 +-
 doc/html/functions_func_0x75.html                  |    16 +-
 doc/html/functions_func_0x77.html                  |    14 +-
 doc/html/functions_func_0x7e.html                  |    74 +-
 doc/html/functions_rela.html                       |    14 +-
 doc/html/functions_type.html                       |    81 +-
 doc/html/functions_vars.html                       |    36 +-
 doc/html/globals.html                              |    24 +-
 doc/html/globals_func.html                         |    24 +-
 doc/html/hierarchy.html                            |   465 +-
 doc/html/index.html                                |     4 +-
 doc/html/modules.html                              |    14 +-
 doc/html/namespacemembers.html                     |    39 +-
 doc/html/namespacemembers_enum.html                |     6 +-
 doc/html/namespacemembers_eval.html                |    10 +-
 doc/html/namespacemembers_func.html                |    23 +-
 doc/html/namespacemembers_type.html                |     6 +-
 doc/html/namespaces.html                           |     6 +-
 doc/html/pages.html                                |     4 +-
 examples/GettingStarted/index.html                 |   360 +-
 examples/GettingStarted/sub_string_finder/Makefile |    38 +-
 .../sub_string_finder/Makefile.windows             |    42 +-
 .../GettingStarted/sub_string_finder/index.html    |    67 -
 .../sub_string_finder/msvs/sub_string_finder.sln   |    92 +-
 .../msvs/sub_string_finder.vcxproj                 |   390 +-
 .../msvs/sub_string_finder_extended.vcxproj        |   390 +-
 .../msvs/sub_string_finder_pretty.vcxproj          |   390 +-
 .../GettingStarted/sub_string_finder/readme.html   |   416 +
 .../sub_string_finder/sub_string_finder.cpp        |   113 +-
 .../sub_string_finder_extended.cpp                 |   265 +-
 .../sub_string_finder/sub_string_finder_pretty.cpp |   154 +-
 examples/Makefile                                  |    40 +-
 examples/common/copy_libraries.bat                 |    37 +-
 examples/common/examples-common.inc                |    38 +
 examples/common/gui/Makefile.gmake                 |    34 +-
 examples/common/gui/Makefile.win                   |    30 +-
 examples/common/gui/convideo.cpp                   |    42 +-
 examples/common/gui/d2dvideo.cpp                   |    42 +-
 examples/common/gui/dxcheck.bat                    |    34 +-
 examples/common/gui/gdivideo.cpp                   |    38 +-
 examples/common/gui/macvideo.cpp                   |    70 +-
 examples/common/gui/video.h                        |    44 +-
 examples/common/gui/winvideo.h                     |    40 +-
 examples/common/gui/xcode/tbbExample/Info.plist    |    59 -
 examples/common/gui/xcode/tbbExample/OpenGLView.h  |    58 +-
 examples/common/gui/xcode/tbbExample/OpenGLView.m  |   106 +-
 .../gui/xcode/tbbExample/en.lproj/MainMenu.xib     |   339 +-
 .../common/gui/xcode/tbbExample/iOS.storyboard     |    28 +
 examples/common/gui/xcode/tbbExample/main.m        |    59 +-
 .../common/gui/xcode/tbbExample/tbbAppDelegate.h   |    50 +-
 .../common/gui/xcode/tbbExample/tbbAppDelegate.m   |    59 +-
 .../gui/xcode/tbbExample/tbbExample-Info.ios.plist |    44 +
 .../gui/xcode/tbbExample/tbbExample-Info.plist     |    16 +-
 .../gui/xcode/tbbExample/tbbExample-Prefix.pch     |    43 +-
 examples/common/gui/xvideo.cpp                     |    55 +-
 examples/common/index.html                         |   457 +-
 examples/common/toolset.props                      |    18 +-
 examples/common/utility/fast_random.h              |    30 +-
 examples/common/utility/utility.h                  |    63 +-
 .../concurrent_hash_map/count_strings/Makefile     |    32 +-
 .../count_strings/Makefile.windows                 |    30 +-
 .../count_strings/count_strings.cpp                |    34 +-
 .../concurrent_hash_map/count_strings/index.html   |    55 -
 .../count_strings/msvs/count_strings.sln           |    52 +-
 .../count_strings/msvs/count_strings.vcxproj       |   396 +-
 .../concurrent_hash_map/count_strings/readme.html  |   401 +
 examples/concurrent_hash_map/index.html            |   360 +-
 examples/concurrent_priority_queue/index.html      |   344 +
 .../concurrent_priority_queue/shortpath/Makefile   |    44 +-
 .../shortpath/Makefile.windows                     |    30 +-
 .../concurrent_priority_queue/shortpath/index.html |    82 -
 .../shortpath/msvs/shortpath.sln                   |    52 +-
 .../shortpath/msvs/shortpath.vcxproj               |   396 +-
 .../shortpath/readme.html                          |   427 +
 .../shortpath/shortpath.cpp                        |    86 +-
 examples/graph/binpack/Makefile                    |    36 +-
 examples/graph/binpack/Makefile.windows            |    30 +-
 examples/graph/binpack/binpack.cpp                 |   103 +-
 examples/graph/binpack/index.html                  |    72 -
 examples/graph/binpack/msvs/binpack.sln            |    52 +-
 examples/graph/binpack/msvs/binpack.vcxproj        |   396 +-
 examples/graph/binpack/readme.html                 |   415 +
 examples/graph/cholesky/Makefile                   |    56 +
 examples/graph/cholesky/Makefile.windows           |    50 +
 examples/graph/cholesky/cholesky.cpp               |   715 +
 examples/graph/cholesky/init.cpp                   |   138 +
 examples/graph/cholesky/msvs/cholesky.sln          |    26 +
 examples/graph/cholesky/msvs/cholesky.vcxproj      |   206 +
 examples/graph/cholesky/readme.html                |   415 +
 .../xcode/cholesky.xcodeproj/project.pbxproj       |   309 +
 examples/graph/dining_philosophers/Makefile        |    32 +-
 .../graph/dining_philosophers/Makefile.windows     |    30 +-
 .../dining_philosophers/dining_philosophers.cpp    |    34 +-
 examples/graph/dining_philosophers/index.html      |    43 -
 .../msvs/dining_philosophers.sln                   |    52 +-
 .../msvs/dining_philosophers.vcxproj               |   396 +-
 examples/graph/dining_philosophers/readme.html     |   383 +
 examples/graph/fgbzip2/Makefile                    |    57 +
 examples/graph/fgbzip2/Makefile.windows            |    54 +
 examples/graph/fgbzip2/blocksort.cpp               |  1146 ++
 examples/graph/fgbzip2/bzlib.cpp                   |  1624 ++
 examples/graph/fgbzip2/bzlib.h                     |   334 +
 examples/graph/fgbzip2/bzlib_private.h             |   561 +
 examples/graph/fgbzip2/compress.cpp                |   724 +
 examples/graph/fgbzip2/crctable.cpp                |   156 +
 examples/graph/fgbzip2/decompress.cpp              |   698 +
 examples/graph/fgbzip2/fgbzip2.cpp                 |   501 +
 examples/graph/fgbzip2/huffman.cpp                 |   257 +
 examples/graph/fgbzip2/msvs/fgbzip2.sln            |    26 +
 examples/graph/fgbzip2/msvs/fgbzip2.vcxproj        |   216 +
 examples/graph/fgbzip2/randtable.cpp               |   136 +
 examples/graph/fgbzip2/readme.html                 |   466 +
 .../xcode/fgbzip2.xcodeproj/project.pbxproj        |   265 +
 examples/graph/index.html                          |   380 +-
 examples/graph/logic_sim/D_latch.h                 |    34 +-
 examples/graph/logic_sim/Makefile                  |    32 +-
 examples/graph/logic_sim/Makefile.windows          |    30 +-
 examples/graph/logic_sim/basics.h                  |    34 +-
 examples/graph/logic_sim/four_bit_adder.h          |    35 +-
 examples/graph/logic_sim/index.html                |    67 -
 examples/graph/logic_sim/msvs/logic_sim.sln        |    52 +-
 examples/graph/logic_sim/msvs/logic_sim.vcxproj    |   396 +-
 examples/graph/logic_sim/one_bit_adder.h           |    34 +-
 examples/graph/logic_sim/readme.html               |   406 +
 examples/graph/logic_sim/test_all.cpp              |    49 +-
 examples/graph/logic_sim/two_bit_adder.h           |    34 +-
 examples/graph/matmult/Makefile                    |    56 +
 examples/graph/matmult/Makefile.windows            |    53 +
 examples/graph/matmult/matmult.cpp                 |   374 +
 examples/graph/matmult/msvs/matmult.sln            |    26 +
 examples/graph/matmult/msvs/matmult.vcxproj        |   145 +
 examples/graph/matmult/readme.html                 |   414 +
 examples/graph/som/Makefile                        |    32 +-
 examples/graph/som/Makefile.windows                |    46 +
 examples/graph/som/Makefile.windows.windows        |    46 -
 examples/graph/som/index.html                      |    51 -
 examples/graph/som/msvs/som.sln                    |    52 +-
 examples/graph/som/msvs/som.vcxproj                |   428 +-
 examples/graph/som/readme.html                     |   391 +
 examples/graph/som/som.cpp                         |    34 +-
 examples/graph/som/som.h                           |    34 +-
 examples/graph/som/som_graph.cpp                   |    36 +-
 examples/graph/stereo/Makefile                     |    72 +
 examples/graph/stereo/Makefile.windows             |    57 +
 examples/graph/stereo/imageEffects.cl              |    56 +
 examples/graph/stereo/lodepng.cpp                  |  6227 ++++++++
 examples/graph/stereo/lodepng.h                    |  1778 +++
 examples/graph/stereo/msvs/stereo.sln              |    26 +
 examples/graph/stereo/msvs/stereo.vcxproj          |   163 +
 examples/graph/stereo/readme.html                  |   445 +
 examples/graph/stereo/stereo.cpp                   |   435 +
 examples/graph/stereo/utils.h                      |   104 +
 .../stereo/xcode/stereo.xcodeproj/project.pbxproj  |   321 +
 examples/index.html                                |   733 +-
 examples/parallel_do/index.html                    |   360 +-
 examples/parallel_do/parallel_preorder/Graph.cpp   |    30 +-
 examples/parallel_do/parallel_preorder/Graph.h     |    36 +-
 examples/parallel_do/parallel_preorder/Makefile    |    32 +-
 .../parallel_do/parallel_preorder/Makefile.windows |    32 +-
 examples/parallel_do/parallel_preorder/Matrix.h    |    34 +-
 examples/parallel_do/parallel_preorder/index.html  |    99 -
 examples/parallel_do/parallel_preorder/main.cpp    |    30 +-
 .../parallel_preorder/msvs/parallel_preorder.sln   |    52 +-
 .../msvs/parallel_preorder.vcxproj                 |   408 +-
 .../parallel_preorder/parallel_preorder.cpp        |    34 +-
 examples/parallel_do/parallel_preorder/readme.html |   444 +
 examples/parallel_for/game_of_life/Makefile        |    32 +-
 .../parallel_for/game_of_life/Makefile.windows     |    30 +-
 examples/parallel_for/game_of_life/index.html      |    54 -
 .../game_of_life/msvs/Game_of_life.sln             |    76 +-
 .../game_of_life/msvs/Game_of_life.vcxproj         |   892 +-
 examples/parallel_for/game_of_life/msvs/resource.h |    20 +
 examples/parallel_for/game_of_life/readme.html     |   392 +
 .../parallel_for/game_of_life/src/AssemblyInfo.cpp |    34 +-
 examples/parallel_for/game_of_life/src/Board.h     |    34 +-
 .../parallel_for/game_of_life/src/Evolution.cpp    |    34 +-
 examples/parallel_for/game_of_life/src/Evolution.h |    34 +-
 examples/parallel_for/game_of_life/src/Form1.h     |    30 +-
 .../parallel_for/game_of_life/src/Game_of_life.cpp |    34 +-
 .../parallel_for/game_of_life/src/Update_state.cpp |    34 +-
 examples/parallel_for/index.html                   |   372 +-
 examples/parallel_for/polygon_overlay/Makefile     |    40 +-
 .../parallel_for/polygon_overlay/Makefile.windows  |    30 +-
 examples/parallel_for/polygon_overlay/index.html   |   121 -
 .../polygon_overlay/msvs/polygon_overlay.sln       |    38 +
 .../parallel_for/polygon_overlay/msvs/pover.sln    |    38 -
 .../polygon_overlay/msvs/pover.vcxproj             |   886 +-
 .../parallel_for/polygon_overlay/msvs/resource.h   |    20 +
 examples/parallel_for/polygon_overlay/polymain.cpp |    34 +-
 examples/parallel_for/polygon_overlay/polymain.h   |    34 +-
 examples/parallel_for/polygon_overlay/polyover.cpp |    34 +-
 examples/parallel_for/polygon_overlay/polyover.h   |    34 +-
 .../parallel_for/polygon_overlay/pover_global.h    |    34 +-
 .../parallel_for/polygon_overlay/pover_video.cpp   |    34 +-
 .../parallel_for/polygon_overlay/pover_video.h     |    34 +-
 examples/parallel_for/polygon_overlay/readme.html  |   476 +
 examples/parallel_for/polygon_overlay/rpolygon.h   |    34 +-
 .../polygon_overlay.xcodeproj/project.pbxproj      |   198 +-
 .../xcshareddata/xcschemes/tbbExample.ios.xcscheme |    91 +
 .../xcshareddata/xcschemes/tbbExample.xcscheme     |    18 +-
 examples/parallel_for/seismic/Makefile             |    40 +-
 examples/parallel_for/seismic/Makefile.windows     |    30 +-
 examples/parallel_for/seismic/index.html           |   112 -
 examples/parallel_for/seismic/main.cpp             |    34 +-
 .../seismic/msvs/SeismicSimulation.sln             |    38 -
 .../seismic/msvs/SeismicSimulation.vcxproj         |   892 +-
 examples/parallel_for/seismic/msvs/resource.h      |    20 +
 examples/parallel_for/seismic/msvs/seismic.sln     |    38 +
 examples/parallel_for/seismic/readme.html          |   471 +
 examples/parallel_for/seismic/seismic_video.cpp    |    34 +-
 examples/parallel_for/seismic/seismic_video.h      |    34 +-
 examples/parallel_for/seismic/universe.cpp         |    34 +-
 examples/parallel_for/seismic/universe.h           |    34 +-
 .../xcode/seismic.xcodeproj/project.pbxproj        |   271 +-
 .../xcshareddata/xcschemes/tbbExample.ios.xcscheme |   119 +
 .../xcshareddata/xcschemes/tbbExample.xcscheme     |    18 +-
 examples/parallel_for/tachyon/Makefile             |    36 +-
 examples/parallel_for/tachyon/Makefile.windows     |    30 +-
 examples/parallel_for/tachyon/android/.classpath   |     8 -
 examples/parallel_for/tachyon/android/.cproject    |   223 -
 examples/parallel_for/tachyon/android/.project     |    98 -
 .../tachyon/android/AndroidManifest.xml            |    26 -
 .../parallel_for/tachyon/android/assets/data.dat   | 14804 -------------------
 .../parallel_for/tachyon/android/jni/Android.mk    |    90 -
 .../tachyon/android/jni/Application.mk             |    23 -
 .../tachyon/android/jni/jni-engine.cpp             |   279 -
 .../tachyon/android/project.properties             |    14 -
 .../tachyon/android/res/menu/main_screen_menu.xml  |    16 -
 .../tachyon/android/res/values/strings.xml         |     4 -
 .../src/com/intel/tbb/example/tachyon/tachyon.java |   307 -
 examples/parallel_for/tachyon/index.html           |   220 -
 examples/parallel_for/tachyon/msvs/resource.h      |    20 +
 .../tachyon/msvs/tachyon.serial.vcxproj            |   776 +-
 examples/parallel_for/tachyon/msvs/tachyon.sln     |   184 +-
 .../parallel_for/tachyon/msvs/tachyon.tbb.vcxproj  |   880 +-
 .../tachyon/msvs/tachyon.tbb1d.vcxproj             |   880 +-
 examples/parallel_for/tachyon/msvs/tachyon.vcxproj |   900 +-
 .../parallel_for/tachyon/msvs/win8ui/App.xaml.cpp  |    34 +-
 .../parallel_for/tachyon/msvs/win8ui/App.xaml.h    |    34 +-
 .../tachyon/msvs/win8ui/DirectXBase.cpp            |    34 +-
 .../parallel_for/tachyon/msvs/win8ui/DirectXBase.h |    34 +-
 .../tachyon/msvs/win8ui/DirectXPage.xaml.cpp       |    34 +-
 .../tachyon/msvs/win8ui/DirectXPage.xaml.h         |    34 +-
 .../msvs/win8ui/copy_libraries_and_assets.bat      |    35 +-
 examples/parallel_for/tachyon/msvs/win8ui/pch.h    |    34 +-
 .../tachyon/msvs/win8ui/tbbTachyon.vcxproj         |   476 +-
 .../tachyon/msvs/win8ui/tbbTachyonRenderer.cpp     |    34 +-
 .../tachyon/msvs/win8ui/tbbTachyonRenderer.h       |    34 +-
 examples/parallel_for/tachyon/readme.html          |   572 +
 examples/parallel_for/tachyon/src/api.cpp          |    34 +-
 examples/parallel_for/tachyon/src/api.h            |    34 +-
 examples/parallel_for/tachyon/src/apigeom.cpp      |    34 +-
 examples/parallel_for/tachyon/src/apitrigeom.cpp   |    34 +-
 examples/parallel_for/tachyon/src/apitrigeom.h     |    34 +-
 examples/parallel_for/tachyon/src/bndbox.cpp       |    34 +-
 examples/parallel_for/tachyon/src/bndbox.h         |    30 +-
 examples/parallel_for/tachyon/src/box.cpp          |    34 +-
 examples/parallel_for/tachyon/src/box.h            |    30 +-
 examples/parallel_for/tachyon/src/camera.cpp       |    34 +-
 examples/parallel_for/tachyon/src/camera.h         |    34 +-
 examples/parallel_for/tachyon/src/coordsys.cpp     |    34 +-
 examples/parallel_for/tachyon/src/coordsys.h       |    34 +-
 examples/parallel_for/tachyon/src/cylinder.cpp     |    34 +-
 examples/parallel_for/tachyon/src/cylinder.h       |    34 +-
 examples/parallel_for/tachyon/src/extvol.cpp       |    34 +-
 examples/parallel_for/tachyon/src/extvol.h         |    30 +-
 examples/parallel_for/tachyon/src/global.cpp       |    34 +-
 examples/parallel_for/tachyon/src/global.h         |    34 +-
 examples/parallel_for/tachyon/src/grid.cpp         |    34 +-
 examples/parallel_for/tachyon/src/grid.h           |    34 +-
 examples/parallel_for/tachyon/src/imageio.cpp      |    34 +-
 examples/parallel_for/tachyon/src/imageio.h        |    30 +-
 examples/parallel_for/tachyon/src/imap.cpp         |    34 +-
 examples/parallel_for/tachyon/src/imap.h           |    34 +-
 examples/parallel_for/tachyon/src/intersect.cpp    |    34 +-
 examples/parallel_for/tachyon/src/intersect.h      |    30 +-
 examples/parallel_for/tachyon/src/jpeg.cpp         |    34 +-
 examples/parallel_for/tachyon/src/jpeg.h           |    34 +-
 examples/parallel_for/tachyon/src/light.cpp        |    34 +-
 examples/parallel_for/tachyon/src/light.h          |    30 +-
 examples/parallel_for/tachyon/src/machine.h        |    30 +-
 examples/parallel_for/tachyon/src/macros.h         |    34 +-
 examples/parallel_for/tachyon/src/main.cpp         |    92 +-
 examples/parallel_for/tachyon/src/objbound.cpp     |    34 +-
 examples/parallel_for/tachyon/src/objbound.h       |    30 +-
 examples/parallel_for/tachyon/src/parse.cpp        |   186 +-
 examples/parallel_for/tachyon/src/parse.h          |    34 +-
 examples/parallel_for/tachyon/src/plane.cpp        |    34 +-
 examples/parallel_for/tachyon/src/plane.h          |    30 +-
 examples/parallel_for/tachyon/src/ppm.cpp          |    34 +-
 examples/parallel_for/tachyon/src/ppm.h            |    34 +-
 examples/parallel_for/tachyon/src/pthread.cpp      |    34 +-
 examples/parallel_for/tachyon/src/pthread_w.h      |    34 +-
 examples/parallel_for/tachyon/src/quadric.cpp      |    34 +-
 examples/parallel_for/tachyon/src/quadric.h        |    30 +-
 examples/parallel_for/tachyon/src/render.cpp       |    34 +-
 examples/parallel_for/tachyon/src/render.h         |    34 +-
 examples/parallel_for/tachyon/src/ring.cpp         |    34 +-
 examples/parallel_for/tachyon/src/ring.h           |    30 +-
 examples/parallel_for/tachyon/src/shade.cpp        |    34 +-
 examples/parallel_for/tachyon/src/shade.h          |    34 +-
 examples/parallel_for/tachyon/src/sphere.cpp       |    34 +-
 examples/parallel_for/tachyon/src/sphere.h         |    34 +-
 .../parallel_for/tachyon/src/tachyon_video.cpp     |    34 +-
 examples/parallel_for/tachyon/src/tachyon_video.h  |    34 +-
 examples/parallel_for/tachyon/src/texture.cpp      |    34 +-
 examples/parallel_for/tachyon/src/texture.h        |    30 +-
 examples/parallel_for/tachyon/src/tgafile.cpp      |    34 +-
 examples/parallel_for/tachyon/src/tgafile.h        |    34 +-
 examples/parallel_for/tachyon/src/trace.h          |    34 +-
 examples/parallel_for/tachyon/src/trace.serial.cpp |    34 +-
 examples/parallel_for/tachyon/src/trace.simple.cpp |    39 +-
 examples/parallel_for/tachyon/src/trace.tbb.cpp    |    34 +-
 examples/parallel_for/tachyon/src/trace.tbb1d.cpp  |    34 +-
 examples/parallel_for/tachyon/src/trace_rest.cpp   |    34 +-
 examples/parallel_for/tachyon/src/triangle.cpp     |    34 +-
 examples/parallel_for/tachyon/src/triangle.h       |    34 +-
 examples/parallel_for/tachyon/src/types.h          |    34 +-
 examples/parallel_for/tachyon/src/ui.cpp           |    34 +-
 examples/parallel_for/tachyon/src/ui.h             |    30 +-
 examples/parallel_for/tachyon/src/util.cpp         |    34 +-
 examples/parallel_for/tachyon/src/util.h           |    30 +-
 examples/parallel_for/tachyon/src/vector.cpp       |    34 +-
 examples/parallel_for/tachyon/src/vector.h         |    30 +-
 examples/parallel_for/tachyon/src/vol.cpp          |    97 +-
 examples/parallel_for/tachyon/src/vol.h            |    34 +-
 .../xcode/tachyon.xcodeproj/project.pbxproj        |   309 +-
 .../xcshareddata/xcschemes/tachyon.serial.xcscheme |    18 +-
 .../xcschemes/tachyon.tbb.ios.xcscheme             |    97 +
 .../xcshareddata/xcschemes/tachyon.tbb.xcscheme    |    18 +-
 .../xcshareddata/xcschemes/tachyon.tbb1d.xcscheme  |    18 +-
 examples/parallel_reduce/convex_hull/Makefile      |    32 +-
 .../parallel_reduce/convex_hull/Makefile.windows   |    34 +-
 examples/parallel_reduce/convex_hull/convex_hull.h |    34 +-
 .../convex_hull/convex_hull_bench.cpp              |    34 +-
 .../convex_hull/convex_hull_sample.cpp             |    34 +-
 examples/parallel_reduce/convex_hull/index.html    |    52 -
 .../convex_hull/msvs/convex_hull.sln               |    72 +-
 .../convex_hull/msvs/convex_hull_benchmark.vcxproj |   406 +-
 .../convex_hull/msvs/convex_hull_sample.vcxproj    |   400 +-
 examples/parallel_reduce/convex_hull/readme.html   |   400 +
 examples/parallel_reduce/index.html                |   364 +-
 examples/parallel_reduce/primes/Makefile           |    32 +-
 examples/parallel_reduce/primes/Makefile.windows   |    32 +-
 examples/parallel_reduce/primes/index.html         |    63 -
 examples/parallel_reduce/primes/main.cpp           |    38 +-
 examples/parallel_reduce/primes/msvs/primes.sln    |    52 +-
 .../parallel_reduce/primes/msvs/primes.vcxproj     |   404 +-
 examples/parallel_reduce/primes/primes.cpp         |    38 +-
 examples/parallel_reduce/primes/primes.h           |    34 +-
 examples/parallel_reduce/primes/readme.html        |   407 +
 examples/pipeline/index.html                       |   360 +-
 examples/pipeline/square/Makefile                  |    32 +-
 examples/pipeline/square/Makefile.windows          |    32 +-
 examples/pipeline/square/gen_input.cpp             |    34 +-
 examples/pipeline/square/index.html                |    71 -
 examples/pipeline/square/msvs/square.sln           |    52 +-
 examples/pipeline/square/msvs/square.vcxproj       |   398 +-
 examples/pipeline/square/readme.html               |   417 +
 examples/pipeline/square/square.cpp                |    42 +-
 examples/task/index.html                           |   360 +-
 examples/task/tree_sum/Makefile                    |    32 +-
 examples/task/tree_sum/Makefile.windows            |    30 +-
 .../task/tree_sum/OptimizedParallelSumTree.cpp     |    32 +-
 examples/task/tree_sum/SerialSumTree.cpp           |    34 +-
 examples/task/tree_sum/SimpleParallelSumTree.cpp   |    36 +-
 examples/task/tree_sum/TreeMaker.h                 |    36 +-
 examples/task/tree_sum/common.h                    |    34 +-
 examples/task/tree_sum/index.html                  |    76 -
 examples/task/tree_sum/main.cpp                    |    34 +-
 examples/task/tree_sum/msvs/tree_sum.sln           |    52 +-
 examples/task/tree_sum/msvs/tree_sum.vcxproj       |   410 +-
 examples/task/tree_sum/readme.html                 |   423 +
 examples/task_arena/fractal/Makefile               |    87 +
 examples/task_arena/fractal/Makefile.windows       |    66 +
 examples/task_arena/fractal/fractal.cpp            |   305 +
 examples/task_arena/fractal/fractal.h              |   163 +
 examples/task_arena/fractal/fractal_video.h        |    90 +
 examples/task_arena/fractal/main.cpp               |    92 +
 examples/task_arena/fractal/msvs/fractal.sln       |    38 +
 examples/task_arena/fractal/msvs/fractal.vcxproj   |   450 +
 .../fractal/msvs/gui.ico                           |   Bin
 .../fractal/msvs/gui.rc                            |     0
 examples/task_arena/fractal/msvs/resource.h        |    28 +
 .../fractal/msvs/small.ico                         |   Bin
 examples/task_arena/fractal/readme.html            |   447 +
 .../xcode/fractal.xcodeproj/project.pbxproj        |   529 +
 .../xcshareddata/xcschemes/tbbExample.ios.xcscheme |    91 +
 .../xcshareddata/xcschemes/tbbExample.xcscheme     |     0
 examples/task_arena/index.html                     |   343 +
 examples/task_group/index.html                     |   360 +-
 examples/task_group/sudoku/Makefile                |    44 +-
 examples/task_group/sudoku/Makefile.windows        |    30 +-
 examples/task_group/sudoku/index.html              |    76 -
 examples/task_group/sudoku/msvs/sudoku.sln         |    52 +-
 examples/task_group/sudoku/msvs/sudoku.vcxproj     |   396 +-
 examples/task_group/sudoku/readme.html             |   417 +
 examples/task_group/sudoku/sudoku.cpp              |    46 +-
 examples/task_priority/fractal/Makefile            |    85 -
 examples/task_priority/fractal/Makefile.windows    |    66 -
 examples/task_priority/fractal/fractal.cpp         |   273 -
 examples/task_priority/fractal/fractal.h           |   114 -
 examples/task_priority/fractal/fractal_video.h     |    72 -
 examples/task_priority/fractal/index.html          |    66 -
 examples/task_priority/fractal/main.cpp            |    92 -
 examples/task_priority/fractal/msvs/fractal.sln    |    38 -
 .../task_priority/fractal/msvs/fractal.vcxproj     |   442 -
 examples/task_priority/fractal/msvs/resource.h     |     8 -
 .../xcode/fractal.xcodeproj/project.pbxproj        |   349 -
 examples/task_priority/index.html                  |    23 -
 examples/test_all/fibonacci/Fibonacci.cpp          |   106 +-
 examples/test_all/fibonacci/Makefile               |    32 +-
 examples/test_all/fibonacci/Makefile.windows       |    30 +-
 examples/test_all/fibonacci/index.html             |    51 -
 examples/test_all/fibonacci/msvs/fibonacci.sln     |    52 +-
 examples/test_all/fibonacci/msvs/fibonacci.vcxproj |   396 +-
 examples/test_all/fibonacci/readme.html            |   402 +
 examples/test_all/index.html                       |   360 +-
 include/index.html                                 |     4 +-
 include/serial/tbb/parallel_for.h                  |    67 +-
 include/serial/tbb/tbb_annotate.h                  |    34 +-
 include/tbb/aggregator.h                           |    54 +-
 include/tbb/aligned_space.h                        |    36 +-
 include/tbb/atomic.h                               |    44 +-
 include/tbb/blocked_range.h                        |    34 +-
 include/tbb/blocked_range2d.h                      |    34 +-
 include/tbb/blocked_range3d.h                      |    34 +-
 include/tbb/cache_aligned_allocator.h              |    38 +-
 include/tbb/combinable.h                           |    65 +-
 include/tbb/compat/condition_variable              |    34 +-
 include/tbb/compat/ppl.h                           |    34 +-
 include/tbb/compat/thread                          |    54 +-
 include/tbb/compat/tuple                           |    34 +-
 include/tbb/concurrent_hash_map.h                  |    70 +-
 include/tbb/concurrent_lru_cache.h                 |    38 +-
 include/tbb/concurrent_priority_queue.h            |    53 +-
 include/tbb/concurrent_queue.h                     |    80 +-
 include/tbb/concurrent_unordered_map.h             |   113 +-
 include/tbb/concurrent_unordered_set.h             |   115 +-
 include/tbb/concurrent_vector.h                    |    57 +-
 include/tbb/critical_section.h                     |    40 +-
 include/tbb/enumerable_thread_specific.h           |   351 +-
 include/tbb/flow_graph.h                           |  2275 +--
 include/tbb/flow_graph_abstractions.h              |    57 +
 include/tbb/flow_graph_opencl_node.h               |  1537 ++
 include/tbb/gfx_factory.h                          |   359 +
 include/tbb/global_control.h                       |    37 +-
 include/tbb/index.html                             |     2 +-
 include/tbb/internal/_aggregator_impl.h            |    62 +-
 include/tbb/internal/_concurrent_queue_impl.h      |    58 +-
 include/tbb/internal/_concurrent_unordered_impl.h  |   262 +-
 include/tbb/internal/_flow_graph_async_msg_impl.h  |   221 +
 include/tbb/internal/_flow_graph_impl.h            |   408 +-
 include/tbb/internal/_flow_graph_indexer_impl.h    |   129 +-
 .../tbb/internal/_flow_graph_item_buffer_impl.h    |    85 +-
 include/tbb/internal/_flow_graph_join_impl.h       |  1099 +-
 include/tbb/internal/_flow_graph_node_impl.h       |   538 +-
 include/tbb/internal/_flow_graph_streaming_node.h  |   745 +
 .../tbb/internal/_flow_graph_tagged_buffer_impl.h  |   170 +-
 include/tbb/internal/_flow_graph_trace_impl.h      |   191 +-
 include/tbb/internal/_flow_graph_types_impl.h      |   273 +-
 include/tbb/internal/_mutex_padding.h              |    34 +-
 include/tbb/internal/_range_iterator.h             |    34 +-
 include/tbb/internal/_tbb_hash_compare_impl.h      |   109 +
 include/tbb/internal/_tbb_strings.h                |    30 +-
 include/tbb/internal/_tbb_windef.h                 |    32 +-
 include/tbb/internal/_template_helpers.h           |    60 +-
 include/tbb/internal/_x86_eliding_mutex_impl.h     |    34 +-
 include/tbb/internal/_x86_rtm_rw_mutex_impl.h      |    36 +-
 include/tbb/machine/gcc_armv7.h                    |    42 +-
 include/tbb/machine/gcc_generic.h                  |   103 +-
 include/tbb/machine/gcc_ia32_common.h              |    44 +-
 include/tbb/machine/gcc_itsx.h                     |    40 +-
 include/tbb/machine/ibm_aix51.h                    |    34 +-
 include/tbb/machine/icc_generic.h                  |    40 +-
 include/tbb/machine/linux_common.h                 |    34 +-
 include/tbb/machine/linux_ia32.h                   |    40 +-
 include/tbb/machine/linux_ia64.h                   |    58 +-
 include/tbb/machine/linux_intel64.h                |    34 +-
 include/tbb/machine/mac_ppc.h                      |    34 +-
 include/tbb/machine/macos_common.h                 |    44 +-
 include/tbb/machine/mic_common.h                   |    38 +-
 include/tbb/machine/msvc_armv7.h                   |    34 +-
 include/tbb/machine/msvc_ia32_common.h             |   232 +-
 include/tbb/machine/sunos_sparc.h                  |    36 +-
 include/tbb/machine/windows_api.h                  |    40 +-
 include/tbb/machine/windows_ia32.h                 |    85 +-
 include/tbb/machine/windows_intel64.h              |    77 +-
 include/tbb/machine/xbox360_ppc.h                  |   119 -
 include/tbb/memory_pool.h                          |    44 +-
 include/tbb/mutex.h                                |    49 +-
 include/tbb/null_mutex.h                           |    54 +-
 include/tbb/null_rw_mutex.h                        |    52 +-
 include/tbb/parallel_do.h                          |   268 +-
 include/tbb/parallel_for.h                         |    82 +-
 include/tbb/parallel_for_each.h                    |   100 +-
 include/tbb/parallel_invoke.h                      |    41 +-
 include/tbb/parallel_reduce.h                      |    86 +-
 include/tbb/parallel_scan.h                        |    90 +-
 include/tbb/parallel_sort.h                        |   127 +-
 include/tbb/parallel_while.h                       |    66 +-
 include/tbb/partitioner.h                          |   487 +-
 include/tbb/pipeline.h                             |   124 +-
 include/tbb/queuing_mutex.h                        |    34 +-
 include/tbb/queuing_rw_mutex.h                     |    34 +-
 include/tbb/reader_writer_lock.h                   |    34 +-
 include/tbb/recursive_mutex.h                      |    48 +-
 include/tbb/runtime_loader.h                       |    34 +-
 include/tbb/scalable_allocator.h                   |    44 +-
 include/tbb/spin_mutex.h                           |    36 +-
 include/tbb/spin_rw_mutex.h                        |    46 +-
 include/tbb/task.h                                 |    64 +-
 include/tbb/task_arena.h                           |   148 +-
 include/tbb/task_group.h                           |    41 +-
 include/tbb/task_scheduler_init.h                  |    92 +-
 include/tbb/task_scheduler_observer.h              |    63 +-
 include/tbb/tbb.h                                  |    39 +-
 include/tbb/tbb_allocator.h                        |    50 +-
 include/tbb/tbb_config.h                           |   498 +-
 include/tbb/tbb_exception.h                        |    80 +-
 include/tbb/tbb_machine.h                          |    77 +-
 include/tbb/tbb_profiling.h                        |    79 +-
 include/tbb/tbb_stddef.h                           |    70 +-
 include/tbb/tbb_thread.h                           |   104 +-
 include/tbb/tbbmalloc_proxy.h                      |    42 +-
 include/tbb/tick_count.h                           |    38 +-
 index.html                                         |    46 +
 index.src.html                                     |    41 -
 jni/Android.mk                                     |    65 +-
 jni/Application.mk                                 |    85 +-
 python/Makefile                                    |    38 +
 python/index.html                                  |    75 +
 python/setup.py                                    |   117 +
 python/tbb.i                                       |   146 +
 python/tbb.src.py                                  |   840 ++
 src/Makefile                                       |    33 +-
 src/index.html                                     |    48 +-
 src/old/concurrent_queue_v2.cpp                    |    44 +-
 src/old/concurrent_queue_v2.h                      |    40 +-
 src/old/concurrent_vector_v2.cpp                   |    30 +-
 src/old/concurrent_vector_v2.h                     |    34 +-
 src/old/spin_rw_mutex_v2.cpp                       |    34 +-
 src/old/spin_rw_mutex_v2.h                         |    34 +-
 src/old/task_v2.cpp                                |    34 +-
 src/old/test_concurrent_queue_v2.cpp               |    30 +-
 src/old/test_concurrent_vector_v2.cpp              |    34 +-
 src/old/test_mutex_v2.cpp                          |    34 +-
 src/old/test_task_scheduler_observer_v3.cpp        |    40 +-
 src/perf/coarse_grained_raii_lru_cache.h           |    32 +-
 src/perf/cpq_pdes.cpp                              |    45 +-
 src/perf/fibonacci_impl_tbb.cpp                    |    30 +-
 src/perf/perf.cpp                                  |    34 +-
 src/perf/perf.h                                    |    34 +-
 src/perf/perf_sched.cpp                            |    34 +-
 src/perf/run_statistics.sh                         |    34 +-
 src/perf/statistics.cpp                            |    30 +-
 src/perf/statistics.h                              |    34 +-
 src/perf/statistics_xml.h                          |    34 +-
 src/perf/time_cpq_throughput_test.cpp              |    45 +-
 src/perf/time_fibonacci_cutoff.cpp                 |    34 +-
 src/perf/time_framework.h                          |    36 +-
 src/perf/time_hash_map.cpp                         |    38 +-
 src/perf/time_hash_map_fill.cpp                    |    52 +-
 src/perf/time_hash_map_fill.html                   |    10 +-
 src/perf/time_locked_work.cpp                      |    38 +-
 src/perf/time_lru_cache_throughput.cpp             |    39 +-
 src/perf/time_parallel_for_each.cpp                |    70 +
 src/perf/time_sandbox.h                            |    30 +-
 src/perf/time_split_node.cpp                       |   120 +
 src/perf/time_vector.cpp                           |    56 +-
 src/rml/client/index.html                          |    20 +-
 src/rml/client/library_assert.h                    |    34 +-
 src/rml/client/omp_dynamic_link.cpp                |    34 +-
 src/rml/client/omp_dynamic_link.h                  |    34 +-
 src/rml/client/rml_factory.h                       |    34 +-
 src/rml/client/rml_omp.cpp                         |    34 +-
 src/rml/client/rml_tbb.cpp                         |    34 +-
 src/rml/include/index.html                         |     2 +-
 src/rml/include/rml_base.h                         |    34 +-
 src/rml/include/rml_omp.h                          |    34 +-
 src/rml/include/rml_tbb.h                          |    34 +-
 src/rml/index.html                                 |     2 +-
 src/rml/perfor/omp_nested.cpp                      |    34 +-
 src/rml/perfor/omp_simple.cpp                      |    34 +-
 src/rml/perfor/tbb_multi_omp.cpp                   |    34 +-
 src/rml/perfor/tbb_simple.cpp                      |    34 +-
 src/rml/perfor/thread_level.h                      |    34 +-
 src/rml/server/index.html                          |     2 +-
 src/rml/server/irml.rc                             |    32 +-
 src/rml/server/job_automaton.h                     |    42 +-
 src/rml/server/lin-rml-export.def                  |    34 +-
 src/rml/server/rml_server.cpp                      |   184 +-
 src/rml/server/thread_monitor.h                    |    34 +-
 src/rml/server/wait_counter.h                      |    30 +-
 src/rml/server/win32-rml-export.def                |    30 +-
 src/rml/server/win64-rml-export.def                |    30 +-
 src/rml/test/rml_omp_stub.cpp                      |    55 +-
 src/rml/test/test_job_automaton.cpp                |    40 +-
 src/rml/test/test_rml_mixed.cpp                    |    69 +-
 src/rml/test/test_rml_omp.cpp                      |    38 +-
 src/rml/test/test_rml_omp_c_linkage.c              |    34 +-
 src/rml/test/test_rml_tbb.cpp                      |    42 +-
 src/rml/test/test_server.h                         |    64 +-
 src/rml/test/test_thread_monitor.cpp               |    30 +-
 src/tbb/arena.cpp                                  |   595 +-
 src/tbb/arena.h                                    |   317 +-
 src/tbb/cache_aligned_allocator.cpp                |    59 +-
 src/tbb/cilk-tbb-interop.h                         |    44 +-
 src/tbb/concurrent_hash_map.cpp                    |    36 +-
 src/tbb/concurrent_monitor.cpp                     |    38 +-
 src/tbb/concurrent_monitor.h                       |    42 +-
 src/tbb/concurrent_queue.cpp                       |    82 +-
 src/tbb/concurrent_vector.cpp                      |    59 +-
 src/tbb/condition_variable.cpp                     |    34 +-
 src/tbb/critical_section.cpp                       |    34 +-
 src/tbb/custom_scheduler.h                         |   193 +-
 src/tbb/dynamic_link.cpp                           |   157 +-
 src/tbb/dynamic_link.h                             |    38 +-
 src/tbb/governor.cpp                               |   188 +-
 src/tbb/governor.h                                 |    89 +-
 src/tbb/ia32-masm/atomic_support.asm               |    30 +-
 src/tbb/ia32-masm/itsx.asm                         |    30 +-
 src/tbb/ia32-masm/lock_byte.asm                    |    30 +-
 src/tbb/ia64-gas/atomic_support.s                  |    30 +-
 src/tbb/ia64-gas/ia64_misc.s                       |    30 +-
 src/tbb/ia64-gas/lock_byte.s                       |    30 +-
 src/tbb/ia64-gas/log2.s                            |    30 +-
 src/tbb/ia64-gas/pause.s                           |    30 +-
 src/tbb/ibm_aix51/atomic_support.c                 |    34 +-
 src/tbb/index.html                                 |     2 +-
 src/tbb/intel64-masm/atomic_support.asm            |    30 +-
 src/tbb/intel64-masm/intel64_misc.asm              |    30 +-
 src/tbb/intel64-masm/itsx.asm                      |    30 +-
 src/tbb/intrusive_list.h                           |    52 +-
 src/tbb/itt_notify.cpp                             |    44 +-
 src/tbb/itt_notify.h                               |    42 +-
 src/tbb/lin32-tbb-export.def                       |    34 +-
 src/tbb/lin32-tbb-export.lst                       |    44 +-
 src/tbb/lin64-tbb-export.def                       |    34 +-
 src/tbb/lin64-tbb-export.lst                       |    44 +-
 src/tbb/lin64ipf-tbb-export.def                    |    34 +-
 src/tbb/lin64ipf-tbb-export.lst                    |    42 +-
 src/tbb/mac32-tbb-export.def                       |    34 +-
 src/tbb/mac32-tbb-export.lst                       |    44 +-
 src/tbb/mac64-tbb-export.def                       |    34 +-
 src/tbb/mac64-tbb-export.lst                       |    44 +-
 src/tbb/mailbox.h                                  |    99 +-
 src/tbb/market.cpp                                 |   427 +-
 src/tbb/market.h                                   |   136 +-
 src/tbb/mutex.cpp                                  |    75 +-
 src/tbb/observer_proxy.cpp                         |    58 +-
 src/tbb/observer_proxy.h                           |    40 +-
 src/tbb/pipeline.cpp                               |    38 +-
 src/tbb/private_server.cpp                         |    92 +-
 src/tbb/queuing_mutex.cpp                          |    35 +-
 src/tbb/queuing_rw_mutex.cpp                       |    53 +-
 src/tbb/reader_writer_lock.cpp                     |    36 +-
 src/tbb/recursive_mutex.cpp                        |    60 +-
 src/tbb/scheduler.cpp                              |   900 +-
 src/tbb/scheduler.h                                |   251 +-
 src/tbb/scheduler_common.h                         |    99 +-
 src/tbb/scheduler_utility.h                        |    42 +-
 src/tbb/semaphore.cpp                              |    36 +-
 src/tbb/semaphore.h                                |    56 +-
 src/tbb/spin_mutex.cpp                             |    34 +-
 src/tbb/spin_rw_mutex.cpp                          |    36 +-
 src/tbb/task.cpp                                   |    82 +-
 src/tbb/task_group_context.cpp                     |    82 +-
 src/tbb/task_stream.h                              |    36 +-
 src/tbb/tbb_assert_impl.h                          |    34 +-
 src/tbb/tbb_main.cpp                               |   117 +-
 src/tbb/tbb_main.h                                 |    46 +-
 src/tbb/tbb_misc.cpp                               |   113 +-
 src/tbb/tbb_misc.h                                 |    46 +-
 src/tbb/tbb_misc_ex.cpp                            |   161 +-
 src/tbb/tbb_resource.rc                            |    32 +-
 src/tbb/tbb_statistics.cpp                         |    42 +-
 src/tbb/tbb_statistics.h                           |    64 +-
 src/tbb/tbb_thread.cpp                             |    36 +-
 src/tbb/tbb_version.h                              |    34 +-
 src/tbb/tls.h                                      |    34 +-
 src/tbb/tools_api/disable_warnings.h               |    34 +-
 src/tbb/tools_api/internal/ittnotify.h             |   210 -
 src/tbb/tools_api/ittnotify.h                      |   167 +-
 src/tbb/tools_api/ittnotify_config.h               |    90 +-
 src/tbb/tools_api/ittnotify_static.c               |   428 +-
 src/tbb/tools_api/ittnotify_static.h               |    36 +-
 src/tbb/tools_api/ittnotify_types.h                |    30 +-
 src/tbb/tools_api/legacy/ittnotify.h               |    59 +-
 src/tbb/tools_api/prototype/ittnotify.h            |   213 -
 src/tbb/win32-tbb-export.def                       |    30 +-
 src/tbb/win32-tbb-export.lst                       |    40 +-
 src/tbb/win64-gcc-tbb-export.def                   |    35 +-
 src/tbb/win64-gcc-tbb-export.lst                   |    42 +-
 src/tbb/win64-tbb-export.def                       |    30 +-
 src/tbb/win64-tbb-export.lst                       |    41 +-
 src/tbb/winrt-tbb-export.lst                       |    37 +-
 src/tbb/x86_rtm_rw_mutex.cpp                       |    51 +-
 src/tbb/xbox360-tbb-export.def                     |   226 -
 src/tbbmalloc/Customize.h                          |    40 +-
 src/tbbmalloc/MapMemory.h                          |    40 +-
 src/tbbmalloc/Statistics.h                         |    34 +-
 src/tbbmalloc/TypeDefinitions.h                    |    34 +-
 src/tbbmalloc/backend.cpp                          |   225 +-
 src/tbbmalloc/backref.cpp                          |    81 +-
 src/tbbmalloc/frontend.cpp                         |   635 +-
 src/tbbmalloc/index.html                           |     2 +-
 src/tbbmalloc/large_objects.cpp                    |   183 +-
 src/tbbmalloc/lin32-proxy-export.def               |    35 +-
 src/tbbmalloc/lin32-tbbmalloc-export.def           |    31 +-
 src/tbbmalloc/lin64-proxy-export.def               |    35 +-
 src/tbbmalloc/lin64-tbbmalloc-export.def           |    31 +-
 src/tbbmalloc/lin64ipf-proxy-export.def            |    35 +-
 src/tbbmalloc/lin64ipf-tbbmalloc-export.def        |    31 +-
 src/tbbmalloc/mac32-tbbmalloc-export.def           |    35 +-
 src/tbbmalloc/mac64-tbbmalloc-export.def           |    35 +-
 src/tbbmalloc/proxy.cpp                            |   267 +-
 src/tbbmalloc/proxy.h                              |    43 +-
 src/tbbmalloc/proxy_overload_osx.h                 |    67 +-
 src/tbbmalloc/shared_utils.h                       |    34 +-
 src/tbbmalloc/tbb_function_replacement.cpp         |    94 +-
 src/tbbmalloc/tbb_function_replacement.h           |    36 +-
 src/tbbmalloc/tbbmalloc.cpp                        |    45 +-
 src/tbbmalloc/tbbmalloc.rc                         |    32 +-
 src/tbbmalloc/tbbmalloc_internal.h                 |   367 +-
 src/tbbmalloc/tbbmalloc_internal_api.h             |    35 +-
 src/tbbmalloc/win32-gcc-tbbmalloc-export.def       |    35 +-
 src/tbbmalloc/win32-tbbmalloc-export.def           |    31 +-
 src/tbbmalloc/win64-gcc-tbbmalloc-export.def       |    35 +-
 src/tbbmalloc/win64-tbbmalloc-export.def           |    31 +-
 src/tbbmalloc/xbox360-tbbmalloc-export.def         |    35 -
 src/tbbproxy/tbbproxy-windows.asm                  |    30 +-
 src/tbbproxy/tbbproxy.cpp                          |    45 +-
 src/test/harness.h                                 |   144 +-
 src/test/harness_allocator.h                       |    60 +-
 src/test/harness_allocator_overload.h              |    39 +
 src/test/harness_assert.h                          |    38 +-
 src/test/harness_bad_expr.h                        |    40 +-
 src/test/harness_barrier.h                         |    69 +-
 src/test/harness_checktype.h                       |    38 +-
 src/test/harness_concurrency.h                     |    36 +-
 src/test/harness_concurrency_checker.h             |    80 -
 src/test/harness_concurrency_tracker.h             |   132 +-
 src/test/harness_cpu.h                             |    48 +-
 src/test/harness_defs.h                            |   102 +-
 src/test/harness_dynamic_libs.h                    |    36 +-
 src/test/harness_eh.h                              |    50 +-
 src/test/harness_fp.h                              |    34 +-
 src/test/harness_graph.h                           |   189 +-
 src/test/harness_inject_scheduler.h                |    36 +-
 src/test/harness_iterator.h                        |   195 +-
 src/test/harness_m128.h                            |    36 +-
 src/test/harness_memory.h                          |    83 +-
 src/test/harness_mic.h                             |    34 +-
 src/test/harness_preload.h                         |    39 +
 src/test/harness_report.h                          |    44 +-
 src/test/harness_runtime_loader.h                  |    34 +-
 src/test/harness_task.h                            |    42 +-
 src/test/harness_tbb_independence.h                |    45 +-
 src/test/harness_test_cases_framework.h            |    36 +-
 src/test/harness_tls.h                             |    79 +
 src/test/harness_tsx.h                             |    42 +-
 src/test/test_ScalableAllocator.cpp                |    72 +-
 src/test/test_ScalableAllocator_STL.cpp            |    34 +-
 src/test/test_aggregator.cpp                       |    42 +-
 src/test/test_aligned_space.cpp                    |    59 +-
 src/test/test_allocator.h                          |    82 +-
 src/test/test_allocator_STL.h                      |    40 +-
 src/test/test_assembly.cpp                         |    60 +-
 src/test/test_async_msg.cpp                        |   652 +
 src/test/test_async_node.cpp                       |   625 +-
 src/test/test_atomic.cpp                           |    78 +-
 src/test/test_blocked_range.cpp                    |    34 +-
 src/test/test_blocked_range2d.cpp                  |    38 +-
 src/test/test_blocked_range3d.cpp                  |    40 +-
 src/test/test_broadcast_node.cpp                   |    78 +-
 src/test/test_buffer_node.cpp                      |    59 +-
 src/test/test_cache_aligned_allocator.cpp          |    34 +-
 src/test/test_cache_aligned_allocator_STL.cpp      |    34 +-
 src/test/test_cilk_common.h                        |    36 +-
 src/test/test_cilk_dynamic_load.cpp                |    38 +-
 src/test/test_cilk_interop.cpp                     |    36 +-
 src/test/test_combinable.cpp                       |   401 +-
 src/test/test_composite_node.cpp                   |   267 +-
 src/test/test_concurrent_hash_map.cpp              |    40 +-
 src/test/test_concurrent_lru_cache.cpp             |    34 +-
 src/test/test_concurrent_monitor.cpp               |    36 +-
 src/test/test_concurrent_priority_queue.cpp        |    69 +-
 src/test/test_concurrent_queue.cpp                 |   198 +-
 src/test/test_concurrent_queue_whitebox.cpp        |    30 +-
 src/test/test_concurrent_unordered_common.h        |   111 +-
 src/test/test_concurrent_unordered_map.cpp         |    58 +-
 src/test/test_concurrent_unordered_set.cpp         |    48 +-
 src/test/test_concurrent_vector.cpp                |    75 +-
 src/test/test_condition_variable.h                 |    34 +-
 src/test/test_container_move_support.h             |    45 +-
 src/test/test_continue_node.cpp                    |    88 +-
 src/test/test_critical_section.cpp                 |    56 +-
 src/test/test_dynamic_link.cpp                     |    32 +-
 src/test/test_eh_algorithms.cpp                    |    70 +-
 src/test/test_eh_flow_graph.cpp                    |   111 +-
 src/test/test_eh_tasks.cpp                         |   130 +-
 src/test/test_enumerable_thread_specific.cpp       |   131 +-
 src/test/test_examples_common_utility.cpp          |    40 +-
 src/test/test_fast_random.cpp                      |    42 +-
 src/test/test_flow_graph.cpp                       |    52 +-
 src/test/test_flow_graph_whitebox.cpp              |   100 +-
 src/test/test_fp.cpp                               |    42 +-
 src/test/test_function_node.cpp                    |   118 +-
 src/test/test_gfx_factory.cpp                      |   309 +
 src/test/test_global_control.cpp                   |   651 +-
 src/test/test_global_control_whitebox.cpp          |    34 +-
 src/test/test_halt.cpp                             |    40 +-
 src/test/test_handle_perror.cpp                    |    36 +-
 src/test/test_hw_concurrency.cpp                   |    34 +-
 src/test/test_indexer_node.cpp                     |   112 +-
 src/test/test_initializer_list.h                   |    36 +-
 src/test/test_inits_loop.cpp                       |    34 +-
 src/test/test_intrusive_list.cpp                   |    38 +-
 src/test/test_ittnotify.cpp                        |    34 +-
 src/test/test_join_node.cpp                        |   887 +-
 src/test/test_lambda.cpp                           |    36 +-
 src/test/test_limiter_node.cpp                     |   117 +-
 src/test/test_malloc_atexit.cpp                    |    50 +-
 src/test/test_malloc_compliance.cpp                |   223 +-
 src/test/test_malloc_init_shutdown.cpp             |    34 +-
 src/test/test_malloc_lib_unload.cpp                |    40 +-
 src/test/test_malloc_overload.cpp                  |   155 +-
 src/test/test_malloc_pools.cpp                     |   529 +-
 src/test/test_malloc_pure_c.c                      |    34 +-
 src/test/test_malloc_regression.cpp                |    34 +-
 src/test/test_malloc_used_by_lib.cpp               |    34 +-
 src/test/test_malloc_whitebox.cpp                  |   201 +-
 src/test/test_model_plugin.cpp                     |    68 +-
 src/test/test_multifunction_node.cpp               |   124 +-
 src/test/test_mutex.cpp                            |    34 +-
 src/test/test_mutex_native_threads.cpp             |    43 +-
 src/test/test_opencl_kernel_32.spir                |   Bin 0 -> 1440 bytes
 src/test/test_opencl_kernel_64.spir                |   Bin 0 -> 1468 bytes
 src/test/test_opencl_node.cl                       |   189 +
 src/test/test_opencl_node.cpp                      |   851 ++
 src/test/test_opencl_precompiled_kernel_gpu_32.ir  |   Bin 0 -> 4110 bytes
 src/test/test_opencl_precompiled_kernel_gpu_64.ir  |   Bin 0 -> 4186 bytes
 src/test/test_openmp.cpp                           |   127 +-
 src/test/test_overwrite_node.cpp                   |    38 +-
 src/test/test_parallel_do.cpp                      |   225 +-
 src/test/test_parallel_for.cpp                     |   157 +-
 src/test/test_parallel_for_each.cpp                |    46 +-
 src/test/test_parallel_for_vectorization.cpp       |    68 +-
 src/test/test_parallel_invoke.cpp                  |    42 +-
 src/test/test_parallel_pipeline.cpp                |    88 +-
 src/test/test_parallel_reduce.cpp                  |   137 +-
 src/test/test_parallel_scan.cpp                    |   114 +-
 src/test/test_parallel_sort.cpp                    |   189 +-
 src/test/test_parallel_while.cpp                   |    54 +-
 src/test/test_partitioner.h                        |    37 +-
 src/test/test_partitioner_whitebox.cpp             |   125 +-
 src/test/test_partitioner_whitebox.h               |    54 +-
 src/test/test_pipeline.cpp                         |    66 +-
 src/test/test_pipeline_with_tbf.cpp                |    94 +-
 src/test/test_priority_queue_node.cpp              |    58 +-
 src/test/test_queue_node.cpp                       |    76 +-
 src/test/test_range_based_for.h                    |    30 +-
 src/test/test_reader_writer_lock.cpp               |    34 +-
 src/test/test_runtime_loader.cpp                   |    38 +-
 src/test/test_rwm_upgrade_downgrade.cpp            |    32 +-
 src/test/test_semaphore.cpp                        |    36 +-
 src/test/test_sequencer_node.cpp                   |    64 +-
 src/test/test_source_node.cpp                      |   178 +-
 src/test/test_split_node.cpp                       |    34 +-
 src/test/test_static_assert.cpp                    |    34 +-
 src/test/test_std_thread.cpp                       |    34 +-
 src/test/test_streaming_node.cpp                   |   895 ++
 src/test/test_tagged_msg.cpp                       |    59 +-
 src/test/test_task.cpp                             |    70 +-
 src/test/test_task_arena.cpp                       |   815 +-
 src/test/test_task_assertions.cpp                  |    38 +-
 src/test/test_task_auto_init.cpp                   |    36 +-
 src/test/test_task_enqueue.cpp                     |    87 +-
 src/test/test_task_group.cpp                       |    51 +-
 src/test/test_task_leaks.cpp                       |    48 +-
 src/test/test_task_priority.cpp                    |   185 +-
 src/test/test_task_scheduler_init.cpp              |   291 +-
 src/test/test_task_scheduler_observer.cpp          |    47 +-
 src/test/test_task_steal_limit.cpp                 |    34 +-
 src/test/test_tbb_condition_variable.cpp           |    34 +-
 src/test/test_tbb_fork.cpp                         |   176 +-
 src/test/test_tbb_header.cpp                       |   107 +-
 src/test/test_tbb_thread.cpp                       |    34 +-
 src/test/test_tbb_version.cpp                      |    55 +-
 src/test/test_thread.h                             |    92 +-
 src/test/test_tick_count.cpp                       |    44 +-
 src/test/test_tuple.cpp                            |    80 +-
 src/test/test_write_once_node.cpp                  |    46 +-
 src/test/test_yield.cpp                            |    34 +-
 1528 files changed, 103067 insertions(+), 76439 deletions(-)

diff --cc debian/changelog
index a1bf630,0000000..cf3eb9f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,357 -1,0 +1,368 @@@
++tbb (2017~U7-1~exp1) experimental; urgency=medium
++
++  * Upgrade to latest upstream version of TBB.
++    + This now builds with gcc 7. Targets: #853679
++    + This supports s390x. Targets: #809663
++  * Update copyright file to Apache 2.0 to match new upstream version.
++  * Fix -march logic in i386 building. Targets: #855088
++  * Fix watch file to point to new upstream on github. Targets: #866678
++
++ -- Steve Capper <steven.capper at gmail.com>  Sat, 08 Jul 2017 10:45:31 +0100
++
 +tbb (4.3~20150611-2) unstable; urgency=medium
 +
 +  * Add support for armel by distinguishing from armhf.
 +  * Fold in unit test timeout logic in to tally patch.
 +
 + -- Steve Capper <steven.capper at gmail.com>  Fri, 03 Jun 2016 20:30:33 +0100
 +
 +tbb (4.3~20150611-1) unstable; urgency=medium
 +
 +  * Dump out /proc/cpuinfo and gcc preprocessor directives on build to
 +    help debug issues.
 +  * Timeout of 10 minutes set on unit tests. Any tests that timeout are
 +    logged.
 +
 +  [Mathieu Malaterre ]
 +  * Tweak 64 bits detection.
 +
 + -- Steve Capper <steven.capper at gmail.com>  Mon, 30 May 2016 17:01:44 +0100
 +
 +tbb (4.3~20150611-0.1) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +
 +  [ Matthias Klose ]
 +  * Upload version from experimental to sid, fixing build with GCC 5.
 +    Closes: #778139.
 +  * The architecture list is now marked as linux-any. Closes: #748876.
 +  * Multiarchify the packages (Marc Glisse). Closes: #751689.
 +  * The new upstream fixes the check for __TBB_CPP11_TYPE_PROPERTIES_PRESENT.
 +    Closes: #779553.
 +
 +  [ Adam Conrad ]
 +  * gcc-atomic-detection.patch: Fix the gcc atomic detection to work for
 +    gcc-5.x and up, as well as adding -latomic to LIBS (closes: #787084)
 +  * gcc-atomic-always.patch: Always define TBB_USE_GCC_BUILTINS for GCC.
 +  * debian/tbb.pc.in: Add -latomic to the pkg-config file for the above.
 +
 + -- Matthias Klose <doko at debian.org>  Sat, 05 Sep 2015 19:06:39 +0200
 +
 +tbb (4.3~20150611-1~exp3) experimental; urgency=medium
 +
 +  * Put Mathieu's ppc32 gcc atomic disable patch back in (it shouldn't
 +      have been removed).
 +  * Switch target architecture to linux-any.
 +  * Go full atomic, move all __sync to __atomic.
 +
 + -- Steve Capper <steven.capper at gmail.com>  Fri, 03 Jul 2015 20:20:34 +0100
 +
 +tbb (4.3~20150611-1~exp2) experimental; urgency=medium
 +
 +  * Replace __sync_val_compare_and_swap with __atomic_compare_exchange_n for
 +    gcc_generic.h
 +    - Original patch by Mathieu Malaterre, some logic has been tweaked.
 +
 + -- Steve Capper <steven.capper at gmail.com>  Thu, 02 Jul 2015 19:32:04 +0100
 +
 +tbb (4.3~20150611-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release.
 +    + Mainly C++11 features/fixes.
 +
 + -- Steve Capper <steven.capper at gmail.com>  Sat, 20 Jun 2015 16:31:03 +0100
 +
 +tbb (4.2~20140122-6) experimental; urgency=medium
 +
 +  * First stab at an experimental upload.
 +  * No substantive changes from -5.
 +
 + -- Steve Capper <steven.capper at gmail.com>  Mon, 27 Apr 2015 21:37:32 +0100
 +
 +tbb (4.2~20140122-5) unstable; urgency=medium
 +
 +  * Locked down build architectures to:
 +        amd64, arm64, armhf, hppa, i386, powerpc and ppc64el
 +
 + -- Steve Capper <steven.capper at gmail.com>  Thu, 22 Jan 2015 17:42:38 +0000
 +
 +tbb (4.2~20140122-4) unstable; urgency=medium
 +  * Bump standards version to 3.9.6.
 +  * Add debian/tbb.pc to clean list.
 +
 +  [ Mathieu Malaterre ]
 +  * Don't use gcc atomics for ppc32. Closes: #762656
 +
 + -- Steve Capper <steven.capper at gmail.com>  Thu, 30 Oct 2014 17:55:02 +0000
 +
 +tbb (4.2~20140122-3) unstable; urgency=medium
 +
 +  * Unit test execution failures no longer cause build to fail; instead take a
 +    tally of passes/failures to make it easier to analyse which cases are prone
 +    to failure.
 +    + debian/patches/tally-unit-test-fails.patch
 +  * debian/rules modified s.t. the unit tests are no longer executed twice
 +
 + -- Steve Capper <steven.capper at gmail.com>  Fri, 19 Sep 2014 20:35:24 +0100
 +
 +tbb (4.2~20140122-2) unstable; urgency=medium
 +
 +  * Unit test compile errors no longer ignored. Closes: #752820
 +  * for i386 architecture, set march=i586 (has to match gcc): Closes: #756233
 +  * Debian architecture overrides uname -m, allows pbuilder i386 builds.
 +  * Amended Linux kernel version detection logic to work with x.y.
 +  * Bump standards version to 3.9.5. 
 +  * A couple of Lintian source-is-missing errors overridden. 
 +
 + -- Steve Capper <steven.capper at gmail.com>  Sat, 26 Jul 2014 18:45:08 +0100
 +
 +tbb (4.2~20140122-1.1) unstable; urgency=low
 +
 +  [ Helge Deller ]
 +  * Enable builds for hppa. Closes: #748876
 +
 +  [ Wookey ]
 +  * Enable builds for arm64. Closes: #748508
 +
 +  [ Mathieu Malaterre ]
 +  * Non-maintainer upload.
 +  * Prefer `Arch: any` now that tbb build on most arch now
 +
 + -- Mathieu Malaterre <malat at debian.org>  Wed, 04 Jun 2014 15:08:28 +0200
 +
 +tbb (4.2~20140122-1) unstable; urgency=medium
 +
 +  * Added myself as maintainer for package.
 +  * Added a symlink to tbb-examples so build instructions now work for them.
 +  * Added a dependency to libjs-query and a symlink to remove the embedded
 +    copy.
 +  * New upstream release:
 +    + armv7l build fixes, removed armhf.patch
 +    + rebased adddebug.patch and fixnonlinux.patch  
 +
 + -- Steve Capper <steven.capper at gmail.com>  Mon, 07 Apr 2014 14:51:05 +0100
 +
 +tbb (4.2~20130725-2) unstable; urgency=low
 +
 +  * Oprhan the package, set maintainer to Debian QA Group
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Sun, 02 Mar 2014 13:05:59 -0500
 +
 +tbb (4.2~20130725-1.2) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Add mips mipsel to the list of supported arches in debian/control
 +    Closes:  #739965
 +
 + -- Anibal Monsalve Salazar <anibal at debian.org>  Mon, 24 Feb 2014 12:27:06 +0000
 +
 +tbb (4.2~20130725-1.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * New upstream
 +  * Fix buildds: x32/sparc/sparc64
 +  * Do not compress Makefiles in tbb-examples
 +
 + -- Mathieu Malaterre <malat at debian.org>  Tue, 08 Oct 2013 08:23:25 +0000
 +
 +tbb (4.1~20130613-1.2) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Fix armhf buildd
 +    + debian/patches/armhf.patch
 +  * Fix hardening flags (missing CPPFLAGS)
 +  * Fix d/watch file
 +
 + -- Mathieu Malaterre <malat at debian.org>  Wed, 18 Sep 2013 09:22:27 +0200
 +
 +tbb (4.1~20130613-1.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Remove patches from bug #692033, since integrated upstream now
 +  * Upload to sid
 +    - Closes: #714986, #715162, #713347, #715425, #705495
 +
 + -- Mathieu Malaterre <malat at debian.org>  Mon, 26 Aug 2013 13:00:26 +0200
 +
 +tbb (4.1~20130613-1.1~exp1) experimental; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Upload 4.1, update 4
 +  * Import patches for armhf (from 4.0+r233+update5-0.2)
 +
 + -- Mathieu Malaterre <malat at debian.org>  Sat, 06 Jul 2013 15:01:19 +0200
 +
 +tbb (4.1~20130516-1.1~exp1) experimental; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Upload 4.1, update 3. Closes: #695683
 +  * Switch to dh/9. Get harderning compilation
 +  * Add d/watch. Closes: #695683
 +  * Use d/rules to generate version. Closes: #712146
 +  * Build PowerPC/SPE. Closes: #695685
 +  * Use new d/rules. Bump Std-Vers: 3.9.4
 +
 + -- Mathieu Malaterre <malat at debian.org>  Fri, 05 Jul 2013 09:06:21 +0200
 +
 +tbb (4.0+r233+update5-0.2) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Add armhf to the list of supported arches in debian/control, now that
 +    ARMv7 support is there. Not (yet) worth doing for armel.
 +
 + -- Steve McIntyre <steve.mcintyre at linaro.org>  Mon, 24 Jun 2013 17:05:45 +0100
 +
 +tbb (4.0+r233+update5-0.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Updated to upstream 4.0 Update 5 release.
 +    + Added 64-bit PowerPC support
 +  * Applied ARMv7-A support patches from linaro. (Closes: #692033)
 +
 + -- Andrew Lee (李健秋) <ajqlee at debian.org>  Wed, 12 Jun 2013 13:57:09 +0800
 +
 +tbb (4.0+r233-1) unstable; urgency=low
 +
 +  * New upstream release
 +    + Add 32-bit PowerPC support
 +  * Update to Standards-Version 3.9.2 (no changes)
 +  * Add note to package descriptions that Pentium4-compatible and higher is
 +    supported for i386 architecture users (Closes: #642248)
 +  * Do not run test suite when DEB_BUILD_OPTIONS=nocheck (Closes: #642251)
 +  * Do not ignore 'make clean' errors (Closes: #642242)
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 24 Sep 2011 17:16:45 -0400
 +
 +tbb (3.0+r147-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * debian/copyright: update years
 +  * debian/control: Add ppc64 to the Architecture fields
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Thu, 31 Mar 2011 15:02:52 -0400
 +
 +tbb (3.0+r035-2) unstable; urgency=low
 +
 +  * Make examples build properly (Closes: #608347)
 +    + Ship common Makefile snippets from upstream
 +    + Document that upstream's _debug library versions are not shipped
 +  * Update to Standards-Version 3.9.1 (no changes)
 +  
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Fri, 31 Dec 2010 15:21:02 -0500
 +
 +tbb (3.0+r035-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Update to Standards-Version 3.9.0 (no changes)
 +  * Switch to dpkg-source 3.0 (quilt) format 
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Mon, 28 Jun 2010 19:29:45 -0400
 +
 +tbb (3.0+r018-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #581614)
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 15 May 2010 07:58:17 -0400
 +
 +tbb (2.2+r013-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * debian/copyright: update years
 +  * Update to Standards-Version 3.8.4 (no changes)
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 20 Feb 2010 12:22:19 -0500
 +
 +tbb (2.2+r012-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Update pkg-config metadata file
 +  * Add ${misc:Depends} as recommended by lintian
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Wed, 27 Jan 2010 09:50:16 -0500
 +
 +tbb (2.2+r009-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Sun, 18 Oct 2009 14:50:25 -0400
 +
 +tbb (2.2+r004-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #545702)
 +  * Update to Standards-Version 3.8.3 (no changes)
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Wed, 09 Sep 2009 17:22:22 -0400
 +
 +tbb (2.1r017-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Change libtbb2-dbg to section debug for new archive layout
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Sun, 10 May 2009 21:15:34 -0400
 +
 +tbb (2.1r015-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * 02_replace_arch_command.dpatch: merged upstream
 +  * Remove build dependency on dpatch and modify debian-rules accordingly
 +  * Add .pc file to help when building against the library
 +  * Update to Standards-Version 3.8.1 (no changes)
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Tue, 17 Mar 2009 15:52:47 -0400
 +
 +tbb (2.1~20080605-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Drop patches
 +    - 01_add_soname: suitable fascimile implemented upstream
 +    - 03_ias_patch: upstream now using as instead of ias
 +  * Update to Standards-Version 3.8.0 (no changes)
 +  * Add new upstream Doxygen documentation (in libtbb-doc package)
 +  * Register new documentation with doc-base
 +  * debian/copyright: Update years of copyright
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Tue, 08 Jul 2008 18:51:22 -0400
 +
 +tbb (2.0r020-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * debian/patches/04_g++-4.3.dpatch: Removed, integrated upstream
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Tue, 29 Apr 2008 15:31:09 -0400
 +
 +tbb (2.0r017-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 08 Mar 2008 22:15:13 -0500
 +
 +tbb (2.0r014-4) unstable; urgency=low
 +
 +  * Make tbb-examples recommend libtbb-dev.
 +  * Make libtbb-dev suggest tbb-examples.
 +  * Patch to allow building with g++-4.3 (Closes: #462415)
 +  * Only conditionally create symlink (Closes: #465617)
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Thu, 14 Feb 2008 18:36:15 -0500
 +
 +tbb (2.0r014-3) unstable; urgency=low
 +
 +  * Fix short descriptions of tbb-examples (Closes: #457442)
 +  * Fix short descriptions of libtbb2-dbg (Closes: #457443)
 +  * Add patch to allow build to succeed on Itanium
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Thu,  3 Jan 2008 15:21:50 -0500
 +
 +tbb (2.0r014-2) unstable; urgency=low
 +
 +  * debian/copyright: Fix license statement.
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Wed, 19 Dec 2007 21:17:16 -0500
 +
 +tbb (2.0r014-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #434583)
 +
 + -- Roberto C. Sanchez <roberto at connexer.com>  Fri, 14 Dec 2007 23:10:58 -0500
 +
diff --cc debian/control
index b04ad3b,0000000..2864d7e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,91 -1,0 +1,89 @@@
 +Source: tbb
 +Priority: extra
 +Maintainer: Steve Capper <steven.capper at gmail.com>
 +Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libjs-jquery, dh-exec (>=0.3)
- Standards-Version: 3.9.6
++Standards-Version: 3.9.8
 +Section: libs
- Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/tbb.git
- Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/tbb.git
- Homepage: https://www.threadingbuildingblocks.org/
++Homepage: http://threadingbuildingblocks.org/
 +
 +Package: libtbb-dev
 +Section: libdevel
 +Architecture: linux-any
 +Multi-arch: same
 +Depends: libtbb2 (= ${binary:Version}), ${misc:Depends}
 +Suggests: tbb-examples, libtbb-doc
 +Description: parallelism library for C++ - development files
 + TBB is a library that helps you leverage multi-core processor
 + performance without having to be a threading expert. It represents a
 + higher-level, task-based parallelism that abstracts platform details
 + and threading mechanism for performance and scalability.
 + .
 + (Note: if you are a user of the i386 architecture, i.e., 32-bit Intel
 + or compatible hardware, this package only supports Pentium4-compatible
 + and higher processors.)
 + .
 + This package includes the TBB development files.
 +
 +Package: libtbb2
 +Architecture: linux-any
 +Multi-arch: same
 +Pre-Depends: ${misc:Pre-Depends}
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Description: parallelism library for C++ - runtime files
 + TBB is a library that helps you leverage multi-core processor
 + performance without having to be a threading expert. It represents a
 + higher-level, task-based parallelism that abstracts platform details
 + and threading mechanism for performance and scalability.
 + .
 + (Note: if you are a user of the i386 architecture, i.e., 32-bit Intel
 + or compatible hardware, this package only supports Pentium4-compatible
 + and higher processors.)
 + .
 + This package includes the TBB runtime files.
 +
 +Package: libtbb2-dbg
 +Section: debug
 +Architecture: linux-any
 +Multi-arch: same
 +Depends: libtbb2 (= ${binary:Version}), ${misc:Depends}
 +Description: parallelism library for C++ - debugging symbols
 + TBB is a library that helps you leverage multi-core processor
 + performance without having to be a threading expert. It represents a
 + higher-level, task-based parallelism that abstracts platform details
 + and threading mechanism for performance and scalability.
 + .
 + (Note: if you are a user of the i386 architecture, i.e., 32-bit Intel
 + or compatible hardware, this package only supports Pentium4-compatible
 + and higher processors.)
 + .
 + This package includes the TBB debugging symbols.
 +
 +Package: libtbb-doc
 +Section: doc
 +Architecture: all
 +Depends: ${misc:Depends}, libjs-jquery (>= 1.7.1)
 +Recommends: libtbb-dev, tbb-examples
 +Description: parallelism library for C++ - documentation
 + TBB is a library that helps you leverage multi-core processor
 + performance without having to be a threading expert. It represents a
 + higher-level, task-based parallelism that abstracts platform details
 + and threading mechanism for performance and scalability.
 + .
 + This package includes the TBB documentation files.
 +
 +Package: tbb-examples
 +Section: doc
 +Architecture: linux-any
 +Depends: ${misc:Depends}
 +Recommends: libtbb-dev, libtbb-doc
 +Description: parallelism library for C++ - example files
 + TBB is a library that helps you leverage multi-core processor
 + performance without having to be a threading expert. It represents a
 + higher-level, task-based parallelism that abstracts platform details
 + and threading mechanism for performance and scalability.
 + .
 + (Note: if you are a user of the i386 architecture, i.e., 32-bit Intel
 + or compatible hardware, this package only supports Pentium4-compatible
 + and higher processors.)
 + .
 + This package includes the TBB example files.
diff --cc debian/copyright
index b2a5c18,0000000..5926234
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,41 -1,0 +1,31 @@@
 +This package was debianized by Roberto C. Sanchez <roberto at connexer.com> on
 +Fri, 14 Dec 2007 23:10:58 -0500.
 +
 +It was downloaded from http://threadingbuildingblocks.org
 +
 +Upstream Author: Intel Corporation
 +
- Copyright: Copyright (c) 2005-2011 Intel Corporation
++Copyright: Copyright (c) 2005-2017 Intel Corporation
 +
 +License:
 +
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2 as
-    published by the Free Software Foundation.
++   Licensed under the Apache License, Version 2.0 (the "License");
++   you may not use this file except in compliance with the License.
++   You may obtain a copy of the License at
 +
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
++       http://www.apache.org/licenses/LICENSE-2.0
 +
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
++   Unless required by applicable law or agreed to in writing, software
++   distributed under the License is distributed on an "AS IS" BASIS,
++   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++   See the License for the specific language governing permissions and
++   limitations under the License.
 +
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
- 
- Additionally, the TBB code carries the following exception:
- 
-    As a special exception, you may use this file as part of a free software
-    library without restriction.  Specifically, if other files instantiate
-    templates or use macros or inline functions from this file, or you compile
-    this file and link it with other files to produce an executable, this
-    file does not by itself cause the resulting executable to be covered by
-    the GNU General Public License.  This exception does not however
-    invalidate any other reasons why the executable file might be covered by
-    the GNU General Public License.
++On Debian systems, the complete text of the Apache 2.0 License can be found at
++`/usr/share/common-licenses/Apache-2.0'.
 +
 +The Debian packaging is Copyright (c) 2007-2011, Athena Capital Research
- <acr-debian at athenacr.com> and is licensed under the GPL version 2, see above.
++<acr-debian at athenacr.com> and is licensed under the GPL version 2, the complete text
++of the GNU General Public License can be fodun on Debian systems at
++`/usr/share/common-licenses/GPL-2'.
 +
diff --cc debian/patches/adddebug.patch
index 1be88e0,0000000..a7f3e75
mode 100644,000000..100644
--- a/debian/patches/adddebug.patch
+++ b/debian/patches/adddebug.patch
@@@ -1,57 -1,0 +1,48 @@@
 +Description: add debug info
 +Author: Mathieu Malaterre <malat at debian.org>
 +
- Index: tbb-4.3~20150611/build/linux.inc
++Index: tbb-2017~U7/build/linux.inc
 +===================================================================
- --- tbb-4.3~20150611.orig/build/linux.inc
- +++ tbb-4.3~20150611/build/linux.inc
- @@ -36,9 +36,17 @@ endif
++--- tbb-2017~U7.orig/build/linux.inc
+++++ tbb-2017~U7/build/linux.inc
++@@ -38,9 +38,17 @@ endif
 + 
 + ifndef arch
 +         uname_m:=$(shell uname -m)
 ++        uname_a:=$(shell uname -a)
 ++        deb_host_arch:=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 ++        $(warning "uname_m: " $(uname_m))
 ++        $(warning "uname_a: " $(uname_a))
 ++        $(warning "deb_host_arch: " $(deb_host_arch))
 +         ifeq ($(uname_m),i686)
 +                 export arch:=ia32
 +         endif
 ++        ifeq ($(uname_m),i686-AT386)
 ++                export arch:=ia32
 ++        endif
 +         ifeq ($(uname_m),ia64)
 +                 export arch:=ia64
 +         endif
- @@ -46,13 +54,21 @@ ifndef arch
++@@ -48,13 +56,21 @@ ifndef arch
 +                 export arch:=intel64
 +         endif
 +         ifeq ($(uname_m),sparc64)
 +-                export arch:=sparc
 ++                export arch:=sparc64
 +         endif
 +         ifeq ($(uname_m),armv7l)
 +                 export arch:=armv7
 +         endif
 ++        ifeq ($(uname_m),ppc)
 ++                export arch:=ppc32
 ++        endif
 ++        ifeq ($(deb_host_arch),x32)
 ++                export arch:=x32
 ++        endif
 +         ifndef arch
 +                 export arch:=$(uname_m)
 ++                $(warning "Unknown arch: " $(arch))
 ++                $(warning "Unknown uname_a: " $(uname_a))
 +         endif
 + endif
 + 
- @@ -97,7 +113,7 @@ SONAME_SUFFIX =$(shell grep TBB_COMPATIB
-  ifeq ($(arch),ia64)
-          def_prefix = lin64ipf
-  endif
- -ifeq ($(arch),sparc)
- +ifeq ($(arch),sparc64)
-          def_prefix = lin64
-  endif
-  ifeq ($(arch),armv7)
diff --cc debian/patches/buildi386.patch
index 6977bfc,0000000..99df72a
mode 100644,000000..100644
--- a/debian/patches/buildi386.patch
+++ b/debian/patches/buildi386.patch
@@@ -1,34 -1,0 +1,30 @@@
 +Description: allow i386 builds on amd64 and set march to match gcc
 +Author: Steve Capper <steven.capper at gmail.com>
 +
- Index: tbb-4.3~20150611/build/linux.gcc.inc
++Index: tbb-2017~U7/build/linux.gcc.inc
 +===================================================================
- --- tbb-4.3~20150611.orig/build/linux.gcc.inc
- +++ tbb-4.3~20150611/build/linux.gcc.inc
- @@ -80,7 +80,11 @@ endif
++--- tbb-2017~U7.orig/build/linux.gcc.inc
+++++ tbb-2017~U7/build/linux.gcc.inc
++@@ -90,7 +90,7 @@ endif
 + 
 + ifeq (ia32,$(arch))
 +     ITT_NOTIFY = -DDO_ITT_NOTIFY
 +-    CPLUS_FLAGS += -m32 -march=pentium4 $(RTM_KEY)
- +    ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),i386)
- +        CPLUS_FLAGS += -m32 -march=i586 $(ENABLE_RTM)
- +    else
- +        CPLUS_FLAGS += -m32 -march=pentium4 $(ENABLE_RTM)
- +    endif
+++    CPLUS_FLAGS += -m32 $(RTM_KEY)
 +     LIB_LINK_FLAGS += -m32
 + endif
 + 
- Index: tbb-4.3~20150611/build/linux.inc
++Index: tbb-2017~U7/build/linux.inc
 +===================================================================
- --- tbb-4.3~20150611.orig/build/linux.inc
- +++ tbb-4.3~20150611/build/linux.inc
- @@ -65,6 +65,9 @@ ifndef arch
++--- tbb-2017~U7.orig/build/linux.inc
+++++ tbb-2017~U7/build/linux.inc
++@@ -67,6 +67,9 @@ ifndef arch
 +         ifeq ($(deb_host_arch),x32)
 +                 export arch:=x32
 +         endif
 ++        ifeq ($(deb_host_arch),i386)
 ++                export arch:=ia32
 ++        endif
 +         ifndef arch
 +                 export arch:=$(uname_m)
 +                 $(warning "Unknown arch: " $(arch))
diff --cc debian/patches/failonbadtests.patch
index 2ddf1e9,0000000..afb5594
mode 100644,000000..100644
--- a/debian/patches/failonbadtests.patch
+++ b/debian/patches/failonbadtests.patch
@@@ -1,22 -1,0 +1,22 @@@
 +Description: Fail hard on serious unit test fails
 +Author: Steve Capper <steven.capper at gmail.com>
 +
- Index: tbb-4.3~20150611/Makefile
++Index: tbb-2017~U7/Makefile
 +===================================================================
- --- tbb-4.3~20150611.orig/Makefile
- +++ tbb-4.3~20150611/Makefile
++--- tbb-2017~U7.orig/Makefile
+++++ tbb-2017~U7/Makefile
 +@@ -41,10 +41,10 @@ tbbproxy: mkdir
 + 	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbproxy cfg=release tbbproxy
 + 
 + test: tbb tbbmalloc $(if $(use_proxy),tbbproxy)
 +-	-$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc_test
 +-	-$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.test cfg=debug
 +-	-$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test
 +-	-$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.test cfg=release
 ++	$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc_test
 ++	$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.test cfg=debug
 ++	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test
 ++	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.test cfg=release
 + 
 + rml: mkdir
 + 	$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.rml cfg=debug
diff --cc debian/patches/fixnonlinux.patch
index 9f72f6f,0000000..41a2a90
mode 100644,000000..100644
--- a/debian/patches/fixnonlinux.patch
+++ b/debian/patches/fixnonlinux.patch
@@@ -1,68 -1,0 +1,68 @@@
 +Description: tweak system inspection to build on hurd/kFreeBSD/x32 systems
 +Author: Mathieu Malaterre <malat at debian.org>
 +
- Index: tbb-4.3~20150611/build/common.inc
++Index: tbb-2017~U7/build/common.inc
 +===================================================================
- --- tbb-4.3~20150611.orig/build/common.inc
- +++ tbb-4.3~20150611/build/common.inc
++--- tbb-2017~U7.orig/build/common.inc
+++++ tbb-2017~U7/build/common.inc
 +@@ -33,6 +33,14 @@ ifndef tbb_os
 +   ifeq ($(OS), Linux)
 +     export tbb_os=linux
 +   endif
 ++  # hurd-386
 ++  ifeq ($(OS), GNU)
 ++    export tbb_os=linux
 ++  endif
 ++  # kfreebsd-*
 ++  ifeq ($(OS), GNU/kFreeBSD)
 ++    export tbb_os=FreeBSD
 ++  endif
 +   ifeq ($(OS), Darwin)
 +     export tbb_os=macos
 +   endif
- Index: tbb-4.3~20150611/build/linux.gcc.inc
++Index: tbb-2017~U7/build/linux.gcc.inc
 +===================================================================
- --- tbb-4.3~20150611.orig/build/linux.gcc.inc
- +++ tbb-4.3~20150611/build/linux.gcc.inc
- @@ -94,6 +94,11 @@ ifeq (ppc32,$(arch))
++--- tbb-2017~U7.orig/build/linux.gcc.inc
+++++ tbb-2017~U7/build/linux.gcc.inc
++@@ -104,6 +104,11 @@ ifeq (ppc32,$(arch))
 +     LIB_LINK_FLAGS += -m32
 + endif
 + 
 ++ifeq (x32,$(arch))
 ++    CPLUS_FLAGS += -mx32
 ++    LIB_LINK_FLAGS += -mx32
 ++endif
 ++
 + ifeq (bg,$(arch))
 +     CPLUS = $(firstword $(notdir $(shell which powerpc{64,32,}-bg{z..a}-linux-g++ 2>/dev/null)))
 +     CONLY = $(firstword $(notdir $(shell which powerpc{64,32,}-bg{z..a}-linux-gcc 2>/dev/null)))
- Index: tbb-4.3~20150611/build/FreeBSD.inc
++Index: tbb-2017~U7/build/FreeBSD.inc
 +===================================================================
- --- tbb-4.3~20150611.orig/build/FreeBSD.inc
- +++ tbb-4.3~20150611/build/FreeBSD.inc
++--- tbb-2017~U7.orig/build/FreeBSD.inc
+++++ tbb-2017~U7/build/FreeBSD.inc
 +@@ -17,15 +17,22 @@
-  # reasons why the executable file might be covered by the GNU General Public License.
++ #
 + 
 + ifndef arch
 +-        ifeq ($(shell uname -m),i386)
 ++        uname_m:=$(shell uname -m)
 ++        uname_a:=$(shell uname -a)
 ++        ifeq ($(uname_m),i386)
 +                 export arch:=ia32
 +         endif
 +-        ifeq ($(shell uname -m),ia64)
 ++        ifeq ($(uname_m),ia64)
 +                 export arch:=ia64
 +         endif
 +-        ifeq ($(shell uname -m),amd64)
 ++        ifeq ($(uname_m),amd64)
 +                 export arch:=intel64
 +         endif
 ++        ifndef arch
 ++                export arch:=$(uname_m)
 ++                $(warning "FreeBSD Unknown arch: " $(arch))
 ++                $(warning "FreeBSD Unknown uname_a: " $(uname_a))
 ++        endif
 + endif
 + 
 + ifndef runtime
diff --cc debian/patches/gcc-atomic-always.patch
index 8e7c72a,0000000..c2dabc9
mode 100644,000000..100644
--- a/debian/patches/gcc-atomic-always.patch
+++ b/debian/patches/gcc-atomic-always.patch
@@@ -1,15 -1,0 +1,17 @@@
 +Description: Always define TBB_USE_GCC_BUILTINS on GCC.
 +Author: Adam Conrad <adconrad at ubuntu.com>
 +
- --- tbb-4.3~20150611.orig/include/tbb/tbb_machine.h
- +++ tbb-4.3~20150611/include/tbb/tbb_machine.h
- @@ -231,6 +231,9 @@ template<> struct atomic_selector<8> {
++Index: tbb-2017~U7/include/tbb/tbb_machine.h
++===================================================================
++--- tbb-2017~U7.orig/include/tbb/tbb_machine.h
+++++ tbb-2017~U7/include/tbb/tbb_machine.h
++@@ -229,6 +229,9 @@ template<> struct atomic_selector<8> {
 + 
 + #elif __linux__ || __FreeBSD__ || __NetBSD__
 + 
 ++    #ifndef TBB_USE_GCC_BUILTINS
 ++        #define TBB_USE_GCC_BUILTINS 1
 ++    #endif
 +     #if (TBB_USE_GCC_BUILTINS && __TBB_GCC_BUILTIN_ATOMICS_PRESENT)
 +         #include "machine/gcc_generic.h"
 +     #elif (TBB_USE_ICC_BUILTINS && __TBB_ICC_BUILTIN_ATOMICS_PRESENT)
diff --cc debian/patches/gcc-atomic-detection.patch
index f7f1cc5,0000000..8b1a51a
mode 100644,000000..100644
--- a/debian/patches/gcc-atomic-detection.patch
+++ b/debian/patches/gcc-atomic-detection.patch
@@@ -1,20 -1,0 +1,22 @@@
 +Description: Fix the gcc atomic detection to work for
 +  gcc-5.x and up, as well as adding -latomic to LIBS
 +Author: Adam Conrad <adconrad at ubuntu.com>
 +Bug-Debian: https://bugs.debian.org/787084
- Last-Update: 2015-08-11
++Last-Update: 2017-07-08
++[ Steve Capper: rebase patch against new upstream version of TBB ]
 +
- --- tbb-4.3~20150611.orig/build/linux.gcc.inc
- +++ tbb-4.3~20150611/build/linux.gcc.inc
- @@ -49,8 +49,10 @@ ifneq (,$(shell gcc -dumpversion | egrep
++Index: tbb-2017~U7/build/linux.gcc.inc
++===================================================================
++--- tbb-2017~U7.orig/build/linux.gcc.inc
+++++ tbb-2017~U7/build/linux.gcc.inc
++@@ -45,8 +45,10 @@ ifneq (,$(shell gcc -dumpversion | egrep
 + endif
 + 
 + # gcc 4.8 and later support RTM intrinsics, but require command line switch to enable them
- -ifneq (,$(shell gcc -dumpversion | egrep  "^4\.[8-9]"))
- +# furthemore, on gcc 4.8 and later, some arches require -ltatomic to use atomic intrinsics
- +ifneq (,$(shell gcc -dumpversion | egrep  "^(4\.[8-9]|[5-9])"))
+++# furthemore, on gcc 4.8 and later, some arches require -latomic to use atomic intrinsics
++ ifneq (,$(shell gcc -dumpversion | egrep  "^(4\.[8-9]|[5-9])"))
 +     RTM_KEY = -mrtm
 ++    LIBS += -latomic
 + endif
 + 
-  ifeq ($(cfg), release)
++ # gcc 4.0 and later have -Wextra that is used by some our customers.
diff --cc debian/patches/removejsquery.patch
index 0000000,0000000..06d7bb6
new file mode 100644
--- /dev/null
+++ b/debian/patches/removejsquery.patch
@@@ -1,0 -1,0 +1,36 @@@
++Index: tbb-2017~U7/doc/html/jquery.js
++===================================================================
++--- tbb-2017~U7.orig/doc/html/jquery.js
+++++ /dev/null
++@@ -1,31 +0,0 @@
++-/*!
++- * jQuery JavaScript Library v1.7.1
++- * http://jquery.com/
++- *
++- * Copyright 2011, John Resig
++- * Dual licensed under the MIT or GPL Version 2 licenses.
++- * http://jquery.org/license
++- *
++- * Includes Sizzle.js
++- * http://sizzlejs.com/
++- * Copyright 2011, The Dojo Foundation
++- * Released under the MIT, BSD, and GPL Licenses.
++- *
++- * Date: Mon Nov 21 21:11:03 2011 -0500
++- */
++-(function(bb,L){var av=bb.document,bu=bb.navigator,bl=bb.location;var b=(function(){var bF=function(b0,b1){return new bF.fn.init(b0,b1,bD)},bU=bb.jQuery,bH=bb.$,bD,bY=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,bM=/\S/,bI=/^\s+/,bE=/\s+$/,bA=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,bN=/^[\],:{}\s]*$/,bW=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,bP=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,bJ=/(?:^|:|,)(?:\s*\[)+/g,by=/(webkit)[ \/]([\w.]+)/,bR=/(opera)(?:.*version)?[ \/]([\w.]+ [...]
++-}else{--bw}}if(!bw){bC.resolveWith(bC,bx)}}else{if(bC!==bA){bC.resolveWith(bC,e?[bA]:[])}}return bE}});b.support=(function(){var bJ,bI,bF,bG,bx,bE,bA,bD,bz,bK,bB,by,bw,bv=av.createElement("div"),bH=av.documentElement;bv.setAttribute("className","t");bv.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";bI=bv.getElementsByTagName("*");bF=bv.getElementsByTagName("a")[0];if(!bI||!bI.length||!bF){return{}}bG=av.createElem [...]
++-if(!bA||bv===3||bv===8||bv===2){return}if(bz&&bx in b.attrFn){return b(bA)[bx](bB)}if(typeof bA.getAttribute==="undefined"){return b.prop(bA,bx,bB)}by=bv!==1||!b.isXMLDoc(bA);if(by){bx=bx.toLowerCase();e=b.attrHooks[bx]||(ao.test(bx)?aY:be)}if(bB!==L){if(bB===null){b.removeAttr(bA,bx);return}else{if(e&&"set" in e&&by&&(bw=e.set(bA,bB,bx))!==L){return bw}else{bA.setAttribute(bx,""+bB);return bB}}}else{if(e&&"get" in e&&by&&(bw=e.get(bA,bx))!==null){return bw}else{bw=bA.getAttribute(bx); [...]
++-}b.event.add(this,"click._submit keypress._submit",function(bx){var bw=bx.target,bv=b.nodeName(bw,"input")||b.nodeName(bw,"button")?bw.form:L;if(bv&&!bv._submit_attached){b.event.add(bv,"submit._submit",function(e){if(this.parentNode&&!e.isTrigger){b.event.simulate("submit",this.parentNode,e,true)}});bv._submit_attached=true}})},teardown:function(){if(b.nodeName(this,"form")){return false}b.event.remove(this,"._submit")}}}if(!b.support.changeBubbles){b.event.special.change={setup:funct [...]
++-/*!
++- * Sizzle CSS Selector Engine
++- *  Copyright 2011, The Dojo Foundation
++- *  Released under the MIT, BSD, and GPL Licenses.
++- *  More information: http://sizzlejs.com/
++- */
++-(function(){var bH=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,bC="sizcache"+(Math.random()+"").replace(".",""),bI=0,bL=Object.prototype.toString,bB=false,bA=true,bK=/\\/g,bO=/\r\n/g,bQ=/\W/;[0,0].sort(function(){bA=false;return 0});var by=function(bV,e,bY,bZ){bY=bY||[];e=e||av;var b1=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!bV||typeof bV!=="string"){return bY}var bS,b3,b6,bR,b2,b5,b4,bX, [...]
++-},lt:function(bS,bR,e){return bR<e[3]-0},gt:function(bS,bR,e){return bR>e[3]-0},nth:function(bS,bR,e){return e[3]-0===bR},eq:function(bS,bR,e){return e[3]-0===bR}},filter:{PSEUDO:function(bS,bX,bW,bY){var e=bX[1],bR=bE.filters[e];if(bR){return bR(bS,bW,bX,bY)}else{if(e==="contains"){return(bS.textContent||bS.innerText||bw([bS])||"").indexOf(bX[3])>=0}else{if(e==="not"){var bT=bX[3];for(var bV=0,bU=bT.length;bV<bU;bV++){if(bT[bV]===bS){return false}}return true}else{by.error(e)}}}},CHIL [...]
++-ax.optgroup=ax.option;ax.tbody=ax.tfoot=ax.colgroup=ax.caption=ax.thead;ax.th=ax.td;if(!b.support.htmlSerialize){ax._default=[1,"div<div>","</div>"]}b.fn.extend({text:function(e){if(b.isFunction(e)){return this.each(function(bw){var bv=b(this);bv.text(e.call(this,bw,bv.text()))})}if(typeof e!=="object"&&e!==L){return this.empty().append((this[0]&&this[0].ownerDocument||av).createTextNode(e))}return b.text(this)},wrapAll:function(e){if(b.isFunction(e)){return this.each(function(bw){b(th [...]
++-if(bA>0){if(bv!=="border"){for(;bx<e;bx++){if(!bv){bA-=parseFloat(b.css(by,"padding"+bz[bx]))||0}if(bv==="margin"){bA+=parseFloat(b.css(by,bv+bz[bx]))||0}else{bA-=parseFloat(b.css(by,"border"+bz[bx]+"Width"))||0}}}return bA+"px"}bA=Z(by,bw,bw);if(bA<0||bA==null){bA=by.style[bw]||0}bA=parseFloat(bA)||0;if(bv){for(;bx<e;bx++){bA+=parseFloat(b.css(by,"padding"+bz[bx]))||0;if(bv!=="padding"){bA+=parseFloat(b.css(by,"border"+bz[bx]+"Width"))||0}if(bv==="margin"){bA+=parseFloat(b.css(by,bv+b [...]
++-}}}}})}var Q={},a8,m,aB=/^(?:toggle|show|hide)$/,aT=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,a3,aH=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],a4;b.fn.extend({show:function(bx,bA,bz){var bw,by;if(bx||bx===0){return this.animate(a0("show",3),bx,bA,bz)}else{for(var bv=0,e=this.length;bv<e;bv++){bw=this[bv];if(bw.style){by=bw.style.display;if(!b._data(bw,"olddisplay")&&by==="none"){by=bw.style [...]
++-})}})(window);
diff --cc debian/patches/series
index 4a8d6f9,0000000..9011036
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,0 +1,10 @@@
 +adddebug.patch
 +fixnonlinux.patch
 +failonbadtests.patch
 +buildi386.patch
 +linuxreleasedetect.patch
 +tally-unit-test-fails.patch
- atomic-rework.patch
 +gcc-atomic-detection.patch
 +gcc-atomic-always.patch
- allow-armel-build.patch
 +tweak-64bits-s390-hppa.patch
++removejsquery.patch
diff --cc debian/patches/tweak-64bits-s390-hppa.patch
index e8bd059,0000000..6d2262a
mode 100644,000000..100644
--- a/debian/patches/tweak-64bits-s390-hppa.patch
+++ b/debian/patches/tweak-64bits-s390-hppa.patch
@@@ -1,20 -1,0 +1,20 @@@
 +Description: Tweak 64 bits detection
 +Author: Mathieu Malaterre <malat at debian.org>
 +
- Index: tbb-4.3~20150611/build/linux.inc
++Index: tbb-2017~U7/build/linux.inc
 +===================================================================
- --- tbb-4.3~20150611.orig/build/linux.inc
- +++ tbb-4.3~20150611/build/linux.inc
- @@ -119,6 +119,12 @@ endif
-  ifeq ($(arch),sparc64)
++--- tbb-2017~U7.orig/build/linux.inc
+++++ tbb-2017~U7/build/linux.inc
++@@ -121,6 +121,12 @@ endif
++ ifneq (,$(findstring $(arch),sparc s390x))
 +         def_prefix = lin64
 + endif
 ++ifeq ($(arch),s390x)
 ++	def_prefix = lin64
 ++endif
 ++ifeq ($(arch),hppa)
 ++	def_prefix = lin64
 ++endif
 + ifeq ($(arch),armv7)
 +         def_prefix = lin32
 + endif
diff --cc debian/watch
index d9350c1,0000000..71c9c8d
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,0 +1,4 @@@
- version=3
- opts=dversionmangle=s/^(\d)(\d)~(\d{8})/$1$2_$3/,uversionmangle=s/(\d)(\d)_(\d{8})/$1.$2~$3/ \
- https://www.threadingbuildingblocks.org/download \
- https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb([0-9_]+)oss_src\.tgz
++version=4
++opts="compression=xz,repack,uversionmangle=s/\./~U/,filenamemangle=s%.*/(\d{4})_U(\d+)\.tar\.gz%@PACKAGE at _$1~U$2.tar.gz%" \
++             https://github.com/01org/@PACKAGE@/tags \
++             .*/(\d{4})_U(\d+)\.tar\.gz debian uupdate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tbb.git



More information about the debian-science-commits mailing list