Author: ps-guest Date: 2013-05-09 12:13:07 +0000 (Thu, 09 May 2013) New Revision: 5571
Added: glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads-stackguard.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads-initfini.diff glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff glibc-package/trunk/debian/patches/series.kfreebsd-amd64 glibc-package/trunk/debian/patches/series.kfreebsd-i386 Log: * kfreebsd/local-sysdeps.diff: update and related fixes Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2013-05-09 10:02:31 UTC (rev 5570) +++ glibc-package/trunk/debian/changelog 2013-05-09 12:13:07 UTC (rev 5571) @@ -28,7 +28,9 @@ * patches/kfreebsd/local-no-pldd.diff: pldd is linux only utility * patches/kfreebsd/local-nscd-nosendfile-fix.diff: handle system without sendfile syscall - * kfreebsd/local-sysdeps.diff: update to revision 4419 (from glibc-bsd). + * patches/kfreebsd/local-linuxthreads-stackguard.diff: handle elf subdir + removal + * kfreebsd/local-sysdeps.diff: update to revision 4422 (from glibc-bsd). -- Adam Conrad <adcon...@0c3.net> Tue, 07 May 2013 13:58:05 -0600 Modified: glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads-initfini.diff =================================================================== --- glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads-initfini.diff 2013-05-09 10:02:31 UTC (rev 5570) +++ glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads-initfini.diff 2013-05-09 12:13:07 UTC (rev 5571) @@ -25,12 +25,12 @@ # Make sure we link with the thread library. ifeq ($(build-shared),yes) -@@ -266,33 +265,6 @@ +@@ -266,32 +265,9 @@ endif ifeq ($(build-shared),yes) -vpath pt-initfini.c $(sysdirs) -- + -$(objpfx)pt-initfini.s: pt-initfini.c - $(compile.c) -S $(CFLAGS-pt-initfini.s) -finhibit-size-directive \ - $(patsubst -f%,-fno-%,$(exceptions)) -o $@ @@ -55,10 +55,11 @@ - -$(objpfx)crtn.o: $(objpfx)crtn.S $(objpfx)defs.h - $(compile.S) -g0 $(ASFLAGS-.os) -o $@ -- ++$(objpfx)crti.o: $(objpfx)pt-crti.o ++ ln -f $< $@ + ifneq ($(multidir),.) $(objpfx)$(multidir): - @mkdir -p $(objpfx)$(multidir) @@ -304,7 +275,7 @@ ln -f $< $@ endif Added: glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads-stackguard.diff =================================================================== --- glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads-stackguard.diff (rev 0) +++ glibc-package/trunk/debian/patches/kfreebsd/local-linuxthreads-stackguard.diff 2013-05-09 12:13:07 UTC (rev 5571) @@ -0,0 +1,11 @@ +--- a/linuxthreads/tst-stackguard1.c ++++ b/linuxthreads/tst-stackguard1.c +@@ -24,7 +24,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/wait.h> +-#include <elf/stackguard-macros.h> ++#include <stackguard-macros.h> + #include <unistd.h> + + static const char *command; Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff =================================================================== --- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2013-05-09 10:02:31 UTC (rev 5570) +++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2013-05-09 12:13:07 UTC (rev 5571) @@ -11049,6 +11049,39 @@ + +weak_alias(__makecontext, makecontext) --- /dev/null ++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/pipe.S +@@ -0,0 +1,30 @@ ++/* Copyright (C) 1991,92,93,95,97,2002 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include <sysdep.h> ++ ++SYSCALL__ (pipe, 1) ++ movl 4(%esp), scratch ++ movl %eax, (scratch) ++ movl r1, 4(scratch) ++ xorl %eax, %eax ++ ret ++PSEUDO_END (__pipe) ++ ++libc_hidden_def (__pipe) ++weak_alias (__pipe, pipe) +--- /dev/null +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/rfork.S @@ -0,0 +1,44 @@ +/* Copyright (C) 1991-1992, 1994-1995, 1997, 2002 Free Software Foundation, Inc. @@ -14346,11 +14379,11 @@ + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + -+/* Arrange for __pthread_initialize_minimal_internal to be called at ++/* Arrange for __pthread_initialize_minimal to be called at + libpthread startup, instead of conditionally calling + __gmon_start__. */ + -+#define PREINIT_FUNCTION __pthread_initialize_minimal_internal ++#define PREINIT_FUNCTION __pthread_initialize_minimal +#define PREINIT_FUNCTION_WEAK 0 + +#include <crti.S> @@ -24920,7 +24953,7 @@ +#endif --- /dev/null +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list -@@ -0,0 +1,201 @@ +@@ -0,0 +1,202 @@ +# File name Caller Syscall name # args Strong name Weak names +sys_access - access i:si __syscall_access +acl_aclcheck_fd - acl_aclcheck_fd i:iip __acl_aclcheck_fd @@ -24966,6 +24999,7 @@ +sys_getdents - getdents i:ibn __syscall_getdents +sys_getdirentries - getdirentries i:ibnP __syscall_getdirentries +getegid - getegid i: __getegid getegid ++getppid - getppid i: __getppid getppid +geteuid - geteuid i: __geteuid geteuid +getfh - getfh i:sp getfh +sys_getlogin - getlogin i:bn __syscall_getlogin Modified: glibc-package/trunk/debian/patches/series.kfreebsd-amd64 =================================================================== --- glibc-package/trunk/debian/patches/series.kfreebsd-amd64 2013-05-09 10:02:31 UTC (rev 5570) +++ glibc-package/trunk/debian/patches/series.kfreebsd-amd64 2013-05-09 12:13:07 UTC (rev 5571) @@ -12,3 +12,4 @@ kfreebsd/local-linuxthreads-initfini.diff kfreebsd/local-no-pldd.diff kfreebsd/local-nscd-nosendfile-fix.diff +kfreebsd/local-linuxthreads-stackguard.diff Modified: glibc-package/trunk/debian/patches/series.kfreebsd-i386 =================================================================== --- glibc-package/trunk/debian/patches/series.kfreebsd-i386 2013-05-09 10:02:31 UTC (rev 5570) +++ glibc-package/trunk/debian/patches/series.kfreebsd-i386 2013-05-09 12:13:07 UTC (rev 5571) @@ -12,3 +12,4 @@ kfreebsd/local-linuxthreads-initfini.diff kfreebsd/local-no-pldd.diff kfreebsd/local-nscd-nosendfile-fix.diff +kfreebsd/local-linuxthreads-stackguard.diff -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1uapie-0005nb...@vasks.debian.org