Print this page
12312 fix unused lib dependencies
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/lib/brand/solaris10/s10_brand/Makefile.com
+++ new/usr/src/lib/brand/solaris10/s10_brand/Makefile.com
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21 #
22 22 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
23 23 # Copyright (c) 2016 by Delphix. All rights reserved.
24 +# Copyright 2020 Joyent, Inc.
24 25 #
25 26
26 27 LIBRARY = s10_brand.a
27 28 VERS = .1
28 29 COBJS = s10_brand.o s10_deleted.o s10_signal.o
29 30 ASOBJS = crt.o handler.o runexe.o brand_util.o
30 31 OBJECTS = $(COBJS)
31 32
32 33 include ../../Makefile.s10
33 34 include $(SRC)/lib/Makefile.lib
34 35
35 36 SRCDIR = ../common
36 37 UTSBASE = $(SRC)/uts
37 38
38 39 LIBS = $(DYNLIB)
39 40 CSRCS = $(COBJS:%o=../common/%c)
40 41 SHAREDOBJS = $(ASOBJS:%o=$(ISAOBJDIR)/%o)
41 42 SRCS = $(CSRCS)
42 43
43 44 #
44 45 # Note that the architecture specific makefiles MUST update DYNFLAGS to
45 46 # explicitly specify an interpreter for the brand emulation library so that we
46 47 # use /lib/ld.so.1 or /lib/64/ld.so.1, which in a s10 zone is the Solaris 10
47 48 # linker. This is different from some other brands where the linker that is
48 49 # used is the native system linker (/.SUNWnative/.../ld.so.1). We have to do
49 50 # this because the linker has a very incestuous relationship with libc and we
50 51 # don't want to use the native linker with the s10 version of libc. (This may
51 52 # come as a surprise to the reader, but when our library is loaded it get's
52 53 # linked against the s10 version of libc.) Although the linker interfaces are
53 54 # normally stable, there are examples, such as with the solaris8 brand, where
54 55 # we could not combine the brand's libc with the native linker. Since we want
55 56 # to run in a known configuration, we use the S10 libc/linker combination.
56 57 #
57 58 # There is one more non-obvious side effect of using the s10 linker that
58 59 # should be mentioned. Since the linker is used to setup processes before
59 60 # libc is loaded, it makes system calls directly (ie avoiding libc), and
60 61 # it makes these system calls before our library has been initialized.
61 62 # Since our library hasn't been initialized yet, there's no way for us
62 63 # to intercept and emulate any of those system calls. So if any of those
63 64 # system calls ever change in the native code such that they break the s10
64 65 # linker then we're kinda screwed and will need to re-visit the current
65 66 # solution. (The likely solution then will probably be to start using the
66 67 # native linker with our brand emulation library.)
67 68 #
68 69 # Note that we make sure to link our brand emulation library
69 70 # libmapmalloc. This is required because in most cases there will be two
70 71 # copies of libc in the same process and we don't want them to fight over
71 72 # the heap. So for our brand library we link against libmapmalloc so that
72 73 # if we (our or copy of libc) try to allocate any memory it will be done
73 74 # via mmap() instead of brk().
74 75 #
↓ open down ↓ |
41 lines elided |
↑ open up ↑ |
75 76 CPPFLAGS += -D_REENTRANT -U_ASM \
76 77 -I. -I$(BRAND_SHARED)/brand/sys -I../sys \
77 78 -I$(UTSBASE)/common/brand/solaris10 \
78 79 -I$(SRC)/uts/common/fs/zfs
79 80 CFLAGS += $(CCVERBOSE)
80 81 # Needed to handle zfs include files
81 82 CSTD= $(CSTD_GNU99)
82 83 C99LMODE= -Xc99=%all
83 84 DYNFLAGS += $(DYNFLAGS_$(CLASS))
84 85 DYNFLAGS += $(BLOCAL) $(ZNOVERSION) -Wl,-e_start
85 -LDLIBS += -lc -lmapmalloc
86 +LDLIBS += -lmapmalloc -lc
86 87 LINTFLAGS += -erroff=E_STATIC_UNUSED
87 88 LINTFLAGS64 += -erroff=E_STATIC_UNUSED
88 89
89 90 CERRWARN += $(CNOWARN_UNINIT)
90 91
91 92 $(LIBS):= PICS += $(SHAREDOBJS)
92 93
93 94 .KEEP_STATE:
94 95
95 96 all: $(LIBS)
96 97
97 -lint: lintcheck
98 -
99 98 include $(SRC)/lib/Makefile.targ
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX