gas: run the hwcaps-bump tests with 64-bit sparc objects only.

[deliverable/binutils-gdb.git] / sim / common / hw-alloc.c

diff --git a/sim/common/hw-alloc.c b/sim/common/hw-alloc.c
index 231acc679d7065947a27d71cec0f72c3b2c072ed..613f776691d8ac3b6617ebb084eb71691fba3423 100644 (file)
--- a/sim/common/hw-alloc.c
+++ b/sim/common/hw-alloc.c
@@ -1,5 +1,5 @@
 /* Hardware memory allocator.
 /* Hardware memory allocator.

-   Copyright (C) 1998, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1998-2016 Free Software Foundation, Inc.

    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.
    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.


@@ -26,9 +26,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdlib.h>
 #endif
 
 #include <stdlib.h>
 #endif
 

-struct hw_alloc_data {
+struct hw_alloc_data
+{

   void *alloc;
   void *alloc;

-  int zalloc_p;

   struct hw_alloc_data *next;
 };
 
   struct hw_alloc_data *next;
 };
 


@@ -54,7 +54,6 @@ hw_zalloc (struct hw *me, unsigned long size)
 {
   struct hw_alloc_data *memory = ZALLOC (struct hw_alloc_data);
   memory->alloc = zalloc (size);
 {
   struct hw_alloc_data *memory = ZALLOC (struct hw_alloc_data);
   memory->alloc = zalloc (size);

-  memory->zalloc_p = 1;

   memory->next = me->alloc_of_hw;
   me->alloc_of_hw = memory;
   return memory->alloc;
   memory->next = me->alloc_of_hw;
   me->alloc_of_hw = memory;
   return memory->alloc;


@@ -65,7 +64,6 @@ hw_malloc (struct hw *me, unsigned long size)
 {
   struct hw_alloc_data *memory = ZALLOC (struct hw_alloc_data);
   memory->alloc = zalloc (size);
 {
   struct hw_alloc_data *memory = ZALLOC (struct hw_alloc_data);
   memory->alloc = zalloc (size);

-  memory->zalloc_p = 0;

   memory->next = me->alloc_of_hw;
   me->alloc_of_hw = memory;
   return memory->alloc;
   memory->next = me->alloc_of_hw;
   me->alloc_of_hw = memory;
   return memory->alloc;


@@ -84,11 +82,8 @@ hw_free (struct hw *me,
        {
          struct hw_alloc_data *die = (*memory);
          (*memory) = die->next;
        {
          struct hw_alloc_data *die = (*memory);
          (*memory) = die->next;

-         if (die->zalloc_p)
-           zfree (die->alloc);
-         else
-           free (die->alloc);
-         zfree (die);
+         free (die->alloc);
+         free (die);

          return;
        }
     }
          return;
        }
     }