Author: aurel32 Date: 2015-12-02 18:03:05 +0000 (Wed, 02 Dec 2015) New Revision: 6737
Modified: glibc-package/branches/glibc-2.22/debian/changelog glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-sysdeps.diff Log: kfreebsd/local-sysdeps.diff: update to revision 5845 (from glibc-bsd). Modified: glibc-package/branches/glibc-2.22/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-02 17:45:45 UTC (rev 6736) +++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-02 18:03:05 UTC (rev 6737) @@ -5,6 +5,7 @@ * debian/rules.d/build.mk: use logme instead of tee to fail the build if the testsuite fails to build, instead of fully ignoring it. * debian/control.in/main, debian/rules: build with gcc-5. + * kfreebsd/local-sysdeps.diff: update to revision 5845 (from glibc-bsd). -- Aurelien Jarno <aure...@debian.org> Wed, 02 Dec 2015 01:10:00 +0100 Modified: glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-sysdeps.diff =================================================================== --- glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-sysdeps.diff 2015-12-02 17:45:45 UTC (rev 6736) +++ glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-sysdeps.diff 2015-12-02 18:03:05 UTC (rev 6737) @@ -37416,7 +37416,7 @@ +#endif /* !PIC */ --- /dev/null +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sysdep.h -@@ -0,0 +1,207 @@ +@@ -0,0 +1,204 @@ +/* Copyright (C) 2001,02,03,04 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Modification for FreeBSD contributed by Petr Salinger, 2006. @@ -37441,13 +37441,10 @@ + +/* There is some commonality. */ +#include <sysdeps/unix/x86_64/sysdep.h> ++/* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO. */ ++#include <dl-sysdep.h> +#include <tls.h> + -+#if IS_IN (rtld) -+# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */ -+#endif -+ -+ +#ifdef __ASSEMBLER__ + +/* We don't want the label for the error handle to be global when we define