Skip to content

Commit 115364c

Browse files
committed
qemu: fix TCTI build
Fixes #4848
1 parent 94e5dd8 commit 115364c

1 file changed

Lines changed: 41 additions & 0 deletions

File tree

patches/qemu-7.2.0-utm.patch

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,3 +322,44 @@ index 7f589b4146..d311c57cca 100644
322322
--
323323
2.28.0
324324

325+
From c874e68e5a1635326f8a2f52320b8dbe82f6be51 Mon Sep 17 00:00:00 2001
326+
From: osy <50960678+osy@users.noreply.github.com>
327+
Date: Fri, 30 Dec 2022 20:24:00 -0800
328+
Subject: [PATCH] tcti: disable TARGET_TB_PCREL for TCTI
329+
330+
It is currently not supported.
331+
---
332+
target/arm/cpu-param.h | 2 ++
333+
target/i386/cpu-param.h | 2 +-
334+
2 files changed, 3 insertions(+), 1 deletion(-)
335+
336+
diff --git a/target/arm/cpu-param.h b/target/arm/cpu-param.h
337+
index 53cac9c89b..6c4af8f0d2 100644
338+
--- a/target/arm/cpu-param.h
339+
+++ b/target/arm/cpu-param.h
340+
@@ -31,7 +31,9 @@
341+
# define TARGET_PAGE_BITS_VARY
342+
# define TARGET_PAGE_BITS_MIN 10
343+
344+
+#ifndef CONFIG_TCG_THREADED_INTERPRETER
345+
# define TARGET_TB_PCREL 1
346+
+#endif
347+
348+
/*
349+
* Cache the attrs and shareability fields from the page table entry.
350+
diff --git a/target/i386/cpu-param.h b/target/i386/cpu-param.h
351+
index f579b16bd2..0975265ff3 100644
352+
--- a/target/i386/cpu-param.h
353+
+++ b/target/i386/cpu-param.h
354+
@@ -25,7 +25,7 @@
355+
#define TARGET_PAGE_BITS 12
356+
#define NB_MMU_MODES 5
357+
358+
-#ifndef CONFIG_USER_ONLY
359+
+#if !defined(CONFIG_USER_ONLY) && !defined(CONFIG_TCG_THREADED_INTERPRETER)
360+
# define TARGET_TB_PCREL 1
361+
#endif
362+
363+
--
364+
2.28.0
365+

0 commit comments

Comments
 (0)