14877 remove support for the old process model from sgs

Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Approved by: Garrett D'Amore <garrett@damore.org>

5 files changed, 0 insertions, 76 deletions

diff --git a/usr/src/cmd/sgs/crle/common/config.c b/usr/src/cmd/sgs/crle/common/config.c
index 7a4dde9108..2d3ae4d839 100644
--- a/usr/src/cmd/sgs/crle/common/config.c
+++ b/usr/src/cmd/sgs/crle/common/config.c
@@ -259,9 +259,7 @@ genconfig(Crle_desc *crle)
 	head->ch_cnflags |= RTC_HDR_64;
 #endif
 
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 	head->ch_cnflags |= RTC_HDR_UPM;
-#endif
 	/*
 	 * If we have a hash table then there are directory and file entries
 	 * to process.
diff --git a/usr/src/cmd/sgs/crle/common/crle.msg b/usr/src/cmd/sgs/crle/common/crle.msg
index 6c9c0e999a..e3de3ab3fa 100644
--- a/usr/src/cmd/sgs/crle/common/crle.msg
+++ b/usr/src/cmd/sgs/crle/common/crle.msg
@@ -143,28 +143,18 @@
 
 @ MSG_DEF_NEWDLP	"  Default Library Path (ELF):\t/lib:/usr/lib  \
 			 (system default)\n"
-@ MSG_DEF_OLDDLP	"  Default Library Path (ELF):\t/usr/lib  \
-			 (system default)\n"
 @ MSG_DEF_NEWTD		"  Trusted Directories (ELF):\t\
 			 /lib/secure:/usr/lib/secure  (system default)\n"
-@ MSG_DEF_OLDTD		"  Trusted Directories (ELF):\t/usr/lib/secure  \
-			 (system default)\n"
 @ MSG_DEF_NEWDLP_64	"  Default Library Path (ELF):\t/lib/64:/usr/lib/64  \
 			 (system default)\n"
-@ MSG_DEF_OLDDLP_64	"  Default Library Path (ELF):\t/usr/lib/64  \
-			 (system default)\n"
 @ MSG_DEF_NEWTD_64	"  Trusted Directories (ELF):\t\
 			 /lib/secure/64:/usr/lib/secure/64  (system default)\n"
-@ MSG_DEF_OLDTD_64	"  Trusted Directories (ELF):\t\
-			 /usr/lib/secure/64  (system default)\n"
 
 @ MSG_DEF_AOUTDLP	"  Default Library Path (AOUT):\t\
 			 /usr/lib:/usr/local/lib  \
 			 (system default)\n"
 @ MSG_DEF_AOUTNEWTD	"  Trusted Directories (AOUT):\t\
 			 /lib/secure:/usr/lib/secure  (system default)\n"
-@ MSG_DEF_AOUTOLDTD	"  Trusted Directories (AOUT):\t\/usr/lib/secure  \
-			 (system default)\n"
 
 @ MSG_ENV_TITLE		"\nEnvironment Variables:\n"
 @ MSG_ENV_RPL		"  %s  (replaceable)\n"
diff --git a/usr/src/cmd/sgs/crle/common/print.c b/usr/src/cmd/sgs/crle/common/print.c
index fe3e0ada96..a614c2988e 100644
--- a/usr/src/cmd/sgs/crle/common/print.c
+++ b/usr/src/cmd/sgs/crle/common/print.c
@@ -138,34 +138,18 @@ fablib(Crle_desc * crle, int flag)
 	switch (flag) {
 	case CRLE_EDLIB:
 #if M_CLASS == ELFCLASS64
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 		path = MSG_ORIG(MSG_PTH_NEWDLP_64);
 #else
-		path = MSG_ORIG(MSG_PTH_OLDDLP_64);
-#endif
-#else
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 		path = MSG_ORIG(MSG_PTH_NEWDLP);
-#else
-		path = MSG_ORIG(MSG_PTH_OLDDLP);
-#endif
 #endif
 		list = &crle->c_edlibpath;
 		break;
 
 	case CRLE_ESLIB:
 #if M_CLASS == ELFCLASS64
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 		path = MSG_ORIG(MSG_PTH_NEWTD_64);
 #else
-		path = MSG_ORIG(MSG_PTH_OLDTD_64);
-#endif
-#else
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 		path = MSG_ORIG(MSG_PTH_NEWTD);
-#else
-		path = MSG_ORIG(MSG_PTH_OLDTD);
-#endif
 #endif
 		list = &crle->c_eslibpath;
 		break;
@@ -176,11 +160,7 @@ fablib(Crle_desc * crle, int flag)
 		break;
 
 	case CRLE_ASLIB:
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 		path = MSG_ORIG(MSG_PTH_NEWTD);
-#else
-		path = MSG_ORIG(MSG_PTH_OLDTD);
-#endif
 		list = &crle->c_aslibpath;
 		break;
 
@@ -464,7 +444,6 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
 		if (crle->c_flags & CRLE_UPDATE) {
 			crle->c_flags &= ~CRLE_AOUT;
 
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 			if ((head->ch_cnflags & RTC_HDR_UPM) == 0) {
 				if (head->ch_cnflags & RTC_HDR_64)
 					str = conv_config_upm(str,
@@ -477,7 +456,6 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
 					    MSG_ORIG(MSG_PTH_UPDLP),
 					    MSG_PTH_UPDLP_SIZE);
 			}
-#endif
 			if (addlib(crle, &crle->c_edlibpath, str) != 0)
 				return (INSCFG_RET_FAIL);
 		} else {
@@ -508,17 +486,9 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
 			 * Indicate any system default.
 			 */
 #if M_CLASS == ELFCLASS64
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 			(void) printf(MSG_INTL(MSG_DEF_NEWDLP_64));
 #else
