From a198d37ade06c03e8dacc54f861fdd325e04381b Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 15 Feb 2019 21:51:20 +0100
Subject: [PATCH] Move remaining nptl_db headers to sysdeps/nptl

sys/procfs.h was already using this sysdeps directory.

This avoids the need for  nptl-specific wrapper headers under
include/, a generic location in the source tree.
---
 ChangeLog                                | 8 ++++++++
 nptl/descr.h                             | 2 +-
 {nptl_db => sysdeps/nptl}/proc_service.h | 0
 {nptl_db => sysdeps/nptl}/thread_db.h    | 0
 4 files changed, 9 insertions(+), 1 deletion(-)
 rename {nptl_db => sysdeps/nptl}/proc_service.h (100%)
 rename {nptl_db => sysdeps/nptl}/thread_db.h (100%)

diff --git a/ChangeLog b/ChangeLog
index c38971ad23..9c23b7bd95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-02-15  Florian Weimer  <fweimer@redhat.com>
+
+	* nptl_db/proc_service.h: Move to ...
+	* sysdeps/nptl/proc_service.h: ... here.
+	* nptl_db/thread_db.h: Move to ...
+	* sysdeps/nptl/thread_db.h: ... here.
+	* nptl/descr.h: Include <thread_db.h>.
+
 2019-02-15  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* io/Makefile (tests): Add tst-lockf.
diff --git a/nptl/descr.h b/nptl/descr.h
index 9c54cbc8f2..4ef33ae465 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -29,7 +29,7 @@
 #include <lowlevellock.h>
 #include <pthreaddef.h>
 #include <dl-sysdep.h>
-#include "../nptl_db/thread_db.h"
+#include <thread_db.h>
 #include <tls.h>
 #include <unwind.h>
 #include <bits/types/res_state.h>
diff --git a/nptl_db/proc_service.h b/sysdeps/nptl/proc_service.h
similarity index 100%
rename from nptl_db/proc_service.h
rename to sysdeps/nptl/proc_service.h
diff --git a/nptl_db/thread_db.h b/sysdeps/nptl/thread_db.h
similarity index 100%
rename from nptl_db/thread_db.h
rename to sysdeps/nptl/thread_db.h
-- 
2.43.5