Print this page
14129 Add NATIVE_CFLAGS64, NATIVE_CCFLAGS64, and rebind NATIVE*64
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
| 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
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
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 24 # Copyright 2016 RackTop Systems.
25 +# Copyright 2021 Joyent, Inc.
25 26 #
26 27
27 28 # rebind basic build macros to 64-bit versions
28 29
29 30 CFLAGS= $(CFLAGS64)
30 31 CCFLAGS= $(CCFLAGS64)
31 32 COPTFLAG= $(COPTFLAG64)
32 33 CCOPTFLAG= $(CCOPTFLAG64)
33 34 COMPILE.c= $(COMPILE64.c)
34 35 COMPILE.cc= $(COMPILE64.cc)
35 36 COMPILE.s= $(COMPILE64.s)
36 37 COMPILE.d= $(COMPILE64.d)
37 38 COMPILE.b= $(COMPILE64.b)
38 39 LINK.c= $(LINK64.c)
39 40 LINK.cc= $(LINK64.cc)
40 41 LINT.c= $(LINT64.c)
42 +NATIVE_CFLAGS= $(NATIVE_CFLAGS64)
43 +NATIVE_CCFLAGS= $(NATIVE_CCFLAGS64)
41 44
42 45 CTF_FLAGS= $(CTF_FLAGS_64)
43 46
44 47 OFFSETS_CREATE= $(OFFSETS_CREATE64)
45 48
46 49 #
47 50 # Moved these up to the top level here, so they can be overridden
48 51 #
49 52 LDLIBS.cmd = $(LDLIBS64)
50 53 LDLIBS.lib = $(LDLIBS64)
51 54
52 55 #
53 56 # Override Makefile.master's settings of GCCLIBDIR
54 57 #
55 58 GCCLIBDIR= $(GCCLIBDIR64)
|
↓ open down ↓ |
5 lines elided |
↑ open up ↑ |
56 59
57 60 #
58 61 # Override Makefile.master's settings of CC, CCC, AS and LINT
59 62 #
60 63 CC= $(CC64)
61 64 CCC= $(CCC64)
62 65 CPP= $(CPP64)
63 66 AS= $(AS64)
64 67 LD= $(LD64)
65 68 LINT= $(LINT64)
69 +NATIVECC= $(NATIVECC64)
70 +NATIVECCC= $(NATIVECCC64)
71 +NATIVECPP= $(NATIVECPP64)
72 +NATIVEAS= $(NATIVEAS64)
73 +NATIVELD= $(NATIVELD64)
66 74
67 75 BUILD.SO= $(BUILD64.SO)
68 76 BUILDCCC.SO= $(BUILDCCC64.SO)
69 77
70 78 #
71 79 # ld(1) requires the -64 option to create a 64-bit filter solely from a mapfile
72 80 #
73 81 MAPFILECLASS= -64
74 82
75 83 MAPFILE.NGB = $(MAPFILE.NGB_$(MACH64))
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX