From 57943c4d32917f34cffd53d41b9bd62d0aff4a46 Mon Sep 17 00:00:00 2001
From: Les De Ridder <les@lesderid.net>
Date: Sun, 2 Aug 2020 19:02:40 +0200
Subject: [PATCH] Remove some function deletes for LLVM compatibility

---
 gdb/gdbsupport/poison.h | 7 -------
 gdb/pdb.h               | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/gdb/gdbsupport/poison.h b/gdb/gdbsupport/poison.h
index 5e1b2cc..1d48978 100644
--- a/gdb/gdbsupport/poison.h
+++ b/gdb/gdbsupport/poison.h
@@ -52,10 +52,6 @@ struct IsMemsettable
 	    std::is_pod<T>>
 {};
 
-template <typename T,
-	  typename = gdb::Requires<gdb::Not<IsMemsettable<T>>>>
-void *memset (T *s, int c, size_t n) = delete;
-
 #if HAVE_IS_TRIVIALLY_COPYABLE
 
 /* Similarly, poison memcpy and memmove of non trivially-copyable
@@ -98,9 +94,6 @@ using IsMallocable = std::true_type;
 template<typename T>
 using IsFreeable = gdb::Or<std::is_trivially_destructible<T>, std::is_void<T>>;
 
-template <typename T, typename = gdb::Requires<gdb::Not<IsFreeable<T>>>>
-void free (T *ptr) = delete;
-
 template<typename T>
 static T *
 xnew ()
diff --git a/gdb/pdb.h b/gdb/pdb.h
index a5dba84..f9b4f4b 100644
--- a/gdb/pdb.h
+++ b/gdb/pdb.h
@@ -1,11 +1,10 @@
-#include "config.h"
+#include "defs.h"
 
 #include <llvm/Object/COFF.h>
 #include <llvm/DebugInfo/PDB/Native/PDBFile.h>
 #undef __STDC_CONSTANT_MACROS
 #undef __STDC_LIMIT_MACROS
 
-#include "defs.h"
 #include "symtab.h"
 #include "minsyms.h"
 #include "gdb_bfd.h"