2 files changed, 15 insertions, 3 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 7cd828733b1..13eca902d88 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -54,7 +54,7 @@ end
 
 define xgetint
   set $bugfix = $arg0
-  set $int = gdb_use_union ? $bugfix.s.val : (gdb_use_lsb ? $bugfix : $bugfix << gdb_gctypebits) >> gdb_gctypebits
+  set $int = gdb_use_union ? $bugfix.s.val : (gdb_use_lsb ? $bugfix >> (gdb_gctypebits - 1) : $bugfix << gdb_gctypebits) >> gdb_gctypebits
 end
 
 define xgettype
@@ -1003,8 +1003,15 @@ end
 
 define xpr
   xtype
-  if $type == Lisp_Int
-    xint
+  if gdb_use_union
+    if $type == Lisp_Int
+      xint
+    end
+  end
+  if !gdb_use_union
+    if $type == Lisp_Int0 || $type == Lisp_Int1
+      xint
+    end
   end
   if $type == Lisp_Symbol
     xsymbol
diff --git a/src/ChangeLog b/src/ChangeLog
index 3fccf8cc439..06d65c7bf33 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-24  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * .gdbinit (xpr): Handle USE_2_TAGS_FOR_INTS.
+        (xgetint): Add missing shift for LSB tags.
+
 2012-04-24  Martin Rudalics  <rudalics@gmx.at>
 
         * keyboard.c (read_char): Don't wipe echo area for select window