Print this page
NEX-9559 remove nza-closed cruft
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Steve Peng <steve.peng@nexenta.com>
NEX-3508 CLONE - Port NEX-2946 Add UNMAP/TRIM functionality to ZFS and illumos
Reviewed by: Josef Sipek <josef.sipek@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
Conflicts:
usr/src/uts/common/io/scsi/targets/sd.c
usr/src/uts/common/sys/scsi/targets/sddef.h
Fix up some merges where we wanted the upstream version.
re #12585 rb4049 ZFS++ work port - refactoring to improve separation of open/closed code, bug fixes, performance improvements - open code
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/lib/libzpool/Makefile.com
+++ new/usr/src/lib/libzpool/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
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 #
|
↓ open down ↓ |
21 lines elided |
↑ open up ↑ |
22 22 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
23 23 # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
24 24 # Copyright 2017 Joyent, Inc.
25 25 #
26 26
27 27 LIBRARY= libzpool.a
28 28 VERS= .1
29 29
30 30 # include the list of ZFS sources
31 31 include ../../../uts/common/Makefile.files
32 -KERNEL_OBJS = kernel.o util.o
32 +KERNEL_OBJS = kernel.o util.o dkioc_free_util.o
33 33 DTRACE_OBJS = zfs.o
34 34
35 35 OBJECTS=$(LUA_OBJS) $(ZFS_COMMON_OBJS) $(ZFS_SHARED_OBJS) $(KERNEL_OBJS)
36 36
37 37 # include library definitions
38 38 include ../../Makefile.lib
39 39
40 40 LUA_SRCS= $(LUA_OBJS:%.o=../../../uts/common/fs/zfs/lua/%.c)
41 41 ZFS_COMMON_SRCS= $(ZFS_COMMON_OBJS:%.o=../../../uts/common/fs/zfs/%.c)
42 42 ZFS_SHARED_SRCS= $(ZFS_SHARED_OBJS:%.o=../../../common/zfs/%.c)
43 43 KERNEL_SRCS= $(KERNEL_OBJS:%.o=../common/%.c)
44 44
45 45 SRCS=$(LUA_SRCS) $(ZFS_COMMON_SRCS) $(ZFS_SHARED_SRCS) $(KERNEL_SRCS)
46 46 SRCDIR= ../common
47 47
48 48 # There should be a mapfile here
49 49 MAPFILES =
50 50
51 51 LIBS += $(LINTLIB) $(DYNLIB)
52 52
53 53 INCS += -I../common
54 54 INCS += -I../../../uts/common/fs/zfs
55 55 INCS += -I../../../uts/common/fs/zfs/lua
56 56 INCS += -I../../../common/zfs
57 57 INCS += -I../../../common
58 58
59 59 CLEANFILES += ../common/zfs.h
60 60 CLEANFILES += $(EXTPICS)
61 61
62 62 $(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC)
63 63 $(LINTLIB): ../common/zfs.h
64 64
65 65 CSTD= $(CSTD_GNU99)
66 66 C99LMODE= -Xc99=%all
67 67
68 68 CFLAGS += -g $(CCVERBOSE) $(CNOGLOBAL)
69 69 CFLAGS64 += -g $(CCVERBOSE) $(CNOGLOBAL)
70 70 LDLIBS += -lcmdutils -lumem -lavl -lnvpair -lz -lc -lsysevent -lmd \
71 71 -lfakekernel
72 72 CPPFLAGS.first = -I$(SRC)/lib/libfakekernel/common
73 73 CPPFLAGS += $(INCS) -DDEBUG -D_FAKE_KERNEL
74 74
75 75 LINTFLAGS += -erroff=E_STATIC_UNUSED $(INCS)
76 76 LINTFLAGS64 += -erroff=E_STATIC_UNUSED $(INCS)
77 77
78 78 CERRWARN += -_gcc=-Wno-parentheses
79 79 CERRWARN += -_gcc=-Wno-switch
80 80 CERRWARN += -_gcc=-Wno-type-limits
81 81 CERRWARN += -_gcc=-Wno-unused-variable
82 82 CERRWARN += -_gcc=-Wno-empty-body
83 83 CERRWARN += -_gcc=-Wno-unused-function
84 84 CERRWARN += -_gcc=-Wno-unused-label
85 85
86 86 .KEEP_STATE:
87 87
88 88 all: $(LIBS)
89 89
90 90 lint: $(LINTLIB)
91 91
92 92 include ../../Makefile.targ
93 93
94 94 EXTPICS= $(DTRACE_OBJS:%=pics/%)
95 95
96 96 pics/%.o: ../../../uts/common/fs/zfs/%.c ../common/zfs.h
97 97 $(COMPILE.c) -o $@ $<
98 98 $(POST_PROCESS_O)
99 99
100 100 pics/%.o: ../../../uts/common/fs/zfs/lua/%.c
101 101 $(COMPILE.c) -o $@ $<
102 102 $(POST_PROCESS_O)
103 103
|
↓ open down ↓ |
61 lines elided |
↑ open up ↑ |
104 104 pics/%.o: ../../../common/zfs/%.c ../common/zfs.h
105 105 $(COMPILE.c) -o $@ $<
106 106 $(POST_PROCESS_O)
107 107
108 108 pics/%.o: ../common/%.d $(PICS)
109 109 $(COMPILE.d) -C -s $< -o $@ $(PICS)
110 110 $(POST_PROCESS_O)
111 111
112 112 ../common/%.h: ../common/%.d
113 113 $(DTRACE) -xnolibs -h -s $< -o $@
114 +
115 +pics/%.o: ../../../uts/common/os/%.c
116 + $(COMPILE.c) -o $@ $<
117 + $(POST_PROCESS_O)
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX