2 files changed, 29 insertions, 1 deletions
diff --git a/src/arch/arm/v7/opdefs/Makefile.am b/src/arch/arm/v7/opdefs/Makefile.am
index 2687a92..10deadb 100644
--- a/src/arch/arm/v7/opdefs/Makefile.am
+++ b/src/arch/arm/v7/opdefs/Makefile.am
@@ -92,7 +92,7 @@ generate_final_makefile:
 fix_includes_in_c_templates:
 	@for f in `find .gen/ -name '*tmpl.c'`; do			\
 		if grep -q '##INCLUDES##' $$f; then				\
-			$(fix_verbose)sed -i 's/##INCLUDES##/\n#include "..\/instruction.h"\n#include "..\/..\/instruction.h"\n#include "..\/helpers.h"\n#include "..\/..\/..\/..\/common\/bconst.h"\n\n/' $$f;	\
+			$(fix_verbose)sed -i 's/##INCLUDES##/\n#include "..\/helpers.h"\n#include "..\/instruction.h"\n#include "..\/link.h"\n#include "..\/post.h"\n#include "..\/..\/instruction.h"\n#include "..\/..\/..\/..\/common\/bconst.h"\n\n/' $$f;	\
 		fi;												\
 	done
 
diff --git a/src/arch/arm/v7/opdefs/bl_A8825.d b/src/arch/arm/v7/opdefs/bl_A8825.d
index dc9c922..96c782f 100644
--- a/src/arch/arm/v7/opdefs/bl_A8825.d
+++ b/src/arch/arm/v7/opdefs/bl_A8825.d
@@ -37,6 +37,13 @@
 
     }
 
+    @hooks {
+
+        link = handle_links_with_instruction_bl_from_thumb
+        post = post_process_branch_instructions
+
+    }
+
 }
 
 @encoding(T2) {
@@ -53,6 +60,13 @@
 
     }
 
+    @hooks {
+
+        link = handle_links_with_instruction_blx_from_thumb
+        post = post_process_branch_instructions
+
+    }
+
 }
 
 @encoding(A1) {
@@ -67,6 +81,13 @@
 
     }
 
+    @hooks {
+
+        link = handle_links_with_instruction_bl_from_arm
+        post = post_process_branch_instructions
+
+    }
+
 }
 
 @encoding(A2) {
@@ -81,4 +102,11 @@
 
     }
 
+    @hooks {
+
+        link = handle_links_with_instruction_blx_from_arm
+        post = post_process_branch_instructions
+
+    }
+
 }