sim: unify toolchain dependency logic

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

diff --git a/sim/common/hw-alloc.c b/sim/common/hw-alloc.c
index db2b256dcb4e8746548468a40bddd3b04b9c6185..a16666b931a08ae7ceba1fcb167de5cd6915c3a0 100644 (file)
--- a/sim/common/hw-alloc.c
+++ b/sim/common/hw-alloc.c
@@ -1,5 +1,5 @@
 /* Hardware memory allocator.
-   Copyright (C) 1998, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1998-2021 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.
@@ -17,18 +17,17 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
 
 #include "hw-main.h"
 #include "hw-base.h"
 
-
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 
-struct hw_alloc_data {
+struct hw_alloc_data
+{
   void *alloc;
-  int zalloc_p;
   struct hw_alloc_data *next;
 };
 
@@ -54,7 +53,6 @@ hw_zalloc (struct hw *me, unsigned long 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;
@@ -65,7 +63,6 @@ hw_malloc (struct hw *me, unsigned long 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;
@@ -84,11 +81,8 @@ hw_free (struct hw *me,
        {
          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;
        }
     }