[adios] 59/207: Merge upstream 1.5.0

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:37 UTC 2015


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

mckinstry pushed a commit to branch master
in repository adios.

commit 2785158396b1eb164152afbc12b6d023f84d0d2e
Merge: ea575ce 54d078e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Dec 9 15:23:06 2013 +0000

    Merge upstream 1.5.0

 CMakeLists.txt                                     | 1181 +++++
 Makefile.am                                        |   27 +-
 Makefile.in                                        |   62 +-
 NEWS                                               |   21 +
 aclocal.m4                                         |   42 +
 adios_config                                       |   68 +-
 adios_config.flags.in                              |    9 +
 runconf => cmake_init                              |  571 +-
 config.h.in => config.h.cmake                      |  190 +-
 config.h.in                                        |   16 +-
 config/ac_cray_pmi.m4                              |    6 +-
 config/ac_cray_ugni.m4                             |    6 +-
 config/ac_dataspaces.m4                            |    7 +
 config/ac_dcmf.m4                                  |   70 +
 config/ac_dimes.m4                                 |   40 +-
 config/ac_flexpath.m4                              |  120 +
 config/compile                                     |   25 +-
 config/config.guess                                |  406 +-
 config/config.sub                                  |  293 +-
 config/depcomp                                     |  172 +-
 config/install-sh                                  |  530 +-
 config/missing                                     |  117 +-
 configure                                          | 3545 +++++++++++--
 configure.ac                                       |   75 +-
 debian/changelog                                   |    9 +
 debian/watch                                       |    2 +
 examples/C/CMakeLists.txt                          |   10 +
 examples/C/Makefile.am                             |    2 +-
 examples/C/Makefile.in                             |   20 +-
 examples/C/arrays/CMakeLists.txt                   |   13 +
 examples/C/arrays/Makefile.am                      |    4 +-
 examples/C/arrays/Makefile.in                      |   24 +-
 examples/C/arrays/arrays_read.c                    |   46 +-
 examples/C/arrays/arrays_write.c                   |    4 +-
 examples/C/attributes/CMakeLists.txt               |   14 +
 examples/C/attributes/Makefile.am                  |    5 +-
 examples/C/attributes/Makefile.in                  |   32 +-
 examples/C/attributes/attributes_read.c            |   23 +-
 examples/C/attributes/attributes_write.c           |    4 +-
 examples/C/flexpath_arrays/Makefile.am             |    1 +
 .../{Fortran => C/flexpath_arrays}/Makefile.in     |   27 +-
 .../global_range_select}/Makefile.am               |    2 +-
 .../global_range_select}/Makefile.in               |   26 +-
 .../flexpath_arrays/global_range_select/arrays.xml |   19 +
 .../global_range_select/arrays_read.c              |  117 +
 .../global_range_select/arrays_write.c             |   58 +
 .../process_select}/Makefile.am                    |    4 +-
 .../process_select}/Makefile.in                    |   28 +-
 .../C/flexpath_arrays/process_select/arrays.xml    |   16 +
 .../C/flexpath_arrays/process_select/arrays_read.c |   95 +
 .../flexpath_arrays/process_select/arrays_write.c  |   80 +
 examples/C/flexpath_arrays/process_select/job.pbs  |    7 +
 examples/C/global-array-time/CMakeLists.txt        |   19 +
 examples/C/global-array-time/Makefile.am           |    9 +-
 examples/C/global-array-time/Makefile.in           |   36 +-
 examples/C/global-array-time/adios_globaltime.c    |    6 +-
 .../C/global-array-time/adios_globaltime_no_xml.c  |    4 +-
 .../C/global-array-time/adios_read_globaltime.c    |   72 +-
 .../adios_read_globaltime_streaming.c              |  135 +-
 examples/C/global-array/CMakeLists.txt             |   38 +
 examples/C/global-array/Makefile.am                |   23 +-
 examples/C/global-array/Makefile.in                |   67 +-
 examples/C/global-array/adios_global.c             |    4 +-
 examples/C/global-array/adios_global.xml           |    1 +
 examples/C/global-array/adios_global_2files.c      |    4 +-
 examples/C/global-array/adios_global_no_xml.c      |    4 +-
 examples/C/global-array/adios_read_global.c        |   26 +-
 examples/C/global-array/adios_read_global_no_xml.c |   30 +-
 examples/C/global-array/no_xml_write_byid.c        |    4 +-
 examples/C/global-array/read_no_xml_write_byid.c   |   29 +-
 examples/C/manual/2_adios_write.c                  |    4 +-
 examples/C/manual/3_adios_read.c                   |    4 +-
 examples/C/manual/4_adios_nfiles.c                 |    4 +-
 examples/C/manual/CMakeLists.txt                   |   19 +
 examples/C/manual/Makefile.in                      |   18 +-
 examples/C/read_all/CMakeLists.txt                 |   12 +
 examples/C/read_all/Makefile.am                    |   10 +-
 examples/C/read_all/Makefile.in                    |   47 +-
 examples/C/read_all/read_all.c                     |   57 +-
 examples/C/read_all/read_all_v1.c                  |  220 +
 examples/C/scalars/CMakeLists.txt                  |   15 +
 examples/C/scalars/Makefile.am                     |    6 +-
 examples/C/scalars/Makefile.in                     |   27 +-
 examples/C/scalars/README                          |   33 -
 examples/C/scalars/scalars_read.c                  |   44 +-
 examples/C/scalars/scalars_write.c                 |    4 +-
 examples/C/schema/CMakeLists.txt                   |   18 +
 examples/C/schema/Makefile.in                      |   18 +-
 examples/C/schema/rectilinear.c                    |    4 +-
 examples/C/schema/structured.c                     |   17 +-
 examples/C/schema/structured.xml                   |   39 +-
 examples/C/schema/uniform.c                        |    4 +-
 examples/C/schema/unstructured.c                   |    4 +-
 examples/C/schema/unstructured.xml                 |   10 +-
 examples/C/stat/CMakeLists.txt                     |   13 +
 examples/C/stat/Makefile.am                        |    7 +-
 examples/C/stat/Makefile.in                        |   34 +-
 examples/C/stat/stat_read.c                        |  171 +-
 examples/C/stat/stat_write.c                       |    6 +-
 examples/CMakeLists.txt                            |    6 +
 examples/Fortran/CMakeLists.txt                    |    5 +
 examples/Fortran/Makefile.in                       |   18 +-
 examples/Fortran/arrays/CMakeLists.txt             |   13 +
 examples/Fortran/arrays/Makefile.am                |    6 +-
 examples/Fortran/arrays/Makefile.in                |   25 +-
 examples/Fortran/arrays/README                     |   16 +-
 examples/Fortran/arrays/arrays_read.F90            |   47 +-
 examples/Fortran/arrays/arrays_write.F90           |    2 +-
 examples/Fortran/global-array-time/CMakeLists.txt  |   10 +
 examples/Fortran/global-array-time/Makefile.in     |   18 +-
 .../Fortran/global-array-time/adios_globaltime.F90 |    2 +-
 examples/Fortran/global-array/CMakeLists.txt       |   13 +
 examples/Fortran/global-array/Makefile.in          |   18 +-
 examples/Fortran/global-array/adios_global.F90     |    2 +-
 .../Fortran/global-array/adios_global_no_xml.F90   |    2 +-
 .../Fortran/global-array/no_xml_write_byid.F90     |    2 +-
 examples/Fortran/scalars/CMakeLists.txt            |   13 +
 examples/Fortran/scalars/Makefile.am               |    6 +-
 examples/Fortran/scalars/Makefile.in               |   25 +-
 examples/Fortran/scalars/README                    |   13 +-
 examples/Fortran/scalars/scalars_read.F90          |   51 +-
 examples/Fortran/scalars/scalars_write.F90         |    2 +-
 examples/Makefile.in                               |   18 +-
 examples/coupling/.svn/all-wcprops                 |   47 -
 examples/coupling/.svn/entries                     |  273 -
 examples/coupling/.svn/format                      |    1 -
 examples/coupling/.svn/prop-base/job.svn-base      |    5 -
 examples/coupling/.svn/text-base/Makefile.svn-base |   45 -
 examples/coupling/.svn/text-base/README.svn-base   |  132 -
 .../.svn/text-base/coupling_reader_2D.xml.svn-base |   27 -
 .../.svn/text-base/coupling_writer_2D.F90.svn-base |  214 -
 .../.svn/text-base/coupling_writer_2D.xml.svn-base |   41 -
 examples/coupling/.svn/text-base/job.svn-base      |   89 -
 examples/coupling/.svn/tmp/tempfile.2.tmp          |   89 -
 examples/coupling/.svn/tmp/tempfile.tmp            |   89 -
 examples/coupling/Makefile                         |   10 +-
 examples/coupling/coupling_reader_2D.F90           |   51 +-
 examples/coupling/coupling_writer_2D.F90           |   18 +-
 examples/coupling/coupling_writer_2D.xml           |    2 +
 .../coupling_reader_2D.F90.svn-base => read.F90}   |   31 +-
 examples/skel/.svn/all-wcprops                     |    5 -
 examples/skel/.svn/entries                         |   43 -
 examples/skel/.svn/format                          |    1 -
 examples/skel/genarray3d/.svn/all-wcprops          |   11 -
 examples/skel/genarray3d/.svn/entries              |   62 -
 examples/skel/genarray3d/.svn/format               |    1 -
 .../.svn/text-base/genarray3d.xml.svn-base         |   48 -
 examples/skel/geos5/.svn/all-wcprops               |   11 -
 examples/skel/geos5/.svn/entries                   |   62 -
 examples/skel/geos5/.svn/format                    |    1 -
 .../skel/geos5/.svn/prop-base/geos5.xml.svn-base   |    5 -
 .../skel/geos5/.svn/text-base/geos5.xml.svn-base   |  301 --
 examples/skel/grapes/.svn/all-wcprops              |   11 -
 examples/skel/grapes/.svn/entries                  |   62 -
 examples/skel/grapes/.svn/format                   |    1 -
 .../skel/grapes/.svn/text-base/grapes.xml.svn-base |   50 -
 examples/skel/gts/.svn/all-wcprops                 |   11 -
 examples/skel/gts/.svn/entries                     |   62 -
 examples/skel/gts/.svn/format                      |    1 -
 examples/skel/gts/.svn/text-base/gts.xml.svn-base  |   82 -
 examples/skel/s3d/.svn/all-wcprops                 |   11 -
 examples/skel/s3d/.svn/entries                     |   62 -
 examples/skel/s3d/.svn/format                      |    1 -
 examples/skel/s3d/.svn/text-base/s3d.xml.svn-base  |   26 -
 examples/staging/.svn/all-wcprops                  |    5 -
 examples/staging/.svn/entries                      |   38 -
 examples/staging/.svn/format                       |    1 -
 examples/staging/stage_write/.svn/all-wcprops      |   83 -
 examples/staging/stage_write/.svn/entries          |  477 --
 examples/staging/stage_write/.svn/format           |    1 -
 .../stage_write/.svn/prop-base/job.svn-base        |    5 -
 .../text-base/Makefile.genarray_stream.svn-base    |   30 -
 .../stage_write/.svn/text-base/Makefile.svn-base   |   41 -
 .../stage_write/.svn/text-base/README.svn-base     |   47 -
 .../.svn/text-base/decompose.h.svn-base            |   17 -
 .../.svn/text-base/decompose_block.c.svn-base      |   91 -
 .../.svn/text-base/decompose_single.c.svn-base     |   27 -
 .../.svn/text-base/genarray_stream.F90.svn-base    |  309 --
 .../.svn/text-base/genarray_stream.xml.svn-base    |   48 -
 .../stage_write/.svn/text-base/job.svn-base        |   62 -
 .../.svn/text-base/stage_write.c.svn-base          |  430 --
 .../.svn/text-base/test_decompose.c.svn-base       |  134 -
 .../stage_write/.svn/text-base/utils.c.svn-base    |  211 -
 .../stage_write/.svn/text-base/utils.h.svn-base    |   50 -
 examples/staging/stage_write/genarray_stream.F90   |    2 +-
 examples/staging/stage_write/stage_write.c         |    4 +-
 examples/staging/stage_write/x.bp.dir/x.bp.0       |  Bin 0 -> 386962 bytes
 runconf                                            |   84 +-
 src/CMakeLists.txt                                 |  628 +++
 src/Makefile.am                                    |   64 +-
 src/Makefile.in                                    | 1277 ++++-
 src/core/CMakeLists.txt                            |    1 +
 src/core/adios.c                                   |   10 +-
 src/core/adios_internals.c                         |   74 +-
 src/core/adios_internals.h                         |   10 +-
 src/core/adios_internals_mxml.c                    | 5594 +++++++++++++++-----
 src/core/adios_internals_mxml.h                    |   10 +-
 src/core/adios_read.c                              |   16 +-
 src/core/adios_read_hooks.c                        |    9 +-
 src/core/adios_read_hooks.h                        |   11 +-
 src/core/adios_read_v1.c                           |   41 +-
 src/core/adios_timing.c                            |  124 +-
 src/core/adios_transport_hooks.c                   |   19 +-
 src/core/adios_transport_hooks.h                   |   17 +-
 src/core/adiosf.c                                  |   24 +-
 src/core/adiosf_defs_mod.f90                       |   13 +-
 src/core/adiosf_read.c                             |   12 +-
 src/core/adiosf_read_mod.f90                       |   18 +-
 src/core/adiosf_read_v1.c                          |    4 +
 src/core/adiosf_write_mod.f90                      |   16 +-
 src/core/bp_utils.c                                |   94 +-
 src/core/bp_utils.h                                |    7 +-
 src/core/common_adios.c                            |   21 +-
 src/core/common_adios.h                            |    6 +-
 src/core/common_read.c                             |   18 +-
 src/core/common_read.h                             |   22 +-
 src/core/ds_metadata.h                             |   11 +
 src/core/flexpath.h                                |  217 +
 src/core/util.c                                    |   10 +-
 src/core/util.h                                    |    4 +-
 src/nssi/adios_nssi_config.c                       |    9 +-
 src/nssi/adios_nssi_filter.c                       |   37 +-
 src/nssi/nssi_coupling_server.cpp                  |    2 +-
 src/nssi/nssi_staging_server.cpp                   |    4 +-
 src/public/adios.h                                 |   17 +-
 src/public/adios_mpi.h                             |   20 +
 src/public/adios_read_v1.h                         |    9 +-
 src/public/adios_read_v2.h                         |   25 +-
 src/public/adios_selection.h                       |    4 +-
 src/public/mpidummy.h                              |    3 +
 src/read/read_bp.c                                 |   38 +-
 src/read/read_bp_staged.c                          |    6 +-
 src/read/read_bp_staged1.c                         |    2 +-
 src/read/read_dataspaces.c                         |   14 +-
 src/read/read_datatap.c                            |   11 +-
 src/read/read_dimes.c                              | 1806 +++++--
 src/read/read_flexpath.c                           | 1409 +++++
 src/write/CMakeLists.txt                           |    1 +
 src/write/adios_dataspaces.c                       |   88 +-
 src/write/adios_dimes.c                            | 1118 ++--
 src/write/adios_flexpath.c                         | 1682 ++++++
 src/write/adios_mpi.c                              |   98 +-
 src/write/adios_mpi_amr.c                          |  112 +-
 src/write/adios_mpi_lustre.c                       |  106 +-
 src/write/adios_nc4.c                              |   57 +-
 src/write/adios_nssi.c                             |   34 +-
 src/write/adios_phdf5.c                            |   89 +-
 src/write/adios_posix.c                            |  105 +-
 src/write/adios_posix1.c                           |    4 +-
 src/write/adios_var_merge.c                        | 1740 ++++++
 tests/C/CMakeLists.txt                             |   13 +
 tests/C/Makefile.in                                |   18 +-
 tests/C/adios_test_c.c                             |   10 +-
 tests/CMakeLists.txt                               |   29 +
 tests/Fortran/CMakeLists.txt                       |    9 +
 tests/Fortran/Makefile.in                          |   18 +-
 tests/Fortran/adios_test_f.F90                     |    5 +-
 tests/Makefile.in                                  |   18 +-
 tests/bp_read/CMakeLists.txt                       |   36 +
 tests/bp_read/Makefile.in                          |   18 +-
 tests/bp_read/genbp.c                              |    6 +-
 tests/genarray/CMakeLists.txt                      |   37 +
 tests/genarray/Makefile.in                         |   18 +-
 tests/genarray/copyarray.F90                       |    7 +-
 tests/genarray/copyarray2D.F90                     |   16 +-
 tests/genarray/genarray.F90                        |    7 +-
 tests/genarray/genarray.xml                        |    3 +-
 tests/genarray/genarray2D.F90                      |    9 +-
 tests/genarray/genarray3d.xml                      |    3 +-
 tests/suite/CMakeLists.txt                         |    8 +
 tests/suite/Makefile.in                            |   18 +-
 tests/suite/programs/CMakeLists.txt                |   50 +
 tests/suite/programs/Makefile.in                   |   18 +-
 tests/suite/programs/adios_amr_write.c             |    4 +-
 tests/suite/programs/adios_amr_write_2vars.c       |    4 +-
 tests/suite/programs/adios_amr_write_2vars.xml     |    3 +-
 tests/suite/programs/connect_to_space_subset.c     |    4 +-
 tests/suite/programs/local_array_time.c            |    6 +-
 tests/suite/programs/many_vars.c                   |    4 +-
 tests/suite/programs/posix_method.F90              |    3 +-
 tests/suite/programs/selections.c                  |    8 +-
 tests/suite/programs/two_groups.c                  |    4 +-
 tests/suite/programs/write_alternate.c             |    8 +-
 tests/suite/programs/write_read.c                  |    4 +-
 tests/suite/reference/global_array_time_read.txt   |  235 +-
 tests/suite/tests/05_global_array_time.sh          |    2 +-
 toolchain.cmake                                    |   13 +
 utils/CMakeLists.txt                               |   36 +
 utils/Makefile.in                                  |   18 +-
 utils/adios_lint/CMakeLists.txt                    |   13 +
 utils/adios_lint/Makefile.in                       |   18 +-
 utils/bp2ascii/CMakeLists.txt                      |   13 +
 utils/bp2ascii/Makefile.in                         |   18 +-
 utils/bp2bp/CMakeLists.txt                         |   10 +
 utils/bp2bp/Makefile.am                            |    2 +-
 utils/bp2bp/Makefile.in                            |   20 +-
 utils/bp2bp/bp2bp.c                                |    4 +-
 utils/bp2h5/CMakeLists.txt                         |   13 +
 utils/bp2h5/Makefile.am                            |    4 +-
 utils/bp2h5/Makefile.in                            |   22 +-
 utils/bp2h5/bp2h5.c                                |    4 +-
 utils/bp2ncd/CMakeLists.txt                        |   21 +
 utils/bp2ncd/Makefile.in                           |   18 +-
 utils/bpdump/CMakeLists.txt                        |   11 +
 utils/bpdump/Makefile.in                           |   18 +-
 utils/bpdump/bpdump.c                              |    7 +-
 utils/bpls/CMakeLists.txt                          |   12 +
 utils/bpls/Makefile.in                             |   18 +-
 utils/bpsplit/CMakeLists.txt                       |   20 +
 utils/bpsplit/Makefile.in                          |   18 +-
 utils/gpp/CMakeLists.txt                           |    1 +
 utils/gpp/Makefile.in                              |   18 +-
 utils/skel/CMakeLists.txt                          |   36 +
 utils/skel/Makefile.am                             |   16 +-
 utils/skel/Makefile.in                             |   31 +-
 utils/skel/bin/skel                                |    8 +-
 utils/skel/{lib => bin}/skel_cat.py                |    0
 utils/skel/bin/skel_extract.py                     |   79 +-
 utils/skel/etc/CMakeLists.txt                      |   28 +
 utils/skel/etc/Makefile.in                         |   18 +-
 utils/skel/etc/compiler_fragment.mk                |    7 -
 utils/skel/etc/templates/Makefile.default.tpl      |    3 +-
 utils/skel/etc/templates/submit_jaguar.tpl         |    2 +-
 .../{submit_sith.tpl => submit_nautilus.tpl}       |   14 +-
 utils/skel/etc/templates/submit_sith.tpl           |    4 +-
 utils/skel/lib/skel_have_adios_timing.py           |    1 +
 utils/skel/lib/skel_have_adios_timing.py.in        |    1 +
 utils/skel/lib/skel_makefile.py                    |   12 +-
 utils/skel/lib/skel_settings.py                    |    8 +-
 utils/skel/lib/skel_source.py                      |   36 +-
 utils/skel/lib/skel_submit.py                      |   10 +-
 utils/skel/lib/skelconf.py                         |    7 +-
 utils/skel/src/CMakeLists.txt                      |   12 +
 utils/skel/src/Makefile.am                         |   15 +
 .../skel/src}/Makefile.in                          |  277 +-
 utils/skel/src/skel_xml_output.c                   |  114 +
 utils/skel/src/skel_xml_output.h                   |    6 +
 utils/skel/src/skel_xml_output_f.c                 |   19 +
 wrappers/.svn/all-wcprops                          |    5 -
 wrappers/.svn/dir-prop-base                        |    5 -
 wrappers/.svn/entries                              |   44 -
 wrappers/.svn/format                               |    1 -
 wrappers/java/.svn/all-wcprops                     |   41 -
 wrappers/java/.svn/entries                         |  350 --
 wrappers/java/.svn/format                          |    1 -
 .../java/.svn/text-base/CMakeLists.txt.svn-base    |   96 -
 wrappers/java/.svn/text-base/README.svn-base       |   49 -
 .../.svn/text-base/gov_ornl_ccs_Adios.cxx.svn-base |  578 --
 .../gov_ornl_ccs_AdiosBufferAllocWhen.cxx.svn-base |    0
 .../gov_ornl_ccs_AdiosDatatype.cxx.svn-base        |    0
 .../text-base/gov_ornl_ccs_AdiosFile.cxx.svn-base  |  102 -
 .../text-base/gov_ornl_ccs_AdiosFlag.cxx.svn-base  |    0
 .../text-base/gov_ornl_ccs_AdiosGroup.cxx.svn-base |   97 -
 .../gov_ornl_ccs_AdiosVarinfo.cxx.svn-base         |  175 -
 wrappers/java/Modules/.svn/entries                 |  137 -
 wrappers/java/Modules/.svn/format                  |    1 -
 .../text-base/CMakeUtilityFunctions.cmake.svn-base |   19 -
 .../.svn/text-base/FindADIOS.cmake.svn-base        |  136 -
 .../FindPackageHandleStandardArgs.cmake.svn-base   |  260 -
 wrappers/java/gov/.svn/all-wcprops                 |    5 -
 wrappers/java/gov/.svn/entries                     |   38 -
 wrappers/java/gov/.svn/format                      |    1 -
 wrappers/java/gov/ornl/.svn/all-wcprops            |    5 -
 wrappers/java/gov/ornl/.svn/entries                |   38 -
 wrappers/java/gov/ornl/.svn/format                 |    1 -
 wrappers/java/gov/ornl/ccs/.svn/all-wcprops        |   35 -
 wrappers/java/gov/ornl/ccs/.svn/entries            |  307 --
 wrappers/java/gov/ornl/ccs/.svn/format             |    1 -
 .../ornl/ccs/.svn/text-base/Adios.java.svn-base    |  266 -
 .../text-base/AdiosBufferAllocWhen.java.svn-base   |   17 -
 .../ccs/.svn/text-base/AdiosDatatype.java.svn-base |   33 -
 .../ccs/.svn/text-base/AdiosFile.java.svn-base     |   65 -
 .../ccs/.svn/text-base/AdiosFlag.java.svn-base     |   18 -
 .../ccs/.svn/text-base/AdiosGroup.java.svn-base    |   71 -
 .../ccs/.svn/text-base/AdiosTest.java.svn-base     |   50 -
 .../ccs/.svn/text-base/AdiosVarinfo.java.svn-base  |  151 -
 wrappers/java/gov/ornl/ccs/Adios.java              |   12 +-
 wrappers/java/gov_ornl_ccs_Adios.cxx               |   12 +-
 wrappers/java/test/.svn/all-wcprops                |   29 -
 wrappers/java/test/.svn/entries                    |  171 -
 wrappers/java/test/.svn/format                     |    1 -
 .../java/test/.svn/prop-base/test1.sh.svn-base     |    5 -
 .../java/test/.svn/prop-base/test2.sh.svn-base     |    5 -
 .../.svn/text-base/AdiosNoxmlTest.java.svn-base    |   57 -
 .../test/.svn/text-base/AdiosTest.java.svn-base    |  106 -
 .../java/test/.svn/text-base/test1.sh.svn-base     |   40 -
 .../java/test/.svn/text-base/test2.sh.svn-base     |   19 -
 wrappers/java/test/AdiosNoxmlTest.java             |    2 +-
 wrappers/java/test/AdiosTest.java                  |    2 +-
 wrappers/matlab/.gitignore                         |    1 +
 wrappers/matlab/.svn/all-wcprops                   |   11 -
 wrappers/matlab/.svn/entries                       |  307 --
 wrappers/matlab/.svn/format                        |    1 -
 wrappers/matlab/.svn/text-base/Makefile.svn-base   |   30 -
 wrappers/matlab/.svn/text-base/adios.m.svn-base    |   54 -
 .../matlab/.svn/text-base/adiosclose.m.svn-base    |  151 -
 .../matlab/.svn/text-base/adiosclosec.c.svn-base   |  114 -
 .../matlab/.svn/text-base/adiosopen.m.svn-base     |  188 -
 .../matlab/.svn/text-base/adiosopenc.c.svn-base    |  427 --
 .../matlab/.svn/text-base/adiosread.m.svn-base     |  268 -
 .../matlab/.svn/text-base/adiosreadc.c.svn-base    |  458 --
 wrappers/numpy/.svn/all-wcprops                    |   17 -
 wrappers/numpy/.svn/entries                        |  146 -
 wrappers/numpy/.svn/format                         |    1 -
 .../numpy/.svn/text-base/CMakeLists.txt.svn-base   |   60 -
 wrappers/numpy/.svn/text-base/README.svn-base      |   37 -
 wrappers/numpy/.svn/text-base/adios.pyx.svn-base   |  607 ---
 wrappers/numpy/CMakeLists.txt                      |    5 +-
 wrappers/numpy/Modules/.svn/entries                |  205 -
 wrappers/numpy/Modules/.svn/format                 |    1 -
 .../text-base/CMakeUtilityFunctions.cmake.svn-base |   19 -
 .../.svn/text-base/FindADIOS.cmake.svn-base        |  136 -
 .../.svn/text-base/FindMPI4Py.cmake.svn-base       |   65 -
 .../.svn/text-base/FindNumpy.cmake.svn-base        |   57 -
 .../FindPackageHandleStandardArgs.cmake.svn-base   |  260 -
 wrappers/numpy/adios.pyx                           |   20 +-
 wrappers/numpy/example/.svn/all-wcprops            |   11 -
 wrappers/numpy/example/.svn/entries                |   62 -
 wrappers/numpy/example/.svn/format                 |    1 -
 .../example/.svn/prop-base/ncdf2bp.py.svn-base     |    5 -
 .../example/.svn/text-base/ncdf2bp.py.svn-base     |  126 -
 wrappers/numpy/test/.svn/all-wcprops               |   17 -
 wrappers/numpy/test/.svn/entries                   |  239 -
 wrappers/numpy/test/.svn/format                    |    1 -
 .../.svn/prop-base/test_adios_noxml.sh.svn-base    |    5 -
 .../.svn/prop-base/test_adios_read.sh.svn-base     |    5 -
 .../.svn/prop-base/test_adios_write.sh.svn-base    |    5 -
 .../.svn/text-base/adios_noxml_test.py.svn-base    |   29 -
 .../.svn/text-base/adios_read_test.py.svn-base     |   14 -
 .../.svn/text-base/adios_write_test.py.svn-base    |   21 -
 .../.svn/text-base/test_adios_noxml.sh.svn-base    |   15 -
 .../.svn/text-base/test_adios_read.sh.svn-base     |   35 -
 .../.svn/text-base/test_adios_write.sh.svn-base    |   35 -
 433 files changed, 23401 insertions(+), 17676 deletions(-)

