From 71b50a6929b0a0c92ed9bfc33f32f0cc03cc17e4 Mon Sep 17 00:00:00 2001
From: emteere <47253321+emteere@users.noreply.github.com>
Date: Tue, 3 Nov 2020 09:32:00 -0500
Subject: [PATCH] GP-348_emteere fixed bad ehFrame addresses due to a fix
 elsewhere in the code no longer needing a translation

---
 .../gcc/structures/ehFrame/FrameDescriptionEntry.java     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/structures/ehFrame/FrameDescriptionEntry.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/structures/ehFrame/FrameDescriptionEntry.java
index fb4b3ab504..9a7b64e81a 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/structures/ehFrame/FrameDescriptionEntry.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/structures/ehFrame/FrameDescriptionEntry.java
@@ -269,14 +269,6 @@ public class FrameDescriptionEntry extends GccAnalysisClass {
 
 		createAndCommentData(program, addr, encodedDt, comment, CodeUnit.EOL_COMMENT);
 		if (pcBeginAddr.getOffset() != 0x0) {
-			// if the program was moved from a preferred image base, need to adjust
-			// the beginning of frame pointer
-			Long oib = ElfLoader.getElfOriginalImageBase(program);
-			if (oib != null) {
-				long imageBaseOffset = program.getImageBase().getOffset() - oib;
-				pcBeginAddr = pcBeginAddr.add(imageBaseOffset);
-			}
-
 			program.getReferenceManager().addMemoryReference(addr, pcBeginAddr, RefType.DATA,
 				SourceType.ANALYSIS, 0);
 		}