diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-07-31 15:13:05 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-07-31 15:13:05 +0000 |
| commit | 7cd3f4b8e082236e604a53fa1ab5dacb8d11c0c5 (patch) | |
| tree | 2cf3b0977768b7a05a135733c7d58288079ee40c /usr/src/lib/libc/sparc | |
| parent | f72f56d9727aa3ebd6798b5f109dbd3d1670cbe5 (diff) | |
| parent | e5c421abb8bd517cb6964747b9ce23066e1a1cef (diff) | |
| download | illumos-joyent-7cd3f4b8e082236e604a53fa1ab5dacb8d11c0c5.tar.gz | |
[illumos-gate merge]
commit e5c421abb8bd517cb6964747b9ce23066e1a1cef
9266 ixgbe: this statement may fall through
commit 8a7aa2a592747bd90d85645126d80688e024a0e2
9673 move internet address manipulation functions to libc
commit 7e3488dc6cdcb0c04e1ce167a1a3bfef83b5f2e0
9610 qede: error: left shift of negative value
commit d972451485b9ccf8c5c4951e2d24f63da9ac2cc8
9609 qede: error: result of '983040 << 16' requires 37 bits to represent, but 'int' only has 32 bits
commit 3df3d01f9da8be5cdd1e81a5d050c24ccc55caa9
9608 qede: error: 'free_buffer_count' may be used uninitialized in this function
commit 0d7de619fa7b28e48c8e80fa26d724400f4f47a4
9607 qede: this statement may fall through
commit 77b62fe435d195b5a58f123e6c5ec9c9dffdc877
9606 qede: error: this 'for' clause does not guard
Conflicts:
usr/src/man/man1m/route.1m
usr/src/lib/libdladm/Makefile.com
Diffstat (limited to 'usr/src/lib/libc/sparc')
| -rw-r--r-- | usr/src/lib/libc/sparc/Makefile.com | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com index 8b0932d08f..dd6a170559 100644 --- a/usr/src/lib/libc/sparc/Makefile.com +++ b/usr/src/lib/libc/sparc/Makefile.com @@ -24,7 +24,7 @@ # Copyright 2016 Joyent, Inc. # Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2013 Garrett D'Amore <garrett@damore.org> -# Copyright 2017 Nexenta Systems, Inc. +# Copyright 2018 Nexenta Systems, Inc. # LIBCDIR= $(SRC)/lib/libc @@ -395,7 +395,7 @@ PORTFP= \ moddi3.o \ muldi3.o \ qdivrem.o \ - ucmpdi2.o \ + ucmpdi2.o \ udivdi3.o \ umoddi3.o @@ -657,6 +657,14 @@ PORTGEN= \ xpg4.o \ xpg6.o +PORTINET= \ + inet_lnaof.o \ + inet_makeaddr.o \ + inet_network.o \ + inet_ntoa.o \ + inet_ntop.o \ + inet_pton.o + PORTPRINT_W= \ doprnt_w.o @@ -1033,6 +1041,7 @@ MOSTOBJS= \ $(PORTGEN64) \ $(PORTI18N) \ $(PORTI18N_COND) \ + $(PORTINET) \ $(PORTLOCALE) \ $(PORTPRINT) \ $(PORTPRINT_C89) \ @@ -1183,6 +1192,7 @@ SRCS= \ $(PORTFP:%.o=$(LIBCDIR)/port/fp/%.c) \ $(PORTGEN:%.o=$(LIBCDIR)/port/gen/%.c) \ $(PORTI18N:%.o=$(LIBCDIR)/port/i18n/%.c) \ + $(PORTINET:%.o=$(LIBCDIR)/port/inet/%.c) \ $(PORTLOCALE:%.o=$(LIBCDIR)/port/locale/%.c) \ $(PORTPRINT:%.o=$(LIBCDIR)/port/print/%.c) \ $(PORTREGEX:%.o=$(LIBCDIR)/port/regex/%.c) \ |