diff options
author | Dmitry Pankratov <dp@ubiquitech.com> | 2016-11-11 20:03:11 (GMT) |
---|---|---|
committer | Dmitry Pankratov <dp@ubiquitech.com> | 2016-11-11 20:03:11 (GMT) |
commit | 0d17d26005efbd5d6157df0f68a26c738c385ed2 (patch) | |
tree | 9c25ccb481bd4b58e54c692403d9c49402f09d98 /patches/glibc/ports-2.7 | |
parent | 34ca68e3b076f4a7eea78aa46215fa50dfb1e322 (diff) | |
parent | 5ebbb52be04e42bbd1c28b903eba642bebaeb1b6 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'patches/glibc/ports-2.7')
-rw-r--r-- | patches/glibc/ports-2.7/100-ARM-asm_page_h.patch | 11 | ||||
-rw-r--r-- | patches/glibc/ports-2.7/110-ARM-NPTL.patch | 12 |
2 files changed, 0 insertions, 23 deletions
diff --git a/patches/glibc/ports-2.7/100-ARM-asm_page_h.patch b/patches/glibc/ports-2.7/100-ARM-asm_page_h.patch deleted file mode 100644 index 60079d3..0000000 --- a/patches/glibc/ports-2.7/100-ARM-asm_page_h.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -durN glibc-ports-2.7.orig/sysdeps/unix/sysv/linux/arm/ioperm.c glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/ioperm.c ---- glibc-2.7.orig/glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/ioperm.c 2005-06-10 13:12:09.000000000 +0200 -+++ glibc-2.7/glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/ioperm.c 2008-05-18 16:19:45.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" diff --git a/patches/glibc/ports-2.7/110-ARM-NPTL.patch b/patches/glibc/ports-2.7/110-ARM-NPTL.patch deleted file mode 100644 index fb801b6..0000000 --- a/patches/glibc/ports-2.7/110-ARM-NPTL.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- glibc-2.7/glibc-ports-2.7.orig/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-06-06 19:27:04.000000000 +0200 -+++ glibc-2.7/glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2008-05-18 16:57:21.000000000 +0200 -@@ -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) |