merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 1260eeb..e2e3acb 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-19  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
+       PR other/33768
+       * splay-tree.c (rotate_left): Fix minor typo in comment.
+       (rotate_right): Likewise.
+
 2007-11-12  Joseph Myers  <joseph@codesourcery.com>
 
        * floatformat.c (floatformat_ibm_long_double_is_valid): Fix

diff --git a/libiberty/splay-tree.c b/libiberty/splay-tree.c
index 060f900..d7ed868 100644 (file)
--- a/libiberty/splay-tree.c
+++ b/libiberty/splay-tree.c
@@ -107,7 +107,7 @@ splay_tree_delete_helper (splay_tree sp, splay_tree_node node)
 }
 
 /* Rotate the edge joining the left child N with its parent P.  PP is the
-   grandparents pointer to P.  */
+   grandparents' pointer to P.  */
 
 static inline void
 rotate_left (splay_tree_node *pp, splay_tree_node p, splay_tree_node n)
@@ -120,7 +120,7 @@ rotate_left (splay_tree_node *pp, splay_tree_node p, splay_tree_node n)
 }
 
 /* Rotate the edge joining the right child N with its parent P.  PP is the
-   grandparents pointer to P.  */
+   grandparents' pointer to P.  */
 
 static inline void
 rotate_right (splay_tree_node *pp, splay_tree_node p, splay_tree_node n)