summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2003-01-04 15:40:46 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2003-01-04 15:40:46 +0000
commit2ca2c7dafe7a16ed5ee28138d05d6c3e8d3783b0 (patch)
tree3d95668d500275ff96ddfb2bd9f8e6d3a1bd0a6f /gnu/usr.bin
parent9f11e510bd2c7ea2ec5a8b308b01e68e6d412b42 (diff)
Remove the support to force linking against a specific shlib major.minor.
This behavior broke libraries which were named libN-X.Y.so.A.B. ok pval, espie
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/binutils/ld/emultempl/elf32.em4
1 files changed, 4 insertions, 0 deletions
diff --git a/gnu/usr.bin/binutils/ld/emultempl/elf32.em b/gnu/usr.bin/binutils/ld/emultempl/elf32.em
index 8d4b0636fd0..394e21b3f7f 100644
--- a/gnu/usr.bin/binutils/ld/emultempl/elf32.em
+++ b/gnu/usr.bin/binutils/ld/emultempl/elf32.em
@@ -100,10 +100,13 @@ gld${EMULATION_NAME}_search_dir (dirname, filename)
force_maj = -1;
force_min = -1;
dot = strchr (filename, '.');
+#ifdef DO_FORCE_VERS
if (dot == NULL)
{
+#endif /* DO_FORCE_VERS */
len = strlen (filename);
alc = NULL;
+#ifdef DO_FORCE_VERS
}
else
{
@@ -119,6 +122,7 @@ gld${EMULATION_NAME}_search_dir (dirname, filename)
if (dot != NULL)
force_min = atoi (dot + 1);
}
+#endif /* DO_FORCE_VERS */
found = NULL;
max_maj = max_min = 0;