diff options
| author | Peter Tribble <peter.tribble@gmail.com> | 2019-05-31 20:55:57 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2019-06-06 20:25:36 +0000 |
| commit | e32fc5b22ae6b7fc68456ddf6ca2c9abe50d8485 (patch) | |
| tree | 8cfe124d3cac6bfd09c9bee675dcf0767e9d4b96 | |
| parent | 96dd34fce4380f5569e21176b9b310b458e5fb13 (diff) | |
| download | illumos-joyent-e32fc5b22ae6b7fc68456ddf6ca2c9abe50d8485.tar.gz | |
11097 SPARC needs some instances of POST_PROCESS_O to be POST_PROCESS_S_O
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Norm Jacobs <naj@snapcon.com>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| -rw-r--r-- | usr/src/lib/libc/sparc/Makefile.com | 3 | ||||
| -rw-r--r-- | usr/src/lib/libc/sparcv9/Makefile.com | 3 | ||||
| -rw-r--r-- | usr/src/lib/libmd/Makefile.targ | 3 | ||||
| -rw-r--r-- | usr/src/lib/libsys/Makefile.targ | 3 | ||||
| -rw-r--r-- | usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.targ | 7 |
5 files changed, 12 insertions, 7 deletions
diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com index 3592065b7a..d70057964b 100644 --- a/usr/src/lib/libc/sparc/Makefile.com +++ b/usr/src/lib/libc/sparc/Makefile.com @@ -26,6 +26,7 @@ # Copyright 2013 Garrett D'Amore <garrett@damore.org> # Copyright 2018 Nexenta Systems, Inc. # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2019 Peter Tribble. # LIBCDIR= $(SRC)/lib/libc @@ -1330,7 +1331,7 @@ $(LIB_PIC): pics $$(PICS) # special cases $(STRETS:%=pics/%): $(LIBCBASE)/crt/stret.s $(AS) $(ASFLAGS) -DSTRET$(@F:stret%.o=%) $(LIBCBASE)/crt/stret.s -o $@ - $(POST_PROCESS_O) + $(POST_PROCESS_S_O) $(LIBCBASE)/crt/_rtbootld.s: $(LIBCBASE)/crt/_rtboot.s $(LIBCBASE)/crt/_rtld.c $(CC) $(CPPFLAGS) $(CTF_FLAGS) -O -S $(C_PICFLAGS) \ diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com index 32fc434b32..c295d8d68f 100644 --- a/usr/src/lib/libc/sparcv9/Makefile.com +++ b/usr/src/lib/libc/sparcv9/Makefile.com @@ -27,6 +27,7 @@ # Copyright 2013 Garrett D'Amore <garrett@damore.org> # Copyright 2018 Nexenta Systems, Inc. # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2019 Peter Tribble. # LIBCDIR= $(SRC)/lib/libc @@ -1253,7 +1254,7 @@ $(LIB_PIC): pics $$(PICS) # special cases #$(STRETS:%=pics/%): crt/stret.s # $(AS) $(ASFLAGS) -DSTRET$(@F:stret%.o=%) crt/stret.s -o $@ -# $(POST_PROCESS_O) +# $(POST_PROCESS_S_O) #crt/_rtbootld.s: crt/_rtboot.s crt/_rtld.c # $(CC) $(CPPFLAGS) -O -S -K pic crt/_rtld.c -o crt/_rtld.s diff --git a/usr/src/lib/libmd/Makefile.targ b/usr/src/lib/libmd/Makefile.targ index fadc3d71ad..f15dc83396 100644 --- a/usr/src/lib/libmd/Makefile.targ +++ b/usr/src/lib/libmd/Makefile.targ @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2013 Saso Kiselkov. All rights reserved. +# Copyright 2019 Peter Tribble. # COMDIR = $(SRC)/common/crypto @@ -45,7 +46,7 @@ pics/%.o: $(COMDIR)/sha1/%.c pics/sha1_asm.o: $(COMDIR)/sha1/sparc/$(PLATFORM)/sha1_asm.s $(COMPILE.s) -o pics/sha1_asm.o \ $(COMDIR)/sha1/sparc/$(PLATFORM)/sha1_asm.s - $(POST_PROCESS_O) + $(POST_PROCESS_S_O) pics/%.o: $(COMDIR)/sha2/%.c $(COMPILE.c) -I$(COMDIR)/sha2 -o $@ $< diff --git a/usr/src/lib/libsys/Makefile.targ b/usr/src/lib/libsys/Makefile.targ index 9738a9b9b6..e025958f2f 100644 --- a/usr/src/lib/libsys/Makefile.targ +++ b/usr/src/lib/libsys/Makefile.targ @@ -21,6 +21,7 @@ # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2019 Peter Tribble. # BUILD.SO += $(PICS) @@ -35,4 +36,4 @@ pics/%.o := ASFLAGS += $(AS_PICFLAGS) pics/%.o: %.s $(COMPILE.s) -o $@ $< - $(POST_PROCESS_O) + $(POST_PROCESS_S_O) diff --git a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.targ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.targ index 422f5f8c17..f28bd2db00 100644 --- a/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.targ +++ b/usr/src/lib/pkcs11/libsoftcrypto/capabilities/sun4u/Makefile.targ @@ -21,18 +21,19 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 Peter Tribble. # include ../../Makefile.targ pics/aes_crypt_asm.o: $(AES_DIR)/sun4u/aes_crypt_asm.s $(COMPILE.s) -o $@ $(AES_DIR)/sun4u/aes_crypt_asm.s - $(POST_PROCESS_O) + $(POST_PROCESS_S_O) pics/arcfour_crypt_asm.o: $(ARCFOUR_DIR)/sun4u/arcfour_crypt_asm.s $(COMPILE.s) -o $@ $(ARCFOUR_DIR)/sun4u/arcfour_crypt_asm.s - $(POST_PROCESS_O) + $(POST_PROCESS_S_O) pics/des_crypt_asm.o: $(DES_DIR)/sun4u/des_crypt_asm.s $(COMPILE.s) -o $@ $(DES_DIR)/sun4u/des_crypt_asm.s - $(POST_PROCESS_O) + $(POST_PROCESS_S_O) |