[llvm-branch-commits] [llvm-branch] r231857 - Merging r227087:

[Dimitry Andric]

Author: dim
Date: Tue Mar 10 16:59:18 2015
New Revision: 231857

URL: http://llvm.org/viewvc/llvm-project?rev=231857&view=rev
Log:
Merging r227087:
------------------------------------------------------------------------
r227087 | vkalintiris | 2015-01-26 13:04:40 +0100 (Mon, 26 Jan 2015) | 7 lines

[mips] Add tests for bitwise binary and integer arithmetic operators.

Reviewers: dsanders

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D7125

Added:
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/add.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/add.ll
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/and.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/and.ll
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/ashr.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/ashr.ll
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/lshr.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/lshr.ll
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/or.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/or.ll
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/sdiv.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/sdiv.ll
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/shl.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/shl.ll
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/srem.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/srem.ll
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/sub.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/sub.ll
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/udiv.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/udiv.ll
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/urem.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/urem.ll
    llvm/branches/release_36/test/CodeGen/Mips/llvm-ir/xor.ll
      - copied unchanged from r227087, llvm/trunk/test/CodeGen/Mips/llvm-ir/xor.ll
Modified:
    llvm/branches/release_36/   (props changed)

Propchange: llvm/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 10 16:59:18 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226170-226171,226182,226473,226588,226616,226664,226708,226711,226755,226791,226808-226809,227005,227085,227250,227260-227261,227290,227294,227299,227319,227339,227491,227584,227603,227628,227670,227809,227815,227903,227934,227972,227983,228049,228129,228168,228331,228411,228444,228490,228500,228507,228518,228525,228565,228656,228760-228761,228793,228842,228899,228957,228969,228979,229029,229343,229351-229352,229421,229495,229529,229731,229911,230058,231563
+/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226170-226171,226182,226473,226588,226616,226664,226708,226711,226755,226791,226808-226809,227005,227085,227087,227250,227260-227261,227290,227294,227299,227319,227339,227491,227584,227603,227628,227670,227809,227815,227903,227934,227972,227983,228049,228129,228168,228331,228411,228444,228490,228500,228507,228518,228525,228565,228656,228760-228761,228793,228842,228899,228957,228969,228979,229029,229343,229351-229352,229421,229495,229529,229731,229911,230058,231563