diff options
| author | Ian Lance Taylor <iant@google.com> | 2014-06-04 23:15:33 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-06-04 23:15:33 +0000 |
| commit | bae90c989cb020d17a24919ec84c0b8dd2fae2da (patch) | |
| tree | 89766166feb4ceca2d983169c5360e3f6f521b12 /libgo/go/sort | |
| parent | 82b3da6a714493644a4333bfd8205e3341ed3b8e (diff) | |
libgo: Merge from revision 18783:00cce3a34d7e of master library.
This revision was committed January 7, 2014. The next
revision deleted runtime/mfinal.c. That will be done in a
subsequent merge.
This merge changes type descriptors to add a zero field,
pointing to a zero value for that type. This is implemented
as a common variable.
* go-gcc.cc (Gcc_backend::implicit_variable): Add is_common and
alignment parameters. Permit init parameter to be NULL.
From-SVN: r211249
Diffstat (limited to 'libgo/go/sort')
| -rw-r--r-- | libgo/go/sort/sort.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/sort/sort.go b/libgo/go/sort/sort.go index f06eb3827ab..242c5fffa21 100644 --- a/libgo/go/sort/sort.go +++ b/libgo/go/sort/sort.go @@ -289,7 +289,7 @@ func StringsAreSorted(a []string) bool { return IsSorted(StringSlice(a)) } // only logarithmic additional stack space. They perform well if compared // experimentaly to other stable in-place sorting algorithms. // -// Remarks on other algoritms evaluated: +// Remarks on other algorithms evaluated: // - GCC's 4.6.3 stable_sort with merge_without_buffer from libstdc++: // Not faster. // - GCC's __rotate for block rotations: Not faster. @@ -349,7 +349,7 @@ func Stable(data Interface) { // The algorithm needs O((M+N)*log(M)) calls to data.Swap. // // The paper gives O((M+N)*log(M)) as the number of assignments assuming a -// rotation algorithm wich uses O(M+N+gcd(M+N)) assignments. The argumentation +// rotation algorithm which uses O(M+N+gcd(M+N)) assignments. The argumentation // in the paper carries through for Swap operations, especially as the block // swapping rotate uses only O(M+N) Swaps. func symMerge(data Interface, a, m, b int) { |