1031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines/* 2031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * README.android describes in high-level the compiler-rt changes that we 3031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * cannot push upstream to the llvm.org repository: 4031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * - Changes due to Android's build system. 5031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * - Changes due to Android's toolchain. 6031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * - Changes due to the limitations in Android-based consumer electronics. 7031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * 8031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * Some of them are to-dos. If and when they are done, there will no longer be 9031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * merge conflicts with upstream on those parts. 10031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * 11031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * The file contains useful hints when we try to resolve future 3-way merge 12031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines * conflicts. 13031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines */ 14031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines 15e34de791db1e32f0e228a4c82d4a28cce79b0a79Shih-wei Liao* For JellyBean: Synced to upstream r155350 166490f0d0b9a761083016aa469c9cce72b341b0a4Stephen Hines* For JellyBean MR1: Synced to upstream r162279 17dd3a5ecd1b9296f0cc3aa46e9bce2f6bdbbaa660Stephen Hines* For Jellybean MR2: Synced to upstream r177337 187cba5f1d950495b02bc8da53d27bdbb1b0d4f117Stephen Hines* For Key Lime Pie: Synced to upstream r187889 1921b5c4df776d34aaa4d1b793b7667aa8353492ddStephen Hines* For FUTURE: Synced to LLVM 3.4 r197381 20031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines 2121b5c4df776d34aaa4d1b793b7667aa8353492ddStephen Hines* Cherry-pick on 2014/2/11: https://llvm.org/svn/llvm-project/compiler-rt/trunk@201068 and https://llvm.org/svn/llvm-project/compiler-rt/trunk@201070 2221b5c4df776d34aaa4d1b793b7667aa8353492ddStephen Hines* Recent downstreaming on 2013/2/11: Synced to r197381 (Contact srhines for merge questions.) 237cba5f1d950495b02bc8da53d27bdbb1b0d4f117Stephen Hines* Recent downstreaming on 2013/8/8: Synced to r187889 (Contact srhines for merge questions.) 24485f73812dec2204e9f1b184bf01420859ca7f31Stephen Hines* Recent downstreaming on 2013/6/13: Synced to r183849 (Contact srhines for merge questions.) 253a02de31fcd8f0071c5d1f2048c7cc1643c16327Stephen Hines* Recent downstreaming on 2013/5/3: Synced to r180792 (Contact srhines for merge questions.) 26dd3a5ecd1b9296f0cc3aa46e9bce2f6bdbbaa660Stephen Hines* Recent downstreaming on 2013/3/18: Synced to r177337 (Contact srhines for merge questions.) 27ff571e2cf5d4a55f7719cd63f05f11c3840f0f57Stephen Hines* Recent downstreaming on 2013/3/5: Synced to r176091 (Contact srhines for merge questions.) 28ff571e2cf5d4a55f7719cd63f05f11c3840f0f57Stephen Hines* Recent downstreaming on 2013/1/8: Synced to r171802 (Contact srhines for merge questions.) 296490f0d0b9a761083016aa469c9cce72b341b0a4Stephen Hines* Recent downstreaming on 2012/08/23: Synced to r162279 (Contact srhines for merge questions.) 30e34de791db1e32f0e228a4c82d4a28cce79b0a79Shih-wei Liao* Recent downstreaming on 2012/08/15: Synced to r159129 (Contact sliao for merge questions.) 3108c058a8b62f3661d38c09c8893f2c082fca949eStephen Hines* Cherry-pick on 2012/07/27: https://llvm.org/svn/llvm-project/compiler-rt/trunk@160853 for ASan (Contact srhines for merge questions.) 3227590d73e7a656b92ed5789172a38468ce7b615eStephen Hines* Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/compiler-rt/trunk@157318 for ASan (Contact srhines for merge questions.) 33e34de791db1e32f0e228a4c82d4a28cce79b0a79Shih-wei Liao* Recent downstreaming on 2012/04/25: Synced to r155350 (Contact sliao for merge questions.) 34031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines* Recent downstreaming on 2012/03/08: Synced to r152058 (Contact srhines for merge questions.) 35031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines 36031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen HinesTODO: This is still not building by default (no Android.mk files are present 37031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hinesyet). Look at frameworks/compile/libbcc/runtime for potential starting points. 38031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hines 39031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen HinesTODO: Switch libbcc to use this version of compiler-rt instead of its own 40031afa326382eab0b4a2ec4ce47c725a00e2fbceStephen Hinestweaked version. 41