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

Issue 184973004: 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-clang.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-clang.git;a=commit;h=d346cc0b6029ce81a5ef0bf6245fbedaedad0f9c

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+175 lines, -464 lines) Patch
M docs/LanguageExtensions.rst View 1 chunk +0 lines, -92 lines 0 comments Download
M docs/ReleaseNotes.rst View 7 chunks +70 lines, -31 lines 0 comments Download
M include/clang/Basic/DiagnosticCommentKinds.td View 1 chunk +1 line, -2 lines 0 comments Download
M include/clang/Basic/DiagnosticGroups.td View 1 chunk +1 line, -3 lines 0 comments Download
M include/clang/Sema/Template.h View 1 chunk +4 lines, -10 lines 0 comments Download
M lib/Basic/Targets.cpp View 2 chunks +1 line, -30 lines 0 comments Download
M lib/CodeGen/CGException.cpp View 3 chunks +4 lines, -8 lines 0 comments Download
M lib/CodeGen/CodeGenFunction.h View 1 chunk +1 line, -1 line 0 comments Download
M lib/CodeGen/CodeGenFunction.cpp View 1 chunk +0 lines, -10 lines 0 comments Download
M lib/Driver/Tools.cpp View 1 chunk +0 lines, -1 line 0 comments Download
M lib/Frontend/InitPreprocessor.cpp View 1 chunk +3 lines, -4 lines 0 comments Download
M lib/Lex/PPMacroExpansion.cpp View 3 chunks +1 line, -13 lines 0 comments Download
M lib/Sema/SemaTemplateInstantiateDecl.cpp View 1 chunk +1 line, -27 lines 0 comments Download
D test/CodeGen/linux-arm-atomic.c View 1 chunk +0 lines, -11 lines 0 comments Download
M test/CodeGenCXX/throw-expressions.cpp View 2 chunks +2 lines, -26 lines 0 comments Download
M test/Driver/sanitizer-ld.c View 4 chunks +0 lines, -4 lines 0 comments Download
M test/Lexer/has_extension_cxx.cpp View 1 chunk +0 lines, -6 lines 0 comments Download
M test/Lexer/has_feature_cxx0x.cpp View 32 chunks +64 lines, -118 lines 0 comments Download
M test/Preprocessor/init.c View 2 chunks +1 line, -19 lines 0 comments Download
D test/SemaCXX/cxx11-inheriting-ctors.cpp View 1 chunk +0 lines, -28 lines 0 comments Download
M tools/clang-format/clang-format.el View 1 chunk +2 lines, -2 lines 0 comments Download
M www/cxx_status.html View 10 chunks +19 lines, -18 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
Mark Seaborn
This is the Clang equivalent of https://codereview.chromium.org/183273009.
6 years, 9 months ago (2014-02-28 22:46:34 UTC) #1
Mark Seaborn
6 years, 8 months ago (2014-04-02 00:40:03 UTC) #2
Message was sent while issue was closed.
This was committed as:
https://gerrit.chromium.org/gerrit/gitweb?p=native_client/pnacl-clang.git;a=c...

Powered by Google App Engine
This is Rietveld 408576698