Mercurial > unleashed > wips
changeset 20575:e1ed8d6406d3
use /usr/bin/ld.sun instead of /usr/bin/ld
| author | Lauri Tirkkonen <lotheac@iki.fi> |
|---|---|
| date | Mon, 13 May 2019 09:59:03 +0000 |
| parents | 19cbdf529781 |
| children | 76b6299aa623 65bc63cd3d9a |
| files | kernel/mk/defines.mk usr/src/Makefile.master usr/src/cmd/sgs/rtld/Makefile.targ usr/src/cmd/sgs/test/ld/x64/tls/ie/Makefile |
| diffstat | 4 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/kernel/mk/defines.mk Sun May 12 23:14:03 2019 +0000 +++ b/kernel/mk/defines.mk Mon May 13 09:59:03 2019 +0000 @@ -119,7 +119,7 @@ # Programs # CC=/opt/gcc/4.4.4/bin/gcc -LD=/usr/bin/ld +LD=/usr/bin/ld.sun CTFCONVERT=/usr/bin/ctfconvert CTFMERGE=/usr/bin/ctfmerge
--- a/usr/src/Makefile.master Sun May 12 23:14:03 2019 +0000 +++ b/usr/src/Makefile.master Mon May 13 09:59:03 2019 +0000 @@ -598,25 +598,25 @@ sparc_CCC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/g++ $(BASIC_CC_ARGS) sparc_CPP= $(GNUC_ROOT)/bin/cpp sparc_AS= /usr/bin/as -xregsym=no -sparc_LD= /usr/bin/ld +sparc_LD= /usr/bin/ld.sun sparcv9_CC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/gcc $(BASIC_CC_ARGS) sparcv9_CCC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/g++ $(BASIC_CC_ARGS) sparcv9_CPP= $(GNUC_ROOT)/bin/cpp sparcv9_AS= /usr/bin/as -xregsym=no -sparcv9_LD= /usr/bin/ld +sparcv9_LD= /usr/bin/ld.sun i386_CC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/gcc $(BASIC_CC_ARGS) -nodefaultlibs i386_CCC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/g++ $(BASIC_CC_ARGS) i386_CPP= $(GNUC_ROOT)/bin/cpp i386_AS= $(GNUC_ROOT)/bin/gcc $(BASIC_AS_ARGS) -i386_LD= /usr/bin/ld +i386_LD= /usr/bin/ld.sun amd64_CC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/gcc $(BASIC_CC_ARGS) -nodefaultlibs amd64_CCC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/g++ $(BASIC_CC_ARGS) amd64_CPP= $(GNUC_ROOT)/bin/cpp amd64_AS= $(GNUC_ROOT)/bin/gcc $(BASIC_AS_ARGS) -amd64_LD= /usr/bin/ld +amd64_LD= /usr/bin/ld.sun NATIVECC= $($(NATIVE_MACH)_CC) NATIVECCC= $($(NATIVE_MACH)_CCC)
--- a/usr/src/cmd/sgs/rtld/Makefile.targ Sun May 12 23:14:03 2019 +0000 +++ b/usr/src/cmd/sgs/rtld/Makefile.targ Mon May 13 09:59:03 2019 +0000 @@ -64,7 +64,7 @@ $(POST_PROCESS_O) $(RTLD): pics $(PICS) $(CRTS) - $(LD_USE_PROTO)ld -o $@ -dy -G $(DYNFLAGS) $(CRTI) $(PICS) \ + $(LD_USE_PROTO)ld.sun -o $@ -dy -G $(DYNFLAGS) $(CRTI) $(PICS) \ $(LDLIBS) $(CRTN) $(POST_PROCESS_SO)
--- a/usr/src/cmd/sgs/test/ld/x64/tls/ie/Makefile Sun May 12 23:14:03 2019 +0000 +++ b/usr/src/cmd/sgs/test/ld/x64/tls/ie/Makefile Mon May 13 09:59:03 2019 +0000 @@ -15,7 +15,7 @@ CFLAGS = -O1 -m64 -LINK.c = env LD_ALTEXEC=$(PROTO)/usr/bin/amd64/ld $(CC) $(CFLAGS) -o $@ $^ +LINK.c = env LD_ALTEXEC=$(PROTO)/usr/bin/amd64/ld.sun $(CC) $(CFLAGS) -o $@ $^ COMPILE.c = $(CC) $(CFLAGS) -c -o $@ $^ COMPILE.s = $(CC) $(CFLAGS) -c -o $@ $^