* m68klinux-nat.c (fetch_register): Fix strict-aliasing violation.

(store_register): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5304e17e6dfffc0c287cde3aceb6c3081737d6e1..e43963e14352c612fd91b87bb56a834a9acead55 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-27  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * m68klinux-nat.c (fetch_register): Fix strict-aliasing violation.
+       (store_register): Likewise.
+
 2012-03-26 Oza Pawandeep  <oza.pawandeep@gmail.com>
 
         * MAINTAINERS (Write After Approval): Add myself to the list.

diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c
index d4410e68034d398862836113b6d499e038669727..3be7c14b1f885b624e680660847ca9611317db77 100644 (file)
--- a/gdb/m68klinux-nat.c
+++ b/gdb/m68klinux-nat.c
@@ -107,7 +107,7 @@ static void
 fetch_register (struct regcache *regcache, int regno)
 {
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  long regaddr;
+  long regaddr, val;
   int i;
   char buf[MAX_REGISTER_SIZE];
   int tid;
@@ -122,7 +122,8 @@ fetch_register (struct regcache *regcache, int regno)
   for (i = 0; i < register_size (gdbarch, regno); i += sizeof (long))
     {
       errno = 0;
-      *(long *) &buf[i] = ptrace (PTRACE_PEEKUSER, tid, regaddr, 0);
+      val = ptrace (PTRACE_PEEKUSER, tid, regaddr, 0);
+      memcpy (&buf[i], &val, sizeof (long));
       regaddr += sizeof (long);
       if (errno != 0)
        error (_("Couldn't read register %s (#%d): %s."), 
@@ -160,7 +161,7 @@ static void
 store_register (const struct regcache *regcache, int regno)
 {
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  long regaddr;
+  long regaddr, val;
   int i;
   int tid;
   char buf[MAX_REGISTER_SIZE];
@@ -180,7 +181,8 @@ store_register (const struct regcache *regcache, int regno)
   for (i = 0; i < register_size (gdbarch, regno); i += sizeof (long))
     {
       errno = 0;
-      ptrace (PTRACE_POKEUSER, tid, regaddr, *(long *) &buf[i]);
+      memcpy (&val, &buf[i], sizeof (long));
+      ptrace (PTRACE_POKEUSER, tid, regaddr, val);
       regaddr += sizeof (long);
       if (errno != 0)
        error (_("Couldn't write register %s (#%d): %s."),