diff options
| author | Toomas Soome <tsoome@me.com> | 2019-09-30 01:39:12 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-10-04 09:38:31 +0300 |
| commit | 63fbf44d4aa850b30ae81628d77f0397b849edc6 (patch) | |
| tree | 43deea0881443b818d22c5886f2faecbbbfa91ca | |
| parent | 238b28907b1e86e000112cdbcb3fd413e95c20e4 (diff) | |
| download | illumos-joyent-63fbf44d4aa850b30ae81628d77f0397b849edc6.tar.gz | |
11760 loader: add explicit_bzero() to libstand
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/boot/Makefile.version | 2 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/libstand/Makefile.com | 6 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/gen/explicit_bzero.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index 67889d27d9..d6a469feb6 100644 --- a/usr/src/boot/Makefile.version +++ b/usr/src/boot/Makefile.version @@ -33,4 +33,4 @@ LOADER_VERSION = 1.1 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes. # The version is processed from left to right, the version number can only # be increased. -BOOT_VERSION = $(LOADER_VERSION)-2019.09.27.1 +BOOT_VERSION = $(LOADER_VERSION)-2019.09.30.1 diff --git a/usr/src/boot/sys/boot/libstand/Makefile.com b/usr/src/boot/sys/boot/libstand/Makefile.com index c08d60fb50..5159856528 100644 --- a/usr/src/boot/sys/boot/libstand/Makefile.com +++ b/usr/src/boot/sys/boot/libstand/Makefile.com @@ -26,6 +26,9 @@ $(LIBRARY): $(SRCS) $(OBJS) include $(SASRC)/Makefile.inc include $(ZFSSRC)/Makefile.inc +LIBCSRC= $(SRC)/lib/libc +OBJS += explicit_bzero.o + CPPFLAGS += -I$(SRC)/uts/common # needs work @@ -66,3 +69,6 @@ x86: %.o: $(LZ4)/%.c $(COMPILE.c) $< + +%.o: $(LIBCSRC)/port/gen/%.c + $(COMPILE.c) $< diff --git a/usr/src/lib/libc/port/gen/explicit_bzero.c b/usr/src/lib/libc/port/gen/explicit_bzero.c index b27b4b9866..bcc7fa3f88 100644 --- a/usr/src/lib/libc/port/gen/explicit_bzero.c +++ b/usr/src/lib/libc/port/gen/explicit_bzero.c @@ -7,9 +7,9 @@ #include <string.h> #pragma weak __explicit_bzero_hook -/* ARGSUSED */ + void -__explicit_bzero_hook(void *buf, size_t len) +__explicit_bzero_hook(void *buf __unused, size_t len __unused) { } |