summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch')
-rw-r--r--9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch24
1 files changed, 12 insertions, 12 deletions
diff --git a/9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch b/9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch
index 06e8d14..bde1527 100644
--- a/9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch
+++ b/9999/0203-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch
@@ -1,8 +1,8 @@
-From 7d2845e6ed10f2109d2e0f6432932b6693f0037d Mon Sep 17 00:00:00 2001
+From 0afb8fa52cded9c332c31c7a1e62b9f2b04acdf8 Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon, 13 Apr 2020 18:09:20 -0300
-Subject: [PATCH 3/7] linux: Set internal DIR filepos as off64_t [BZ #23960, BZ
- #24050]
+Subject: [PATCH 09/14] linux: Set internal DIR filepos as off64_t [BZ #23960,
+ BZ #24050]
It allows to obtain the expected entry offset on telldir and set
it correctly on seekdir on platforms where long int is smaller
@@ -39,7 +39,7 @@ and arm-linux-gnueabihf.
create mode 100644 sysdeps/unix/sysv/linux/telldir.h
diff --git a/dirent/Makefile b/dirent/Makefile
-index afc7226a5b..c7f046b3f7 100644
+index b80f6a73ea..65119db578 100644
--- a/dirent/Makefile
+++ b/dirent/Makefile
@@ -31,7 +31,7 @@ routines := opendir closedir readdir readdir_r rewinddir \
@@ -216,7 +216,7 @@ index 0000000000..3e01b361e5
+
+#include <support/test-driver.c>
diff --git a/sysdeps/unix/sysv/linux/closedir.c b/sysdeps/unix/sysv/linux/closedir.c
-index 1f71445ad9..1845c48be0 100644
+index d876d49d78..8e5669963c 100644
--- a/sysdeps/unix/sysv/linux/closedir.c
+++ b/sysdeps/unix/sysv/linux/closedir.c
@@ -43,6 +43,10 @@ __closedir (DIR *dirp)
@@ -231,7 +231,7 @@ index 1f71445ad9..1845c48be0 100644
__libc_lock_fini (dirp->lock);
#endif
diff --git a/sysdeps/unix/sysv/linux/dirstream.h b/sysdeps/unix/sysv/linux/dirstream.h
-index 64b1495ba0..1a3362fda6 100644
+index 064273cc31..a284292cb2 100644
--- a/sysdeps/unix/sysv/linux/dirstream.h
+++ b/sysdeps/unix/sysv/linux/dirstream.h
@@ -21,6 +21,7 @@
@@ -262,7 +262,7 @@ index 64b1495ba0..1a3362fda6 100644
/* Directory block. We must make sure that this block starts
at an address that is aligned adequately enough to store
diff --git a/sysdeps/unix/sysv/linux/opendir.c b/sysdeps/unix/sysv/linux/opendir.c
-index d7df13575e..56365f9da5 100644
+index bfd2f382a6..9a0b7ab4c4 100644
--- a/sysdeps/unix/sysv/linux/opendir.c
+++ b/sysdeps/unix/sysv/linux/opendir.c
@@ -150,6 +150,9 @@ __alloc_dir (int fd, bool close_fd, int flags,
@@ -276,7 +276,7 @@ index d7df13575e..56365f9da5 100644
return dirp;
}
diff --git a/sysdeps/unix/sysv/linux/readdir.c b/sysdeps/unix/sysv/linux/readdir.c
-index 8647bb0aef..b26d2756b9 100644
+index 7b4571839e..94ac4cbae7 100644
--- a/sysdeps/unix/sysv/linux/readdir.c
+++ b/sysdeps/unix/sysv/linux/readdir.c
@@ -17,6 +17,7 @@
@@ -288,7 +288,7 @@ index 8647bb0aef..b26d2756b9 100644
#if !_DIRENT_MATCHES_DIRENT64
#include <dirstream.h>
diff --git a/sysdeps/unix/sysv/linux/rewinddir.c b/sysdeps/unix/sysv/linux/rewinddir.c
-index 5b68db7167..74b336bfd8 100644
+index b1e8259703..0194d29e38 100644
--- a/sysdeps/unix/sysv/linux/rewinddir.c
+++ b/sysdeps/unix/sysv/linux/rewinddir.c
@@ -33,6 +33,11 @@ __rewinddir (DIR *dirp)
@@ -304,7 +304,7 @@ index 5b68db7167..74b336bfd8 100644
__libc_lock_unlock (dirp->lock);
#endif
diff --git a/sysdeps/unix/sysv/linux/seekdir.c b/sysdeps/unix/sysv/linux/seekdir.c
-index b128ae8e76..2fcf689dc0 100644
+index f4e1a9f8e0..0c3e58a2ed 100644
--- a/sysdeps/unix/sysv/linux/seekdir.c
+++ b/sysdeps/unix/sysv/linux/seekdir.c
@@ -22,14 +22,40 @@
@@ -354,7 +354,7 @@ index b128ae8e76..2fcf689dc0 100644
__libc_lock_unlock (dirp->lock);
}
diff --git a/sysdeps/unix/sysv/linux/telldir.c b/sysdeps/unix/sysv/linux/telldir.c
-index b184db8d2c..a0eb1efeff 100644
+index b60b231e48..874905489f 100644
--- a/sysdeps/unix/sysv/linux/telldir.c
+++ b/sysdeps/unix/sysv/linux/telldir.c
@@ -18,16 +18,59 @@
@@ -490,5 +490,5 @@ index 0000000000..7c45886341
+
+#endif /* _TELLDIR_H */
--
-2.32.0
+2.34.1