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
          +++ new/usr/src/Makefile.master
↓ open down ↓ 20 lines elided ↑ open up ↑
  21   21  
  22   22  #
  23   23  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright (c) 2012 by Delphix. All rights reserved.
  25   25  # Copyright 2014 Garrett D'Amore <garrett@damore.org>
  26   26  # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
  27   27  # Copyright 2015 Gary Mills
  28   28  # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
  29   29  # Copyright 2016 Toomas Soome <tsoome@me.com>
  30   30  # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
  31      -# Copyright 2020 Joyent, Inc.
       31 +# Copyright 2021 Joyent, Inc.
  32   32  # Copyright 2019 RackTop Systems.
  33   33  # Copyright 2020 Oxide Computer Company
  34   34  # Copyright 2020 Peter Tribble
  35   35  #
  36   36  
  37   37  #
  38   38  # Makefile.master, global definitions for system source
  39   39  #
  40   40  ROOT=           /proto
  41   41  
↓ open down ↓ 660 lines elided ↑ open up ↑
 702  702  # run on the build machine (also known as the NATIVE_BUILD).
 703  703  #
 704  704  NATIVE_CFLAGS=  $(COPTFLAG) $($(NATIVE_MACH)_CFLAGS) $(CCMODE) \
 705  705                  $(ILDOFF) $(CERRWARN) $(CSTD) $($(NATIVE_MACH)_CCUNBOUND) \
 706  706                  $(IROPTFLAG) $(CGLOBALSTATIC) $(CCNOAUTOINLINE) \
 707  707                  $(CCNOREORDER) $(CSOURCEDEBUGFLAGS) $(CUSERFLAGS)
 708  708  
 709  709  NATIVE_CCFLAGS= $(CCOPTFLAG) $($(NATIVE_MACH)_CCFLAGS) $(CCSOURCEDEBUGFLAGS) \
 710  710                  $(CCUSERFLAGS)
 711  711  
      712 +NATIVE_CFLAGS64=        $(COPTFLAG64) $($(NATIVE_MACH64)_CFLAGS) $(CCMODE64) \
      713 +                $(ILDOFF) $(CERRWARN) $(CSTD) $($(NATIVE_MACH64)_CCUNBOUND) \
      714 +                $(IROPTFLAG64) $(CGLOBALSTATIC) $(CCNOAUTOINLINE) \
      715 +                $(CCNOREORDER) $(CSOURCEDEBUGFLAGS) $(CUSERFLAGS64)
      716 +
      717 +NATIVE_CCFLAGS64=       $(CCOPTFLAG64) $($(NATIVE_MACH64)_CCFLAGS) \
      718 +                $(CCSOURCEDEBUGFLAGS) $(CCUSERFLAGS64)
      719 +
 712  720  DTEXTDOM=-DTEXT_DOMAIN=\"$(TEXT_DOMAIN)\"       # For messaging.
 713  721  DTS_ERRNO=-D_TS_ERRNO
 714  722  CPPFLAGS.first= # Please keep empty.  Only lower makefiles should set this.
 715  723  CPPFLAGS.master=$(DTEXTDOM) $(DTS_ERRNO) \
 716  724          $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) \
 717  725          $(ADJUNCT_PROTO:%=-I%/usr/include)
 718  726  CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) \
 719  727                  $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/include
 720  728  CPPFLAGS=       $(CPPFLAGS.first) $(CPPFLAGS.master)
 721  729  AS_CPPFLAGS=    $(CPPFLAGS.first) $(CPPFLAGS.master)
↓ open down ↓ 653 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX