diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2018-02-11 21:47:18 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2018-10-11 22:43:46 +0000 |
| commit | e1bf37b1abeb6653a6e35e2bd6924131cced1efe (patch) | |
| tree | e9a3d8a4d258db31c91c111dcede64a011e4055d /usr/src/cmd | |
| parent | a5d83f5b2c771c419ad216ce0358fbeee032fc32 (diff) | |
| download | illumos-joyent-e1bf37b1abeb6653a6e35e2bd6924131cced1efe.tar.gz | |
9884 cw(1) should use -fpic rather than -Kpic
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Andy Stormont <andyjstormont@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/sgs/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/sparcv9/Makefile | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr/src/cmd/sgs/Makefile.com b/usr/src/cmd/sgs/Makefile.com index 6964761a4e..9230fd96de 100644 --- a/usr/src/cmd/sgs/Makefile.com +++ b/usr/src/cmd/sgs/Makefile.com @@ -66,8 +66,8 @@ CPPFLAGS = -I. -I../common -I../../include -I../../include/$(MACH) \ $(CPPFLAGS.master) -I$(ELFCAP) # PICS64 is unique to our environment -$(PICS64) := sparc_CFLAGS += -xregs=no%appl -K pic -$(PICS64) := sparcv9_CFLAGS += -xregs=no%appl -K pic +$(PICS64) := sparc_CFLAGS += -xregs=no%appl $(C_PICFLAGS) +$(PICS64) := sparcv9_CFLAGS += -xregs=no%appl $(C_PICFLAGS) $(PICS64) := CPPFLAGS += -DPIC -D_REENTRANT LDFLAGS += $(ZIGNORE) diff --git a/usr/src/cmd/sgs/rtld/sparc/Makefile b/usr/src/cmd/sgs/rtld/sparc/Makefile index d2630c52db..d3af26fc0b 100644 --- a/usr/src/cmd/sgs/rtld/sparc/Makefile +++ b/usr/src/cmd/sgs/rtld/sparc/Makefile @@ -68,7 +68,7 @@ include $(SRC)/cmd/sgs/rtld/Makefile.com CPPFLAGS += -I../../../../uts/sparc/krtld -DA_OUT CFLAGS += -xregs=no%appl -ASFLAGS += -K pic +ASFLAGS += $(AS_PICFLAGS) LINTFLAGS += -DA_OUT ADBGENCFLAGS += -erroff=%all ADBGENFLAGS += -milp32 diff --git a/usr/src/cmd/sgs/rtld/sparcv9/Makefile b/usr/src/cmd/sgs/rtld/sparcv9/Makefile index 0093a7b86e..d9863462a7 100644 --- a/usr/src/cmd/sgs/rtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/rtld/sparcv9/Makefile @@ -40,11 +40,11 @@ P_MACHOBJS= sparc_elf.o _setup.o CP_MACHOBJS= common_sparc.o -S_MACHOBJS= +S_MACHOBJS= P_ASOBJS= boot.o boot_elf.o caller.o -S_ASOBJS= +S_ASOBJS= CRTSRCS= ../../../../lib/crt/sparc CRTI= pics/crti.o @@ -68,7 +68,7 @@ include $(SRC)/lib/Makefile.lib.64 CPPFLAGS += -I../../../../uts/sparc/krtld CFLAGS += -xregs=no%appl -ASFLAGS += -s -K pic -D__sparcv9 -D_ELF64 $(sparcv9_XARCH) +ASFLAGS += -s $(AS_PICFLAGS) -D__sparcv9 -D_ELF64 $(sparcv9_XARCH) ADBGENFLAGS += -mlp64 ADBGENCFLAGS += -erroff=%all ADBSUB= $(ADBSUB64) |