overlays/mtk: Add back Cadence-removed macro

There is no "predicted branches" extension in any version of the Xtensa ISA reference I have. Newer versions of Cadence tooling have removed (and presumably deprecated) this symbol, but binutils still relies on seeing it (even just to evaluate to a zero to diable the feature). Really the proper fix would be to patch binutils upstream, but let's have compatible headers here first. Signed-off-by: Andy Ross <[email protected]>
zephyrproject-rtos · Dec 1, 2024 · f13ee75 · f13ee75
1 parent 664c710
commit f13ee75
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/overlays/xtensa_mtk_mt818x_adsp/binutils/include/xtensa-config.h b/overlays/xtensa_mtk_mt818x_adsp/binutils/include/xtensa-config.h
@@ -183,3 +183,7 @@
 
 
 #endif /* !XTENSA_CONFIG_H */
+
+#ifndef XCHAL_HAVE_PREDICTED_BRANCHES
+#define XCHAL_HAVE_PREDICTED_BRANCHES 0 /* Needed by Zephyr SDK binutils */
+#endif
diff --git a/overlays/xtensa_mtk_mt818x_adsp/gcc/include/xtensa-config.h b/overlays/xtensa_mtk_mt818x_adsp/gcc/include/xtensa-config.h
@@ -183,3 +183,7 @@
 
 
 #endif /* !XTENSA_CONFIG_H */
+
+#ifndef XCHAL_HAVE_PREDICTED_BRANCHES
+#define XCHAL_HAVE_PREDICTED_BRANCHES 0 /* Needed by Zephyr SDK binutils */
+#endif
diff --git a/overlays/xtensa_mtk_mt818x_adsp/gdb/include/xtensa-config.h b/overlays/xtensa_mtk_mt818x_adsp/gdb/include/xtensa-config.h
@@ -183,3 +183,7 @@
 
 
 #endif /* !XTENSA_CONFIG_H */
+
+#ifndef XCHAL_HAVE_PREDICTED_BRANCHES
+#define XCHAL_HAVE_PREDICTED_BRANCHES 0 /* Needed by Zephyr SDK binutils */
+#endif
diff --git a/overlays/xtensa_mtk_mt8196_adsp/binutils/include/xtensa-config.h b/overlays/xtensa_mtk_mt8196_adsp/binutils/include/xtensa-config.h
@@ -183,3 +183,7 @@
 
 
 #endif /* !XTENSA_CONFIG_H */
+
+#ifndef XCHAL_HAVE_PREDICTED_BRANCHES
+#define XCHAL_HAVE_PREDICTED_BRANCHES 0 /* Needed by Zephyr SDK binutils */
+#endif
diff --git a/overlays/xtensa_mtk_mt8196_adsp/gcc/include/xtensa-config.h b/overlays/xtensa_mtk_mt8196_adsp/gcc/include/xtensa-config.h
@@ -183,3 +183,7 @@
 
 
 #endif /* !XTENSA_CONFIG_H */
+
+#ifndef XCHAL_HAVE_PREDICTED_BRANCHES
+#define XCHAL_HAVE_PREDICTED_BRANCHES 0 /* Needed by Zephyr SDK binutils */
+#endif
diff --git a/overlays/xtensa_mtk_mt8196_adsp/gdb/include/xtensa-config.h b/overlays/xtensa_mtk_mt8196_adsp/gdb/include/xtensa-config.h
@@ -183,3 +183,7 @@
 
 
 #endif /* !XTENSA_CONFIG_H */
+
+#ifndef XCHAL_HAVE_PREDICTED_BRANCHES
+#define XCHAL_HAVE_PREDICTED_BRANCHES 0 /* Needed by Zephyr SDK binutils */
+#endif