Skip to content

Commit

Permalink
qemu: fix TCTI build
Browse files Browse the repository at this point in the history
Fixes #4848
  • Loading branch information
osy committed Dec 31, 2022
1 parent 94e5dd8 commit 115364c
Showing 1 changed file with 41 additions and 0 deletions.
41 changes: 41 additions & 0 deletions patches/qemu-7.2.0-utm.patch
Original file line number Diff line number Diff line change
Expand Up @@ -322,3 +322,44 @@ index 7f589b4146..d311c57cca 100644
--
2.28.0

From c874e68e5a1635326f8a2f52320b8dbe82f6be51 Mon Sep 17 00:00:00 2001
From: osy <50960678+osy@users.noreply.github.com>
Date: Fri, 30 Dec 2022 20:24:00 -0800
Subject: [PATCH] tcti: disable TARGET_TB_PCREL for TCTI

It is currently not supported.
---
target/arm/cpu-param.h | 2 ++
target/i386/cpu-param.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/target/arm/cpu-param.h b/target/arm/cpu-param.h
index 53cac9c89b..6c4af8f0d2 100644
--- a/target/arm/cpu-param.h
+++ b/target/arm/cpu-param.h
@@ -31,7 +31,9 @@
# define TARGET_PAGE_BITS_VARY
# define TARGET_PAGE_BITS_MIN 10

+#ifndef CONFIG_TCG_THREADED_INTERPRETER
# define TARGET_TB_PCREL 1
+#endif

/*
* Cache the attrs and shareability fields from the page table entry.
diff --git a/target/i386/cpu-param.h b/target/i386/cpu-param.h
index f579b16bd2..0975265ff3 100644
--- a/target/i386/cpu-param.h
+++ b/target/i386/cpu-param.h
@@ -25,7 +25,7 @@
#define TARGET_PAGE_BITS 12
#define NB_MMU_MODES 5

-#ifndef CONFIG_USER_ONLY
+#if !defined(CONFIG_USER_ONLY) && !defined(CONFIG_TCG_THREADED_INTERPRETER)
# define TARGET_TB_PCREL 1
#endif

--
2.28.0

0 comments on commit 115364c

Please sign in to comment.