about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRomain Naour <romain.naour@gmail.com>2018-01-29 16:12:08 +0000
committerJoseph Myers <joseph@codesourcery.com>2018-01-29 16:12:08 +0000
commitb7ccb5de359e8dd9918dbedfc1f4d96e06fcd634 (patch)
tree742e6c48904b931a84dd9cef1a8af060b4d97b8f
parente3aa6999d7f59324dfca6131268825bc73ee0375 (diff)
downloadglibc-b7ccb5de359e8dd9918dbedfc1f4d96e06fcd634.tar.gz
glibc-b7ccb5de359e8dd9918dbedfc1f4d96e06fcd634.tar.xz
glibc-b7ccb5de359e8dd9918dbedfc1f4d96e06fcd634.zip
microblaze: don't use copy_file_range syscall with kernel headers < 4.10
copy_file_range syscall was added for microblaze in 4.10.

This patch makes the MicroBlaze kernel-features.h undefine
__ASSUME_COPY_FILE_RANGE for toolchains built with kernel headers < 4.10.

	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
	(__ASSUME_COPY_FILE_RANGE) [__LINUX_KERNEL_VERSION < 0x040A00]: Undef.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?id=7181e5590e5ba898804aef3ee6be7f27606e6f8b

Signed-off-by: Romain Naour <romain.naour@gmail.com>
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/kernel-features.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a930a9a76..f156d857e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-29  Romain Naour  <romain.naour@gmail.com>  (tiny change)
+
+	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+	(__ASSUME_COPY_FILE_RANGE) [__LINUX_KERNEL_VERSION < 0x040A00]: Undef.
+
 2018-01-29  Joseph Myers  <joseph@codesourcery.com>
 
 	* scripts/build-many-glibcs.py (Context.git_checkout): Use git
diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
index e0e6483c91..745f899911 100644
--- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
@@ -52,3 +52,8 @@
 #if __LINUX_KERNEL_VERSION < 0x040000
 # undef __ASSUME_EXECVEAT
 #endif
+
+/* Support for the copy_file_range syscall was added in 4.10.  */
+#if __LINUX_KERNEL_VERSION < 0x040A00
+# undef __ASSUME_COPY_FILE_RANGE
+#endif