Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 16 years ago
parent
commit
b38c3bafcb
3 changed files with 61 additions and 0 deletions
  1. +27
    -0
      package/base/glibc/glibc27/6225_all_glibc-2.7-cargs6.patch
  2. +21
    -0
      package/base/glibc/glibc27/glibc-2.7-arm-THREAD_SELF.patch
  3. +13
    -0
      package/base/glibc/glibc27/glibc-2.7-arm-asm_page.patch

+ 27
- 0
package/base/glibc/glibc27/6225_all_glibc-2.7-cargs6.patch

@ -0,0 +1,27 @@
Copied from http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo/src/patchsets/glibc/2.7/6225_all_glibc-2.7-cargs6.patch; also see http://sourceware.org/ml/libc-ports/2008-02/msg00005.html
fix building on arm:
(echo '#include <sysdep-cancel.h>'; \
echo 'PSEUDO (splice, splice, 6)'; \
echo ' ret'; \
echo 'PSEUDO_END(splice)'; \
echo 'libc_hidden_def (splice)'; \
) | armv4l-unknown-linux-gnu-gcc -c -I../include -I/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/misc -I/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/armv4l-unknown-linux-gnu/4.1.2/include -isystem /usr/lib/gcc/armv4l-unknown-linux-gnu/4.1.2/include-fixed -isystem /usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h -DASSEMBLER -x assembler-with-cpp -o /var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/misc/splice.o -
<stdin>: Assembler messages:
<stdin>:2: Error: bad instruction `docargs_6'
<stdin>:2: Error: bad instruction `undocargs_6'
make[2]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/misc/splice.o] Error 1
--- ./ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
+++ ./ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
@@ -73,6 +73,9 @@
# define DOCARGS_5 DOCARGS_4
# define UNDOCARGS_5 UNDOCARGS_4
+# define DOCARGS_6 DOCARGS_5
+# define UNDOCARGS_6 UNDOCARGS_5
+
# ifdef IS_IN_libpthread
# define CENABLE bl PLTJMP(__pthread_enable_asynccancel)
# define CDISABLE bl PLTJMP(__pthread_disable_asynccancel)

+ 21
- 0
package/base/glibc/glibc27/glibc-2.7-arm-THREAD_SELF.patch

@ -0,0 +1,21 @@
Fixes the error:
In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM'
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'THREAD_SELF' undeclared (first use in this function)
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: (Each undeclared identifier is reported only once
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: for each function it appears in.)
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function)
Copied from http://www.nabble.com/arm-linux-compilation-failure-and-possible-fix-td19229074.html
--- ./ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig 2008-10-04 20:46:13.000000000 +0200
+++ ./ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h 2008-10-04 20:45:40.000000000 +0200
@@ -25,6 +25,7 @@
#include <atomic.h>
#include <sysdep.h>
#include <kernel-features.h>
+#include <tls.h>
#define FUTEX_WAIT 0
#define FUTEX_WAKE 1

+ 13
- 0
package/base/glibc/glibc27/glibc-2.7-arm-asm_page.patch

@ -0,0 +1,13 @@
See e.g. http://www.mail-archive.com/debian-glibc%40lists.debian.org/msg38393.html
or http://sourceware.org/ml/crossgcc/2008-05/msg00014.html
--- ./ports/sysdeps/unix/sysv/linux/arm/ioperm.c.orig 2008-10-04 19:47:32.000000000 +0200
+++ ./ports/sysdeps/unix/sysv/linux/arm/ioperm.c 2008-10-04 19:47:42.000000000 +0200
@@ -45,7 +45,6 @@
#include <sys/mman.h>
#include <linux/version.h>
-#include <asm/page.h>
#include <sys/sysctl.h>
#define PATH_ARM_SYSTYPE "/etc/arm_systype"

Loading…
Cancel
Save