-			(void) printf(MSG_INTL(MSG_DEF_OLDDLP_64));
-#endif
-#else
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 			(void) printf(MSG_INTL(MSG_DEF_NEWDLP));
-#else
-			(void) printf(MSG_INTL(MSG_DEF_OLDDLP));
-#endif
 #endif
 		}
 	}
@@ -531,7 +501,6 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
 		if (crle->c_flags & CRLE_UPDATE) {
 			crle->c_flags &= ~CRLE_AOUT;
 
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 			if ((head->ch_cnflags & RTC_HDR_UPM) == 0) {
 				if (head->ch_cnflags & RTC_HDR_64)
 					str = conv_config_upm(str,
@@ -544,7 +513,6 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
 					    MSG_ORIG(MSG_PTH_UPTD),
 					    MSG_PTH_UPTD_SIZE);
 			}
-#endif
 			if (addlib(crle, &crle->c_eslibpath, str) != 0)
 				return (INSCFG_RET_FAIL);
 		} else {
@@ -575,17 +543,9 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
 			 * Indicate any system default.
 			 */
 #if M_CLASS == ELFCLASS64
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 			(void) printf(MSG_INTL(MSG_DEF_NEWTD_64));
 #else
-			(void) printf(MSG_INTL(MSG_DEF_OLDTD_64));
-#endif
-#else
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 			(void) printf(MSG_INTL(MSG_DEF_NEWTD));
-#else
-			(void) printf(MSG_INTL(MSG_DEF_OLDTD));
-#endif
 #endif
 		}
 	}
@@ -666,11 +626,7 @@ scanconfig(Crle_desc * crle, Addr addr, int c_class)
 			/*
 			 * Indicate any system default.
 			 */
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 			(void) printf(MSG_INTL(MSG_DEF_AOUTNEWTD));
-#else
-			(void) printf(MSG_INTL(MSG_DEF_AOUTOLDTD));
-#endif
 		}
 	}
 
