Merge ^/head r364051 through r364081.

nhuff · Aug 10, 2020 · 8460d75 · 8460d75
2 parents a303050 + a08d04f
commit 8460d75
Show file tree

Hide file tree

Showing 38 changed files with 2,441 additions and 978 deletions.
diff --git a/RELNOTES b/RELNOTES
@@ -27,6 +27,13 @@ r363180:
 r363084:
 	nc(1) now implements SCTP mode, enabled by specifying the --sctp option.
 
+r362681:
+	A new implementation of bc and dc has been imported. It offers
+	better standards compliance, performance, localization and comes
+	with extensive test cases that are optionally installed.
+	Use WITHOUT_GH_BC=yes to build and install the world with the
+	previous version instead of the new one, if required.
+
 r362158, r362163:
 	struct export_args has changed so that the "user" specified for
 	the -maproot and -mapall exports(5) options may be in more than

diff --git a/lib/libclang_rt/fuzzer/Makefile b/lib/libclang_rt/fuzzer/Makefile
@@ -23,4 +23,8 @@ SRCS+=		fuzzer/FuzzerUtil.cpp
 SRCS+=		fuzzer/FuzzerUtilLinux.cpp
 SRCS+=		fuzzer/FuzzerUtilPosix.cpp
 
+.PATH:		${CRTSRC}/include/fuzzer
+INCSDIR=	${CLANGDIR}/include/fuzzer
+INCS+=		FuzzedDataProvider.h
+
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/profile/Makefile b/lib/libclang_rt/profile/Makefile
@@ -25,4 +25,8 @@ SRCS+=		profile/InstrProfilingUtil.c
 SRCS+=		profile/InstrProfilingValue.c
 SRCS+=		profile/InstrProfilingWriter.c
 
+.PATH:		${CRTSRC}/include/profile
+INCSDIR=	${CLANGDIR}/include/profile
+INCS+=		InstrProfData.inc
+
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/xray/Makefile b/lib/libclang_rt/xray/Makefile
@@ -41,4 +41,10 @@ SRCS+=		xray/xray_trampoline_x86_64.S
 SRCS+=		xray/xray_utils.cpp
 SRCS+=		xray/xray_x86_64.cpp
 
+.PATH:		${CRTSRC}/include/xray
+INCSDIR=	${CLANGDIR}/include/xray
+INCS+=		xray_interface.h
+INCS+=		xray_log_interface.h
+INCS+=		xray_records.h
+
 .include <bsd.lib.mk>
diff --git a/lib/libifconfig/Makefile b/lib/libifconfig/Makefile
@@ -13,15 +13,30 @@ SRCS=		libifconfig.c \
 		libifconfig_inet6.c \
 		libifconfig_internal.c \
 		libifconfig_lagg.c \
-		libifconfig_media.c
+		libifconfig_media.c \
+		libifconfig_sfp.c
+
+GEN=		libifconfig_sfp_tables.h \
+		libifconfig_sfp_tables.c \
+		libifconfig_sfp_tables_internal.h
+
+SRCS+=	${GEN}
+
+.include <src.lua.mk>
+
+.SUFFIXES: .tpl.c .tpl.h
+.tpl.c.c .tpl.h.h: sfp.lua
+	${LUA} ${.CURDIR}/sfp.lua ${.IMPSRC} >${.TARGET}
+
+CLEANFILES+= ${GEN}
 
 # If libifconfig become public uncomment those two lines
 #INCSDIR=	${INCLUDEDIR}
-#INCS=		libifconfig.h
+#INCS=		libifconfig.h libifconfig_sfp.h libifconfig_sfp_tables.h
 
 #MAN=		libifconfig.3
 
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR} -I${.OBJDIR}
 NO_WCAST_ALIGN= yes
 
 .include <bsd.lib.mk>
diff --git a/lib/libifconfig/libifconfig.h b/lib/libifconfig/libifconfig.h
@@ -28,6 +28,10 @@
 
 #pragma once
 
+#include <sys/types.h>
+
+#include <net/if.h>
+
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>