From 636a9f27a4d8e4e5fe654de36b420186ebda6946 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 13 Dec 2019 05:27:56 +0000
Subject: lang/compute-runtime: switch to upstream fix for Clang 9

---
 lang/compute-runtime/files/patch-clang9 | 76 ---------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 lang/compute-runtime/files/patch-clang9

(limited to 'lang/compute-runtime/files/patch-clang9')

diff --git a/lang/compute-runtime/files/patch-clang9 b/lang/compute-runtime/files/patch-clang9
deleted file mode 100644
index c91edd8c5776..000000000000
--- a/lang/compute-runtime/files/patch-clang9
+++ /dev/null
@@ -1,76 +0,0 @@
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen9.cpp
->>>            preamble_gen9.cpp.o:(.rodata+0x0) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen9.cpp
->>>            preamble_gen9.cpp.o:(.rodata+0x4) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at command_stream_receiver_hw_gen11.cpp
->>>            command_stream_receiver_hw_gen11.cpp.o:(.rodata+0x0) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at command_stream_receiver_hw_gen11.cpp
->>>            command_stream_receiver_hw_gen11.cpp.o:(.rodata+0x4) in archive ../lib/libigdrcl_lib_release.a
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen11.cpp
->>>            preamble_gen11.cpp.o:(.rodata+0x0) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen11.cpp
->>>            preamble_gen11.cpp.o:(.rodata+0x4) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at aub_mem_dump_gen12lp.cpp
->>>            aub_mem_dump_gen12lp.cpp.o:(.rodata+0x0) in archive ../lib/libigdrcl_lib_release.a
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at aub_mem_dump_gen12lp.cpp
->>>            aub_mem_dump_gen12lp.cpp.o:(.rodata+0x4) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen12lp.cpp
->>>            preamble_gen12lp.cpp.o:(.rodata+0x0) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen12lp.cpp
->>>            preamble_gen12lp.cpp.o:(.rodata+0x4) in archive ../lib/libigdrcl_lib_release.a
-
---- runtime/gen11/reg_configs.h.orig	2019-11-29 14:23:34 UTC
-+++ runtime/gen11/reg_configs.h
-@@ -25,9 +25,15 @@ struct L3CNTLRegisterOffset<ICLFamily> {
- 
- namespace DebugModeRegisterOffset {
- template <>
-+#ifdef __clang__
-+static
-+#endif
- constexpr uint32_t registerOffset<ICLFamily> = 0x20d8;
- template <>
-+#ifdef __clang__
-+static
-+#endif
- constexpr uint32_t debugEnabledValue<ICLFamily> = (1 << 5) | (1 << 21);
- }; // namespace DebugModeRegisterOffset
- 
- namespace gen11HdcModeRegister {
-- 
cgit v1.2.3