X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Faarch64%2Fmemory.c;h=692c22608156ff38b1c0f0371180c5c3dca46a18;hb=a1d1fa3e417b4bd8e79e2a731f9c6089e2d5f747;hp=94c549fa0ad3803a393a75675627a5c44e459226;hpb=293acfae4e3c9aad417e262edc9847c79bbbbb11;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/aarch64/memory.c b/sim/aarch64/memory.c
index 94c549fa0a..692c226081 100644
--- a/sim/aarch64/memory.c
+++ b/sim/aarch64/memory.c
@@ -1,6 +1,6 @@
 /* memory.c -- Memory accessor functions for the AArch64 simulator
 
-   Copyright (C) 2015-2016 Free Software Foundation, Inc.
+   Copyright (C) 2015-2020 Free Software Foundation, Inc.
 
    Contributed by Red Hat.
 
@@ -25,10 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bfd.h"
 #include "libiberty.h"
-#include "elf/internal.h"
-#include "elf/common.h"
 
 #include "memory.h"
 #include "simulator.h"
@@ -163,10 +160,10 @@ aarch64_get_mem_ptr (sim_cpu *cpu, uint64_t address)
 uint64_t
 aarch64_get_heap_start (sim_cpu *cpu)
 {
-  uint64_t heap = aarch64_get_sym_value ("end");
+  uint64_t heap = trace_sym_value (CPU_STATE (cpu), "end");
 
   if (heap == 0)
-    heap = aarch64_get_sym_value ("_end");
+    heap = trace_sym_value (CPU_STATE (cpu), "_end");
   if (heap == 0)
     {
       heap = STACK_TOP - 0x100000;