@@ -1071,28 +1027,14 @@ inspectconfig(Crle_desc * crle, int c_class)
 
 				if (crle->c_flags & CRLE_AOUT) {
 					fmt1 = MSG_INTL(MSG_DEF_AOUTDLP);
-#ifndef SGS_PRE_UNIFIED_PROCESS
 					fmt2 = MSG_INTL(MSG_DEF_AOUTNEWTD);
-#else
-					fmt2 = MSG_INTL(MSG_DEF_AOUTOLDTD);
-#endif
 				} else {
 #if M_CLASS == ELFCLASS64
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 					fmt1 = MSG_INTL(MSG_DEF_NEWDLP_64);
 					fmt2 = MSG_INTL(MSG_DEF_NEWTD_64);
 #else
-					fmt1 = MSG_INTL(MSG_DEF_OLDDLP_64);
-					fmt2 = MSG_INTL(MSG_DEF_OLDTD_64);
-#endif
-#else
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 					fmt1 = MSG_INTL(MSG_DEF_NEWDLP);
 					fmt2 = MSG_INTL(MSG_DEF_NEWTD);
-#else
-					fmt1 = MSG_INTL(MSG_DEF_OLDDLP);
-					fmt2 = MSG_INTL(MSG_DEF_OLDTD);
-#endif
 #endif
 				}
 				(void) printf(fmt1);
diff --git a/usr/src/cmd/sgs/rtld/common/config_elf.c b/usr/src/cmd/sgs/rtld/common/config_elf.c
index e2de5eeff3..54539e5924 100644
--- a/usr/src/cmd/sgs/rtld/common/config_elf.c
+++ b/usr/src/cmd/sgs/rtld/common/config_elf.c
@@ -320,7 +320,6 @@ elf_config(Rt_map *lmp, int aout)
 	 */
 	if (head->ch_edlibpath) {
 		str = (const char *)(head->ch_edlibpath + addr);
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 		if ((head->ch_cnflags & RTC_HDR_UPM) == 0) {
 #if	defined(_ELF64)
 			str = conv_config_upm(str, MSG_ORIG(MSG_PTH_USRLIB_64),
@@ -330,14 +329,12 @@ elf_config(Rt_map *lmp, int aout)
 			    MSG_ORIG(MSG_PTH_LIB), MSG_PTH_LIB_SIZE);
 #endif
 		}
-#endif
 		if (expand_paths(lmp, str, &elf_def_dirs, AL_CNT_SEARCH,
 		    (LA_SER_DEFAULT | LA_SER_CONFIG), PD_TKN_CAP) != 0)
 			features |= CONF_EDLIBPATH;
 	}
 	if (head->ch_eslibpath) {
 		str = (const char *)(head->ch_eslibpath + addr);
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 		if ((head->ch_cnflags & RTC_HDR_UPM) == 0) {
 #if	defined(_ELF64)
 			str = conv_config_upm(str,
@@ -348,7 +345,6 @@ elf_config(Rt_map *lmp, int aout)
 			    MSG_ORIG(MSG_PTH_LIBSE), MSG_PTH_LIBSE_SIZE);
 #endif
 		}
-#endif
 		if (expand_paths(lmp, str, &elf_sec_dirs, AL_CNT_SEARCH,
 		    (LA_SER_SECURE | LA_SER_CONFIG), PD_TKN_CAP) != 0)
 			features |= CONF_ESLIBPATH;
diff --git a/usr/src/cmd/sgs/rtld/common/setup.c b/usr/src/cmd/sgs/rtld/common/setup.c
index 862bb7d61f..3bd4af5c5d 100644
--- a/usr/src/cmd/sgs/rtld/common/setup.c
+++ b/usr/src/cmd/sgs/rtld/common/setup.c
@@ -61,10 +61,8 @@ extern int	_end, _edata, _etext;
 extern void	_init(void);
 extern int	_brk_unlocked(void *);
 
-#ifndef	SGS_PRE_UNIFIED_PROCESS
 /* needed for _brk_unlocked() */
 void *_nd = &_end;
-#endif
 
 /*
  * Counters that are incremented every time an object is mapped/unmapped.