Prep for merging 3.4: Undo changes from 3.3 branch
In order to cleanly merge LLVM 3.4, we must first undo the various
changes we've merged from LLVM's 3.3 branch, for two reasons:
* To avoid merge conflicts where the same (or slightly different)
changes appear in both LLVM's 3.3 branch and LLVM trunk.
* To remove changes that were applied in the 3.3 branch and not on
trunk, such as updating config scripts to refer to "3.3".
I made this change by doing:
git diff $(git merge-base upstream/master upstream/release_33)..$(git merge-base upstream/release_33 origin/master) > tmp_patch
git apply --index --reverse tmp_patch
BUG=https://code.google.com/p/nativeclient/issues/detail?id=3757
TEST=none
Review URL: https://codereview.chromium.org/184973004/
22 files changed