From 906a06fdb4cb045b325fada949be35027b89ea56 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratoch@fedoraproject.org>
Date: Mon, 13 Apr 2009 21:25:31 +0000
Subject: [PATCH] - Archer update to the snapshot:
 d1fee5066408a09423621d1ebc64e6d3e248ed08 - Archer backport:
 4854339f75bdaf4b228fc35579bddbb2a1fecdc1 - Fix Python FrameIterator.

---
 gdb-archer.patch | 39 +++++++++++++++++++++++++++++++++------
 gdb.spec         |  7 ++++++-
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/gdb-archer.patch b/gdb-archer.patch
index bc0894c..1c9c9f7 100644
--- a/gdb-archer.patch
+++ b/gdb-archer.patch
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectArcher
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 7c250ce99c90cf6097e2ec55ea0f205830979cee
+commit d1fee5066408a09423621d1ebc64e6d3e248ed08
 
 branch `archer' - the merge of branches:
 archer-jankratochvil-merge-expr
@@ -23940,13 +23940,13 @@ index 375f82e..8c3f476 100644
  	      struct type *type = value_type (val_args[i]);
 diff --git a/gdb/python/lib/gdb/FrameIterator.py b/gdb/python/lib/gdb/FrameIterator.py
 new file mode 100644
-index 0000000..87fb074
+index 0000000..5654546
 --- /dev/null
 +++ b/gdb/python/lib/gdb/FrameIterator.py
 @@ -0,0 +1,33 @@
 +# Iterator over frames.
 +
-+# Copyright (C) 2008 Free Software Foundation, Inc.
++# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -23973,7 +23973,7 @@ index 0000000..87fb074
 +
 +    def next (self):
 +        result = self.frame
-+        if result == None:
++        if result is None:
 +            raise StopIteration
 +        self.frame = result.older ()
 +        return result
@@ -26445,10 +26445,10 @@ index 36cde34..e6e3ac0 100644
  
 diff --git a/gdb/python/python-frame.c b/gdb/python/python-frame.c
 new file mode 100644
-index 0000000..c257ac3
+index 0000000..dafe69a
 --- /dev/null
 +++ b/gdb/python/python-frame.c
-@@ -0,0 +1,686 @@
+@@ -0,0 +1,713 @@
 +/* Python interface to stack frames
 +
 +   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
@@ -27029,6 +27029,33 @@ index 0000000..c257ac3
 +  return PyUnicode_Decode (str, strlen (str), host_charset (), NULL);
 +}
 +
++/* Implements the equality comparison for Frame objects.
++   All other comparison operators will throw a TypeError Python exception,
++   as they aren't valid for frames.  */
++
++static PyObject *
++frapy_richcompare (PyObject *self, PyObject *other, int op)
++{
++  int result;
++
++  if (!PyObject_TypeCheck (other, &frame_object_type)
++      || (op != Py_EQ && op != Py_NE))
++    {
++      Py_INCREF (Py_NotImplemented);
++      return Py_NotImplemented;
++    }
++
++  if (frame_id_eq (((frame_object *) self)->frame_id,
++		   ((frame_object *) other)->frame_id))
++    result = Py_EQ;
++  else
++    result = Py_NE;
++
++  if (op == result)
++    Py_RETURN_TRUE;
++  Py_RETURN_FALSE;
++}
++
 +/* Sets up the Frame API in the gdb module.  */
 +
 +void
diff --git a/gdb.spec b/gdb.spec
index e6cc825..7fda137 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -13,7 +13,7 @@ Version: 6.8.50.20090302
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 17%{?_with_upstream:.upstream}%{?dist}
+Release: 18%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -851,6 +851,11 @@ fi
 %endif
 
 %changelog
+* Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-18
+- Archer update to the snapshot: d1fee5066408a09423621d1ebc64e6d3e248ed08
+- Archer backport: 4854339f75bdaf4b228fc35579bddbb2a1fecdc1
+  - Fix Python FrameIterator.
+
 * Mon Apr 13 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-17
 - Archer update to the snapshot: 7c250ce99c90cf6097e2ec55ea0f205830979cee
 - Archer backport: c14d9ab7eef43281b2052c885f89d2db96fb5f8e