Browse Source

Kill SVR4_BUGCOMPAT

Eric Andersen 21 years ago
parent
commit
7ce7c76476
4 changed files with 4 additions and 16 deletions
  1. 1 1
      ldso/ldso/dl-elf.c
  2. 2 2
      ldso/ldso/ldso.c
  3. 0 12
      ldso/ldso/linuxelf.h
  4. 1 1
      ldso/ldso/readelflib1.c

+ 1 - 1
ldso/ldso/dl-elf.c

@@ -562,7 +562,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 				continue;
 			}
 			dynamic_info[dpnt->d_tag] = dpnt->d_un.d_val;
-			if (dpnt->d_tag == DT_TEXTREL || SVR4_BUGCOMPAT)
+			if (dpnt->d_tag == DT_TEXTREL)
 				dynamic_info[DT_TEXTREL] = 1;
 			dpnt++;
 		};

+ 2 - 2
ldso/ldso/ldso.c

@@ -397,7 +397,7 @@ LD_BOOT(unsigned long args)
 #endif
 		if (dpnt->d_tag < 24) {
 			tpnt->dynamic_info[dpnt->d_tag] = dpnt->d_un.d_val;
-			if (dpnt->d_tag == DT_TEXTREL || SVR4_BUGCOMPAT) {
+			if (dpnt->d_tag == DT_TEXTREL) {
 				tpnt->dynamic_info[DT_TEXTREL] = 1;
 			}
 		}
@@ -435,7 +435,7 @@ LD_BOOT(unsigned long args)
 #else
 						dpnt_debug = dpnt;
 #endif
-					if (dpnt->d_tag == DT_TEXTREL || SVR4_BUGCOMPAT)
+					if (dpnt->d_tag == DT_TEXTREL)
 						app_tpnt->dynamic_info[DT_TEXTREL] = 1;
 					dpnt++;
 				}

+ 0 - 12
ldso/ldso/linuxelf.h

@@ -30,18 +30,6 @@ extern int _dl_linux_resolve(void);
 #define ELF_CLASS   ELFCLASS32
 
 
-#ifndef SVR4_BUGCOMPAT
-# ifdef FORCE_SHAREABLE_TEXT_SEGMENTS
-#  define SVR4_BUGCOMPAT 0
-# else
-#  define SVR4_BUGCOMPAT 1
-# endif
-#else
-# ifdef FORCE_SHAREABLE_TEXT_SEGMENTS
-#  error option SVR4_BUGCOMPAT combined with option FORCE_SHAREABLE_TEXT_SEGMENTS makes no sense
-# endif
-#endif
-
 #if ELF_CLASS == ELFCLASS32
 
 #define elfhdr		Elf32_Ehdr

+ 1 - 1
ldso/ldso/readelflib1.c

@@ -562,7 +562,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 				continue;
 			}
 			dynamic_info[dpnt->d_tag] = dpnt->d_un.d_val;
-			if (dpnt->d_tag == DT_TEXTREL || SVR4_BUGCOMPAT)
+			if (dpnt->d_tag == DT_TEXTREL)
 				dynamic_info[DT_TEXTREL] = 1;
 			dpnt++;
 		};