diff --cc config/config.guess
index c2246a4,e3ef63f..b79252d
--- a/config/config.guess
+++ b/config/config.guess
@@@ -1,14 -1,13 +1,12 @@@
  #! /bin/sh
  # Attempt to guess a canonical system name.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- #   Free Software Foundation, Inc.
 -#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   Copyright 1992-2013 Free Software Foundation, Inc.
  
- timestamp='2009-12-30'
 -timestamp='2005-12-13'
++timestamp='2013-06-10'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
++# the Free Software Foundation; either version 3 of the License, or
  # (at your option) any later version.
  #
  # This program is distributed in the hope that it will be useful, but
@@@ -17,26 -16,26 +15,22 @@@
  # General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--
- # Originally written by Per Bothner.  Please send patches (context
- # diff format) to <config-patches at gnu.org> and include a ChangeLog
- # entry.
 -# Originally written by Per Bothner <per at bothner.com>.
 -# Please send patches to <config-patches at gnu.org>.  Submit a context
 -# diff and a properly formatted ChangeLog entry.
++# the same distribution terms that you use for the rest of that
++# program.  This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
 +#
- # This script attempts to guess a canonical system name similar to
- # config.sub.  If it succeeds, it prints the system name on stdout, and
- # exits with 0.  Otherwise, it exits with 1.
++# Originally written by Per Bothner.
  #
 -# This script attempts to guess a canonical system name similar to
 -# config.sub.  If it succeeds, it prints the system name on stdout, and
 -# exits with 0.  Otherwise, it exits with 1.
 +# You can get the latest version of this script from:
 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ #
 -# The plan is that this can be called by configure scripts if you
 -# don't specify an explicit build system type.
