diff options
| author | Stephen Hines <srhines@google.com> | 2014-02-11 20:01:10 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-02-11 20:01:10 -0800 |
| commit | ce9904c6ea8fd669978a8eefb854b330eb9828ff (patch) | |
| tree | 2418ee2e96ea220977c8fb74959192036ab5b133 /docs/HistoricalNotes | |
| parent | c27b10b198c1d9e9b51f2303994313ec2778edd7 (diff) | |
| parent | dbb832b83351cec97b025b61c26536ef50c3181c (diff) | |
| download | external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.zip external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.tar.gz external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.tar.bz2 | |
Merge remote-tracking branch 'upstream/release_34' into merge-20140211
Conflicts:
lib/Linker/LinkModules.cpp
lib/Support/Unix/Signals.inc
Change-Id: Ia54f291fa5dc828052d2412736e8495c1282aa64
Diffstat (limited to 'docs/HistoricalNotes')
| -rw-r--r-- | docs/HistoricalNotes/2003-06-25-Reoptimizer1.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/HistoricalNotes/2003-06-25-Reoptimizer1.txt b/docs/HistoricalNotes/2003-06-25-Reoptimizer1.txt index a745784..521526f 100644 --- a/docs/HistoricalNotes/2003-06-25-Reoptimizer1.txt +++ b/docs/HistoricalNotes/2003-06-25-Reoptimizer1.txt @@ -132,6 +132,6 @@ is supposed to be cache-line-aligned, but it is not page-aligned. We generate instrumentation traces and optimized traces into separate trace caches. We keep the instrumented code around because you don't want to delete a trace when you still might have to return to it -(i.e., return from a llvm_first_trigger() or countPath() call.) +(i.e., return from an llvm_first_trigger() or countPath() call.) |