| 1 |
vapier 17/02/09 16:24:59 |
| 2 |
|
| 3 |
Modified: README.history |
| 4 |
Added: |
| 5 |
00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch |
| 6 |
00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch |
| 7 |
Log: |
| 8 |
add upstream fix for #602968 and prepare for ~arch |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.5 src/patchsets/glibc/2.24/README.history |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?rev=1.5&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?rev=1.5&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?r1=1.4&r2=1.5 |
| 16 |
|
| 17 |
Index: README.history |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.24/README.history,v |
| 20 |
retrieving revision 1.4 |
| 21 |
retrieving revision 1.5 |
| 22 |
diff -u -r1.4 -r1.5 |
| 23 |
--- README.history 9 Feb 2017 11:38:18 -0000 1.4 |
| 24 |
+++ README.history 9 Feb 2017 16:24:59 -0000 1.5 |
| 25 |
@@ -1,3 +1,7 @@ |
| 26 |
+5 09 Feb 2017 |
| 27 |
+ + 00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch |
| 28 |
+ + 00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch |
| 29 |
+ |
| 30 |
4 09 Feb 2017 |
| 31 |
+ 00_all_0039-Bug-11941-ld.so-Improper-assert-map-l_init_called-in.patch |
| 32 |
+ 00_all_0040-localedata-bs_BA-fix-yesexpr-noexpr-BZ-20974.patch |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.1 src/patchsets/glibc/2.24/00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch?rev=1.1&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch?rev=1.1&content-type=text/plain |
| 40 |
|
| 41 |
Index: 00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch |
| 42 |
=================================================================== |
| 43 |
From 27a54a0980cb30f7d3fd930d540c8cd10e2cccd0 Mon Sep 17 00:00:00 2001 |
| 44 |
From: "H.J. Lu" <hjl.tools@×××××.com> |
| 45 |
Date: Mon, 28 Nov 2016 09:44:49 -0800 |
| 46 |
Subject: [PATCH] X86_64: Don't use PLT nor GOT in static archives [BZ #20750] |
| 47 |
|
| 48 |
There is no need to use PLT nor GOT in static archives to branch to a |
| 49 |
function, regardless whether static archives is compiled with PIC or |
| 50 |
not. When static archives are used to create dynamic executable, |
| 51 |
PLT/GOT may be used. The resulting executable still works correctly. |
| 52 |
|
| 53 |
[BZ #20750] |
| 54 |
* sysdeps/x86_64/sysdep.h (JUMPTARGET): Check SHARED instead |
| 55 |
of PIC. |
| 56 |
|
| 57 |
(cherry picked from commit c9070e6305c08365c5f8b604bdca39c699d70cfa) |
| 58 |
(cherry picked from commit d012ea850680a2a94959f1c5136502a0f712b30a) |
| 59 |
--- |
| 60 |
sysdeps/x86_64/sysdep.h | 3 ++- |
| 61 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 62 |
|
| 63 |
diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h |
| 64 |
index 75ac747be8a8..4b67fa80c19a 100644 |
| 65 |
--- a/sysdeps/x86_64/sysdep.h |
| 66 |
+++ b/sysdeps/x86_64/sysdep.h |
| 67 |
@@ -89,13 +89,14 @@ lose: \ |
| 68 |
END (name) |
| 69 |
|
| 70 |
#undef JUMPTARGET |
| 71 |
-#ifdef PIC |
| 72 |
+#ifdef SHARED |
| 73 |
# ifdef BIND_NOW |
| 74 |
# define JUMPTARGET(name) *name##@GOTPCREL(%rip) |
| 75 |
# else |
| 76 |
# define JUMPTARGET(name) name##@PLT |
| 77 |
# endif |
| 78 |
#else |
| 79 |
+/* For static archives, branch to target directly. */ |
| 80 |
# define JUMPTARGET(name) name |
| 81 |
#endif |
| 82 |
|
| 83 |
-- |
| 84 |
2.11.0 |
| 85 |
|
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
1.1 src/patchsets/glibc/2.24/00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch |
| 90 |
|
| 91 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch?rev=1.1&view=markup |
| 92 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch?rev=1.1&content-type=text/plain |
| 93 |
|
| 94 |
Index: 00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch |
| 95 |
=================================================================== |
| 96 |
From 764c430aa0c6af6181d5834bcb20d8ea99562992 Mon Sep 17 00:00:00 2001 |
| 97 |
From: Mike Frysinger <vapier@g.o> |
| 98 |
Date: Thu, 9 Feb 2017 11:19:48 -0500 |
| 99 |
Subject: [PATCH] Revert "sys/types.h: drop sys/sysmacros.h include" |
| 100 |
|
| 101 |
This reverts commit 92bf87d8c4837feaec62958be59c3119b8b4f5ae. |
| 102 |
|
| 103 |
We keep this in the testing version, but once we want to start |
| 104 |
stabilizing, we drop it. |
| 105 |
--- |
| 106 |
posix/sys/types.h | 3 +++ |
| 107 |
1 file changed, 3 insertions(+) |
| 108 |
|
| 109 |
diff --git a/posix/sys/types.h b/posix/sys/types.h |
| 110 |
index b3007db0247c..a7285671bf31 100644 |
| 111 |
--- a/posix/sys/types.h |
| 112 |
+++ b/posix/sys/types.h |
| 113 |
@@ -217,6 +217,9 @@ typedef int register_t __attribute__ ((__mode__ (__word__))); |
| 114 |
|
| 115 |
/* It also defines `fd_set' and the FD_* macros for `select'. */ |
| 116 |
# include <sys/select.h> |
| 117 |
+ |
| 118 |
+/* BSD defines these symbols, so we follow. */ |
| 119 |
+# include <sys/sysmacros.h> |
| 120 |
#endif /* Use misc. */ |
| 121 |
|
| 122 |
|
| 123 |
-- |
| 124 |
2.11.0 |
Archives