From 960294f00a33559af40143ac056f68d21c006d27 Mon Sep 17 00:00:00 2001
From: Carlos O'Donell <carlos@redhat.com>
Date: Fri, 28 Oct 2016 16:17:30 -0400
Subject: [PATCH] Add include/crypt.h.

To support tests that include crypt.h we add a wrapper.
---
 ChangeLog       | 5 +++++
 elf/Makefile    | 1 -
 include/crypt.h | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 include/crypt.h

diff --git a/ChangeLog b/ChangeLog
index d49f22153a..cbd4409a46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-28  Carlos O'Donell  <carlos@redhat.com>
+
+	* elf/Makefile (CFALGS-tst-linkall-static): Remove.
+	* include/crypt.h: New file.
+
 2016-10-28  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 
 	* dlfcn/bug-atexit3-lib.cc (write_message): New function, copied
diff --git a/elf/Makefile b/elf/Makefile
index 057a19fb2b..82c7e0559d 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -1280,7 +1280,6 @@ $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig
 
 $(objpfx)tst-dlsym-error: $(libdl)
 
-CFLAGS-tst-linkall-static.c = -I../crypt
 $(objpfx)tst-linkall-static: \
   $(common-objpfx)math/libm.a \
   $(common-objpfx)crypt/libcrypt.a \
diff --git a/include/crypt.h b/include/crypt.h
new file mode 100644
index 0000000000..544551da21
--- /dev/null
+++ b/include/crypt.h
@@ -0,0 +1,3 @@
+#ifndef _CRYPT_H
+# include <crypt/crypt.h>
+#endif /* _CRYPT_H */