diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-09-09 11:26:45 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-09-09 11:26:45 +0000 |
| commit | b36aca9fee0db2b4336b9f6ee7835a8f3fbfe9c9 (patch) | |
| tree | 029c95d18101ff3839ddd942d4ed90ff16fd8fe7 /usr/src/cmd/sgs/rtld | |
| parent | 1cc204b97b9317e681958da0e91abeb27bcc6f82 (diff) | |
| parent | 793ac993be490bb7c16673e5f2588c6d18672894 (diff) | |
| download | illumos-joyent-b36aca9fee0db2b4336b9f6ee7835a8f3fbfe9c9.tar.gz | |
[illumos-gate merge]
commit 793ac993be490bb7c16673e5f2588c6d18672894
11654 libipmi/Makefile.com has an invalid and unused variable substitution
commit d8109ce4330e1b8ad6c29f9fccacec969066bb9d
11653 tools/make/bin/Makefile has an invalid and unused variable substitution
commit bdf3516c67ac96d42da6a8adc5bf9a0a5b72b060
11652 Remove unused archive library rules from cmd/sgs
commit 2b1ff28bbd88f04a83e6ca2d284eb7be0959c43c
11647 6026 regressed after 5980
commit 21ec5af72097881ccdcd81ebfd26e1c85b609ad6
11662 nss_ldap: group members are not comma separated
commit aa5636e518a7c706134caf5072a16f9f85f7497a
11633 SPARC NULL pointer errors in libprtdiag_psr
commit 3f8c0768c028803de6022c542bbd9e9e6f08289f
11632 SPARC NULL pointer error in libtsalarm
commit 53bfe442a2e3c2938be0ac7b2b05d096689c2ea6
11631 SPARC NULL pointer error in libds
commit 9cb0a1d4446fe891a01d01e07b2e27f0177c84cd
11630 remove checks for 64-bit capable hardware
commit 95bfa623bf6336d9476ba272ebda6e2c2a305e6f
10852 libficl-sys: implement loader emulator commands with linker set
commit 90ce8b937724b0472efa92ca9911002383cf25a2
10851 want sys/linker_set.h
commit bfa93d3911fd4856c353c9b190c18cdb98fc36b4
11610 PCI ID ambiguity leads to driver induced mayhem
11611 pchtemp driver should use new IPD 9 aliases
commit 96fc3fdf646c403f7896ecd3e9657d0474025bba
11617 esc fails with /usr/bin/cpp present
commit 5711d3938643272e5ca2aaf5d868e612e7bc97b6
11640 add zpool ashift property tunable
commit 2c54ade085d70dd5a2914f0fa5cf7fe208cd36a6
11603 smbadm has wrong exit code while listing SMB group properties
commit 69b1fd3f24d0ee2e682883606201c61f52085805
11461 should use a native link-editor during the build
11463 SUNWonld has passed its use-by date
11464 cmd/sgs/tools should contain tools, not common code
11465 sgsmsg should be built with the rest of the build tools
commit d58ceae2ed78dc65ab682a0281ce523d6c4116fe
11646 fbt entry probes incorrectly placed due to -fshrink-wrap
Conflicts:
usr/src/uts/Makefile.uts
Diffstat (limited to 'usr/src/cmd/sgs/rtld')
| -rw-r--r-- | usr/src/cmd/sgs/rtld/Makefile.com | 22 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/Makefile.targ | 6 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/mdbmod/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/sparcv9/Makefile | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com index fbdede2a9e..6a767de04b 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.com +++ b/usr/src/cmd/sgs/rtld/Makefile.com @@ -29,13 +29,13 @@ RTLD= ld.so.1 AVLOBJ= avl.o DTROBJ= dtrace_data.o -TOOLOBJS= alist.o strhash.o +SGSCOMMONOBJ= alist.o strhash.o BLTOBJ= msg.o ELFCAPOBJ= elfcap.o OBJECTS= $(BLTOBJ) \ $(AVLOBJ) \ $(DTROBJ) \ - $(TOOLOBJS) \ + $(SGSCOMMONOBJ) \ $(ELFCAPOBJ) \ $(P_ASOBJS) $(P_COMOBJS) $(P_MACHOBJS) $(G_MACHOBJS) \ $(S_ASOBJS) $(S_COMOBJS) $(S_MACHOBJS) $(CP_MACHOBJS) @@ -75,10 +75,10 @@ ROOTDYNLIB64= $(RTLD:%=$(ROOTFS_LIBDIR64)/%) FILEMODE = 755 -CPPFLAGS += -I$(SRCBASE)/lib/libc/inc \ - -I$(SRCBASE)/uts/common/krtld \ - -I$(SRCBASE)/uts/$(PLAT) \ - -I$(SRCBASE)/uts/$(PLAT)/krtld \ +CPPFLAGS += -I$(SRC)/lib/libc/inc \ + -I$(SRC)/uts/common/krtld \ + -I$(SRC)/uts/$(PLAT) \ + -I$(SRC)/uts/$(PLAT)/krtld \ -I$(SRC)/common/sgsrtcid \ -I$(ELFCAP) \ $(CPPFEATUREMACROS) @@ -101,11 +101,11 @@ CPICLIB = $(VAR_RTLD_CPICLIB) CPICLIB64 = $(VAR_RTLD_CPICLIB64) CLIB = -lc_pic -LDLIBS += $(CONVLIBDIR) $(CONV_LIB) \ +LDLIBS += $(CONVLIBDIR) -lconv \ $(CPICLIB) $(CLIB) \ - $(LDDBGLIBDIR) $(LDDBG_LIB) \ + $(LDDBGLIBDIR) -llddbg \ $(RTLDLIB) -lrtld \ - $(LDLIB) $(LD_LIB) + $(LDLIB) -lld DYNFLAGS += -i -e _rt_boot $(VERSREF) $(ZNODLOPEN) \ $(ZINTERPOSE) -zdtrace=dtrace_data '-R$$ORIGIN' @@ -138,9 +138,9 @@ SGSMSGFLAGS2= $(SGSMSGFLAGS) -h $(BLTDEFS) -d $(BLTDATA) -n rtld_msg SRCS= $(AVLOBJ:%.o=$(VAR_AVLDIR)/%.c) \ $(DTROBJ:%.o=$(VAR_DTRDIR)/%.c) \ - $(TOOLOBJS:%.o=$(SGSTOOLS)/common/%.c) \ + $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c) \ $(COMOBJS:%.o=../common/%.c) $(MACHOBJS:%.o=%.c) $(BLTDATA) \ - $(G_MACHOBJS:%.o=$(SRCBASE)/uts/$(PLAT)/krtld/%.c) \ + $(G_MACHOBJS:%.o=$(SRC)/uts/$(PLAT)/krtld/%.c) \ $(CP_MACHOBJS:%.o=../$(MACH)/%.c) \ $(ASOBJS:%.o=%.s) diff --git a/usr/src/cmd/sgs/rtld/Makefile.targ b/usr/src/cmd/sgs/rtld/Makefile.targ index 6ea1a29e6d..ff2ccf9864 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.targ +++ b/usr/src/cmd/sgs/rtld/Makefile.targ @@ -58,11 +58,11 @@ pics/%.o: $(VAR_DTRDIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -pics/%.o: $(SGSTOOLS)/common/%.c +pics/%.o: $(SGSCOMMON)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -pics/%.o: $(SRCBASE)/uts/$(PLAT)/krtld/%.c +pics/%.o: $(SRC)/uts/$(PLAT)/krtld/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) @@ -71,7 +71,7 @@ pics/elfcap.o: $(ELFCAP)/elfcap.c $(POST_PROCESS_O) $(RTLD): pics $(PICS) $(CRTS) - $(LD_USE_PROTO)ld -o $@ -dy -G $(DYNFLAGS) $(CRTI) $(PICS) \ + $(LD) -o $@ -dy -G $(DYNFLAGS) $(CRTI) $(PICS) \ $(LDLIBS) $(CRTN) $(POST_PROCESS_SO) diff --git a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com index e7cfe1137f..4f654ba8c4 100644 --- a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com +++ b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com @@ -66,7 +66,7 @@ CPPFLAGS += -I. -I../common -I../../common -I../../../include \ -I$(SRC)/uts/$(ARCH)/sys DYNFLAGS += $(VERSREF) -LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -lc +LDLIBS += $(CONVLIBDIR) -lconv -lc ROOTMDBLIB= $(ROOT)/usr/lib/mdb/proc ROOTMDBLIB64= $(ROOTMDBLIB)/$(MACH64) diff --git a/usr/src/cmd/sgs/rtld/sparc/Makefile b/usr/src/cmd/sgs/rtld/sparc/Makefile index 4c60c5c8d6..d63f57b13a 100644 --- a/usr/src/cmd/sgs/rtld/sparc/Makefile +++ b/usr/src/cmd/sgs/rtld/sparc/Makefile @@ -53,7 +53,7 @@ CRTI= pics/crti.o CRTN= pics/crtn.o CRTS= $(CRTI) $(CRTN) -CHKSRCS= $(SRCBASE)/uts/common/krtld/reloc.h +CHKSRCS= $(SRC)/uts/common/krtld/reloc.h BASEPLAT = sparc diff --git a/usr/src/cmd/sgs/rtld/sparcv9/Makefile b/usr/src/cmd/sgs/rtld/sparcv9/Makefile index d351ee66da..87593bc6d2 100644 --- a/usr/src/cmd/sgs/rtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/rtld/sparcv9/Makefile @@ -52,7 +52,7 @@ CRTI= pics/crti.o CRTN= pics/crtn.o CRTS= $(CRTI) $(CRTN) -CHKSRCS= $(SRCBASE)/uts/common/krtld/reloc.h +CHKSRCS= $(SRC)/uts/common/krtld/reloc.h BASEPLAT = sparc |