changeset 1478:c1d26568dbb8

Fix sparc dynamic linker.
author Rob Landley <rob@landley.net>
date Tue, 27 Dec 2011 08:59:51 -0600
parents 431d5b4ee537
children b69933a9a06b
files sources/patches/uClibc-sparcfix.patch sources/targets/sparc
diffstat 2 files changed, 19 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sources/patches/uClibc-sparcfix.patch	Tue Dec 27 08:59:51 2011 -0600
@@ -0,0 +1,18 @@
+The sparc dynamic linker segfaults without this.  I should track down why
+and do a proper fix that doesn't hit common code...
+
+diff -ruN uClibc-0.9.32.bak/ldso/include/dl-hash.h uClibc-0.9.32/ldso/include/dl-hash.h
+--- uClibc-0.9.32.bak/ldso/include/dl-hash.h	2011-06-08 14:35:20.000000000 -0500
++++ uClibc-0.9.32/ldso/include/dl-hash.h	2011-11-10 17:53:49.148917902 -0600
+@@ -111,7 +111,11 @@
+   ElfW(Addr) relro_addr;
+   size_t relro_size;
+ 
++#ifdef __sparc__
++  int st_dev;
++#else
+   dev_t st_dev;      /* device */
++#endif
+   ino_t st_ino;      /* inode */
+ 
+ #ifdef __powerpc__
--- a/sources/targets/sparc	Tue Dec 27 08:58:16 2011 -0600
+++ b/sources/targets/sparc	Tue Dec 27 08:59:51 2011 -0600
@@ -16,7 +16,7 @@
 GCC_FLAGS=
 QEMU_TEST=$KARCH
 
-BUILD_STATIC=all
+#BUILD_STATIC=all
 
 ROOT=sda
 CONSOLE=ttyS0