diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index efc27aa493e..277ae10e031 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -5160,7 +5160,7 @@ dnl
       linux*)
 	GCC_TRY_COMPILE_OR_LINK(
 	  [#include <unistd.h>],
-	  [copy_file_range(1, nullptr, 2, nullptr, 1, 0);],
+	  [copy_file_range(1, (loff_t*)nullptr, 2, (loff_t*)nullptr, 1, 0);],
 	  [glibcxx_cv_copy_file_range=yes],
 	  [glibcxx_cv_copy_file_range=no])
 	;;
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index bda8053ecc2..98568ae0c30 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -72473,7 +72473,7 @@ else
 int
 main ()
 {
-copy_file_range(1, nullptr, 2, nullptr, 1, 0);
+copy_file_range(1, (loff_t*)nullptr, 2, (loff_t*)nullptr, 1, 0);
   ;
   return 0;
 }
@@ -72494,7 +72494,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 int
 main ()
 {
-copy_file_range(1, nullptr, 2, nullptr, 1, 0);
+copy_file_range(1, (loff_t*)nullptr, 2, (loff_t*)nullptr, 1, 0);
   ;
   return 0;
 }
diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h
index f04bbc66d7d..2e4331bb682 100644
--- a/libstdc++-v3/src/filesystem/ops-common.h
+++ b/libstdc++-v3/src/filesystem/ops-common.h
@@ -374,7 +374,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
 	return false;
       }
     size_t bytes_left = length;
-    off64_t off_in = 0, off_out = 0;
+    loff_t off_in = 0, off_out = 0;
     ssize_t bytes_copied;
     do
       {