From 5284075cf989f91fe7eb98a6892cd521bb3e44ee Mon Sep 17 00:00:00 2001
From: Joel Linn <jl@conductive.de>
Date: Wed, 5 May 2021 16:06:35 +0200
Subject: [PATCH] [CPU] Misc GCC build fixes

---
 src/xenia/cpu/backend/x64/x64_op.h | 12 ++++--------
 src/xenia/cpu/export_resolver.h    |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/xenia/cpu/backend/x64/x64_op.h b/src/xenia/cpu/backend/x64/x64_op.h
index f71338304..0846f9255 100644
--- a/src/xenia/cpu/backend/x64/x64_op.h
+++ b/src/xenia/cpu/backend/x64/x64_op.h
@@ -105,8 +105,7 @@ struct Op : OpBase {
 
 struct VoidOp : Op<VoidOp, KEY_TYPE_X> {
  protected:
-  template <typename T, KeyType KEY_TYPE>
-  friend struct Op;
+  friend struct Op<VoidOp, KEY_TYPE_X>;
   template <hir::Opcode OPCODE, typename... Ts>
   friend struct I;
   void Load(const Instr::Op& op) {}
@@ -116,8 +115,7 @@ struct OffsetOp : Op<OffsetOp, KEY_TYPE_O> {
   uint64_t value;
 
  protected:
-  template <typename T, KeyType KEY_TYPE>
-  friend struct Op;
+  friend struct Op<OffsetOp, KEY_TYPE_O>;
   template <hir::Opcode OPCODE, typename... Ts>
   friend struct I;
   void Load(const Instr::Op& op) { this->value = op.offset; }
@@ -127,8 +125,7 @@ struct SymbolOp : Op<SymbolOp, KEY_TYPE_S> {
   Function* value;
 
  protected:
-  template <typename T, KeyType KEY_TYPE>
-  friend struct Op;
+  friend struct Op<SymbolOp, KEY_TYPE_S>;
   template <hir::Opcode OPCODE, typename... Ts>
   friend struct I;
   bool Load(const Instr::Op& op) {
@@ -141,8 +138,7 @@ struct LabelOp : Op<LabelOp, KEY_TYPE_L> {
   hir::Label* value;
 
  protected:
-  template <typename T, KeyType KEY_TYPE>
-  friend struct Op;
+  friend struct Op<LabelOp, KEY_TYPE_L>;
   template <hir::Opcode OPCODE, typename... Ts>
   friend struct I;
   void Load(const Instr::Op& op) { this->value = op.label; }
diff --git a/src/xenia/cpu/export_resolver.h b/src/xenia/cpu/export_resolver.h
index 5b1bdc1f8..216f47548 100644
--- a/src/xenia/cpu/export_resolver.h
+++ b/src/xenia/cpu/export_resolver.h
@@ -39,7 +39,7 @@ enum class ExportCategory : uint8_t {
 };
 
 struct ExportTag {
-  typedef uint32_t type;
+  using type = uint32_t;
 
   // packed like so:
   // ll...... cccccccc ........ ..bihssi