Print this page
OS-3643 lx brand: add USDT provider to lx_brand.so.1
OS-3644 lx brand: ptrace_init() never called
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/Makefile.master.64
+++ new/usr/src/Makefile.master.64
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) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
23 23 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
24 +# Copyright (c) 2014 Joyent, Inc. All rights reserved.
24 25 #
25 26
26 27 # rebind basic build macros to 64-bit versions
27 28
28 29 CFLAGS= $(CFLAGS64)
29 30 CCFLAGS= $(CCFLAGS64)
30 31 COPTFLAG= $(COPTFLAG64)
31 32 CCOPTFLAG= $(CCOPTFLAG64)
32 33 COMPILE.c= $(COMPILE64.c)
33 34 COMPILE.cc= $(COMPILE64.cc)
34 35 COMPILE.s= $(COMPILE64.s)
35 36 COMPILE.d= $(COMPILE64.d)
36 37 COMPILE.b= $(COMPILE64.b)
37 38 LINK.c= $(LINK64.c)
38 39 LINK.cc= $(LINK64.cc)
39 40 LINT.c= $(LINT64.c)
40 41
41 42 CTF_FLAGS= $(CTF_FLAGS_64)
42 43
43 44 OFFSETS_CREATE= $(OFFSETS_CREATE64)
44 45
45 46 #
46 47 # Moved these up to the top level here, so they can be overridden
47 48 #
48 49 LDLIBS.cmd = $(LDLIBS64)
49 50 LDLIBS.lib = $(LDLIBS64)
50 51
51 52 #
52 53 # Override Makefile.master's settings of GCCLIBDIR
53 54 #
54 55 GCCLIBDIR= $(GCCLIBDIR64)
55 56
56 57 #
57 58 # Override Makefile.master's settings of CC, CCC, AS and LINT
58 59 #
59 60 CC= $($(MACH64)_CC)
|
↓ open down ↓ |
26 lines elided |
↑ open up ↑ |
60 61 CCC= $($(MACH64)_CCC)
61 62 CPP= $($(MACH64)_CPP)
62 63 AS= $($(MACH64)_AS)
63 64 LD= $($(MACH64)_LD)
64 65 LINT= $($(MACH64)_LINT)
65 66
66 67 REAL_CC= $(CW_CC_CMD:sh)
67 68 REAL_CCC= $(CW_CCC_CMD:sh)
68 69
69 70 BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \
70 - $(PICS) $(EXTPICS) -L $(ROOTLIBDIR64) $(LDLIBS)
71 + $(PICS) $(EXTPICS) $(USDT_PICS) -L $(ROOTLIBDIR64) $(LDLIBS)
71 72
72 73 #
73 74 # ld(1) requires the -64 option to create a 64-bit filter solely from a mapfile
74 75 #
75 76 MAPFILECLASS= -64
76 77
77 78 CCNEEDED = -lCrun
78 79 $(__GNUC64)CCNEEDED = -L$(GCCLIBDIR) -lstdc++
79 80 $(__GNUC64)CCNEEDED += -lgcc_s
80 81
81 82 BUILDCCC.SO= $(CCC) $(CCFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \
82 83 $(PICS) $(EXTPICS) $(LDLIBS) $(CCNEEDED)
83 84 MAPFILE.NGB = $(MAPFILE.NGB_$(MACH64))
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX