From 6ff4b7d36ba214bfe506c2d038731fdb56e85dfb Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@google.com>
Date: Thu, 3 Jul 2025 17:00:57 +0900
Subject: [PATCH 1/7] [compiler-rt] Include <function> in FuzzerDriver.cpp for
 `std::ref`.

---
 compiler-rt/lib/fuzzer/FuzzerDriver.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
index 3771abf5f532d..734cf28b4e4ac 100644
--- a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
@@ -24,6 +24,7 @@
 #include <chrono>
 #include <cstdlib>
 #include <cstring>
+#include <functional>
 #include <mutex>
 #include <string>
 #include <thread>

From 79f9e6295b036871447433d2c95a2c5907b58671 Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@google.com>
Date: Thu, 3 Jul 2025 20:34:55 +0900
Subject: [PATCH 2/7] Update FuzzerDriver.cpp

---
 compiler-rt/lib/fuzzer/FuzzerDriver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
index 734cf28b4e4ac..40322e231602c 100644
--- a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
@@ -24,11 +24,11 @@
 #include <chrono>
 #include <cstdlib>
 #include <cstring>
+#include <fstream>
 #include <functional>
 #include <mutex>
 #include <string>
 #include <thread>
-#include <fstream>
 
 // This function should be present in the libFuzzer so that the client
 // binary can test for its existence.

From 91f9bff67c212f267205a9887f9817b35cbd6e74 Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@google.com>
Date: Thu, 3 Jul 2025 21:46:52 +0900
Subject: [PATCH 3/7] Update FuzzerIOPosix.cpp

---
 compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp b/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp
index 3700fb098e55b..b56046ea3dca3 100644
--- a/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp
@@ -15,6 +15,7 @@
 #include <cstdarg>
 #include <cstdio>
 #include <dirent.h>
+#include <errno.h>
 #include <fstream>
 #include <iterator>
 #include <libgen.h>

From 348c50f6b90e1fed7db4bc328c2e22f25e1d727d Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@google.com>
Date: Fri, 4 Jul 2025 11:49:55 +0900
Subject: [PATCH 4/7] Update FuzzerRandom.h

---
 compiler-rt/lib/fuzzer/FuzzerRandom.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler-rt/lib/fuzzer/FuzzerRandom.h b/compiler-rt/lib/fuzzer/FuzzerRandom.h
index ad6c07eb5ef56..84d674398d246 100644
--- a/compiler-rt/lib/fuzzer/FuzzerRandom.h
+++ b/compiler-rt/lib/fuzzer/FuzzerRandom.h
@@ -11,6 +11,7 @@
 #ifndef LLVM_FUZZER_RANDOM_H
 #define LLVM_FUZZER_RANDOM_H
 
+#include <math.h>
 #include <random>
 
 namespace fuzzer {

From 7fadb909181f714da55560f0e398b142d5cfb75c Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@google.com>
Date: Fri, 4 Jul 2025 11:53:25 +0900
Subject: [PATCH 5/7] Update compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp

Co-authored-by: Petr Hosek <phosek@google.com>
---
 compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp b/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp
index b56046ea3dca3..3016d328ef431 100644
--- a/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp
@@ -15,7 +15,7 @@
 #include <cstdarg>
 #include <cstdio>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <fstream>
 #include <iterator>
 #include <libgen.h>

From 3737c7f87ef5f8ec0256092f62f8d361eebca0ab Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@google.com>
Date: Fri, 4 Jul 2025 11:53:32 +0900
Subject: [PATCH 6/7] Update compiler-rt/lib/fuzzer/FuzzerRandom.h

Co-authored-by: Petr Hosek <phosek@google.com>
---
 compiler-rt/lib/fuzzer/FuzzerRandom.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-rt/lib/fuzzer/FuzzerRandom.h b/compiler-rt/lib/fuzzer/FuzzerRandom.h
index 84d674398d246..b12fc21a1855e 100644
--- a/compiler-rt/lib/fuzzer/FuzzerRandom.h
+++ b/compiler-rt/lib/fuzzer/FuzzerRandom.h
@@ -11,7 +11,7 @@
 #ifndef LLVM_FUZZER_RANDOM_H
 #define LLVM_FUZZER_RANDOM_H
 
-#include <math.h>
+#include <cmath>
 #include <random>
 
 namespace fuzzer {

From 8943ca2f53c7f7cb0b10fbf4380a5c971b5f9cfd Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@google.com>
Date: Fri, 4 Jul 2025 11:54:11 +0900
Subject: [PATCH 7/7] Update FuzzerIOPosix.cpp

---
 compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp b/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp
index 3016d328ef431..f145dddcbb29c 100644
--- a/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerIOPosix.cpp
@@ -12,10 +12,10 @@
 
 #include "FuzzerExtFunctions.h"
 #include "FuzzerIO.h"
+#include <cerrno>
 #include <cstdarg>
 #include <cstdio>
 #include <dirent.h>
-#include <cerrno>
 #include <fstream>
 #include <iterator>
 #include <libgen.h>