diff -ur glibc-2.25/sysdeps/sparc/sparc32/fpu/w_sqrt_compat.S glibc-2.25/sysdeps/sparc/sparc32/fpu/w_sqrt_compat.S
--- glibc-2.25/sysdeps/sparc/sparc32/fpu/w_sqrt_compat.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc32/fpu/w_sqrt_compat.S	2018-01-29 14:16:35.799777589 -0800
@@ -30,7 +30,7 @@
 8:	retl
 	 fsqrtd	%f0, %f0
 1:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG_LEAF(o5, g1)
 	sethi	%gdop_hix22(_LIB_VERSION), %g1
 	xor	%g1, %gdop_lox10(_LIB_VERSION), %g1
diff -ur glibc-2.25/sysdeps/sparc/sparc32/fpu/w_sqrtf_compat.S glibc-2.25/sysdeps/sparc/sparc32/fpu/w_sqrtf_compat.S
--- glibc-2.25/sysdeps/sparc/sparc32/fpu/w_sqrtf_compat.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc32/fpu/w_sqrtf_compat.S	2018-01-29 14:16:35.786777594 -0800
@@ -29,7 +29,7 @@
 8:	retl
 	 fsqrts	%f0, %f0
 1:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG_LEAF(o5, g1)
 	sethi	%gdop_hix22(_LIB_VERSION), %g1
 	xor	%g1, %gdop_lox10(_LIB_VERSION), %g1
diff -ur glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt_compat-vis3.S glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt_compat-vis3.S
--- glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt_compat-vis3.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt_compat-vis3.S	2018-01-29 14:16:36.302777418 -0800
@@ -28,7 +28,7 @@
 8:	retl
 	 fsqrtd	%f0, %f0
 1:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG_LEAF(o5, g1)
 	sethi	%gdop_hix22(_LIB_VERSION), %g1
 	xor	%g1, %gdop_lox10(_LIB_VERSION), %g1
diff -ur glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf_compat-vis3.S glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf_compat-vis3.S
--- glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf_compat-vis3.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf_compat-vis3.S	2018-01-29 14:16:36.329777408 -0800
@@ -27,7 +27,7 @@
 8:	retl
 	 fsqrts	%f0, %f0
 1:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG_LEAF(o5, g1)
 	sethi	%gdop_hix22(_LIB_VERSION), %g1
 	xor	%g1, %gdop_lox10(_LIB_VERSION), %g1
diff -ur glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt_compat.S glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt_compat.S
--- glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt_compat.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt_compat.S	2018-01-29 14:16:36.157777467 -0800
@@ -28,7 +28,7 @@
 8:	retl
 	 fsqrtd	%f0, %f0
 1:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG_LEAF(o5, g1)
 	sethi	%gdop_hix22(_LIB_VERSION), %g1
 	xor	%g1, %gdop_lox10(_LIB_VERSION), %g1
diff -ur glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf_compat.S glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf_compat.S
--- glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf_compat.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf_compat.S	2018-01-29 14:16:36.142777472 -0800
@@ -28,7 +28,7 @@
 8:	retl
 	 fsqrts	%f0, %f0
 1:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG_LEAF(o5, g1)
 	sethi	%gdop_hix22(_LIB_VERSION), %g1
 	xor	%g1, %gdop_lox10(_LIB_VERSION), %g1
diff -ur glibc-2.25/sysdeps/sparc/sparc32/start.S glibc-2.25/sysdeps/sparc/sparc32/start.S
--- glibc-2.25/sysdeps/sparc/sparc32/start.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc32/start.S	2018-01-29 14:16:35.636777645 -0800
@@ -42,7 +42,7 @@
 	.global _start
 	.type _start,#function
 _start:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG(l7)
 #endif
 
@@ -57,7 +57,7 @@
 	add	%sp, 23*4, %o2
 
   /* Load the addresses of the user entry points.  */
-#ifndef SHARED
+#ifndef PIC
 	sethi	%hi(main), %o0
 	sethi	%hi(__libc_csu_init), %o3
 	sethi	%hi(__libc_csu_fini), %o4
