tree 68577dfcfb2bf5725f5cdbe6e9e15122a3a5dbad
parent 942762e4b7cc9eb5c77d9bf32e0db9dbd860466c
parent 4c657bfa8fb1c0595a5c020af5b7c1d3eb3c1394
author David Neto <dneto@google.com> 1458831619 -0400
committer David Neto <dneto@google.com> 1458831619 -0400

Merge remote-tracking branch 'aosp/upstream-master' into update-master

Pulls in the following updates, especially support for MinGW compile:

  4c657bf Make everything compile cleanly with -Wpedantic.
  e04b935 Support both -h, --help on spirv-as, spirv-val
  d0f80fa Travis CI: update test binary location and return correct status.
  eb6fc51 Split CMakeLists.txt into smaller ones.
  02141e5 Travis CI: add configuration for testing on Mac OS X.
  7c58c1d Support Linux-to-Windows cross comiple via MinGW
  6032b98 Change the interface for getWord().
  de4a7c7 Travis CI: use Ubuntu 14.04 (Trusty) as the Linux environment.
  755eb6d Remove AssemblyContext::getWord().
  c31d7cb Add patchlevel to CMake requirement
  476989e Return str in describe() as said by the blurb.
  9149a66 Fix the corner case in version generation script.