* x86-64-tdep.c (amd64_classify_aggregate): Ignore static fields.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cba018feddff9ae90db3490fdbf1bbb01be8f4b0..f9d48bddcd985b869b593cdc0517d7ffab902b60 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2004-01-10  Mark Kettenis  <kettenis@gnu.org>
 
+       * x86-64-tdep.c (amd64_classify_aggregate): Ignore static fields.
+
        * x86-64-tdep.c (amd64_register_info): Add %cs and %ss.  Adjust
        register numbers in comments.
        * x86-64-tdep.h: Update copyright year.

diff --git a/gdb/x86-64-tdep.c b/gdb/x86-64-tdep.c
index b96193fa3c9c5e73aa7cd7c54b66fe869f009f70..c3bb166bb54d4ad6aa94aba87f82e0b51265b531 100644 (file)
--- a/gdb/x86-64-tdep.c
+++ b/gdb/x86-64-tdep.c
@@ -318,6 +318,10 @@ amd64_classify_aggregate (struct type *type, enum amd64_reg_class class[2])
          int pos = TYPE_FIELD_BITPOS (type, i) / 64;
          enum amd64_reg_class subclass[2];
 
+         /* Ignore static fields.  */
+         if (TYPE_FIELD_STATIC (type, i))
+           continue;
+
          gdb_assert (pos == 0 || pos == 1);
 
          amd64_classify (subtype, subclass);