diff -ur glibc-2.25/sysdeps/sparc/sparc64/cpu_relax.S glibc-2.25/sysdeps/sparc/sparc64/cpu_relax.S
--- glibc-2.25/sysdeps/sparc/sparc64/cpu_relax.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc64/cpu_relax.S	2018-01-29 14:16:37.084777151 -0800
@@ -36,14 +36,14 @@
 
 ENTRY(__cpu_relax)
 	.type	__cpu_relax, @gnu_indirect_function
-# ifdef SHARED
+# ifdef PIC
 	SETUP_PIC_REG_LEAF(o3, o5)
 # endif
 	set	HWCAP_SPARC_PAUSE, %o1
 	andcc	%o0, %o1, %g0
 	be	1f
 	 nop
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__cpu_relax_pause), %o1
 	xor	%o1, %gdop_lox10(__cpu_relax_pause), %o1
 # else
@@ -52,14 +52,14 @@
 	ba	10f
 	 nop
 1:
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__cpu_relax_generic), %o1
 	xor	%o1, %gdop_lox10(__cpu_relax_generic), %o1
 # else
 	set	__cpu_relax_generic, %o1
 # endif
 10:
-# ifdef SHARED
+# ifdef PIC
 	add	%o3, %o1, %o1
 # endif
 	retl
diff -ur glibc-2.25/sysdeps/sparc/sparc64/fpu/w_sqrt_compat.S glibc-2.25/sysdeps/sparc/sparc64/fpu/w_sqrt_compat.S
--- glibc-2.25/sysdeps/sparc/sparc64/fpu/w_sqrt_compat.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc64/fpu/w_sqrt_compat.S	2018-01-29 14:16:36.746777266 -0800
@@ -26,7 +26,7 @@
 8:	retl
 	 fsqrtd	%f0, %f0
 1:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG_LEAF(o5, g1)
 	sethi	%gdop_hix22(_LIB_VERSION), %g1
 	xor	%g1, %gdop_lox10(_LIB_VERSION), %g1
diff -ur glibc-2.25/sysdeps/sparc/sparc64/fpu/w_sqrtf_compat.S glibc-2.25/sysdeps/sparc/sparc64/fpu/w_sqrtf_compat.S
--- glibc-2.25/sysdeps/sparc/sparc64/fpu/w_sqrtf_compat.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc64/fpu/w_sqrtf_compat.S	2018-01-29 14:16:36.728777272 -0800
@@ -26,7 +26,7 @@
 8:	retl
 	 fsqrts	%f1, %f0
 1:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG_LEAF(o5, g1)
 	sethi	%gdop_hix22(_LIB_VERSION), %g1
 	xor	%g1, %gdop_lox10(_LIB_VERSION), %g1
diff -ur glibc-2.25/sysdeps/sparc/sparc64/multiarch/addmul_1.S glibc-2.25/sysdeps/sparc/sparc64/multiarch/addmul_1.S
--- glibc-2.25/sysdeps/sparc/sparc64/multiarch/addmul_1.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc64/multiarch/addmul_1.S	2018-01-29 14:16:37.240777097 -0800
@@ -22,14 +22,14 @@
 
 ENTRY(__mpn_addmul_1)
 	.type	__mpn_addmul_1, @gnu_indirect_function
-# ifdef SHARED
+# ifdef PIC
 	SETUP_PIC_REG_LEAF(o3, o5)
 # endif
 	set	HWCAP_SPARC_VIS3, %o1
 	andcc	%o0, %o1, %g0
 	be	1f
 	 nop
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mpn_addmul_1_vis3), %o1
 	xor	%o1, %gdop_lox10(__mpn_addmul_1_vis3), %o1
 # else
@@ -38,14 +38,14 @@
 	ba	10f
 	 nop
 1:
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mpn_addmul_1_generic), %o1
 	xor	%o1, %gdop_lox10(__mpn_addmul_1_generic), %o1
 # else
 	set	__mpn_addmul_1_generic, %o1
 # endif
 10:
-# ifdef SHARED
+# ifdef PIC
 	add	%o3, %o1, %o1
 # endif
 	retl
diff -ur glibc-2.25/sysdeps/sparc/sparc64/multiarch/add_n.S glibc-2.25/sysdeps/sparc/sparc64/multiarch/add_n.S
--- glibc-2.25/sysdeps/sparc/sparc64/multiarch/add_n.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc64/multiarch/add_n.S	2018-01-29 14:16:37.381777049 -0800
@@ -22,14 +22,14 @@
 
 ENTRY(__mpn_add_n)
 	.type	__mpn_add_n, @gnu_indirect_function
-# ifdef SHARED
+# ifdef PIC
 	SETUP_PIC_REG_LEAF(o3, o5)
 # endif
 	set	HWCAP_SPARC_VIS3, %o1
 	andcc	%o0, %o1, %g0
 	be	1f
 	 nop
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mpn_add_n_vis3), %o1
 	xor	%o1, %gdop_lox10(__mpn_add_n_vis3), %o1
 # else
@@ -38,14 +38,14 @@
 	ba	10f
 	 nop
 1:
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mpn_add_n_generic), %o1
 	xor	%o1, %gdop_lox10(__mpn_add_n_generic), %o1
 # else
 	set	__mpn_add_n_generic, %o1
 # endif
 10:
-# ifdef SHARED
+# ifdef PIC
 	add	%o3, %o1, %o1
 # endif
 	retl
diff -ur glibc-2.25/sysdeps/sparc/sparc64/multiarch/memcpy.S glibc-2.25/sysdeps/sparc/sparc64/multiarch/memcpy.S
--- glibc-2.25/sysdeps/sparc/sparc64/multiarch/memcpy.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc64/multiarch/memcpy.S	2018-01-29 14:16:37.342777063 -0800
@@ -24,14 +24,14 @@
 	.text
 ENTRY(memcpy)
 	.type	memcpy, @gnu_indirect_function
-# ifdef SHARED
+# ifdef PIC
 	SETUP_PIC_REG_LEAF(o3, o5)
 # endif
 	set	HWCAP_SPARC_CRYPTO, %o1
 	andcc	%o0, %o1, %g0
 	be	1f
 	 andcc	%o0, HWCAP_SPARC_N2, %g0
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__memcpy_niagara4), %o1
 	xor	%o1, %gdop_lox10(__memcpy_niagara4), %o1
 # else
@@ -41,7 +41,7 @@
 	 nop
 1:	be	1f
 	 andcc	%o0, HWCAP_SPARC_BLKINIT, %g0
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__memcpy_niagara2), %o1
 	xor	%o1, %gdop_lox10(__memcpy_niagara2), %o1
 # else
@@ -51,7 +51,7 @@
 	 nop
 1:	be	1f
 	 andcc	%o0, HWCAP_SPARC_ULTRA3, %g0
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__memcpy_niagara1), %o1
 	xor	%o1, %gdop_lox10(__memcpy_niagara1), %o1
 # else
@@ -61,7 +61,7 @@
 	 nop
 1:	be	9f
 	 nop
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__memcpy_ultra3), %o1
 	xor	%o1, %gdop_lox10(__memcpy_ultra3), %o1
 # else
@@ -70,14 +70,14 @@
 	ba	10f
 	 nop
 9:
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__memcpy_ultra1), %o1
 	xor	%o1, %gdop_lox10(__memcpy_ultra1), %o1
 # else
 	set	__memcpy_ultra1, %o1
 # endif
 10:
-# ifdef SHARED
+# ifdef PIC
 	add	%o3, %o1, %o1
 # endif
 	retl
@@ -86,14 +86,14 @@
 
 ENTRY(__mempcpy)
 	.type	__mempcpy, @gnu_indirect_function
-# ifdef SHARED
+# ifdef PIC
 	SETUP_PIC_REG_LEAF(o3, o5)
 # endif
 	set	HWCAP_SPARC_CRYPTO, %o1
 	andcc	%o0, %o1, %g0
 	be	1f
 	 andcc	%o0, HWCAP_SPARC_N2, %g0
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mempcpy_niagara4), %o1
 	xor	%o1, %gdop_lox10(__mempcpy_niagara4), %o1
 # else
@@ -103,7 +103,7 @@
 	 nop
 1:	be	1f
 	 andcc	%o0, HWCAP_SPARC_BLKINIT, %g0
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mempcpy_niagara2), %o1
 	xor	%o1, %gdop_lox10(__mempcpy_niagara2), %o1
 # else
@@ -113,7 +113,7 @@
 	 nop
 1:	be	1f
 	 andcc	%o0, HWCAP_SPARC_ULTRA3, %g0
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mempcpy_niagara1), %o1
 	xor	%o1, %gdop_lox10(__mempcpy_niagara1), %o1
 # else
