From f9ba7300e39578f7277e95f9debca7336d865e5c Mon Sep 17 00:00:00 2001
From: Mikhail Kurinnoi <m.kurinnoi@samsung.com>
Date: Wed, 10 Jan 2024 13:09:33 +0300
Subject: [PATCH] Fix gbs clang15/gcc13 build.

---
 src/debugger/breakpoint_interop_rendezvous.h | 1 +
 src/debugger/breakpoints_interop.cpp         | 1 +
 src/debugger/interop_debugging.cpp           | 1 +
 src/debugger/interop_mem_helpers.h           | 1 +
 src/debugger/interop_unwind.h                | 1 +
 src/debugger/sigaction.cpp                   | 2 +-
 third_party/libelfin/dwarf/line.cpp          | 4 ++--
 7 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/debugger/breakpoint_interop_rendezvous.h b/src/debugger/breakpoint_interop_rendezvous.h
index 4b77c55..d2feb01 100644
--- a/src/debugger/breakpoint_interop_rendezvous.h
+++ b/src/debugger/breakpoint_interop_rendezvous.h
@@ -9,6 +9,7 @@
 #include <memory>
 #include <functional>
 #include <unordered_map>
+#include <string>
 #include "debugger/interop_ptrace_helpers.h"
 
 
diff --git a/src/debugger/breakpoints_interop.cpp b/src/debugger/breakpoints_interop.cpp
index ec8f17d..5daa8b0 100644
--- a/src/debugger/breakpoints_interop.cpp
+++ b/src/debugger/breakpoints_interop.cpp
@@ -8,6 +8,7 @@
 #include <elf.h> // NT_PRSTATUS
 #include <assert.h>
 #include <string.h>
+#include <cstdlib>
 #include "utils/logger.h"
 
 
diff --git a/src/debugger/interop_debugging.cpp b/src/debugger/interop_debugging.cpp
index a94de17..ffe067f 100644
--- a/src/debugger/interop_debugging.cpp
+++ b/src/debugger/interop_debugging.cpp
@@ -22,6 +22,7 @@
 #include <dirent.h>
 #include <unistd.h> // usleep
 
+#include <array>
 #include <vector>
 #include <algorithm>
 #include <sstream>
diff --git a/src/debugger/interop_mem_helpers.h b/src/debugger/interop_mem_helpers.h
index 6907d9a..9bf044b 100644
--- a/src/debugger/interop_mem_helpers.h
+++ b/src/debugger/interop_mem_helpers.h
@@ -5,6 +5,7 @@
 
 #ifdef INTEROP_DEBUGGING
 
+#include <cstdint>
 #include <sys/types.h>
 #include <string>
 #include <unordered_map>
diff --git a/src/debugger/interop_unwind.h b/src/debugger/interop_unwind.h
index 65bfaad..8d95430 100644
--- a/src/debugger/interop_unwind.h
+++ b/src/debugger/interop_unwind.h
@@ -6,6 +6,7 @@
 #ifdef INTEROP_DEBUGGING
 
 #include <sys/types.h>
+#include <cstdint>
 #include <functional>
 #include <libunwind.h>
 
diff --git a/src/debugger/sigaction.cpp b/src/debugger/sigaction.cpp
index 4a2d56f..ac8fea4 100644
--- a/src/debugger/sigaction.cpp
+++ b/src/debugger/sigaction.cpp
@@ -6,7 +6,7 @@
 
 #ifdef FEATURE_PAL
 #include <dlfcn.h>
-
+#include <stdlib.h>
 #include "utils/logger.h"
 
 namespace netcoredbg
diff --git a/third_party/libelfin/dwarf/line.cpp b/third_party/libelfin/dwarf/line.cpp
index ea40544..f2a92b8 100644
--- a/third_party/libelfin/dwarf/line.cpp
+++ b/third_party/libelfin/dwarf/line.cpp
@@ -132,7 +132,7 @@ line_table::line_table(const std::shared_ptr<section> &sec, section_offset offse
                 if (incdir.back() != '/')
                         incdir += '/';
                 if (incdir[0] == '/')
-                        m->include_directories.push_back(move(incdir));
+                        m->include_directories.push_back(std::move(incdir));
                 else
                         m->include_directories.push_back(comp_dir + incdir);
         }
@@ -230,7 +230,7 @@ line_table::impl::read_file_entry(cursor *cur, bool in_header)
         last_file_name_end = cur->get_section_offset();
 
         if (file_name[0] == '/')
-                file_names.emplace_back(move(file_name), mtime, length);
+                file_names.emplace_back(std::move(file_name), mtime, length);
         else if (dir_index < include_directories.size())
                 file_names.emplace_back(
                         include_directories[dir_index] + file_name,
-- 
2.34.1