diff options
| author | Shih-wei Liao <sliao@google.com> | 2011-07-02 11:47:03 -0700 |
|---|---|---|
| committer | Shih-wei Liao <sliao@google.com> | 2011-07-02 11:47:03 -0700 |
| commit | d6a2e7d87f9dfd54ad5e480f62a839bf26ade59a (patch) | |
| tree | 1498a99361e822216a584b1b28de8dc31cfe5997 /README.android | |
| parent | 7c328f3347b42249c4178432bc29ca66271617a9 (diff) | |
| download | external_llvm-d6a2e7d87f9dfd54ad5e480f62a839bf26ade59a.zip external_llvm-d6a2e7d87f9dfd54ad5e480f62a839bf26ade59a.tar.gz external_llvm-d6a2e7d87f9dfd54ad5e480f62a839bf26ade59a.tar.bz2 | |
Update README.
Change-Id: I5459cec018db6cf91d85d76495bfb95b78a2f3f8
Diffstat (limited to 'README.android')
| -rw-r--r-- | README.android | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/README.android b/README.android index c8e5513..ae53dd6 100644 --- a/README.android +++ b/README.android @@ -5,18 +5,19 @@ * - Changes due to Android's toolchain. * - Changes due to the limitations in Android-based consumer electronics. * - * Some of them are to-dos. If and when they are done, there will no longer be + * Some of them are to-dos. If and when they are done, there will no longer be * merge conflicts with upstream on those parts. * - * The file contains useful hints when we try to resolve future 3-way merge - * conflicts. - */ + * The file contains useful hints when we try to resolve future 3-way merge + * conflicts. + */ * For Honeycomb: Synced to upstream r112344. * For Honeycomb MR1: Synced to upstream r119309 * For Honeycomb MR2: Synced to upstream r119309 -* For Ice Cream Sandwich: Synced to upstream r133718 +* For Ice Cream Sandwich: Synced to upstream r134306 +* Recent downstreaming on 2011/7/2: From r133718 to 134306 * Recent downstreaming on 2011/6/30: From r133240 to 133718 * This downstreaming could have broken bitcode compatibility * Upstream was migrating from 2.7 bitcode to 3.0 bitcode. @@ -43,15 +44,15 @@ * All the tblgen work to enable Android to build a generator-generator binary and then run it in the middle of Android build process. -* Explicitly include <cctype> header since is*() are not builtin functions in +* Explicitly include <cctype> header since is*() are not builtin functions in Android toolchain. * Code changes to make Android's toolchain stop outputting warnings. (This part should be pushed upstream eventually.) * lib/Target/{X86,ARM}/AsmPrinter/{X86,ARM}AsmPrinter.cpp - Move from lib/Target/{X86,ARM}/{X86,ARM}AsmPrinter.cpp. - AsmPrinter is only needed in Android when disassembly functionality + Move from lib/Target/{X86,ARM}/{X86,ARM}AsmPrinter.cpp. + AsmPrinter is only needed in Android when disassembly functionality is desired to be included. * Our ARM code generation fixes that upstream hasn't accepted yet. (This |