amd/llvm: Reorder LLVM headers

LLVM uses __declspec(restrict) which breaks because Mesa define restrict
as __restrict. Move the LLVM headerse up to dodge the macro.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6180>
This commit is contained in:
James Park
2020-08-05 09:59:25 -07:00
committed by Marge Bot
parent 1541ef636b
commit 24b80f8bb9
+12 -6
View File
@@ -25,12 +25,6 @@
#include <cstring>
#include "ac_binary.h"
#include "ac_llvm_util.h"
#include "ac_llvm_build.h"
#include "util/macros.h"
#include <llvm-c/Core.h>
#include <llvm/Target/TargetMachine.h>
#include <llvm/IR/IRBuilder.h>
@@ -39,6 +33,18 @@
#include <llvm/IR/LegacyPassManager.h>
/* DO NOT REORDER THE HEADERS
* The LLVM headers need to all be included before any Mesa header,
* as they use the `restrict` keyword in ways that are incompatible
* with our #define in include/c99_compat.h
*/
#include "ac_binary.h"
#include "ac_llvm_util.h"
#include "ac_llvm_build.h"
#include "util/macros.h"
void ac_add_attr_dereferenceable(LLVMValueRef val, uint64_t bytes)
{
llvm::Argument *A = llvm::unwrap<llvm::Argument>(val);