Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Issue 183273009: Prep for merging 3.4: Undo changes from 3.3 branch (Closed)

Created:
6 years, 9 months ago by Mark Seaborn
Modified:
6 years, 8 months ago
CC:
native-client-reviews_googlegroups.com
Base URL:
http://git.chromium.org/native_client/pnacl-llvm.git@master
Visibility:
Public.

Description

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 Committed: https://gerrit.chromium.org/gerrit/gitweb?p=native_client/pnacl-llvm.git;a=commit;h=b768b984a38ef3d097b1db720872326b7d82a4d7

Patch Set 1 #

Patch Set 2 : Retry #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1611 lines, -2014 lines) Patch
M CODE_OWNERS.TXT View 1 chunk +0 lines, -4 lines 0 comments Download
M autoconf/configure.ac View 1 chunk +1 line, -1 line 0 comments Download
M configure View 8 chunks +9 lines, -9 lines 0 comments Download
M docs/CodeGenerator.rst View 9 chunks +0 lines, -9 lines 0 comments Download
M docs/CommandLine.rst View 1 chunk +0 lines, -2 lines 0 comments Download
M docs/LangRef.rst View 1 chunk +5 lines, -4 lines 0 comments Download
M docs/ReleaseNotes.rst View 5 chunks +51 lines, -182 lines 0 comments Download
M include/llvm/Analysis/ScalarEvolution.h View 4 chunks +4 lines, -6 lines 0 comments Download
M include/llvm/IR/IntrinsicsNVVM.td View 1 chunk +0 lines, -2 lines 0 comments Download
M include/llvm/MC/MCELFObjectWriter.h View 1 chunk +1 line, -8 lines 0 comments Download
M lib/Analysis/ScalarEvolution.cpp View 13 chunks +37 lines, -68 lines 0 comments Download
M lib/CodeGen/AsmPrinter/DwarfDebug.cpp View 4 chunks +4 lines, -16 lines 0 comments Download
M lib/CodeGen/IntrinsicLowering.cpp View 1 chunk +0 lines, -6 lines 0 comments Download
M lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp View 1 chunk +0 lines, -5 lines 0 comments Download
M lib/MC/MCParser/AsmParser.cpp View 1 chunk +1 line, -1 line 0 comments Download
M lib/MC/MCStreamer.cpp View 1 chunk +0 lines, -1 line 0 comments Download
M lib/Target/ARM/ARMISelLowering.cpp View 3 chunks +25 lines, -32 lines 0 comments Download
M lib/Target/NVPTX/CMakeLists.txt View 1 chunk +0 lines, -1 line 0 comments Download
M lib/Target/NVPTX/NVPTX.h View 2 chunks +0 lines, -4 lines 0 comments Download
M lib/Target/NVPTX/NVPTXAsmPrinter.h View 7 chunks +11 lines, -15 lines 0 comments Download
M lib/Target/NVPTX/NVPTXAsmPrinter.cpp View 31 chunks +52 lines, -81 lines 0 comments Download
D lib/Target/NVPTX/NVPTXGenericToNVVM.cpp View 1 chunk +0 lines, -436 lines 0 comments Download
M lib/Target/NVPTX/NVPTXISelDAGToDAG.h View 1 chunk +0 lines, -4 lines 0 comments Download
M lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp View 2 chunks +0 lines, -7 lines 0 comments Download
M lib/Target/NVPTX/NVPTXInstrInfo.td View 1 chunk +0 lines, -3 lines 0 comments Download
M lib/Target/NVPTX/NVPTXIntrinsics.td View 2 chunks +28 lines, -12 lines 0 comments Download
M lib/Target/NVPTX/NVPTXTargetMachine.cpp View 4 chunks +0 lines, -8 lines 0 comments Download
M lib/Target/NVPTX/NVVMReflect.cpp View 4 chunks +3 lines, -21 lines 0 comments Download
M lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp View 3 chunks +1 line, -10 lines 0 comments Download
M lib/Target/PowerPC/PPCBranchSelector.cpp View 1 chunk +3 lines, -9 lines 0 comments Download
M lib/Target/PowerPC/PPCFrameLowering.cpp View 1 chunk +0 lines, -1 line 0 comments Download
M lib/Target/PowerPC/PPCInstrInfo.cpp View 6 chunks +18 lines, -11 lines 0 comments Download
M lib/Target/R600/AMDGPUInstructions.td View 1 chunk +0 lines, -11 lines 0 comments Download
M lib/Target/R600/AMDGPUTargetMachine.cpp View 1 chunk +1 line, -0 lines 0 comments Download
M lib/Target/R600/AMDILDeviceInfo.cpp View 1 chunk +1 line, -2 lines 0 comments Download
A lib/Target/R600/AMDILPeepholeOptimizer.cpp View 1 chunk +1215 lines, -0 lines 0 comments Download
M lib/Target/R600/CMakeLists.txt View 1 chunk +1 line, -0 lines 0 comments Download
M lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h View 1 chunk +2 lines, -1 line 0 comments Download
M lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp View 1 chunk +1 line, -1 line 0 comments Download
M lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp View 3 chunks +6 lines, -11 lines 0 comments Download
M lib/Target/R600/Processors.td View 1 chunk +0 lines, -1 line 0 comments Download
M lib/Target/R600/R600ControlFlowFinalizer.cpp View 5 chunks +5 lines, -13 lines 0 comments Download
M lib/Target/R600/R600ISelLowering.cpp View 3 chunks +0 lines, -9 lines 0 comments Download
M lib/Target/R600/R600Instructions.td View 1 chunk +0 lines, -1 line 0 comments Download
M lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp View 2 chunks +2 lines, -2 lines 0 comments Download
M lib/Target/X86/X86FrameLowering.cpp View 5 chunks +19 lines, -16 lines 0 comments Download
M lib/Target/X86/X86ISelLowering.cpp View 3 chunks +15 lines, -26 lines 0 comments Download
M lib/Target/X86/X86Subtarget.cpp View 1 chunk +1 line, -2 lines 0 comments Download
M lib/Transforms/IPO/GlobalOpt.cpp View 2 chunks +2 lines, -102 lines 0 comments Download
M lib/Transforms/InstCombine/InstCombineMulDivRem.cpp View 1 chunk +22 lines, -23 lines 0 comments Download
M lib/Transforms/Scalar/CodeGenPrepare.cpp View 3 chunks +5 lines, -2 lines 0 comments Download
M lib/Transforms/Vectorize/LoopVectorize.cpp View 15 chunks +25 lines, -47 lines 0 comments Download
M test/CodeGen/ARM/vmul.ll View 1 chunk +0 lines, -24 lines 0 comments Download
D test/CodeGen/Generic/annotate.ll View 1 chunk +0 lines, -15 lines 0 comments Download
D test/CodeGen/Generic/ptr-annotate.ll View 1 chunk +0 lines, -18 lines 0 comments Download
D test/CodeGen/NVPTX/generic-to-nvvm.ll View 1 chunk +0 lines, -25 lines 0 comments Download
D test/CodeGen/NVPTX/i1-global.ll View 1 chunk +0 lines, -19 lines 0 comments Download
D test/CodeGen/NVPTX/i1-param.ll View 1 chunk +0 lines, -18 lines 0 comments Download
M test/CodeGen/NVPTX/intrinsics.ll View 1 chunk +0 lines, -7 lines 0 comments Download
D test/CodeGen/NVPTX/refl1.ll View 1 chunk +0 lines, -37 lines 0 comments Download
M test/CodeGen/PowerPC/crsave.ll View 2 chunks +4 lines, -8 lines 0 comments Download
M test/CodeGen/PowerPC/optcmp.ll View 2 chunks +2 lines, -2 lines 0 comments Download
D test/CodeGen/R600/bfe_uint.ll View 1 chunk +0 lines, -26 lines 0 comments Download
D test/CodeGen/R600/mul.ll View 1 chunk +0 lines, -16 lines 0 comments Download
D test/CodeGen/R600/r600-encoding.ll View 1 chunk +0 lines, -24 lines 0 comments Download
D test/CodeGen/R600/sra.ll View 1 chunk +0 lines, -13 lines 0 comments Download
D test/CodeGen/R600/sub.ll View 1 chunk +0 lines, -15 lines 0 comments Download
D test/CodeGen/R600/vselect.ll View 1 chunk +0 lines, -17 lines 0 comments Download
D test/CodeGen/R600/vtx-schedule.ll View 1 chunk +0 lines, -22 lines 0 comments Download
D test/CodeGen/X86/codegen-prepare.ll View 1 chunk +0 lines, -44 lines 0 comments Download
D test/CodeGen/X86/compact-unwind.ll View 1 chunk +0 lines, -30 lines 0 comments Download
M test/CodeGen/X86/vec_compare.ll View 5 chunks +2 lines, -22 lines 0 comments Download
M test/DebugInfo/X86/stmt-list-multiple-compile-units.ll View 2 chunks +0 lines, -6 lines 0 comments Download
M test/ExecutionEngine/MCJIT/eh.ll View 1 chunk +1 line, -1 line 0 comments Download
M test/MC/AsmParser/exprs.s View 1 chunk +0 lines, -1 line 0 comments Download
D test/Transforms/GlobalOpt/alias-used.ll View 1 chunk +0 lines, -42 lines 0 comments Download
M test/Transforms/InstCombine/add4.ll View 1 chunk +0 lines, -18 lines 0 comments Download
M test/Transforms/LoopUnroll/scevunroll.ll View 2 chunks +6 lines, -44 lines 0 comments Download
M test/Transforms/LoopUnroll/unloop.ll View 2 chunks +16 lines, -18 lines 0 comments Download
M test/Transforms/LoopVectorize/lcssa-crash.ll View 1 chunk +0 lines, -11 lines 0 comments Download
D test/Transforms/LoopVectorize/multiple-address-spaces.ll View 1 chunk +0 lines, -47 lines 0 comments Download
D test/Transforms/LoopVectorize/no_outside_user.ll View 1 chunk +0 lines, -41 lines 0 comments Download
D test/Transforms/LoopVectorize/reverse_induction.ll View 1 chunk +0 lines, -79 lines 0 comments Download
D test/Transforms/LoopVectorize/value-ptr-bug.ll View 1 chunk +0 lines, -50 lines 0 comments Download
M unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp View 1 chunk +0 lines, -2 lines 0 comments Download
M utils/release/tag.sh View 2 chunks +2 lines, -2 lines 0 comments Download
M utils/release/test-release.sh View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 2 (0 generated)
Mark Seaborn
Obviously I'll push the commits in one go, and won't push this change on its ...
6 years, 9 months ago (2014-02-28 22:37:42 UTC) #1
Mark Seaborn
6 years, 8 months ago (2014-04-02 00:37:52 UTC) #2
Message was sent while issue was closed.
This was committed as:
https://gerrit.chromium.org/gerrit/gitweb?p=native_client/pnacl-llvm.git;a=co...

Powered by Google App Engine
This is Rietveld 408576698