Browse Source

Disable this code for mips, which does things quite differently...
-Erik

Eric Andersen 23 years ago
parent
commit
0af25e081c
2 changed files with 6 additions and 2 deletions
  1. 3 1
      ldso/ldso/dl-hash.c
  2. 3 1
      ldso/ldso/hash.c

+ 3 - 1
ldso/ldso/dl-hash.c

@@ -185,7 +185,7 @@ char *_dl_find_hash(char *name, struct dyn_elf *rpnt1,
 	   that any shared library data symbols referenced in the executable
 	   that any shared library data symbols referenced in the executable
 	   will be seen at the same address by the executable, shared libraries
 	   will be seen at the same address by the executable, shared libraries
 	   and dynamically loaded code. -Rob Ryan (robr@cmu.edu) */
 	   and dynamically loaded code. -Rob Ryan (robr@cmu.edu) */
-	if (copyrel!=caller_type && rpnt1) {
+	if (!caller_type && rpnt1) {
 		first = (*_dl_symbol_tables);
 		first = (*_dl_symbol_tables);
 		first.next = rpnt1;
 		first.next = rpnt1;
 		rpnt1 = (&first);
 		rpnt1 = (&first);
@@ -299,6 +299,7 @@ char *_dl_find_hash(char *name, struct dyn_elf *rpnt1,
 						break;
 						break;
 					}
 					}
 				  }
 				  }
+#ifndef __mips__
 				  /*
 				  /*
 				   * References to the address of a function from an executable file and
 				   * References to the address of a function from an executable file and
 				   * the shared objects associated with it might not resolve to the same
 				   * the shared objects associated with it might not resolve to the same
@@ -316,6 +317,7 @@ char *_dl_find_hash(char *name, struct dyn_elf *rpnt1,
 				  {
 				  {
 				      return (char*)symtab[si].st_value;
 				      return (char*)symtab[si].st_value;
 				  }
 				  }
+#endif
 				}
 				}
 			}
 			}
 		}
 		}

+ 3 - 1
ldso/ldso/hash.c

@@ -185,7 +185,7 @@ char *_dl_find_hash(char *name, struct dyn_elf *rpnt1,
 	   that any shared library data symbols referenced in the executable
 	   that any shared library data symbols referenced in the executable
 	   will be seen at the same address by the executable, shared libraries
 	   will be seen at the same address by the executable, shared libraries
 	   and dynamically loaded code. -Rob Ryan (robr@cmu.edu) */
 	   and dynamically loaded code. -Rob Ryan (robr@cmu.edu) */
-	if (copyrel!=caller_type && rpnt1) {
+	if (!caller_type && rpnt1) {
 		first = (*_dl_symbol_tables);
 		first = (*_dl_symbol_tables);
 		first.next = rpnt1;
 		first.next = rpnt1;
 		rpnt1 = (&first);
 		rpnt1 = (&first);
@@ -299,6 +299,7 @@ char *_dl_find_hash(char *name, struct dyn_elf *rpnt1,
 						break;
 						break;
 					}
 					}
 				  }
 				  }
+#ifndef __mips__
 				  /*
 				  /*
 				   * References to the address of a function from an executable file and
 				   * References to the address of a function from an executable file and
 				   * the shared objects associated with it might not resolve to the same
 				   * the shared objects associated with it might not resolve to the same
@@ -316,6 +317,7 @@ char *_dl_find_hash(char *name, struct dyn_elf *rpnt1,
 				  {
 				  {
 				      return (char*)symtab[si].st_value;
 				      return (char*)symtab[si].st_value;
 				  }
 				  }
+#endif
 				}
 				}
 			}
 			}
 		}
 		}