From d27a576b8604f0936d9150db84f635d6d13b21a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Ha=CC=88user?=
 <8659494+mhaeuser@users.noreply.github.com>
Date: Sun, 2 Apr 2023 14:38:17 +0200
Subject: [PATCH] ImageTool: Explicitly convert IR to XIP for PE emission

---
 BaseTools/ImageTool/PeEmit.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/BaseTools/ImageTool/PeEmit.c b/BaseTools/ImageTool/PeEmit.c
index 1f6612c8d5..d95882f0dd 100644
--- a/BaseTools/ImageTool/PeEmit.c
+++ b/BaseTools/ImageTool/PeEmit.c
@@ -886,8 +886,15 @@ ToolImageEmitPe (
 
   memset (&Context, 0, sizeof (Context));
 
-  Context.Image         = Image;
+  // FIXME: Non-XIP is not well-supported right now.
   Context.FileAlignment = Image->SegmentInfo.SegmentAlignment;
+  Result = ImageConvertToXip ((image_tool_image_info_t *)Image);
+  if (!Result) {
+    raise ();
+    return NULL;
+  }
+
+  Context.Image = Image;
 
   Result = EmitPeGetHeaderSizes (Image, &Context.HdrInfo);
   if (!Result) {