From 11400615292bad518ae0d2d085d8ec68b328d532 Mon Sep 17 00:00:00 2001
From: achan1989 <achan1989@gmail.com>
Date: Sat, 27 Apr 2019 14:01:52 +0100
Subject: [PATCH 1/2] Report errors about labels in macros.

---
 .../main/java/ghidra/pcodeCPort/slgh_compile/SleighCompile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompile.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompile.java
index 895c894be6..9b1926087a 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompile.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompile.java
@@ -1537,7 +1537,7 @@ public class SleighCompile extends SleighBase {
 		entry("buildMacro", sym, rtl);
 		String errstring = checkSymbols(symtab.getCurrentScope());
 		if (errstring.length() != 0) {
-			reportError(sym.getLocation(), " in definition of macro " + sym.getName() + ":");
+			reportError(sym.getLocation(), " in definition of macro " + sym.getName() + ":" + errstring);
 			return;
 		}
 		if (!expandMacros(rtl)) {

From 4f2e0f16b4d343f0445b174e328f5c4cf45310b8 Mon Sep 17 00:00:00 2001
From: Ryan Kurtz <ryanmkurtz@users.noreply.github.com>
Date: Thu, 11 Jul 2019 14:10:38 -0400
Subject: [PATCH 2/2] GT-2995 (closes #522): Certifying

Pulled-from: achan1989 <achan1989@gmail.com>