about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-02-08 16:51:17 +0100
committerFlorian Weimer <fweimer@redhat.com>2019-02-08 16:51:17 +0100
commite47d82c99a6db060419b421768aced76bea92997 (patch)
tree3124d71ee971f8ee8fefd0e96eb423c169ca7621
parent8f89ab216f205c2ffd90d1fc8454efdfc0b01dee (diff)
downloadglibc-e47d82c99a6db060419b421768aced76bea92997.tar.gz
glibc-e47d82c99a6db060419b421768aced76bea92997.tar.xz
glibc-e47d82c99a6db060419b421768aced76bea92997.zip
Provide <bits/unistd_ext.h> as a sysdeps header exclusively
Non-sysdeps headers cannot be overriden by sysdeps headers across the
entire build, so it is necessary to turn such extension headers into
sysdeps headers themselves.  The approach here follows the existing
<bits/shm.h> header (although it uses sysdeps/gnu instead of
sysdeps/generic).

Fixes commit 1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92 ("Linux: Add
gettid system call wrapper [BZ #6399]") and commit
8f89ab216f205c2ffd90d1fc8454efdfc0b01dee ("posix: Fix missing wrapper
header for <bits/unistd_ext.h>").
-rw-r--r--ChangeLog6
-rw-r--r--include/bits/unistd_ext.h1
-rw-r--r--sysdeps/generic/bits/unistd_ext.h (renamed from posix/bits/unistd_ext.h)0
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 164db3f085..62a78a193f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2019-02-08  Florian Weimer  <fweimer@redhat.com>
 
+	* include/bits/unistd_ext.h: Remove file.
+	* posix/bits/unistd_ext.h: Move to ...
+	* sysdeps/generic/bits/unistd_ext.h: ... here.
+
+2019-02-08  Florian Weimer  <fweimer@redhat.com>
+
 	* include/bits/unistd_ext.h: New file.
 
 2019-02-08  TAMUKI Shoichi  <tamuki@linet.gr.jp>
diff --git a/include/bits/unistd_ext.h b/include/bits/unistd_ext.h
deleted file mode 100644
index 24e8d09ba8..0000000000
--- a/include/bits/unistd_ext.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <posix/bits/unistd_ext.h>
diff --git a/posix/bits/unistd_ext.h b/sysdeps/generic/bits/unistd_ext.h
index d6e88f3bd4..d6e88f3bd4 100644
--- a/posix/bits/unistd_ext.h
+++ b/sysdeps/generic/bits/unistd_ext.h