diff options
| author | Patrick Mooney <pmooney@pfmooney.com> | 2016-08-18 19:31:54 +0000 |
|---|---|---|
| committer | Patrick Mooney <pmooney@pfmooney.com> | 2016-08-25 01:08:07 +0000 |
| commit | c89aa2cda9c4c5a89db5c7b85f420548cd437c12 (patch) | |
| tree | 0c7e524bb7e43d6c9da98baafb5b356637f5dba4 /usr/src | |
| parent | 0c8abfcb7a94e2016322218587cc80b4bd710642 (diff) | |
| download | illumos-joyent-c89aa2cda9c4c5a89db5c7b85f420548cd437c12.tar.gz | |
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>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/i86pc/ml/comm_page.s | 6 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/unix/Makefile | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/usr/src/uts/i86pc/ml/comm_page.s b/usr/src/uts/i86pc/ml/comm_page.s index 7ff803ea93..49d39397bf 100644 --- a/usr/src/uts/i86pc/ml/comm_page.s +++ b/usr/src/uts/i86pc/ml/comm_page.s @@ -20,7 +20,7 @@ #include <sys/comm_page.h> #include <sys/tsc.h> -#if defined(__lint) +#if defined(_GENCTF) || defined(__lint) hrtime_t tsc_last; hrtime_t tsc_resume_cap; @@ -37,7 +37,7 @@ hrtime_t tsc_sync_tick_delta[NCPU]; comm_page_t comm_page; -#else /* defined(__lint) */ +#else /* defined(_GENCTF) || defined(__lint) */ #include "assym.h" @@ -85,4 +85,4 @@ comm_page_t comm_page; /* pad out the rest of the page from the struct end */ .fill _CONST(COMM_PAGE_SIZE - COMM_PAGE_S_SIZE), 1, 0 -#endif /* defined(__lint) */ +#endif /* defined(_GENCTF) || defined(__lint) */ diff --git a/usr/src/uts/i86pc/unix/Makefile b/usr/src/uts/i86pc/unix/Makefile index 6fcd879327..2b3eeb8c8b 100644 --- a/usr/src/uts/i86pc/unix/Makefile +++ b/usr/src/uts/i86pc/unix/Makefile @@ -65,7 +65,7 @@ GENUNIX_DIR = ../../intel/$(GENUNIX) LIBOPTS = -L $(GENUNIX_DIR)/$(OBJS_DIR) -l $(GENUNIX) -CTFEXTRAOBJS = $(OBJS_DIR)/vers.o +CTFEXTRAOBJS = $(OBJS_DIR)/vers.o $(OBJS_DIR)/comm_page_ctf.o DBOOT_OBJS_DIR = dboot/$(OBJS_DIR) DBOOT_OBJECTS = $(DBOOT_OBJS:%=$(DBOOT_OBJS_DIR)/%) @@ -98,9 +98,10 @@ UNIX_DIR = . # CLEANFILES += \ $(UNIX_O) $(MODSTUBS_O) \ - $(OBJS_DIR)/vers.c $(OBJS_DIR)/vers.o \ + $(OBJS_DIR)/vers.c \ $(OBJS_DIR)/dtracestubs.s \ - $(DTRACESTUBS_O) $(DTRACESTUBS) + $(DTRACESTUBS_O) $(DTRACESTUBS) \ + $(CTFEXTRAOBJS) CLEANFILES += \ $(DBOOT_O) $(DBOOT_S) \ @@ -189,7 +190,7 @@ $(UNIX_BIN): $(UNIX_O) $(MODSTUBS_O) $(MAPFILE_NAME) \ $(CTFMERGE_UNIQUIFY_AGAINST_GENUNIX) $(POST_PROCESS) -$(UNIX_O): $(OBJECTS) $(OBJS_DIR)/vers.o +$(UNIX_O): $(OBJECTS) $(CTFEXTRAOBJS) $(LD) -r -o $@ $(OBJECTS) $(OBJS_DIR)/vers.o $(DBOOT_BIN): $(DBOOT_OBJS_DIR) $(DBOOT_OBJECTS) dboot/Mapfile.dboot @@ -206,6 +207,10 @@ $(DBOOT_O): $(DBOOT_BIN) $(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. |