OS-5601 comm page symbols need ctf augmentation
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Ryan Zezeski <ryan.zezeski@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>

*** 62,72 ****
  GENUNIX         = genunix
  GENUNIX_DIR     = ../../intel/$(GENUNIX)
  
  LIBOPTS         = -L $(GENUNIX_DIR)/$(OBJS_DIR) -l $(GENUNIX)
  
! CTFEXTRAOBJS    = $(OBJS_DIR)/vers.o
  
  DBOOT_OBJS_DIR  = dboot/$(OBJS_DIR)
  DBOOT_OBJECTS   = $(DBOOT_OBJS:%=$(DBOOT_OBJS_DIR)/%)
  DBOOT_BIN       = $(DBOOT_OBJS_DIR)/$(DBOOT)
  DBOOT_O         = $(OBJS_DIR)/$(DBOOT).o
--- 62,72 ----
  GENUNIX         = genunix
  GENUNIX_DIR     = ../../intel/$(GENUNIX)
  
  LIBOPTS         = -L $(GENUNIX_DIR)/$(OBJS_DIR) -l $(GENUNIX)
  
! CTFEXTRAOBJS    = $(OBJS_DIR)/vers.o $(OBJS_DIR)/comm_page_ctf.o
  
  DBOOT_OBJS_DIR  = dboot/$(OBJS_DIR)
  DBOOT_OBJECTS   = $(DBOOT_OBJS:%=$(DBOOT_OBJS_DIR)/%)
  DBOOT_BIN       = $(DBOOT_OBJS_DIR)/$(DBOOT)
  DBOOT_O         = $(OBJS_DIR)/$(DBOOT).o
*** 95,107 ****
  #
  #       Overrides
  #
  CLEANFILES      +=              \
          $(UNIX_O) $(MODSTUBS_O) \
!         $(OBJS_DIR)/vers.c $(OBJS_DIR)/vers.o \
          $(OBJS_DIR)/dtracestubs.s \
!         $(DTRACESTUBS_O) $(DTRACESTUBS)
  
  CLEANFILES      +=              \
          $(DBOOT_O) $(DBOOT_S)   \
          $(DBOOT_OBJECTS)        \
          $(OBJS_DIR)/bios_call_src.o \
--- 95,108 ----
  #
  #       Overrides
  #
  CLEANFILES      +=              \
          $(UNIX_O) $(MODSTUBS_O) \
!         $(OBJS_DIR)/vers.c \
          $(OBJS_DIR)/dtracestubs.s \
!         $(DTRACESTUBS_O) $(DTRACESTUBS) \
!         $(CTFEXTRAOBJS)
  
  CLEANFILES      +=              \
          $(DBOOT_O) $(DBOOT_S)   \
          $(DBOOT_OBJECTS)        \
          $(OBJS_DIR)/bios_call_src.o \
*** 186,196 ****
              $(DTRACESTUBS)
          $(MBH_PATCH) $(UNIX_BIN)
          $(CTFMERGE_UNIQUIFY_AGAINST_GENUNIX)
          $(POST_PROCESS)
  
! $(UNIX_O):      $(OBJECTS) $(OBJS_DIR)/vers.o
          $(LD) -r -o $@ $(OBJECTS) $(OBJS_DIR)/vers.o
  
  $(DBOOT_BIN):   $(DBOOT_OBJS_DIR) $(DBOOT_OBJECTS) dboot/Mapfile.dboot
          $(LD) -dn -e _start -M dboot/Mapfile.dboot \
                  -o $(DBOOT_BIN) $(DBOOT_OBJECTS)
--- 187,197 ----
              $(DTRACESTUBS)
          $(MBH_PATCH) $(UNIX_BIN)
          $(CTFMERGE_UNIQUIFY_AGAINST_GENUNIX)
          $(POST_PROCESS)
  
! $(UNIX_O):      $(OBJECTS) $(CTFEXTRAOBJS)
          $(LD) -r -o $@ $(OBJECTS) $(OBJS_DIR)/vers.o
  
  $(DBOOT_BIN):   $(DBOOT_OBJS_DIR) $(DBOOT_OBJECTS) dboot/Mapfile.dboot
          $(LD) -dn -e _start -M dboot/Mapfile.dboot \
                  -o $(DBOOT_BIN) $(DBOOT_OBJECTS)
*** 203,212 ****
--- 204,217 ----
          $(COMPILE.s) -o $(DBOOT_O) $(DBOOT_S)
  
  $(DBOOT_OBJS_DIR):
          -@mkdir -p $@ 2> /dev/null
  
+ $(OBJS_DIR)/comm_page_ctf.o:    $(UTSBASE)/i86pc/ml/comm_page.s
+         $(COMPILE.c) -_gcc=-xc -D_GENCTF -o $@ $(UTSBASE)/i86pc/ml/comm_page.s
+         $(CTFCONVERT_O)
+ 
  #
  # dboot is built as an intermediate target in dboot.o, so just make
  # dboot.o the dependency here.
  #
  $(MULTIBOOT):   $(DBOOT_O)