Skip to content

Commit

Permalink
Merge branch 'freebsd/current/master' into hardened/current/master
Browse files Browse the repository at this point in the history
* freebsd/current/master:
  r350739 try #2
  Disable useless -Wformat-zero-length
  powerpc/pmap: Minor optimizations to 64-bit booke pmap
  Change autounmountd(8) to use time_t for duration instead of double
  Fix !DDB kernel configurations after r350713
  Follow r350693 to add a link for sbuf_nl_terminate(9)
  ddb(4): Add 'sysctl' command
  • Loading branch information
opntr-auto committed Aug 8, 2019
2 parents 185791a + 4c8a9e2 commit c0c00f3
Show file tree
Hide file tree
Showing 6 changed files with 569 additions and 40 deletions.
1 change: 1 addition & 0 deletions share/man/man9/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1790,6 +1790,7 @@ MLINKS+=sbuf.9 sbuf_bcat.9 \
sbuf.9 sbuf_new.9 \
sbuf.9 sbuf_new_auto.9 \
sbuf.9 sbuf_new_for_sysctl.9 \
sbuf.9 sbuf_nl_terminate.9 \
sbuf.9 sbuf_printf.9 \
sbuf.9 sbuf_printf_drain.9 \
sbuf.9 sbuf_putbuf.9 \
Expand Down
3 changes: 3 additions & 0 deletions share/mk/bsd.sys.mk
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ FORMAT_EXTENSIONS= -fformat-extensions
CWARNFLAGS+= -Wno-unknown-pragmas
.endif # IGNORE_PRAGMA

# This warning is utter nonsense
CFLAGS+= -Wno-format-zero-length

# We need this conditional because many places that use it
# only enable it for some files with CLFAGS.$FILE+=${CLANG_NO_IAS}.
# unconditionally, and can't easily use the CFLAGS.clang=
Expand Down
6 changes: 4 additions & 2 deletions sys/conf/kern.mk
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ CWARNEXTRA?= -Wno-error=address \
CWARNEXTRA+= -Wno-error=misleading-indentation \
-Wno-error=nonnull-compare \
-Wno-error=shift-overflow \
-Wno-error=tautological-compare \
-Wno-format-zero-length
-Wno-error=tautological-compare
.endif
.if ${COMPILER_VERSION} >= 70200
CWARNEXTRA+= -Wno-error=memset-elt-size
Expand All @@ -80,6 +79,9 @@ NO_WNONNULL= -Wno-nonnull
.endif
.endif

# This warning is utter nonsense
CWARNFLAGS+= -Wno-format-zero-length

# External compilers may not support our format extensions. Allow them
# to be disabled. WARNING: format checking is disabled in this case.
.if ${MK_FORMAT_EXTENSIONS} == "no"
Expand Down
Loading

0 comments on commit c0c00f3

Please sign in to comment.