File: local-biarch.diff

package info (click to toggle)
glibc 2.19-13
  • links: PTS, VCS
  • area: main
  • in suites: jessie, jessie-kfreebsd
  • size: 202,472 kB
  • ctags: 140,344
  • sloc: ansic: 969,274; asm: 241,208; sh: 10,047; makefile: 8,467; cpp: 3,595; perl: 2,077; pascal: 1,839; awk: 1,704; yacc: 317; sed: 73
file content (27 lines) | stat: -rw-r--r-- 977 bytes parent folder | download | duplicates (10)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Allow ldconfig to work on x86-64/i386 biarch systems

---
 sysdeps/unix/sysv/linux/x86_64/dl-cache.h |   21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

--- a/sysdeps/unix/sysv/linux/x86_64/dl-cache.h
+++ b/sysdeps/unix/sysv/linux/x86_64/dl-cache.h
@@ -27,7 +27,7 @@
       size_t len = strlen (dir);				\
       char path[len + 4];					\
       memcpy (path, dir, len + 1);				\
-      if (len >= 6 && ! memcmp (path + len - 6, "/lib64", 6))	\
+      if (len >= 6 && ! memcmp (path + len - 6, "/lib32", 6))	\
 	{							\
 	  len -= 2;						\
 	  path[len] = '\0';					\
@@ -41,7 +41,7 @@
       add_dir (path);						\
       if (len >= 4 && ! memcmp (path + len - 4, "/lib", 4))	\
 	{							\
-	  memcpy (path + len, "64", 3);				\
+	  memcpy (path + len, "32", 3);				\
 	  add_dir (path);					\
 	  memcpy (path + len, "x32", 4);				\
 	  add_dir (path);					\