[gentoo-commits] gentoo commit in src/patchsets/glibc/2.24: 00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch 00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch README.history

[gentoo-commits] gentoo commit in src/patchsets/glibc/2.24: 00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch 00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch README.history

[Mike Frysinger (vapier)]

vapier      17/02/09 16:24:59

  Modified:             README.history
  Added:               
                        00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch
                        00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch
  Log:
  add upstream fix for #602968 and prepare for ~arch

Revision  Changes    Path
1.5                  src/patchsets/glibc/2.24/README.history

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.24/README.history?r1=1.4&r2=1.5

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.24/README.history,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.history	9 Feb 2017 11:38:18 -0000	1.4
+++ README.history	9 Feb 2017 16:24:59 -0000	1.5
@@ -1,3 +1,7 @@
+5		09 Feb 2017
+	+ 00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch
+	+ 00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch
+
 4		09 Feb 2017
 	+ 00_all_0039-Bug-11941-ld.so-Improper-assert-map-l_init_called-in.patch
 	+ 00_all_0040-localedata-bs_BA-fix-yesexpr-noexpr-BZ-20974.patch



1.1                  src/patchsets/glibc/2.24/00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch

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
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

Index: 00_all_0044-X86_64-Don-t-use-PLT-nor-GOT-in-static-archives-BZ-2.patch
===================================================================
From 27a54a0980cb30f7d3fd930d540c8cd10e2cccd0 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 28 Nov 2016 09:44:49 -0800
Subject: [PATCH] X86_64: Don't use PLT nor GOT in static archives [BZ #20750]

There is no need to use PLT nor GOT in static archives to branch to a
function, regardless whether static archives is compiled with PIC or
not.  When static archives are used to create dynamic executable,
PLT/GOT may be used.  The resulting executable still works correctly.

	[BZ #20750]
	* sysdeps/x86_64/sysdep.h (JUMPTARGET): Check SHARED instead
	of PIC.

(cherry picked from commit c9070e6305c08365c5f8b604bdca39c699d70cfa)
(cherry picked from commit d012ea850680a2a94959f1c5136502a0f712b30a)
---
 sysdeps/x86_64/sysdep.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h
index 75ac747be8a8..4b67fa80c19a 100644
--- a/sysdeps/x86_64/sysdep.h
+++ b/sysdeps/x86_64/sysdep.h
@@ -89,13 +89,14 @@ lose:									      \
   END (name)
 
 #undef JUMPTARGET
-#ifdef PIC
+#ifdef SHARED
 # ifdef BIND_NOW
 #  define JUMPTARGET(name)	*name##@GOTPCREL(%rip)
 # else
 #  define JUMPTARGET(name)	name##@PLT
 # endif
 #else
+/* For static archives, branch to target directly.  */
 # define JUMPTARGET(name)	name
 #endif
 
-- 
2.11.0




1.1                  src/patchsets/glibc/2.24/00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch

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
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

Index: 00_all_0045-Revert-sys-types.h-drop-sys-sysmacros.h-include.patch
===================================================================
From 764c430aa0c6af6181d5834bcb20d8ea99562992 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 9 Feb 2017 11:19:48 -0500
Subject: [PATCH] Revert "sys/types.h: drop sys/sysmacros.h include"

This reverts commit 92bf87d8c4837feaec62958be59c3119b8b4f5ae.

We keep this in the testing version, but once we want to start
stabilizing, we drop it.
---
 posix/sys/types.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/posix/sys/types.h b/posix/sys/types.h
index b3007db0247c..a7285671bf31 100644
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -217,6 +217,9 @@ typedef int register_t __attribute__ ((__mode__ (__word__)));
 
 /* It also defines `fd_set' and the FD_* macros for `select'.  */
 # include <sys/select.h>
+
+/* BSD defines these symbols, so we follow.  */
+# include <sys/sysmacros.h>
 #endif /* Use misc.  */
 
 
-- 
2.11.0