Print this page
remove inlines,some other files

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/i86xpv/Makefile.i86xpv
          +++ new/usr/src/uts/i86xpv/Makefile.i86xpv
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # uts/i86xpv/Makefile.i86xpv
  24   24  #
  25   25  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  26   26  # Use is subject to license terms.
  27   27  # Copyright (c) 2013 Andrew Stormont.  All rights reserved.
       28 +# Copyright 2019 Joyent, Inc.
  28   29  #
  29   30  
  30   31  #
  31   32  #       This makefile contains the common definitions for the i86xpv unix
  32   33  #       and all i86xpv implementation architecture dependent modules.
  33   34  #
  34   35  
  35   36  #
  36   37  #       Machine type (implementation architecture):
  37   38  #
↓ open down ↓ 52 lines elided ↑ open up ↑
  90   91  #
  91   92  include $(UTSBASE)/Makefile.uts
  92   93  
  93   94  #
  94   95  #       Define supported builds
  95   96  #
  96   97  DEF_BUILDS              = $(DEF_BUILDS64)
  97   98  ALL_BUILDS              = $(ALL_BUILDS64)
  98   99  
  99  100  #
 100      -#       x86 or amd64 inline templates
 101      -#
 102      -INLINES_32              = $(UTSBASE)/intel/ia32/ml/ia32.il \
 103      -                          $(UTSBASE)/$(PLATFORM)/ml/ia32.il
 104      -INLINES_64              = $(UTSBASE)/intel/amd64/ml/amd64.il \
 105      -                          $(UTSBASE)/$(PLATFORM)/ml/amd64.il
 106      -INLINES                 += $(INLINES_$(CLASS))
 107      -
 108      -#
 109  101  #       kernel-specific optimizations; override default in Makefile.master
 110  102  #
 111  103  
 112  104  CFLAGS_XARCH_32         = $(i386_CFLAGS)
 113  105  CFLAGS_XARCH_64         = $(amd64_CFLAGS)
 114  106  CFLAGS_XARCH            = $(CFLAGS_XARCH_$(CLASS))
 115  107  
 116  108  COPTFLAG_32             = $(COPTFLAG)
 117  109  COPTFLAG_64             = $(COPTFLAG64)
 118  110  COPTIMIZE               = $(COPTFLAG_$(CLASS))
 119  111  
 120  112  CFLAGS                  = $(CFLAGS_XARCH)
 121  113  CFLAGS                  += $(COPTIMIZE)
 122      -CFLAGS                  += $(INLINES) -D_ASM_INLINES
      114 +CFLAGS                  += -D_ASM_INLINES
 123  115  CFLAGS                  += $(CCMODE)
 124  116  CFLAGS                  += $(SPACEFLAG)
 125  117  CFLAGS                  += $(CCUNBOUND)
 126  118  CFLAGS                  += $(CFLAGS_uts)
 127  119  
 128  120  ASFLAGS_XARCH_32        = $(i386_ASFLAGS)
 129  121  ASFLAGS_XARCH_64        = $(amd64_ASFLAGS)
 130  122  ASFLAGS_XARCH           = $(ASFLAGS_XARCH_$(CLASS))
 131  123  
 132  124  ASFLAGS                 += $(ASFLAGS_XARCH)
↓ open down ↓ 5 lines elided ↑ open up ↑
 138  130  #
 139  131  #       MAPFILE:        ld mapfile for the build of kernel/unix.
 140  132  #       MODSTUBS:       Module stubs source file.
 141  133  #       GENASSYM_SRC:   genassym.c
 142  134  
 143  135  MAPFILE         = $(UTSBASE)/$(PLATFORM)/conf/Mapfile
 144  136  MODSTUBS        = $(UTSBASE)/intel/ia32/ml/modstubs.s
 145  137  GENASSYM_SRC    = $(UTSBASE)/i86pc/ml/genassym.c
 146  138  OFFSETS_SRC     = $(UTSBASE)/i86pc/ml/offsets.in
 147  139  
 148      -#PLATFORM_OFFSETS_32    = $(UTSBASE)/$(PLATFORM)/ml/mach_offsets.in
 149      -PLATFORM_OFFSETS_32     = $(UTSBASE)/i86pc/ml/mach_offsets.in
 150      -PLATFORM_OFFSETS_64     = $(UTSBASE)/intel/amd64/ml/mach_offsets.in
 151      -PLATFORM_OFFSETS_SRC    = $(PLATFORM_OFFSETS_$(CLASS))
      140 +PLATFORM_OFFSETS_SRC    = $(UTSBASE)/intel/amd64/ml/mach_offsets.in
 152  141  KDI_OFFSETS_SRC         = $(UTSBASE)/intel/kdi/kdi_offsets.in
 153  142  
 154  143  #
 155  144  #       Define the actual specific platforms
 156  145  #
 157  146  MACHINE_DEFS     = -D__$(PLATFORM) -D__xpv -D_MACHDEP
 158  147  
 159  148  #
 160  149  #       Software workarounds for hardware "features"
 161  150  #
↓ open down ↓ 17 lines elided ↑ open up ↑
 179  168  DEBUG_DEFS              = $(DEBUG_DEFS_$(BUILD_TYPE))
 180  169  
 181  170  DEBUG_COND_OBJ32        = $(POUND_SIGN)
 182  171  DEBUG_COND_DBG32        =
 183  172  DEBUG_COND_OBJ64        = $(POUND_SIGN)
 184  173  DEBUG_COND_DBG64        =
 185  174  IF_DEBUG_OBJ            = $(DEBUG_COND_$(BUILD_TYPE))$(OBJS_DIR)/
 186  175  
 187  176  $(IF_DEBUG_OBJ)trap.o           := DEBUG_DEFS += -DTRAPDEBUG -DTRAPTRACE
 188  177  $(IF_DEBUG_OBJ)syscall_asm.o    := DEBUG_DEFS += -DSYSCALLTRACE -DTRAPTRACE
 189      -$(IF_DEBUG_OBJ)syscall_asm_amd64.o := DEBUG_DEFS += -DSYSCALLTRACE -DTRAPTRACE
 190  178  $(IF_DEBUG_OBJ)fast_trap_asm.o  := DEBUG_DEFS += -DTRAPTRACE
 191  179  $(IF_DEBUG_OBJ)interrupt.o      := DEBUG_DEFS += -DTRAPTRACE
 192  180  $(IF_DEBUG_OBJ)intr.o           := DEBUG_DEFS += -DTRAPTRACE
 193  181  $(IF_DEBUG_OBJ)locore.o         := DEBUG_DEFS += -DTRAPTRACE
 194  182  $(IF_DEBUG_OBJ)mp_startup.o     := DEBUG_DEFS += -DTRAPTRACE
 195  183  $(IF_DEBUG_OBJ)machdep.o        := DEBUG_DEFS += -DTRAPTRACE
 196  184  $(IF_DEBUG_OBJ)exception.o      := DEBUG_DEFS += -DTRAPTRACE
 197  185  $(IF_DEBUG_OBJ)x_call.o         := DEBUG_DEFS += -DTRAPTRACE
 198  186  $(IF_DEBUG_OBJ)mp_call.o        := DEBUG_DEFS += -DTRAPTRACE
 199  187  $(IF_DEBUG_OBJ)cbe.o            := DEBUG_DEFS += -DTRAPTRACE
↓ open down ↓ 121 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX