Per suggestion from Stefan Allius, change DO_MPROTECT_HACKS to

the more clear FORCE_SHAREABLE_TEXT_SEGMENTS.

ldso/ldso/dl-elf.c

@@ -573,7 +573,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 	   back again later. */
 
 	if (dynamic_info[DT_TEXTREL]) {
-#ifdef DO_MPROTECT_HACKS
+#ifdef FORCE_SHAREABLE_TEXT_SEGMENTS
 		ppnt = (elf_phdr *)(intptr_t) & header[epnt->e_phoff];
 		for (i = 0; i < epnt->e_phnum; i++, ppnt++) {
 			if (ppnt->p_type == PT_LOAD && !(ppnt->p_flags & PF_W))

ldso/ldso/ldso.c

@@ -32,7 +32,7 @@
 
 /* Enable mprotect protection munging.  ARM and MIPS Linux needs this
  * it seems, so leave this enabled by default */
-#define DO_MPROTECT_HACKS
+#define FORCE_SHAREABLE_TEXT_SEGMENTS
 
 // Support a list of library preloads in /etc/ld.so.preload
 //#define SUPPORT_LDSO_PRELOAD_FILE
@@ -434,7 +434,7 @@ LD_BOOT(unsigned long args)
 					}
 					app_tpnt->dynamic_info[dpnt->d_tag] = dpnt->d_un.d_val;
 					if (dpnt->d_tag == DT_DEBUG)
-#ifndef DO_MPROTECT_HACKS
+#ifndef FORCE_SHAREABLE_TEXT_SEGMENTS
 						dpnt->d_un.d_val = (unsigned long) debug_addr;
 #else
 						dpnt_debug = dpnt;
@@ -455,7 +455,7 @@ LD_BOOT(unsigned long args)
 	tpnt->elf_buckets = hash_addr;
 	hash_addr += tpnt->nbucket;
 
-#ifdef DO_MPROTECT_HACKS
+#ifdef FORCE_SHAREABLE_TEXT_SEGMENTS
 	/* Ugly, ugly.  We need to call mprotect to change the protection of
 	   the text pages so that we can do the dynamic linking.  We can set the
 	   protection back again once we are done */
@@ -1186,7 +1186,7 @@ static void _dl_get_ready_to_run(struct elf_resolve *tpnt, struct elf_resolve *a
 		*_dl_envp = (unsigned long) envp;
 	}
 
-#ifdef DO_MPROTECT_HACKS
+#ifdef FORCE_SHAREABLE_TEXT_SEGMENTS
 	{
 		unsigned int j;
 		elf_phdr *myppnt;

ldso/ldso/readelflib1.c

@@ -573,7 +573,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 	   back again later. */
 
 	if (dynamic_info[DT_TEXTREL]) {
-#ifdef DO_MPROTECT_HACKS
+#ifdef FORCE_SHAREABLE_TEXT_SEGMENTS
 		ppnt = (elf_phdr *)(intptr_t) & header[epnt->e_phoff];
 		for (i = 0; i < epnt->e_phnum; i++, ppnt++) {
 			if (ppnt->p_type == PT_LOAD && !(ppnt->p_flags & PF_W))