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.man.txt
+++ new/usr/src/Makefile.master.64.man.txt
1 1 () ()
2 2
3 3
4 4
5 5 # # CDDL HEADER START # # The contents of this file are subject to the terms
6 6 of the # Common Development and Distribution License (the "License"). # You
|
↓ open down ↓ |
6 lines elided |
↑ open up ↑ |
7 7 may not use this file except in compliance with the License. # # You can
8 8 obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or
9 9 http://www.opensolaris.org/os/licensing. # See the License for the specific
10 10 language governing permissions # and limitations under the License. # # When
11 11 distributing Covered Code, include this CDDL HEADER in each # file and include
12 12 the License file at usr/src/OPENSOLARIS.LICENSE. # If applicable, add the
13 13 following below this CDDL HEADER, with the # fields enclosed by brackets "[]"
14 14 replaced with your own identifying # information: Portions Copyright [yyyy]
15 15 [name of copyright owner] # # CDDL HEADER END # # # Copyright (c) 1997, 2010,
16 16 Oracle and/or its affiliates. All rights reserved. # Copyright 2014 Garrett
17 -D'Amore <garrett@damore.org> # Copyright 2016 RackTop Systems. #
17 +D'Amore <garrett@damore.org> # Copyright 2016 RackTop Systems. # Copyright
18 +2021 Joyent, Inc. #
18 19
19 20 # rebind basic build macros to 64-bit versions
20 21
21 22 CFLAGS= $(CFLAGS64) CCFLAGS= $(CCFLAGS64) COPTFLAG= $(COPTFLAG64)
22 23 CCOPTFLAG= $(CCOPTFLAG64) COMPILE.c= $(COMPILE64.c) COMPILE.cc=
23 24 $(COMPILE64.cc) COMPILE.s= $(COMPILE64.s) COMPILE.d=
24 25 $(COMPILE64.d) COMPILE.b= $(COMPILE64.b) LINK.c= $(LINK64.c)
25 -LINK.cc= $(LINK64.cc) LINT.c= $(LINT64.c)
26 +LINK.cc= $(LINK64.cc) LINT.c= $(LINT64.c) NATIVE_CFLAGS=
27 + $(NATIVE_CFLAGS64) NATIVE_CCFLAGS= $(NATIVE_CCFLAGS64)
26 28
27 29 CTF_FLAGS= $(CTF_FLAGS_64)
28 30
29 31 OFFSETS_CREATE= $(OFFSETS_CREATE64)
30 32
31 33 # # Moved these up to the top level here, so they can be overridden #
32 34 LDLIBS.cmd = $(LDLIBS64) LDLIBS.lib = $(LDLIBS64)
33 35
34 36 # # Override Makefile.master's settings of GCCLIBDIR # GCCLIBDIR=
35 37 $(GCCLIBDIR64)
36 38
37 39 # # Override Makefile.master's settings of CC, CCC, AS and LINT # CC=
38 40 $(CC64) CCC= $(CCC64) CPP= $(CPP64) AS= $(AS64)
39 -LD= $(LD64) LINT= $(LINT64)
41 +LD= $(LD64) LINT= $(LINT64) NATIVECC= $(NATIVECC64) NATIVECCC=
42 + $(NATIVECCC64) NATIVECPP= $(NATIVECPP64) NATIVEAS= $(NATIVEAS64)
43 +NATIVELD= $(NATIVELD64)
40 44
41 45 BUILD.SO= $(BUILD64.SO) BUILDCCC.SO= $(BUILDCCC64.SO)
42 46
43 47 # # ld(1) requires the -64 option to create a 64-bit filter solely from a
44 48 mapfile # MAPFILECLASS= -64
45 49
46 50 MAPFILE.NGB = $(MAPFILE.NGB_$(MACH64))
47 51
48 52
49 53
50 54 October 5, 2021 ()
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX