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>

*** 12,30 **** the License file at usr/src/OPENSOLARIS.LICENSE. # If applicable, add the following below this CDDL HEADER, with the # fields enclosed by brackets "[]" replaced with your own identifying # information: Portions Copyright [yyyy] [name of copyright owner] # # CDDL HEADER END # # # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2014 Garrett ! D'Amore <garrett@damore.org> # Copyright 2016 RackTop Systems. # # rebind basic build macros to 64-bit versions CFLAGS= $(CFLAGS64) CCFLAGS= $(CCFLAGS64) COPTFLAG= $(COPTFLAG64) CCOPTFLAG= $(CCOPTFLAG64) COMPILE.c= $(COMPILE64.c) COMPILE.cc= $(COMPILE64.cc) COMPILE.s= $(COMPILE64.s) COMPILE.d= $(COMPILE64.d) COMPILE.b= $(COMPILE64.b) LINK.c= $(LINK64.c) ! LINK.cc= $(LINK64.cc) LINT.c= $(LINT64.c) CTF_FLAGS= $(CTF_FLAGS_64) OFFSETS_CREATE= $(OFFSETS_CREATE64) --- 12,32 ---- the License file at usr/src/OPENSOLARIS.LICENSE. # If applicable, add the following below this CDDL HEADER, with the # fields enclosed by brackets "[]" replaced with your own identifying # information: Portions Copyright [yyyy] [name of copyright owner] # # CDDL HEADER END # # # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2014 Garrett ! D'Amore <garrett@damore.org> # Copyright 2016 RackTop Systems. # Copyright ! 2021 Joyent, Inc. # # rebind basic build macros to 64-bit versions CFLAGS= $(CFLAGS64) CCFLAGS= $(CCFLAGS64) COPTFLAG= $(COPTFLAG64) CCOPTFLAG= $(CCOPTFLAG64) COMPILE.c= $(COMPILE64.c) COMPILE.cc= $(COMPILE64.cc) COMPILE.s= $(COMPILE64.s) COMPILE.d= $(COMPILE64.d) COMPILE.b= $(COMPILE64.b) LINK.c= $(LINK64.c) ! LINK.cc= $(LINK64.cc) LINT.c= $(LINT64.c) NATIVE_CFLAGS= ! $(NATIVE_CFLAGS64) NATIVE_CCFLAGS= $(NATIVE_CCFLAGS64) CTF_FLAGS= $(CTF_FLAGS_64) OFFSETS_CREATE= $(OFFSETS_CREATE64)
*** 34,44 **** # # Override Makefile.master's settings of GCCLIBDIR # GCCLIBDIR= $(GCCLIBDIR64) # # Override Makefile.master's settings of CC, CCC, AS and LINT # CC= $(CC64) CCC= $(CCC64) CPP= $(CPP64) AS= $(AS64) ! LD= $(LD64) LINT= $(LINT64) BUILD.SO= $(BUILD64.SO) BUILDCCC.SO= $(BUILDCCC64.SO) # # ld(1) requires the -64 option to create a 64-bit filter solely from a mapfile # MAPFILECLASS= -64 --- 36,48 ---- # # Override Makefile.master's settings of GCCLIBDIR # GCCLIBDIR= $(GCCLIBDIR64) # # Override Makefile.master's settings of CC, CCC, AS and LINT # CC= $(CC64) CCC= $(CCC64) CPP= $(CPP64) AS= $(AS64) ! LD= $(LD64) LINT= $(LINT64) NATIVECC= $(NATIVECC64) NATIVECCC= ! $(NATIVECCC64) NATIVECPP= $(NATIVECPP64) NATIVEAS= $(NATIVEAS64) ! NATIVELD= $(NATIVELD64) BUILD.SO= $(BUILD64.SO) BUILDCCC.SO= $(BUILDCCC64.SO) # # ld(1) requires the -64 option to create a 64-bit filter solely from a mapfile # MAPFILECLASS= -64