Test for POSIX headers from Newlib 20170522

Update #2833.

2 files changed, 66 insertions, 62 deletions

diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index df7cd282ec..6f5c5937ef 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -22,9 +22,7 @@ libnetworking_a_CPPFLAGS = $(AM_CPPFLAGS) $(libnetworking_CPPFLAGS)
 
 ## poll.h is not in the list because RTEMS does not have poll()
 ## and installing poll.h confuses autoconf.
-include_HEADERS = netdb.h
-include_HEADERS += resolv.h
-include_HEADERS += syslog.h
+include_HEADERS = resolv.h
 
 libnetworking_a_SOURCES = opt_atalk.h opt_bdg.h opt_compat.h opt_inet6.h \
     opt_inet.h opt_ipfw.h opt_ipx.h opt_mac.h opt_mrouting.h opt_netgraph.h \
@@ -37,7 +35,6 @@ libnetworking_a_SOURCES += bpfilter.h
 include_arpadir = $(includedir)/arpa
 
 include_arpa_HEADERS = arpa/ftp.h
-include_arpa_HEADERS += arpa/inet.h
 include_arpa_HEADERS += arpa/nameser.h
 include_arpa_HEADERS += arpa/nameser_compat.h
 
@@ -66,7 +63,6 @@ include_netdir = $(includedir)/net
 
 include_net_HEADERS = net/bpf.h
 include_net_HEADERS += net/ethernet.h
-include_net_HEADERS += net/if.h
 include_net_HEADERS += net/if_arp.h
 include_net_HEADERS += net/if_dl.h
 include_net_HEADERS += net/if_llc.h
@@ -95,7 +91,6 @@ include_netinet_HEADERS = netinet/icmp_var.h
 include_netinet_HEADERS += netinet/if_ether.h
 include_netinet_HEADERS += netinet/igmp.h
 include_netinet_HEADERS += netinet/igmp_var.h
-include_netinet_HEADERS += netinet/in.h
 include_netinet_HEADERS += netinet/in_pcb.h
 include_netinet_HEADERS += netinet/in_systm.h
 include_netinet_HEADERS += netinet/in_var.h
@@ -104,7 +99,6 @@ include_netinet_HEADERS += netinet/ip_fw.h
 include_netinet_HEADERS += netinet/ip_icmp.h
 include_netinet_HEADERS += netinet/ip_mroute.h
 include_netinet_HEADERS += netinet/ip_var.h
-include_netinet_HEADERS += netinet/tcp.h
 include_netinet_HEADERS += netinet/tcp_debug.h
 include_netinet_HEADERS += netinet/tcp_fsm.h
 include_netinet_HEADERS += netinet/tcp_seq.h
@@ -127,7 +121,6 @@ libnetworking_a_SOURCES += netinet/if_ether.c netinet/igmp.c netinet/in.c \
 
 include_netinet6dir = $(includedir)/netinet6
 
-include_netinet6_HEADERS = netinet6/in6.h
 
 ## nfs
 
@@ -174,8 +167,7 @@ libnetworking_a_SOURCES += rtems/sghostname.c \
 
 include_sysdir = $(includedir)/sys
 
-include_sys_HEADERS = sys/_sockaddr_storage.h
-include_sys_HEADERS += sys/callout.h
+include_sys_HEADERS = sys/callout.h
 include_sys_HEADERS += sys/conf.h
 include_sys_HEADERS += sys/domain.h
 include_sys_HEADERS += sys/kernel.h
@@ -190,14 +182,10 @@ include_sys_HEADERS += sys/reboot.h
 include_sys_HEADERS += sys/resourcevar.h
 include_sys_HEADERS += sys/selinfo.h
 include_sys_HEADERS += sys/signalvar.h
-include_sys_HEADERS += sys/socket.h
 include_sys_HEADERS += sys/socketvar.h
 include_sys_HEADERS += sys/sysctl.h
-include_sys_HEADERS += sys/syslog.h
 include_sys_HEADERS += sys/systm.h
-include_sys_HEADERS += sys/ttydefaults.h
 include_sys_HEADERS += sys/ucred.h
-include_sys_HEADERS += sys/un.h
 
 # vm
 
@@ -212,6 +200,21 @@ include_vm_HEADERS += vm/vm_param.h
 include_dev_miidir = $(includedir)/dev/mii
 include_dev_mii_HEADERS = dev/mii/mii.h
 
+if !HAS_NEWLIB_20170522_HEADER
+include_arpa_HEADERS += arpa/inet.h
+include_HEADERS += netdb.h
+include_HEADERS += syslog.h
+include_net_HEADERS += net/if.h
+include_netinet6_HEADERS = netinet6/in6.h
+include_netinet_HEADERS += netinet/in.h
+include_netinet_HEADERS += netinet/tcp.h
+include_sys_HEADERS += sys/_sockaddr_storage.h
+include_sys_HEADERS += sys/socket.h
+include_sys_HEADERS += sys/syslog.h
+include_sys_HEADERS += sys/ttydefaults.h
+include_sys_HEADERS += sys/un.h
+endif
+
 ## libc
 
 libc_CPPFLAGS = -DNOPOLL -DNOSELECT -D__BSD_VISIBLE -D_THREAD_SAFE
diff --git a/cpukit/libnetworking/preinstall.am b/cpukit/libnetworking/preinstall.am
index 0d7c270b2a..2427f1e7b6 100644
--- a/cpukit/libnetworking/preinstall.am
+++ b/cpukit/libnetworking/preinstall.am
@@ -19,18 +19,10 @@ $(PROJECT_INCLUDE)/$(dirstamp):
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
 
 if LIBNETWORKING
-$(PROJECT_INCLUDE)/netdb.h: netdb.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netdb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netdb.h
-
 $(PROJECT_INCLUDE)/resolv.h: resolv.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/resolv.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/resolv.h
 
-$(PROJECT_INCLUDE)/syslog.h: syslog.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/syslog.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/syslog.h
-
 $(PROJECT_INCLUDE)/arpa/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/arpa
 	@: > $(PROJECT_INCLUDE)/arpa/$(dirstamp)
@@ -40,10 +32,6 @@ $(PROJECT_INCLUDE)/arpa/ftp.h: arpa/ftp.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/ftp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/ftp.h
 
-$(PROJECT_INCLUDE)/arpa/inet.h: arpa/inet.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/inet.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/inet.h
-
 $(PROJECT_INCLUDE)/arpa/nameser.h: arpa/nameser.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/nameser.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/nameser.h
@@ -94,10 +82,6 @@ $(PROJECT_INCLUDE)/net/ethernet.h: net/ethernet.h $(PROJECT_INCLUDE)/net/$(dirst
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/ethernet.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/ethernet.h
 
-$(PROJECT_INCLUDE)/net/if.h: net/if.h $(PROJECT_INCLUDE)/net/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if.h
-
 $(PROJECT_INCLUDE)/net/if_arp.h: net/if_arp.h $(PROJECT_INCLUDE)/net/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_arp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_arp.h
@@ -179,10 +163,6 @@ $(PROJECT_INCLUDE)/netinet/igmp_var.h: netinet/igmp_var.h $(PROJECT_INCLUDE)/net
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/igmp_var.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/igmp_var.h
 
-$(PROJECT_INCLUDE)/netinet/in.h: netinet/in.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/in.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/in.h
-
 $(PROJECT_INCLUDE)/netinet/in_pcb.h: netinet/in_pcb.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/in_pcb.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/in_pcb.h
@@ -215,10 +195,6 @@ $(PROJECT_INCLUDE)/netinet/ip_var.h: netinet/ip_var.h $(PROJECT_INCLUDE)/netinet
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/ip_var.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/ip_var.h
 
-$(PROJECT_INCLUDE)/netinet/tcp.h: netinet/tcp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp.h
-
 $(PROJECT_INCLUDE)/netinet/tcp_debug.h: netinet/tcp_debug.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp_debug.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp_debug.h
@@ -256,10 +232,6 @@ $(PROJECT_INCLUDE)/netinet6/$(dirstamp):
 	@: > $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
 
-$(PROJECT_INCLUDE)/netinet6/in6.h: netinet6/in6.h $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet6/in6.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet6/in6.h
-
 $(PROJECT_INCLUDE)/nfs/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/nfs
 	@: > $(PROJECT_INCLUDE)/nfs/$(dirstamp)
@@ -340,10 +312,6 @@ $(PROJECT_INCLUDE)/sys/$(dirstamp):
 	@: > $(PROJECT_INCLUDE)/sys/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sys/$(dirstamp)
 
-$(PROJECT_INCLUDE)/sys/_sockaddr_storage.h: sys/_sockaddr_storage.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/_sockaddr_storage.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/_sockaddr_storage.h
-
 $(PROJECT_INCLUDE)/sys/callout.h: sys/callout.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/callout.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/callout.h
@@ -404,10 +372,6 @@ $(PROJECT_INCLUDE)/sys/signalvar.h: sys/signalvar.h $(PROJECT_INCLUDE)/sys/$(dir
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/signalvar.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/signalvar.h
 
-$(PROJECT_INCLUDE)/sys/socket.h: sys/socket.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/socket.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/socket.h
-
 $(PROJECT_INCLUDE)/sys/socketvar.h: sys/socketvar.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/socketvar.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/socketvar.h
@@ -416,26 +380,14 @@ $(PROJECT_INCLUDE)/sys/sysctl.h: sys/sysctl.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/sysctl.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/sysctl.h
 
-$(PROJECT_INCLUDE)/sys/syslog.h: sys/syslog.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/syslog.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/syslog.h
-
 $(PROJECT_INCLUDE)/sys/systm.h: sys/systm.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/systm.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/systm.h
 
-$(PROJECT_INCLUDE)/sys/ttydefaults.h: sys/ttydefaults.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ttydefaults.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ttydefaults.h
-
 $(PROJECT_INCLUDE)/sys/ucred.h: sys/ucred.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ucred.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ucred.h
 
-$(PROJECT_INCLUDE)/sys/un.h: sys/un.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/un.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/un.h
-
 $(PROJECT_INCLUDE)/vm/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/vm
 	@: > $(PROJECT_INCLUDE)/vm/$(dirstamp)
@@ -466,6 +418,55 @@ $(PROJECT_INCLUDE)/dev/mii/mii.h: dev/mii/mii.h $(PROJECT_INCLUDE)/dev/mii/$(dir
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/mii/mii.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/mii/mii.h
 
+if !HAS_NEWLIB_20170522_HEADER
+$(PROJECT_INCLUDE)/arpa/inet.h: arpa/inet.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/inet.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/inet.h
+
+$(PROJECT_INCLUDE)/netdb.h: netdb.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netdb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/netdb.h
+
+$(PROJECT_INCLUDE)/syslog.h: syslog.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/syslog.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/syslog.h
+
+$(PROJECT_INCLUDE)/net/if.h: net/if.h $(PROJECT_INCLUDE)/net/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if.h
+
+$(PROJECT_INCLUDE)/netinet6/in6.h: netinet6/in6.h $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet6/in6.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet6/in6.h
+
+$(PROJECT_INCLUDE)/netinet/in.h: netinet/in.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/in.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/in.h
+
+$(PROJECT_INCLUDE)/netinet/tcp.h: netinet/tcp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp.h
+
+$(PROJECT_INCLUDE)/sys/_sockaddr_storage.h: sys/_sockaddr_storage.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/_sockaddr_storage.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/_sockaddr_storage.h
+
+$(PROJECT_INCLUDE)/sys/socket.h: sys/socket.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/socket.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/socket.h
+
+$(PROJECT_INCLUDE)/sys/syslog.h: sys/syslog.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/syslog.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/syslog.h
+
+$(PROJECT_INCLUDE)/sys/ttydefaults.h: sys/ttydefaults.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ttydefaults.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ttydefaults.h
+
+$(PROJECT_INCLUDE)/sys/un.h: sys/un.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/un.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/un.h
+endif
 $(PROJECT_INCLUDE)/ifaddrs.h: ifaddrs.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ifaddrs.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/ifaddrs.h