Mesa (master): android: aco: fix undefined template 'std::__1::array' build errors

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c24ad565ae7c19417f381ddfcb5ba6bff0934878
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c24ad565ae7c19417f381ddfcb5ba6bff0934878

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat Sep 21 17:38:52 2019 +0200

android: aco: fix undefined template 'std::__1::array' build errors

Fixes a few building errors similar to the following:

In file included from external/mesa/src/amd/compiler/aco_instruction_selection.cpp:26:
In file included from external/libcxx/include/algorithm:639:
external/libcxx/include/utility:321:9:
error: implicit instantiation of undefined template 'std::__1::array<aco::Temp, 4>'
    _T2 second;
        ^

Fixes: 93c8ebf ("aco: Initial commit of independent AMD compiler")
Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>

---

 src/amd/compiler/aco_instruction_selection.cpp       | 1 +
 src/amd/compiler/aco_instruction_selection_setup.cpp | 1 +
 src/amd/compiler/aco_print_asm.cpp                   | 2 +-
 src/amd/compiler/aco_register_allocation.cpp         | 1 +
 src/amd/compiler/aco_validate.cpp                    | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index 7b5dc7f7426..b08a4008330 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -24,6 +24,7 @@
  */
 
 #include <algorithm>
+#include <array>
 #include <map>
 
 #include "aco_ir.h"
diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index 3a276035ba5..a1b2e4a7e57 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include <array>
 #include <unordered_map>
 #include "aco_ir.h"
 #include "nir.h"
diff --git a/src/amd/compiler/aco_print_asm.cpp b/src/amd/compiler/aco_print_asm.cpp
index 31079aa1c4a..d3f4c3cb40d 100644
--- a/src/amd/compiler/aco_print_asm.cpp
+++ b/src/amd/compiler/aco_print_asm.cpp
@@ -1,4 +1,4 @@
-
+#include <array>
 #include <iomanip>
 #include "aco_ir.h"
 #include "llvm-c/Disassembler.h"
diff --git a/src/amd/compiler/aco_register_allocation.cpp b/src/amd/compiler/aco_register_allocation.cpp
index d55f1febc65..47ea932f115 100644
--- a/src/amd/compiler/aco_register_allocation.cpp
+++ b/src/amd/compiler/aco_register_allocation.cpp
@@ -27,6 +27,7 @@
  */
 
 #include <algorithm>
+#include <array>
 #include <map>
 #include <unordered_map>
 #include <functional>
diff --git a/src/amd/compiler/aco_validate.cpp b/src/amd/compiler/aco_validate.cpp
index 0988d66df3a..9919d0a585d 100644
--- a/src/amd/compiler/aco_validate.cpp
+++ b/src/amd/compiler/aco_validate.cpp
@@ -24,6 +24,7 @@
 
 #include "aco_ir.h"
 
+#include <array>
 #include <map>
 
 namespace aco {