Merge GDB 7.5.1

sim/bfin/interp.c

 /* Simulator for Analog Devices Blackfin processors.
 
    Copyright (C) 2005-2012 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of simulators.
 
    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
    the Free Software Foundation; either version 3 of the License, or
@@ skipping 1033 matching lines @@
        env[0..N][0..M]
        FDPIC loadmaps   -- for FDPIC apps
      So set things up the same way.  */
   int i, argc, envc;
   bu32 argv_flat, env_flat;
 
   bu32 sp, sp_flat;
 
   /* start, at_phdr, at_phnum, at_base, at_entry, pt_dynamic  */
   bu32 elf_addrs[6];
-  bu32 auxvt, auxvt_size;
+  bu32 auxvt;
   bu32 exec_loadmap, ldso_loadmap;
   char *ldso_path;
 
   unsigned char null[4] = { 0, 0, 0, 0 };
 
   host_callback *cb = STATE_CALLBACK (sd);
 
   elf_addrs[0] = elf_addrs[4] = bfd_get_start_address (abfd);
   elf_addrs[1] = elf_addrs[2] = elf_addrs[3] = elf_addrs[5] = 0;
 
@@ skipping 72 matching lines @@
   if (auxvt)
     {
 # define AT_PUSH(at, val) \
   auxvt_size += 8; \
   sp -= 4; \
   auxvt = (val); \
   sim_write (sd, sp, (void *)&auxvt, 4); \
   sp -= 4; \
   auxvt = (at); \
   sim_write (sd, sp, (void *)&auxvt, 4)
-  auxvt_size = 0;
       unsigned int egid = getegid (), gid = getgid ();
       unsigned int euid = geteuid (), uid = getuid ();
+      bu32 auxvt_size = 0;
       AT_PUSH (AT_NULL, 0);
       AT_PUSH (AT_SECURE, egid != gid || euid != uid);
       AT_PUSH (AT_EGID, egid);
       AT_PUSH (AT_GID, gid);
       AT_PUSH (AT_EUID, euid);
       AT_PUSH (AT_UID, uid);
       AT_PUSH (AT_ENTRY, elf_addrs[4]);
       AT_PUSH (AT_FLAGS, 0);
       AT_PUSH (AT_BASE, elf_addrs[3]);
       AT_PUSH (AT_PHNUM, elf_addrs[2]);
@@ skipping 112 matching lines @@
     case OPERATING_ENVIRONMENT:
       bfin_os_init (sd, cpu, (void *)argv);
       break;
     default:
       bfin_virtual_init (sd, cpu);
       break;
     }
 
   return SIM_RC_OK;
 }