Print this page
remove inlines,some other files

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