++# Please send patches with a ChangeLog entry to config-patches at gnu.org.
++
  
  me=`echo "$0" | sed -e 's,.*/,,'`
  
@@@ -56,9 -55,8 +50,7 @@@ version="
  GNU config.guess ($timestamp)
  
  Originally written by Per Bothner.
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
- Software Foundation, Inc.
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 -Free Software Foundation, Inc.
++Copyright 1992-2013 Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@@ -140,12 -138,12 +132,33 @@@ UNAME_RELEASE=`(uname -r) 2>/dev/null` 
  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
++case "${UNAME_SYSTEM}" in
++Linux|GNU|GNU/*)
++	# If the system lacks a compiler, then just pick glibc.
++	# We could probably try harder.
++	LIBC=gnu
++
++	eval $set_cc_for_build
++	cat <<-EOF > $dummy.c
++	#include <features.h>
++	#if defined(__UCLIBC__)
++	LIBC=uclibc
++	#elif defined(__dietlibc__)
++	LIBC=dietlibc
++	#else
++	LIBC=gnu
++	#endif
++	EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	;;
++esac
++
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      *:NetBSD:*:*)
  	# NetBSD (nbsd) targets should (where applicable) match one or
--	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
  	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
  	# switched to ELF, *-*-netbsd* would select the old
  	# object file format.  This provides both forward
@@@ -181,7 -178,7 +194,7 @@@
  		fi
  		;;
  	    *)
--	        os=netbsd
++		os=netbsd
  		;;
  	esac
  	# The OS release
@@@ -202,6 -199,6 +215,10 @@@
  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
  	echo "${machine}-${os}${release}"
  	exit ;;
++    *:Bitrig:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	exit ;;
      *:OpenBSD:*:*)
  	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
  	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@@ -224,7 -218,7 +241,7 @@@
  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
  		;;
  	*5.*)
--	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
  		;;
  	esac
  	# According to Compaq, /usr/sbin/psrinfo has been available on
@@@ -270,7 -264,7 +287,10 @@@
  	# A Xn.n version is an unreleased experimental baselevel.
  	# 1.2 uses "1.2" for uname -r.
  	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit ;;
++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++	exitcode=$?
++	trap '' 0
++	exit $exitcode ;;
      Alpha\ *:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# Should we change UNAME_MACHINE based on the output of uname instead
@@@ -296,12 -290,12 +316,12 @@@
  	echo s390-ibm-zvmoe
  	exit ;;
      *:OS400:*:*)
--        echo powerpc-ibm-os400
++	echo powerpc-ibm-os400
  	exit ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
  	exit ;;
--    arm:riscos:*:*|arm:RISCOS:*:*)
++    arm*:riscos:*:*|arm*:RISCOS:*:*)
  	echo arm-unknown-riscos
  	exit ;;
      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@@ -395,23 -370,23 +415,23 @@@
      # MiNT.  But MiNT is downward compatible to TOS, so this should
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
  	exit ;;
      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
  	echo m68k-atari-mint${UNAME_RELEASE}
--        exit ;;
++	exit ;;
      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
  	exit ;;
      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
--        echo m68k-milan-mint${UNAME_RELEASE}
--        exit ;;
++	echo m68k-milan-mint${UNAME_RELEASE}
++	exit ;;
      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
--        echo m68k-hades-mint${UNAME_RELEASE}
--        exit ;;
++	echo m68k-hades-mint${UNAME_RELEASE}
++	exit ;;
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
--        echo m68k-unknown-mint${UNAME_RELEASE}
--        exit ;;
++	echo m68k-unknown-mint${UNAME_RELEASE}
++	exit ;;
      m68k:machten:*:*)
  	echo m68k-apple-machten${UNAME_RELEASE}
  	exit ;;
@@@ -481,8 -456,8 +501,8 @@@ EO
  	echo m88k-motorola-sysv3
  	exit ;;
      AViiON:dgux:*:*)
--        # DG/UX returns AViiON for all architectures
--        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	# DG/UX returns AViiON for all architectures
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
  	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
  	then
  	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@@ -495,7 -470,7 +515,7 @@@
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
-- 	exit ;;
++	exit ;;
      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
  	echo m88k-dolphin-sysv3
  	exit ;;
@@@ -552,7 -527,7 +572,7 @@@ EO
  		echo rs6000-ibm-aix3.2
  	fi
  	exit ;;
-     *:AIX:*:[456])
 -    *:AIX:*:[45])
++    *:AIX:*:[4567])
  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
@@@ -595,52 -570,52 +615,52 @@@
  	    9000/[678][0-9][0-9])
  		if [ -x /usr/bin/getconf ]; then
  		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
--                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
--                    case "${sc_cpu_version}" in
--                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
--                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
--                      532)                      # CPU_PA_RISC2_0
--                        case "${sc_kernel_bits}" in
--                          32) HP_ARCH="hppa2.0n" ;;
--                          64) HP_ARCH="hppa2.0w" ;;
++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++		    case "${sc_cpu_version}" in
++		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++		      532)                      # CPU_PA_RISC2_0
++			case "${sc_kernel_bits}" in
++			  32) HP_ARCH="hppa2.0n" ;;
++			  64) HP_ARCH="hppa2.0w" ;;
  			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
--                        esac ;;
--                    esac
++			esac ;;
++		    esac
  		fi
  		if [ "${HP_ARCH}" = "" ]; then
  		    eval $set_cc_for_build
--		    sed 's/^              //' << EOF >$dummy.c
++		    sed 's/^		//' << EOF >$dummy.c
  
--              #define _HPUX_SOURCE
--              #include <stdlib.h>
--              #include <unistd.h>
++		#define _HPUX_SOURCE
++		#include <stdlib.h>
++		#include <unistd.h>
  
--              int main ()
--              {
--              #if defined(_SC_KERNEL_BITS)
--                  long bits = sysconf(_SC_KERNEL_BITS);
--              #endif
--                  long cpu  = sysconf (_SC_CPU_VERSION);
++		int main ()
++		{
++		#if defined(_SC_KERNEL_BITS)
++		    long bits = sysconf(_SC_KERNEL_BITS);
++		#endif
++		    long cpu  = sysconf (_SC_CPU_VERSION);
  
--                  switch (cpu)
--              	{
--              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
--              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
--              	case CPU_PA_RISC2_0:
--              #if defined(_SC_KERNEL_BITS)
--              	    switch (bits)
--              		{
--              		case 64: puts ("hppa2.0w"); break;
--              		case 32: puts ("hppa2.0n"); break;
--              		default: puts ("hppa2.0"); break;
--              		} break;
--              #else  /* !defined(_SC_KERNEL_BITS) */
--              	    puts ("hppa2.0"); break;
--              #endif
--              	default: puts ("hppa1.0"); break;
--              	}
--                  exit (0);
--              }
++		    switch (cpu)
++			{
++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++			case CPU_PA_RISC2_0:
++		#if defined(_SC_KERNEL_BITS)
++			    switch (bits)
++				{
++				case 64: puts ("hppa2.0w"); break;
++				case 32: puts ("hppa2.0n"); break;
++				default: puts ("hppa2.0"); break;
++				} break;
++		#else  /* !defined(_SC_KERNEL_BITS) */
++			    puts ("hppa2.0"); break;
++		#endif
++			default: puts ("hppa1.0"); break;
++			}
++		    exit (0);
++		}
  EOF
  		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
  		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@@ -731,22 -706,22 +751,22 @@@ EO
  	exit ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
--        exit ;;
++	exit ;;
      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
  	if getsysinfo -f scalar_acc
  	then echo c32-convex-bsd
  	else echo c2-convex-bsd
  	fi
--        exit ;;
++	exit ;;
      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
  	echo c34-convex-bsd
--        exit ;;
++	exit ;;
      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
  	echo c38-convex-bsd
--        exit ;;
++	exit ;;
      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
  	echo c4-convex-bsd
--        exit ;;
++	exit ;;
      CRAY*Y-MP:*:*:*)
  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit ;;
@@@ -770,14 -745,14 +790,14 @@@
  	exit ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
--        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
--        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit ;;
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
      5000:UNIX_System_V:4.*:*)
--        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
--        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
--        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
  	exit ;;
      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@@ -789,40 -764,24 +809,45 @@@
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit ;;
      *:FreeBSD:*:*)
- 	case ${UNAME_MACHINE} in
- 	    pc98)
- 		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 -	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
++	case ${UNAME_PROCESSOR} in
 +	    amd64)
 +		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 +	    *)
- 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 +	esac
  	exit ;;
      i*:CYGWIN*:*)
  	echo ${UNAME_MACHINE}-pc-cygwin
  	exit ;;
 -    i*:MINGW*:*)
++    *:MINGW64*:*)
++	echo ${UNAME_MACHINE}-pc-mingw64
++	exit ;;
 +    *:MINGW*:*)
  	echo ${UNAME_MACHINE}-pc-mingw32
  	exit ;;
++    i*:MSYS*:*)
++	echo ${UNAME_MACHINE}-pc-msys
++	exit ;;
      i*:windows32*:*)
--    	# uname -m includes "-pc" on this system.
--    	echo ${UNAME_MACHINE}-mingw32
++	# uname -m includes "-pc" on this system.
++	echo ${UNAME_MACHINE}-mingw32
  	exit ;;
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit ;;
 -    x86:Interix*:[345]*)
 -	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 -	exit ;;
 +    *:Interix*:*)
-     	case ${UNAME_MACHINE} in
++	case ${UNAME_MACHINE} in
 +	    x86)
 +		echo i586-pc-interix${UNAME_RELEASE}
 +		exit ;;
 +	    authenticamd | genuineintel | EM64T)
 +		echo x86_64-unknown-interix${UNAME_RELEASE}
 +		exit ;;
 +	    IA64)
 +		echo ia64-unknown-interix${UNAME_RELEASE}
 +		exit ;;
 +	esac ;;
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
  	echo i${UNAME_MACHINE}-pc-mks
  	exit ;;
@@@ -849,72 -805,37 +874,83 @@@
  	exit ;;
      *:GNU:*:*)
  	# the GNU system
--	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  	exit ;;
      *:GNU/*:*:*)
  	# other systems with GNU libc and userland
--	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
  	exit ;;
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
  	exit ;;
++    aarch64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
 +    alpha:Linux:*:*)
 +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 +	  EV5)   UNAME_MACHINE=alphaev5 ;;
 +	  EV56)  UNAME_MACHINE=alphaev56 ;;
 +	  PCA56) UNAME_MACHINE=alphapca56 ;;
 +	  PCA57) UNAME_MACHINE=alphapca56 ;;
 +	  EV6)   UNAME_MACHINE=alphaev6 ;;
 +	  EV67)  UNAME_MACHINE=alphaev67 ;;
 +	  EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
++	esac
 +	objdump --private-headers /bin/sh | grep -q ld.so.1
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    arc:Linux:*:* | arceb:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
      arm*:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	eval $set_cc_for_build
 +	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 +	    | grep -q __ARM_EABI__
 +	then
- 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	else
- 	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++		| grep -q __ARM_PCS_VFP
++	    then
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
++	    else
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++	    fi
 +	fi
 +	exit ;;
 +    avr32*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      cris:Linux:*:*)
--	echo cris-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
  	exit ;;
      crisv32:Linux:*:*)
--	echo crisv32-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
  	exit ;;
      frv:Linux:*:*)
--    	echo frv-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    hexagon:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    i*86:Linux:*:*)
- 	LIBC=gnu
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#ifdef __dietlibc__
- 	LIBC=dietlibc
- 	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
  	exit ;;
      ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      m32r*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
 -    mips:Linux:*:*)
 +    mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
  	#undef CPU
@@@ -930,53 -851,139 +966,65 @@@
  	#endif
  	#endif
  EOF
 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 -	;;
 -    mips64:Linux:*:*)
 -	eval $set_cc_for_build
 -	sed 's/^	//' << EOF >$dummy.c
 -	#undef CPU
 -	#undef mips64
 -	#undef mips64el
 -	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 -	CPU=mips64el
 -	#else
 -	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 -	CPU=mips64
 -	#else
 -	CPU=
 -	#endif
 -	#endif
 -EOF
 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
  	;;
++    or1k:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
      or32:Linux:*:*)
--	echo or32-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
 -    ppc:Linux:*:*)
 -	echo powerpc-unknown-linux-gnu
 +    padre:Linux:*:*)
- 	echo sparc-unknown-linux-gnu
++	echo sparc-unknown-linux-${LIBC}
  	exit ;;
 -    ppc64:Linux:*:*)
 -	echo powerpc64-unknown-linux-gnu
 -	exit ;;
 -    alpha:Linux:*:*)
 -	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 -	  EV5)   UNAME_MACHINE=alphaev5 ;;
 -	  EV56)  UNAME_MACHINE=alphaev56 ;;
 -	  PCA56) UNAME_MACHINE=alphapca56 ;;
 -	  PCA57) UNAME_MACHINE=alphapca56 ;;
 -	  EV6)   UNAME_MACHINE=alphaev6 ;;
 -	  EV67)  UNAME_MACHINE=alphaev67 ;;
 -	  EV68*) UNAME_MACHINE=alphaev68 ;;
 -        esac
 -	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 -	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 +    parisc64:Linux:*:* | hppa64:Linux:*:*)
- 	echo hppa64-unknown-linux-gnu
++	echo hppa64-unknown-linux-${LIBC}
  	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
--	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
--	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
--	  *)    echo hppa-unknown-linux-gnu ;;
++	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
++	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
++	  *)    echo hppa-unknown-linux-${LIBC} ;;
  	esac
  	exit ;;
 -    parisc64:Linux:*:* | hppa64:Linux:*:*)
 -	echo hppa64-unknown-linux-gnu
 +    ppc64:Linux:*:*)
- 	echo powerpc64-unknown-linux-gnu
++	echo powerpc64-unknown-linux-${LIBC}
 +	exit ;;
 +    ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
++	echo powerpc-unknown-linux-${LIBC}
++	exit ;;
++    ppc64le:Linux:*:*)
++	echo powerpc64le-unknown-linux-${LIBC}
++	exit ;;
++    ppcle:Linux:*:*)
++	echo powerpcle-unknown-linux-${LIBC}
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
--	echo ${UNAME_MACHINE}-ibm-linux
++	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
  	exit ;;
      sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      sh*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      sparc:Linux:*:* | sparc64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    tile*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      vax:Linux:*:*)
--	echo ${UNAME_MACHINE}-dec-linux-gnu
++	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
  	exit ;;
      x86_64:Linux:*:*)
--	echo x86_64-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    xtensa*:Linux:*:*)
-     	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
 -    i*86:Linux:*:*)
 -	# The BFD linker knows what the default object file format is, so
 -	# first see if it will tell us. cd to the root directory to prevent
 -	# problems with other programs or directories called `ld' in the path.
 -	# Set LC_ALL=C to ensure ld outputs messages in English.
 -	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
 -			 | sed -ne '/supported targets:/!d
 -				    s/[ 	][ 	]*/ /g
 -				    s/.*supported targets: *//
 -				    s/ .*//
 -				    p'`
 -        case "$ld_supported_targets" in
 -	  elf32-i386)
 -		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 -		;;
 -	  a.out-i386-linux)
 -		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 -		exit ;;
 -	  coff-i386)
 -		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 -		exit ;;
 -	  "")
 -		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 -		# one that does not give us useful --help.
 -		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 -		exit ;;
 -	esac
 -	# Determine whether the default compiler is a.out or elf
 -	eval $set_cc_for_build
 -	sed 's/^	//' << EOF >$dummy.c
 -	#include <features.h>
 -	#ifdef __ELF__
 -	# ifdef __GLIBC__
 -	#  if __GLIBC__ >= 2
 -	LIBC=gnu
 -	#  else
 -	LIBC=gnulibc1
 -	#  endif
 -	# else
 -	LIBC=gnulibc1
 -	# endif
 -	#else
 -	#if defined(__INTEL_COMPILER) || defined(__PGI)
 -	LIBC=gnu
 -	#else
 -	LIBC=gnuaout
 -	#endif
 -	#endif
 -	#ifdef __dietlibc__
 -	LIBC=dietlibc
 -	#endif
 -EOF
 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
 -	test x"${LIBC}" != x && {
 -		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 -		exit
 -	}
 -	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 -	;;
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
  	# earlier versions are messed up and put the nodename in both
@@@ -984,11 -991,11 +1032,11 @@@
  	echo i386-sequent-sysv4
  	exit ;;
      i*86:UNIX_SV:4.2MP:2.*)
--        # Unixware is an offshoot of SVR4, but it has its own version
--        # number series starting with 2...
--        # I am not positive that other SVR4 systems won't match this,
++	# Unixware is an offshoot of SVR4, but it has its own version
++	# number series starting with 2...
++	# I am not positive that other SVR4 systems won't match this,
  	# I just have to hope.  -- rms.
--        # Use sysv4.2uw... so that sysv4* matches it.
++	# Use sysv4.2uw... so that sysv4* matches it.
  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
  	exit ;;
      i*86:OS/2:*:*)
@@@ -1020,7 -1027,7 +1068,7 @@@
  	fi
  	exit ;;
      i*86:*:5:[678]*)
--    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
  	case `/bin/uname -X | grep "^Machine"` in
  	    *486*)	     UNAME_MACHINE=i486 ;;
  	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@@ -1048,13 -1055,10 +1096,13 @@@
  	exit ;;
      pc:*:*:*)
  	# Left here for compatibility:
--        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-         # the processor, so we play safe by assuming i586.
 -        # the processor, so we play safe by assuming i386.
 -	echo i386-pc-msdosdjgpp
 -        exit ;;
++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
++	# the processor, so we play safe by assuming i586.
 +	# Note: whatever this is, it MUST be the same as what config.sub
 +	# prints for the "djgpp" host, or else GDB configury will decide that
 +	# this is a cross-build.
 +	echo i586-pc-msdosdjgpp
-         exit ;;
++	exit ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
  	exit ;;
@@@ -1089,18 -1093,8 +1137,18 @@@
  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
  	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
--        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && { echo i486-ncr-sysv4; exit; } ;;
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	  && { echo i486-ncr-sysv4; exit; } ;;
 +    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 +	OS_REL='.3'
 +	test -r /etc/.relid \
 +	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 +	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 +	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 +	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
 +	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 +	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
@@@ -1133,10 -1127,10 +1181,10 @@@
  		echo ns32k-sni-sysv
  	fi
  	exit ;;
--    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
--                      # says <Richard.M.Bartel at ccMail.Census.GOV>
--        echo i586-unisys-sysv4
--        exit ;;
++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++			# says <Richard.M.Bartel at ccMail.Census.GOV>
++	echo i586-unisys-sysv4
++	exit ;;
      *:UNIX_System_V:4*:FTX*)
  	# From Gerald Hewes <hewes at openmarket.com>.
  	# How about differentiating between stratus architectures? -djm
@@@ -1162,11 -1156,11 +1210,11 @@@
  	exit ;;
      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
  	if [ -d /usr/nec ]; then
--	        echo mips-nec-sysv${UNAME_RELEASE}
++		echo mips-nec-sysv${UNAME_RELEASE}
  	else
--	        echo mips-unknown-sysv${UNAME_RELEASE}
++		echo mips-unknown-sysv${UNAME_RELEASE}
  	fi
--        exit ;;
++	exit ;;
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  	echo powerpc-be-beos
  	exit ;;
@@@ -1176,9 -1170,6 +1224,12 @@@
      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  	echo i586-pc-beos
  	exit ;;
 +    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 +	echo i586-pc-haiku
 +	exit ;;
++    x86_64:Haiku:*:*)
++	echo x86_64-unknown-haiku
++	exit ;;
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
  	exit ;;
@@@ -1205,19 -1187,9 +1256,21 @@@
  	exit ;;
      *:Darwin:*:*)
  	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
--	case $UNAME_PROCESSOR in
- 	    i386)
- 		eval $set_cc_for_build
- 		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- 		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- 		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- 		      grep IS_64BIT_ARCH >/dev/null
- 		  then
- 		      UNAME_PROCESSOR="x86_64"
- 		  fi
- 		fi ;;
--	    unknown) UNAME_PROCESSOR=powerpc ;;
--	esac
++	eval $set_cc_for_build
++	if test "$UNAME_PROCESSOR" = unknown ; then
++	    UNAME_PROCESSOR=powerpc
++	fi
++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		grep IS_64BIT_ARCH >/dev/null
++	    then
++		case $UNAME_PROCESSOR in
++		    i386) UNAME_PROCESSOR=x86_64 ;;
++		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
++		esac
++	    fi
++	fi
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@@ -1231,7 -1203,7 +1284,10 @@@
      *:QNX:*:4*)
  	echo i386-pc-qnx
  	exit ;;
--    NSE-?:NONSTOP_KERNEL:*:*)
++    NEO-?:NONSTOP_KERNEL:*:*)
++	echo neo-tandem-nsk${UNAME_RELEASE}
++	exit ;;
++    NSE-*:NONSTOP_KERNEL:*:*)
  	echo nse-tandem-nsk${UNAME_RELEASE}
  	exit ;;
      NSR-?:NONSTOP_KERNEL:*:*)
@@@ -1276,13 -1248,13 +1332,13 @@@
  	echo pdp10-unknown-its
  	exit ;;
      SEI:*:*:SEIUX)
--        echo mips-sei-seiux${UNAME_RELEASE}
++	echo mips-sei-seiux${UNAME_RELEASE}
  	exit ;;
      *:DragonFly:*:*)
  	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  	exit ;;
      *:*VMS:*:*)
--    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
  	case "${UNAME_MACHINE}" in
  	    A*) echo alpha-dec-vms ; exit ;;
  	    I*) echo ia64-dec-vms ; exit ;;
@@@ -1297,14 -1269,11 +1353,14 @@@
      i*86:rdos:*:*)
  	echo ${UNAME_MACHINE}-pc-rdos
  	exit ;;
 +    i*86:AROS:*:*)
 +	echo ${UNAME_MACHINE}-pc-aros
 +	exit ;;
++    x86_64:VMkernel:*:*)
++	echo ${UNAME_MACHINE}-unknown-esx
++	exit ;;
  esac
  
--#echo '(No uname command or uname output not recognized.)' 1>&2
--#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
--
  eval $set_cc_for_build
  cat >$dummy.c <<EOF
  #ifdef _SEQUENT_
@@@ -1322,11 -1291,11 +1378,11 @@@ main (
  #include <sys/param.h>
    printf ("m68k-sony-newsos%s\n",
  #ifdef NEWSOS4
--          "4"
++	"4"
  #else
--	  ""
++	""
  #endif
--         ); exit (0);
++	); exit (0);
  #endif
  #endif
  
diff --cc config/config.sub
index c2d1257,2851647..9633db7
--- a/config/config.sub
+++ b/config/config.sub
@@@ -1,38 -1,37 +1,31 @@@
  #! /bin/sh
  # Configuration validation subroutine script.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- #   Free Software Foundation, Inc.
 -#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   Copyright 1992-2013 Free Software Foundation, Inc.
  
- timestamp='2010-01-22'
 -timestamp='2005-12-11'
++timestamp='2013-08-10'
  
--# This file is (in principle) common to ALL GNU software.
--# The presence of a machine in this file suggests that SOME GNU software
--# can handle that machine.  It does not imply ALL GNU software can.
--#
--# This file is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
++# This file is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
  # (at your option) any later version.
  #
--# This program 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.
++# This program 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.
  #
  # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
++# the same distribution terms that you use for the rest of that
++# program.  This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
  
  
--# Please send patches to <config-patches at gnu.org>.  Submit a context
- # diff and a properly formatted GNU ChangeLog entry.
 -# diff and a properly formatted ChangeLog entry.
++# Please send patches with a ChangeLog entry to config-patches at gnu.org.
  #
  # Configuration subroutine to validate and canonicalize a configuration type.
  # Supply the specified configuration type as an argument.
@@@ -75,9 -71,8 +68,7 @@@ Report bugs and patches to <config-patc
  version="\
  GNU config.sub ($timestamp)
  
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
- Software Foundation, Inc.
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 -Free Software Foundation, Inc.
++Copyright 1992-2013 Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@@ -124,13 -119,12 +115,18 @@@ esa
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
--  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++  knetbsd*-gnu* | netbsd*-gnu* | \
 +  kopensolaris*-gnu* | \
    storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
++  android-linux)
++    os=-linux-android
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++    ;;
    *)
      basic_machine=`echo $1 | sed 's/-[^-]*$//'`
      if [ $basic_machine != $1 ]
@@@ -153,13 -147,10 +149,13 @@@ case $os i
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- 	-apple | -axis | -knuth | -cray | -microblaze)
 -	-apple | -axis | -knuth | -cray)
++	-apple | -axis | -knuth | -cray | -microblaze*)
  		os=
  		basic_machine=$1
  		;;
-         -bluegene*)
- 	        os=-cnk
++	-bluegene*)
++		os=-cnk
 +		;;
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
  		basic_machine=$1
@@@ -174,10 -165,10 +170,10 @@@
  		os=-chorusos
  		basic_machine=$1
  		;;
-- 	-chorusrdb)
-- 		os=-chorusrdb
++	-chorusrdb)
++		os=-chorusrdb
  		basic_machine=$1
-- 		;;
++		;;
  	-hiux*)
  		os=-hiuxwe2
  		;;
@@@ -222,6 -213,6 +218,12 @@@
  	-isc*)
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
++	-lynx*178)
++		os=-lynxos178
++		;;
++	-lynx*5)
++		os=-lynxos5
++		;;
  	-lynx*)
  		os=-lynxos
  		;;
@@@ -246,20 -237,18 +248,27 @@@ case $basic_machine i
  	# Some are omitted here because they have special meanings below.
  	1750a | 580 \
  	| a29k \
++	| aarch64 | aarch64_be \
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
  	| am33_2.0 \
- 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 -	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| arc | arceb \
++	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++	| avr | avr32 \
++	| be32 | be64 \
  	| bfin \
--	| c4x | clipper \
++	| c4x | c8051 | clipper \
  	| d10v | d30v | dlx | dsp16xx \
 -	| fr30 | frv \
++	| epiphany \
 +	| fido | fr30 | frv \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| hexagon \
  	| i370 | i860 | i960 | ia64 \
  	| ip2k | iq2000 \
 -	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++	| le32 | le64 \
 +	| lm32 \
 +	| m32c | m32r | m32rle | m68000 | m68k | m88k \
- 	| maxq | mb | microblaze | mcore | mep | metag \
++	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
  	| mips | mipsbe | mipseb | mipsel | mipsle \
  	| mips16 \
  	| mips64 | mips64el \
@@@ -277,34 -264,32 +286,45 @@@
  	| mipsisa64r2 | mipsisa64r2el \
  	| mipsisa64sb1 | mipsisa64sb1el \
  	| mipsisa64sr71k | mipsisa64sr71kel \
++	| mipsr5900 | mipsr5900el \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
 +	| moxie \
  	| mt \
  	| msp430 \
- 	| nios | nios2 \
++	| nds32 | nds32le | nds32be \
++	| nios | nios2 | nios2eb | nios2el \
  	| ns16k | ns32k \
--	| or32 \
++	| open8 \
++	| or1k | or32 \
  	| pdp10 | pdp11 | pj | pjl \
--	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| powerpc | powerpc64 | powerpc64le | powerpcle \
  	| pyramid \
- 	| rx \
 -	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| rl78 | rx \
 +	| score \
 +	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  	| sh64 | sh64le \
 -	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
 -	| sparcv8 | sparcv9 | sparcv9b \
 -	| strongarm \
 -	| tahoe | thumb | tic4x | tic80 | tron \
 -	| v850 | v850e \
 +	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 +	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- 	| spu | strongarm \
- 	| tahoe | thumb | tic4x | tic80 | tron \
++	| spu \
++	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 +	| ubicom32 \
- 	| v850 | v850e \
++	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
  	| we32k \
- 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 -	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 -	| z8k)
++	| x86 | xc16x | xstormy16 | xtensa \
 +	| z8k | z80)
  		basic_machine=$basic_machine-unknown
  		;;
- 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- 		# Motorola 68HC11/12.
 -	m32c)
 -		basic_machine=$basic_machine-unknown
++	c54x)
++		basic_machine=tic54x-unknown
+ 		;;
 -	m6811 | m68hc11 | m6812 | m68hc12)
 -		# Motorola 68HC11/12.
++	c55x)
++		basic_machine=tic55x-unknown
++		;;
++	c6x)
++		basic_machine=tic6x-unknown
++		;;
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
  		basic_machine=$basic_machine-unknown
  		os=-none
  		;;
@@@ -314,6 -299,6 +334,21 @@@
  		basic_machine=mt-unknown
  		;;
  
++	strongarm | thumb | xscale)
++		basic_machine=arm-unknown
++		;;
++	xgate)
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	xscaleeb)
++		basic_machine=armeb-unknown
++		;;
++
++	xscaleel)
++		basic_machine=armel-unknown
++		;;
++
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
  	# (2) the word "unknown" tends to confuse beginning users.
@@@ -328,25 -313,24 +363,30 @@@
  	# Recognize the basic CPU types with company name.
  	580-* \
  	| a29k-* \
++	| aarch64-* | aarch64_be-* \
  	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
  	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
--	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 -	| avr-* \
 +	| avr-* | avr32-* \
++	| be32-* | be64-* \
  	| bfin-* | bs2000-* \
--	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
--	| clipper-* | craynv-* | cydra-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* \
++	| c8051-* | clipper-* | craynv-* | cydra-* \
  	| d10v-* | d30v-* | dlx-* \
  	| elxsi-* \
 -	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 +	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
  	| h8300-* | h8500-* \
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| hexagon-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
  	| ip2k-* | iq2000-* \
 -	| m32r-* | m32rle-* \
++	| le32-* | le64-* \
 +	| lm32-* \
 +	| m32c-* | m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 -	| m88110-* | m88k-* | maxq-* | mcore-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++	| microblaze-* | microblazeel-* \
  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  	| mips16-* \
  	| mips64-* | mips64el-* \
@@@ -364,37 -346,32 +404,41 @@@
  	| mipsisa64r2-* | mipsisa64r2el-* \
  	| mipsisa64sb1-* | mipsisa64sb1el-* \
  	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
++	| mipsr5900-* | mipsr5900el-* \
  	| mipstx39-* | mipstx39el-* \
  	| mmix-* \
  	| mt-* \
  	| msp430-* \
- 	| nios-* | nios2-* \
++	| nds32-* | nds32le-* | nds32be-* \
++	| nios-* | nios2-* | nios2eb-* | nios2el-* \
  	| none-* | np1-* | ns16k-* | ns32k-* \
++	| open8-* \
  	| orion-* \
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
--	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
  	| pyramid-* \
- 	| romp-* | rs6000-* | rx-* \
 -	| romp-* | rs6000-* \
 -	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| rl78-* | romp-* | rs6000-* | rx-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 -	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
 +	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
  	| sparclite-* \
- 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 -	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
--	| tahoe-* | thumb-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++	| tahoe-* \
  	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- 	| tile-* | tilegx-* \
++	| tile*-* \
  	| tron-* \
 -	| v850-* | v850e-* | vax-* \
 +	| ubicom32-* \
- 	| v850-* | v850e-* | vax-* \
++	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++	| vax-* \
  	| we32k-* \
- 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 -	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
 -	| xstormy16-* | xtensa-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* \
 +	| xstormy16-* | xtensa*-* \
  	| ymp-* \
 -	| z8k-*)
 +	| z8k-* | z80-*)
  		;;
 -	m32c-*)
 +	# Recognize the basic CPU types without company name, with glob match.
 +	xtensa*)
 +		basic_machine=$basic_machine-unknown
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
@@@ -412,7 -389,7 +456,7 @@@
  		basic_machine=a29k-amd
  		os=-udi
  		;;
--    	abacus)
++	abacus)
  		basic_machine=abacus-unknown
  		;;
  	adobe68k)
@@@ -470,26 -443,10 +514,35 @@@
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
 +	blackfin)
 +		basic_machine=bfin-unknown
 +		os=-linux
 +		;;
 +	blackfin-*)
 +		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		os=-linux
 +		;;
 +	bluegene*)
 +		basic_machine=powerpc-ibm
 +		os=-cnk
 +		;;
++	c54x-*)
++		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c55x-*)
++		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c6x-*)
++		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
  	c90)
  		basic_machine=c90-cray
  		os=-unicos
  		;;
-         cegcc)
++	cegcc)
 +		basic_machine=arm-unknown
 +		os=-cegcc
 +		;;
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
@@@ -518,8 -475,8 +571,8 @@@
  		basic_machine=craynv-cray
  		os=-unicosmp
  		;;
- 	cr16)
 -	cr16c)
 -		basic_machine=cr16c-unknown
++	cr16 | cr16-*)
 +		basic_machine=cr16-unknown
  		os=-elf
  		;;
  	crds | unos)
@@@ -676,7 -629,7 +729,6 @@@
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
  		;;
--# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
  	i*86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
@@@ -734,17 -679,10 +786,21 @@@
  		basic_machine=ns32k-utek
  		os=-sysv
  		;;
-         microblaze)
++	microblaze*)
 +		basic_machine=microblaze-xilinx
 +		;;
++	mingw64)
++		basic_machine=x86_64-pc
++		os=-mingw64
++		;;
  	mingw32)
--		basic_machine=i386-pc
++		basic_machine=i686-pc
  		os=-mingw32
  		;;
 +	mingw32ce)
 +		basic_machine=arm-unknown
 +		os=-mingw32ce
 +		;;
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
@@@ -773,10 -711,10 +829,18 @@@
  	ms1-*)
  		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
  		;;
++	msys)
++		basic_machine=i686-pc
++		os=-msys
++		;;
  	mvs)
  		basic_machine=i370-ibm
  		os=-mvs
  		;;
++	nacl)
++		basic_machine=le32-unknown
++		os=-nacl
++		;;
  	ncr3000)
  		basic_machine=i486-ncr
  		os=-sysv4
@@@ -841,6 -779,6 +905,12 @@@
  	np1)
  		basic_machine=np1-gould
  		;;
++	neo-tandem)
++		basic_machine=neo-tandem
++		;;
++	nse-tandem)
++		basic_machine=nse-tandem
++		;;
  	nsr-tandem)
  		basic_machine=nsr-tandem
  		;;
@@@ -923,9 -847,9 +993,10 @@@
  		;;
  	power)	basic_machine=power-ibm
  		;;
--	ppc)	basic_machine=powerpc-unknown
++	ppc | ppcbe)	basic_machine=powerpc-unknown
  		;;
--	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc-* | ppcbe-*)
++		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	ppcle | powerpclittle | ppc-le | powerpc-little)
  		basic_machine=powerpcle-unknown
@@@ -950,7 -874,7 +1021,11 @@@
  		basic_machine=i586-unknown
  		os=-pw32
  		;;
--	rdos)
++	rdos | rdos64)
++		basic_machine=x86_64-pc
++		os=-rdos
++		;;
++	rdos32)
  		basic_machine=i386-pc
  		os=-rdos
  		;;
@@@ -1019,6 -936,6 +1094,9 @@@
  		basic_machine=i860-stratus
  		os=-sysv4
  		;;
++	strongarm-* | thumb-*)
++		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
  	sun2)
  		basic_machine=m68000-sun
  		;;
@@@ -1075,26 -992,17 +1153,9 @@@
  		basic_machine=t90-cray
  		os=-unicos
  		;;
--	tic54x | c54x*)
--		basic_machine=tic54x-unknown
--		os=-coff
--		;;
--	tic55x | c55x*)
--		basic_machine=tic55x-unknown
--		os=-coff
--		;;
--	tic6x | c6x*)
--		basic_machine=tic6x-unknown
--		os=-coff
- 		;;
-         # This must be matched before tile*.
-         tilegx*)
- 		basic_machine=tilegx-unknown
- 		os=-linux-gnu
- 		;;
 +	tile*)
- 		basic_machine=tile-unknown
++		basic_machine=$basic_machine-unknown
 +		os=-linux-gnu
  		;;
  	tx39)
  		basic_machine=mipstx39-unknown
@@@ -1163,6 -1071,6 +1224,9 @@@
  	xps | xps100)
  		basic_machine=xps100-honeywell
  		;;
++	xscale-* | xscalee[bl]-*)
++		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		;;
  	ymp)
  		basic_machine=ymp-cray
  		os=-unicos
@@@ -1260,12 -1164,9 +1324,12 @@@ esa
  if [ x"$os" != x"" ]
  then
  case $os in
--        # First match some system type aliases
--        # that might get confused with valid system types.
++	# First match some system type aliases
++	# that might get confused with valid system types.
  	# -solaris* is a basic system type, with this one exception.
-         -auroraux)
- 	        os=-auroraux
++	-auroraux)
++		os=-auroraux
 +		;;
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  		;;
@@@ -1286,22 -1187,20 +1350,23 @@@
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 -	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 -	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 +	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 +	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* \
++	      | -sym* | -kopensolaris* | -plan9* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 -	      | -aos* \
 +	      | -aos* | -aros* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 -	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 +	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- 	      | -openbsd* | -solidbsd* \
++	      | -bitrig* | -openbsd* | -solidbsd* \
  	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 -	      | -chorusos* | -chorusrdb* \
 -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 -	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 +	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
++	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* \
  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@@ -1348,7 -1247,7 +1413,7 @@@
  	-opened*)
  		os=-openedition
  		;;
--        -os400*)
++	-os400*)
  		os=-os400
  		;;
  	-wince*)
@@@ -1397,7 -1296,7 +1462,7 @@@
  	-sinix*)
  		os=-sysv4
  		;;
--        -tpf*)
++	-tpf*)
  		os=-tpf
  		;;
  	-triton*)
@@@ -1433,17 -1332,12 +1498,14 @@@
  	-aros*)
  		os=-aros
  		;;
--	-kaos*)
--		os=-kaos
--		;;
  	-zvmoe)
  		os=-zvmoe
  		;;
 +	-dicos*)
 +		os=-dicos
 +		;;
-         -nacl*)
- 	        ;;
++	-nacl*)
++		;;
  	-none)
  		;;
  	*)
@@@ -1466,12 -1360,6 +1528,12 @@@ els
  # system, and we'll never get to this point.
  
  case $basic_machine in
-         score-*)
++	score-*)
 +		os=-elf
 +		;;
-         spu-*)
++	spu-*)
 +		os=-elf
 +		;;
  	*-acorn)
  		os=-riscix1.2
  		;;
@@@ -1481,9 -1369,9 +1543,24 @@@
  	arm*-semi)
  		os=-aout
  		;;
-         c4x-* | tic4x-*)
-         	os=-coff
 -    c4x-* | tic4x-*)
 -        os=-coff
 -        ;;
++	c4x-* | tic4x-*)
++		os=-coff
++		;;
++	c8051-*)
++		os=-elf
++		;;
++	hexagon-*)
++		os=-elf
++		;;
++	tic54x-*)
++		os=-coff
++		;;
++	tic55x-*)
++		os=-coff
++		;;
++	tic6x-*)
++		os=-coff
 +		;;
  	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
@@@ -1502,22 -1390,19 +1579,22 @@@
  		;;
  	m68000-sun)
  		os=-sunos3
--		# This also exists in the configure program, but was not the
--		# default.
--		# os=-sunos4
  		;;
  	m68*-cisco)
  		os=-aout
  		;;
-         mep-*)
++	mep-*)
 +		os=-elf
 +		;;
  	mips*-cisco)
  		os=-elf
  		;;
  	mips*-*)
  		os=-elf
  		;;
++	or1k-*)
++		os=-elf
++		;;
  	or32-*)
  		os=-coff
  		;;
@@@ -1536,7 -1421,7 +1613,7 @@@
  	*-ibm)
  		os=-aix
  		;;
--    	*-knuth)
++	*-knuth)
  		os=-mmixware
  		;;
  	*-wec)
diff --cc debian/changelog
index 73f12c0,0000000..91a3b0a
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,107 -1,0 +1,116 @@@
++adios (1.4.1-2) unstable; urgency=medium
++
++  * New upstream.
++  * Standards-Version: 3.9.5
++  * Include latest config.{sub,guess} 
++  * New watch file.
++
++ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 09 Dec 2013 15:21:31 +0000
++
 +adios (1.4.1-1) unstable; urgency=low
 +
 +  * New upstream.
 +  * update config.{sub,guess} for the AArch64 port. Closes: #727312.
 +  * Make python code python2-3 agnostic.
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Thu, 24 Oct 2013 19:27:47 +0100
 +
 +adios (1.3-11) unstable; urgency=low
 +
 +  * Comment out lustre support (and remove dependency) as Wheezy will not
 +    ship with lustre-dev. Closes: #699262.
 +  * Standards-Version: 3.9.4. No changes required.
 +  * Update debhelper dependency to 9 for multiarch.
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Tue, 29 Jan 2013 16:18:53 +0000
 +
 +adios (1.3-10) unstable; urgency=low
 +
 +  * Patch from Simon Ruderich for hardening flags. Closes: #663925, #663978. 
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Wed, 21 Mar 2012 10:20:55 +0000
 +
 +adios (1.3-9) unstable; urgency=low
 +
 +  * Move to Standards-Version: 3.9.3. No changes required.
 +  * Fixes to build with hardening flags.  
 +  * Patch from Pino Toscano to fix FTBFS on Hurd. Closes: #660562.
 +  * Fix netcdf linking. Closes: #662995 
 +  * Change to Multiarch: foreign now we ship arch-dependent binaries
 +    in libadios-dev. 
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Fri, 09 Mar 2012 17:34:24 +0000
 +
 +adios (1.3-8) unstable; urgency=low
 +
 +  * Add -Wl,--as-needed to remove unnecessary dependencies.
 +  * Mult-Arch support. 
 +    - No longer ship adios_config.flags. Instead recommend users use  
 +      pkg-config, which Does The Right Thing in multi-arch.
 +    - adios_
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Wed, 14 Sep 2011 15:43:29 +0100
 +
 +adios (1.3-7) unstable; urgency=low
 +
 +  * Rename gpp to adiosxml2h. (Will be renamed by upstream in next release)
 +    Closes: #639257. 
 +  * Move DH_COMPAT=8 
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Thu, 25 Aug 2011 18:17:09 +0100
 +
 +adios (1.3-6) unstable; urgency=low
 +
 +  * LAM uses mpicc.lam, not mpicc.  
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Tue, 16 Aug 2011 17:18:36 +0100
 +
 +adios (1.3-5) unstable; urgency=low
 +
 +  * MPI_IN_PLACE patch is needed for adiso_mpi_lustre.c too, even though
 +   Lustre is not used in LAM environment. Sigh.  
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Tue, 16 Aug 2011 09:57:26 +0100
 +
 +adios (1.3-4) unstable; urgency=low
 +
 +  * Patch to stop compilation with dummy MPI if real parallel HDF5 is used.
 +    Closes: #637893. 
 +  * make use of MPI_IN_PLACE conditional on MPI_IN_PLACE existing,
 +    as its not present in LAM MPI. Also, conditionally use mpicc.
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Mon, 15 Aug 2011 17:57:34 +0100
 +
 +adios (1.3-3) unstable; urgency=low
 +
 +  * Make lustre support conditional to intel,amd64, powerpc archs. 
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Mon, 15 Aug 2011 16:56:23 +0100
 +
 +adios (1.3-2) unstable; urgency=low
 +
 +  * Set CC=mpicc to ensure new C code gets built with MPI. 
 +    Closes: #637714. 
 +  * Add lustre support. 
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Sun, 14 Aug 2011 16:12:14 +0100
 +
 +adios (1.3-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Ignore -little flag in configure to support SH4. 
 +    Thanks to Nobuhiro Iwamatsu; Closes: #635908. 
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Tue, 09 Aug 2011 20:32:58 +0100
 +
 +adios (1.2.1-2) unstable; urgency=low
 +
 +  * Use MPIFC=mpif77 during build, to work on LAM-based MPI systems. 
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Sun, 10 Jul 2011 00:33:10 +0100
 +
 +adios (1.2.1-1) unstable; urgency=low
 +
 +  * Initial release. (Closes: #624371).
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Wed, 27 Apr 2011 19:16:12 +0100
diff --cc debian/watch
index 0000000,0000000..ae9d9d4
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,2 @@@
++version=3
++http://www.olcf.ornl.gov/center-projects/adios/ .*/adios-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))

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



More information about the debian-science-commits mailing list