@@ -123,7 +123,7 @@
 	 nop
 1:	be	9f
 	 nop
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mempcpy_ultra3), %o1
 	xor	%o1, %gdop_lox10(__mempcpy_ultra3), %o1
 # else
@@ -132,14 +132,14 @@
 	ba	10f
 	 nop
 9:
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mempcpy_ultra1), %o1
 	xor	%o1, %gdop_lox10(__mempcpy_ultra1), %o1
 # else
 	set	__mempcpy_ultra1, %o1
 # endif
 10:
-# ifdef SHARED
+# ifdef PIC
 	add	%o3, %o1, %o1
 # endif
 	retl
diff -ur glibc-2.25/sysdeps/sparc/sparc64/multiarch/memset.S glibc-2.25/sysdeps/sparc/sparc64/multiarch/memset.S
--- glibc-2.25/sysdeps/sparc/sparc64/multiarch/memset.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc64/multiarch/memset.S	2018-01-29 14:16:37.250777094 -0800
@@ -24,14 +24,14 @@
 	.text
 ENTRY(memset)
 	.type	memset, @gnu_indirect_function
-# ifdef SHARED
+# ifdef PIC
 	SETUP_PIC_REG_LEAF(o3, o5)
 # endif
 	set	HWCAP_SPARC_CRYPTO, %o1
 	andcc	%o0, %o1, %g0
 	be	1f
 	 andcc	%o0, HWCAP_SPARC_BLKINIT, %g0
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__memset_niagara4), %o1
 	xor	%o1, %gdop_lox10(__memset_niagara4), %o1
 # else
@@ -41,7 +41,7 @@
 	 nop
 1:	be	9f
 	 nop
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__memset_niagara1), %o1
 	xor	%o1, %gdop_lox10(__memset_niagara1), %o1
 # else
@@ -50,14 +50,14 @@
 	ba	10f
 	 nop
 9:
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__memset_ultra1), %o1
 	xor	%o1, %gdop_lox10(__memset_ultra1), %o1
 # else
 	set	__memset_ultra1, %o1
 # endif
 10:
-# ifdef SHARED
+# ifdef PIC
 	add	%o3, %o1, %o1
 # endif
 	retl
@@ -66,14 +66,14 @@
 
 ENTRY(__bzero)
 	.type	bzero, @gnu_indirect_function
-# ifdef SHARED
+# ifdef PIC
 	SETUP_PIC_REG_LEAF(o3, o5)
 # endif
 	set	HWCAP_SPARC_CRYPTO, %o1
 	andcc	%o0, %o1, %g0
 	be	1f
 	 andcc	%o0, HWCAP_SPARC_BLKINIT, %g0
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__bzero_niagara4), %o1
 	xor	%o1, %gdop_lox10(__bzero_niagara4), %o1
 # else
@@ -83,7 +83,7 @@
 	 nop
 1:	be	9f
 	 nop
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__bzero_niagara1), %o1
 	xor	%o1, %gdop_lox10(__bzero_niagara1), %o1
 # else
@@ -92,14 +92,14 @@
 	ba	10f
 	 nop
 9:
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__bzero_ultra1), %o1
 	xor	%o1, %gdop_lox10(__bzero_ultra1), %o1
 # else
 	set	__bzero_ultra1, %o1
 # endif
 10:
-# ifdef SHARED
+# ifdef PIC
 	add	%o3, %o1, %o1
 # endif
 	retl
diff -ur glibc-2.25/sysdeps/sparc/sparc64/multiarch/mul_1.S glibc-2.25/sysdeps/sparc/sparc64/multiarch/mul_1.S
--- glibc-2.25/sysdeps/sparc/sparc64/multiarch/mul_1.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc64/multiarch/mul_1.S	2018-01-29 14:16:37.388777047 -0800
@@ -22,14 +22,14 @@
 
 ENTRY(__mpn_mul_1)
 	.type	__mpn_mul_1, @gnu_indirect_function
-# ifdef SHARED
+# ifdef PIC
 	SETUP_PIC_REG_LEAF(o3, o5)
 # endif
 	set	HWCAP_SPARC_VIS3, %o1
 	andcc	%o0, %o1, %g0
 	be	1f
 	 nop
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mpn_mul_1_vis3), %o1
 	xor	%o1, %gdop_lox10(__mpn_mul_1_vis3), %o1
 # else
@@ -38,14 +38,14 @@
 	ba	10f
 	 nop
 1:
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mpn_mul_1_generic), %o1
 	xor	%o1, %gdop_lox10(__mpn_mul_1_generic), %o1
 # else
 	set	__mpn_mul_1_generic, %o1
 # endif
 10:
-# ifdef SHARED
+# ifdef PIC
 	add	%o3, %o1, %o1
 # endif
 	retl
diff -ur glibc-2.25/sysdeps/sparc/sparc64/multiarch/submul_1.S glibc-2.25/sysdeps/sparc/sparc64/multiarch/submul_1.S
--- glibc-2.25/sysdeps/sparc/sparc64/multiarch/submul_1.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc64/multiarch/submul_1.S	2018-01-29 14:16:37.233777100 -0800
@@ -22,14 +22,14 @@
 
 ENTRY(__mpn_submul_1)
 	.type	__mpn_submul_1, @gnu_indirect_function
-# ifdef SHARED
+# ifdef PIC
 	SETUP_PIC_REG_LEAF(o3, o5)
 # endif
 	set	HWCAP_SPARC_VIS3, %o1
 	andcc	%o0, %o1, %g0
 	be	1f
 	 nop
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mpn_submul_1_vis3), %o1
 	xor	%o1, %gdop_lox10(__mpn_submul_1_vis3), %o1
 # else
@@ -38,14 +38,14 @@
 	ba	10f
 	 nop
 1:
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mpn_submul_1_generic), %o1
 	xor	%o1, %gdop_lox10(__mpn_submul_1_generic), %o1
 # else
 	set	__mpn_submul_1_generic, %o1
 # endif
 10:
-# ifdef SHARED
+# ifdef PIC
 	add	%o3, %o1, %o1
 # endif
 	retl
diff -ur glibc-2.25/sysdeps/sparc/sparc64/multiarch/sub_n.S glibc-2.25/sysdeps/sparc/sparc64/multiarch/sub_n.S
--- glibc-2.25/sysdeps/sparc/sparc64/multiarch/sub_n.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc64/multiarch/sub_n.S	2018-01-29 14:16:37.182777117 -0800
@@ -22,14 +22,14 @@
 
 ENTRY(__mpn_sub_n)
 	.type	__mpn_sub_n, @gnu_indirect_function
-# ifdef SHARED
+# ifdef PIC
 	SETUP_PIC_REG_LEAF(o3, o5)
 # endif
 	set	HWCAP_SPARC_VIS3, %o1
 	andcc	%o0, %o1, %g0
 	be	1f
 	 nop
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mpn_sub_n_vis3), %o1
 	xor	%o1, %gdop_lox10(__mpn_sub_n_vis3), %o1
 # else
@@ -38,14 +38,14 @@
 	ba	10f
 	 nop
 1:
-# ifdef SHARED
+# ifdef PIC
 	sethi	%gdop_hix22(__mpn_sub_n_generic), %o1
 	xor	%o1, %gdop_lox10(__mpn_sub_n_generic), %o1
 # else
 	set	__mpn_sub_n_generic, %o1
 # endif
 10:
-# ifdef SHARED
+# ifdef PIC
 	add	%o3, %o1, %o1
 # endif
 	retl
diff -ur glibc-2.25/sysdeps/sparc/sparc64/start.S glibc-2.25/sysdeps/sparc/sparc64/start.S
--- glibc-2.25/sysdeps/sparc/sparc64/start.S	2017-02-05 07:28:43.000000000 -0800
+++ glibc-2.25/sysdeps/sparc/sparc64/start.S	2018-01-29 14:16:36.576777324 -0800
@@ -42,7 +42,7 @@
 	.global _start
 	.type _start,#function
 _start:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG(l7)
 #endif
 
@@ -58,7 +58,7 @@
 	add	%sp, STACK_BIAS+23*8, %o2
 
   /* Load the addresses of the user entry points.  */
-#ifndef SHARED
+#ifndef PIC
 	sethi	%hi(main), %o0
 	sethi	%hi(__libc_csu_init), %o3
 	sethi	%hi(__libc_csu_fini), %o4