[Openmp-commits] [openmp] c816ee1 - [OpenMP][VE plugin] Fixing failure to build VE plugin with consolidated error handling in libomptarget

[Simon Moll via Openmp-commits]

Author: Manoel Roemmer
Date: 2020-09-29T17:38:01+02:00
New Revision: c816ee13ad9e14ec1b69e07b1d3851d8b548ff8c

URL: https://github.com/llvm/llvm-project/commit/c816ee13ad9e14ec1b69e07b1d3851d8b548ff8c
DIFF: https://github.com/llvm/llvm-project/commit/c816ee13ad9e14ec1b69e07b1d3851d8b548ff8c.diff

LOG: [OpenMP][VE plugin] Fixing failure to build VE plugin with consolidated error handling in libomptarget

The libomptarget VE plugin [[
http://lab.llvm.org:8014/builders/clang-ve-ninja/builds/8937/steps/build-unified-tree/logs/stdio
| fails zu build ]] after ae95ceeb8f98d81f615c69da02f73b5ee6b1519a .

Differential Revision: https://reviews.llvm.org/D88476

Added: 
    

Modified: 
    openmp/libomptarget/plugins/ve/src/rtl.cpp

Removed: 
    


################################################################################
diff  --git a/openmp/libomptarget/plugins/ve/src/rtl.cpp b/openmp/libomptarget/plugins/ve/src/rtl.cpp
index 414fc62650fb..1994389deb42 100644
--- a/openmp/libomptarget/plugins/ve/src/rtl.cpp
+++ b/openmp/libomptarget/plugins/ve/src/rtl.cpp
@@ -11,9 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Debug.h"
-#include "omptargetplugin.h"
-
 #include <algorithm>
 #include <cassert>
 #include <cerrno>
@@ -26,14 +23,19 @@
 #include <vector>
 #include <veosinfo/veosinfo.h>
 
-#ifndef TARGET_ELF_ID
-#define TARGET_ELF_ID 0
-#endif
+#include "Debug.h"
+#include "omptargetplugin.h"
 
+#ifndef TARGET_NAME
 #define TARGET_NAME VE
+#endif
 
 #define DEBUG_PREFIX "Target " GETNAME(TARGET_NAME) " RTL"
 
+#ifndef TARGET_ELF_ID
+#define TARGET_ELF_ID 0
+#endif
+
 #include "../../common/elf_common.c"
 
 struct DynLibTy {