Print this page
11506 smatch resync
*** 20,30 ****
#
#
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
! # Copyright (c) 2019, Joyent, Inc.
#
#
# The build process for libumem is sightly different from that used by other
# libraries, because libumem must be built in two flavors - as a standalone
--- 20,30 ----
#
#
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
! # Copyright 2019 Joyent, Inc.
#
#
# The build process for libumem is sightly different from that used by other
# libraries, because libumem must be built in two flavors - as a standalone
*** 110,120 ****
CLOBBERFILES_standalone = $(LINKTEST_OBJ)
CLOBBERFILES += $(CLOBBERFILES_$(CURTYPE))
LIBS_standalone = $(STANDLIBRARY)
! LIBS_library = $(DYNLIB) $(LINTLIB)
LIBS = $(LIBS_$(CURTYPE))
MAPFILE_SUPPLEMENTAL_standalone = ../common/stand_mapfile
MAPFILE_SUPPLEMENTAL = $(MAPFILE_SUPPLEMENTAL_$(CURTYPE))
--- 110,120 ----
CLOBBERFILES_standalone = $(LINKTEST_OBJ)
CLOBBERFILES += $(CLOBBERFILES_$(CURTYPE))
LIBS_standalone = $(STANDLIBRARY)
! LIBS_library = $(DYNLIB)
LIBS = $(LIBS_$(CURTYPE))
MAPFILE_SUPPLEMENTAL_standalone = ../common/stand_mapfile
MAPFILE_SUPPLEMENTAL = $(MAPFILE_SUPPLEMENTAL_$(CURTYPE))
*** 126,137 ****
ASFLAGS_standalone = -DUMEM_STANDALONE
ASFLAGS_library =
ASFLAGS += -P $(ASFLAGS_$(CURTYPE)) -D_ASM
- $(LINTLIB) := SRCS = ../common/$(LINTSRC)
-
# We want the thread-specific errno in the library, but we don't want it in
# the standalone. $(DTS_ERRNO) is designed to add -D_TS_ERRNO to $(CPPFLAGS),
# in order to enable this feature. Conveniently, -D_REENTRANT does the same
# thing. As such, we null out $(DTS_ERRNO) to ensure that the standalone
# doesn't get it.
--- 126,135 ----
*** 155,170 ****
CFLAGS += $(CFLAGS_$(CURTYPE)) $(CFLAGS_common)
CFLAGS64_standalone = $(STAND_FLAGS_64)
CFLAGS64 += $(CCVERBOSE) $(CFLAGS64_$(CURTYPE)) $(CFLAGS64_common)
! INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLINT) $(ROOTLIBS)
! #
! # turn off ptr-cast warnings, since we do them all the time
! #
! LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
! LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN
DYNFLAGS += $(ZINTERPOSE)
.KEEP_STATE:
--- 153,166 ----
CFLAGS += $(CFLAGS_$(CURTYPE)) $(CFLAGS_common)
CFLAGS64_standalone = $(STAND_FLAGS_64)
CFLAGS64 += $(CCVERBOSE) $(CFLAGS64_$(CURTYPE)) $(CFLAGS64_common)
! # false positive for umem_alloc_sizes_add()
! pics/umem.o := SMOFF += index_overflow
! objs/umem.o := SMOFF += index_overflow
! INSTALL_DEPS_library = $(ROOTLINKS) $(ROOTLIBS)
DYNFLAGS += $(ZINTERPOSE)
.KEEP_STATE: