redboot/fconfig - work around GCC bug

[Gary Thomas]

Closes BZ#1000672

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

Index: redboot/current/ChangeLog
===================================================================
RCS file: /srv/misc/cvsfiles/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.266
diff -u -5 -p -r1.266 ChangeLog
--- redboot/current/ChangeLog   20 Feb 2009 22:27:58 -0000      1.266
+++ redboot/current/ChangeLog   4 Mar 2009 17:17:38 -0000
@@ -1,5 +1,10 @@
+2009-03-04  Gary Thomas  <g...@mlbassoc.com>
+
+       * src/fconfig.c (get_config): Simplify memcpy() call to
+       work around GCC 4.3 code generation error.  BZ#1000672
+
 2009-02-20  Jonathan Larmour  <j...@ecoscentric.com>
 
        * src/flash.c (do_flash_init): Call cyg_flash_init() with
        NULL argument.
 
Index: redboot/current/src/fconfig.c
===================================================================
RCS file: /srv/misc/cvsfiles/ecos/packages/redboot/current/src/fconfig.c,v
retrieving revision 1.17
diff -u -5 -p -r1.17 fconfig.c
--- redboot/current/src/fconfig.c       29 Jan 2009 17:50:04 -0000      1.17
+++ redboot/current/src/fconfig.c       4 Mar 2009 17:15:10 -0000
@@ -383,11 +383,11 @@ get_config(char *dp, char *title, int li
             return CONFIG_OK;
         }
         break;
 #ifdef CYGPKG_REDBOOT_NETWORKING
     case CONFIG_IP:
-        memcpy(&hold_ip_val.s_addr, &((in_addr_t *)val_ptr)->s_addr, 
sizeof(in_addr_t));
+        memcpy(&hold_ip_val, val_ptr, sizeof(in_addr_t));
         if (!_gethostbyname(line, &new_ip_val)) {
             return CONFIG_BAD;
         }
         if (hold_ip_val.s_addr != new_ip_val.s_addr) {
             memcpy(val_ptr, &new_ip_val, sizeof(in_addr_t));