Add patch to silence when LTO is in use by Michael Weiser, bug #538604

Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 130 insertions, 7 deletions

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index d82222780fca..67d081350d14 100644
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/binutils-apple
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.40 2015/02/04 02:55:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.41 2015/02/04 17:33:20 grobian Exp $
+
+  04 Feb 2015; Fabian Groffen <grobian@gentoo.org>
+  +files/ld64-241.9-lto-noremarks.patch, binutils-apple-6.1.ebuild:
+  Add patch to silence when LTO is in use by Michael Weiser, bug #538604
 
   04 Feb 2015; Patrick Lauer <patrick@gentoo.org> binutils-apple-4.2-r1.ebuild,
   binutils-apple-4.3-r1.ebuild:
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 5470667ca895..8df3023aff01 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX Makefile 246 SHA256 eadeb8c0339d90728868200ce7015fa643564e5f024db5ec8b602ec8318b3716 SHA512 f38baeb942ad678a02191d72d70f54303a7f2229abf702f328ff6381ce45a63eab214bc9ad72159dd7c6373aa2a2fab52b99794fb37f21101efe6f4fd8f548f7 WHIRLPOOL 1d04f586cbce3fa515651b8f5943230a7d1906614d138e31961016eaa275cca91a22115b6a6e93a9b2940a0fdd238e39453b8439c5344a9b704753eaab90d6cb
 AUX binutils-apple-3.1.1-as-dir.patch 1531 SHA256 767b44fd052acdea83a55e80c6fccb413ba6044895414eb2f54086a09d1561ce SHA512 6a9c3749f8201e725827a71d5da5b311ab44c20ee11c635a7d2bc440365b8217a249e76531fc4622bb32467eb9eeee882243ced9adea597bcda57e3adac75ec0 WHIRLPOOL 64be761f779bd3ddb9f518455cee7ad0bf23de0aa7b645fcba8d73364363cfead1cf81c462076ed23d7b37aa85a3fab461b8eb8446d48f3ba210b63fbb533aa0
 AUX binutils-apple-3.1.1-as.patch 2659 SHA256 56bacc3100fc2804d09368042f9e0389729762f84d3d5f674a0b43c76512286d SHA512 54cf9b7472e54ca1a5d45b7864f5593e59d0bf0a7a01f3f80ca7c1a73ab11bae14856e09c566de287eea516c09c0608ecf7f07d8890e5cd3c0ff5f2fba092c3a WHIRLPOOL 8aa3668860da12d1103a8acf1591c7a8d5ebc8a788ac263bfeec78cc44fc959ab52b5b2c7fc94551a6fc9716d8a38353c9c51716b26947ee0dcdc78e89f8a8f9
@@ -58,6 +61,7 @@ AUX ld64-241.9-cc_md5.patch 621 SHA256 5cafa073188e00d0b241c27ed975788ae0569cbcb
 AUX ld64-241.9-extraneous-includes.patch 411 SHA256 c2f69d099937364f16bfb71ad7e4e6982296b90e4ae5609bd937c76b6ed6448f SHA512 a86a54d604e2df4f3e6b3754a3d2e7086e7dd0e709bf170888024a77ce9d85c603f60bda2a4079a45b4e4a84b9847c7775b068a3a295d4b53a35901ba8413fcd WHIRLPOOL 819dc84afe8477fe12ea39bea63fb78b3db9358a680d5e58e586f366dec579d218bf6a496a03b302d35a01f206cb1378110306075dee11a4f1ef31a8e28256f2
 AUX ld64-241.9-gcc.patch 40446 SHA256 88885353b3663bd91753bb5bdb9e5665a243403394e0819b97b2b28d6646632f SHA512 f6d2649d0f5cb79f4e771bc989ce35ad044835e8941b6e7aeee44139dd87ee9c58fc8bb64f40fa51ca2b16f94dbdca204f873cb911ff8d82cb691c5e4dca428b WHIRLPOOL 97697767a137922c9e5cbb9989850895cdf021693e1a0bdc0f9d956eec44fec6dbcfb006b56a742370e28a38908c06bc4339aece78f197822123df19f9b7b547
 AUX ld64-241.9-get-comm-align.patch 1131 SHA256 5ba6ced4fdd7aa0b189690ab0be7396bdbe1e5df74dee39a2aa5494837757651 SHA512 f715b622f71cf1df1165f10dd4239727362065397ff85240fe988e99ccdb0c49abf4f9320be4fad3db32fa22b2ba325746d1ecbc82b373bf37ad681b5dc057e7 WHIRLPOOL 51b8b7f55670d60b015d8654a89e31fe19e8a7be89dfa68c377d4eba4b8ae81a68baf3045c9b913727aa63c54c3269255cf3b636df1082a2d2259ff1f5475316
+AUX ld64-241.9-lto-noremarks.patch 4309 SHA256 a66b05073090a4e57a1abd4e3ae8032a42b30b66bf49673b105abfb1e9d21ba5 SHA512 fca09c87e452a7746b2ada395836a7265ab4ed600c5f78b4de539713cb3123b12c17fc9ed5dc7518bd9b1659b94650680785a3c97831b9853bfbe0e58e7e79ec WHIRLPOOL b9dfa7e5b74827afe8572cc47ffdbea96c245eddfc2059153f9bc5f433d67f270a126752a91106bf2e7a2b7c8fee6cde8ba56ba4d6fd55f56ad0e22b32207a68
 AUX ld64-241.9-noarm.patch 39659 SHA256 f94e1efa02094cef9baaed9b3b29be6d2def4462becaa3be9797d99dafd7141c SHA512 d4b29155231dfabb69b44e9a662fffc4f88e864e75a4ea018a496317ca3059101913b8b577bda0655256375e468f8cc96d92f0303849774f94b469fa6f753d25 WHIRLPOOL 27ac6f4dd734db51e9ef51f3402e67de1d1b64d26c86a88ce70bda43dda4aead298a393dd63f862c6aacd4670c477ed2e21d330d3e7f27b38355c0a2115a894c
 AUX ld64-241.9-nosnapshots.patch 23156 SHA256 2b2669441b5a4e6c27d1bb0e4285eade713d31b896f02061d2a74f898d6437c7 SHA512 c3c8d6aef4327ed8e355173c1f0c9beb90247be4b97052d6f1b0a2bbbe1f033fde950f0cd0ea24d12409052148e9c5e6e0171adefbe1fe84db9b727e08bd79c0 WHIRLPOOL 0b6870674f85cd013ca33b58c9e2ef65ad594d4705b25ccd2607f59a929e8093abaffa78fb438c82d5e9d1116e1c6d9ab3932311ef1976af8d9dc7a1a276a95d
 AUX ld64-241.9-register-names.patch 1361 SHA256 cfe3795666427926643baedb7ff03a95c630f5b31625321abdc973aff2825cc3 SHA512 2880789ea5df9db341be39631fc75bc01d0f45bfa5870f7bfe4ed327685aa1db9716be62bd40f93aa43a17f53bfba36224e593c56ad034a2f7f4c1e43ef2ddf1 WHIRLPOOL 62eb015cc4b59c326ae71394749ad9f8516e89bc21a092acc1aa21f3a1d8d20a65d099c4234125a9362a1a7d611c44a84f14729e8a2412bb79de5482dfd108ad
@@ -93,6 +97,13 @@ EBUILD binutils-apple-4.2.ebuild 8744 SHA256 dc6a457f8916974209b0b7c733c0c2d2800
 EBUILD binutils-apple-4.3-r1.ebuild 9357 SHA256 323dbe7095afe1d94333a06519ffaa9d1c34375ed1e17fdf0cc0daa0d8438f73 SHA512 f4819579a5a165d48b159cc3d8a88690996a3a96e3d6f9d6abd38d5f41d26c3a2e2d780f010893f9a153fe726acc01e7e7914b41f8bf346722270bf490cbfc79 WHIRLPOOL f8e8bcd0f02cde78cab3f91d4f7f9929768bdd4d2866700d8857357a1ce6305d39a20af3c658a303f6a2c55d427e788d7156b2b8a6ce8b4616bca523ef28bf06
 EBUILD binutils-apple-4.3.ebuild 8543 SHA256 b84402d9d8175779b15aeb1a029b8c74456c157b0e9e8358ea63c6464f39eec6 SHA512 161812b264eb95653f34115574c0fa11f2968e8949de826c353da76aa663d39aa981e146dc70b8b2aeb7416727f500537d2f3173974a5e64a21dbac2d9c0a1f4 WHIRLPOOL 56d9f3de5c95056c7170740b4bf1c651f47d97747e14110f773e9a08661e7d4fed8673723b72bcb8bc5275737b595a7a327cc1b3d9a7c2e86924fe33e462c830
 EBUILD binutils-apple-5.1.ebuild 10969 SHA256 2fcf6d482172f479874c0f0f4ce678fe9acb5c3600992ecc52cccb564c995342 SHA512 45afb1df26edb3cd55a7e5e35053ea360a8b4427ee467ea9aff2096dbea77e0afe38045cd37296a693c3aad9b211dbe22ef438f0130f11aab807dc34cfd28b4f WHIRLPOOL 078d7114c4734280ae5830c9b9933af0b7f3e824b33a07fc7e9bf43bdc3e9ff0f6226cb94c6b6507af14a22359ed5c7477abf1af10dee9ea70ed8136181cd43c
-EBUILD binutils-apple-6.1.ebuild 10873 SHA256 d00cc0ada1bd196d0a4c9510ee50c740bcc98da85a9cadafcb18ac13c820188f SHA512 307c0ca7a40993b2cfb6dfddbda9e1f87b19e5e6dc5c3a43acd6c8d82082c570843acb7b49b29b809705c4dd4f1b36a2fa5017716413856e05a49c86ee3c66d5 WHIRLPOOL 6d6f19f60e9578447cf1008803b30467da7dbfeeb097ddaa268b1e9c2a695a5934a982eee0e830b146c8297461d131649ecbdeee0b4ebea48d85674a30caa95e
-MISC ChangeLog 13786 SHA256 bd1488584f046fa79ff76fb74b28548566a9e0712651a13a2caf26f071461c10 SHA512 cc27040feebb71390e86a1bad4a16882283ea742bd84946c743032dee9954a2db5bccc08dfd064312347362e8ad4f2b40b0317839209370128424047443b3bb4 WHIRLPOOL 2c0b2fa98fa6984263aeb26a3b9ab4aaee182ee42a2da1c999b95da51e9c6daa581fd287445de92a38c2b7e756cafbc7f1a1ff71808dc45745c44565ef8811be
+EBUILD binutils-apple-6.1.ebuild 11002 SHA256 2958d9065b15f56e17452a393c406f8d4b489a14826fbff514d02ac2c7621ffb SHA512 f5276adcdad07a94e49b976c4ee68c3d15ad81d525f7381ba702734af47594c67478394f105a7fe71e208ce99b0384fd907f2e850e523a871f45009ba3694aaa WHIRLPOOL be5a7c0791d3d2bc117b0996fdfa6578c2ff425cc1632f9c81fe4b301cbdd9e3e0619cf547acea1c78681d974efada9fa89c9082e6533a71244d45b58a0b8534
+MISC ChangeLog 13979 SHA256 5ad129d3c6d04e39ce276d276d97bdcbaf5635067d61a47e10068386b4d5bb15 SHA512 deb30c8620efad1723d60fd834a0597a52e35cc046df1e28e464c136e8f6c597f52b6a52fe8692278d3adfe713db5a34b68685a003509acd10186d9324dc7794 WHIRLPOOL 2ed91e8087660b86000296318751c633988458af13d1cda1b3acf5ab4cb37a18fe3012cfb058b3c0721211a92f1190276331470de98586ee616e8ecfa52df9f8
 MISC metadata.xml 302 SHA256 899f79a24a243a7aa89abd5513bf75a9af445051813ebe137320ddc27bb22849 SHA512 20531dd7fdd3e84f20b1151bbe85e148643f7b26cfd77fadf649cd2b5c3ef4b3beeaf99299f0eb671250762ad10094ecdc1ff22c0b2eac0f7cb9f8d90aa21bed WHIRLPOOL e441ebd6ca8a5b2cd44b8a55fecb33f4895c1016f3b62bfa13c0e1e6fecf15ce3f58aaab3f19ea231cdc67bad2bcda31aabe7973b19feca70cd9cf7c9d5c69a9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlTSV+EACgkQX3X2B8XHTokabQCfYWN7m8rP8Z92Z5w4lSrAB6PW
+NpsAoKBPYs9kN+ZeTmT1kFzi10ZHVXGK
+=HJnk
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-apple/binutils-apple-6.1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1.ebuild
index e29259999308..03dc1a91d4b9 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-6.1.ebuild,v 1.2 2015/01/31 02:33:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-6.1.ebuild,v 1.3 2015/02/04 17:33:20 grobian Exp $
 
 EAPI="3"
 
@@ -73,6 +73,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/ld64-241.9-register-names.patch
 	epatch "${FILESDIR}"/ld64-241.9-get-comm-align.patch
 	epatch "${FILESDIR}"/ld64-241.9-cc_md5.patch
+	epatch "${FILESDIR}"/ld64-241.9-lto-noremarks.patch
 
 	# We used to use our own copy of lto.h, which doesn't require llvm
 	# build-env. Current versions of llvm provide
@@ -99,7 +100,7 @@ src_prepare() {
 
 	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
 	# older systems
-	[[ ${CHOST#*-darwin} -le 8 ]] && \
+	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
 		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
 
 	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
@@ -198,11 +199,11 @@ src_configure() {
 	append-cppflags -DNDEBUG
 
 	# Block API and thus snapshots supported on >= 10.6
-	[ ${CHOST#*-darwin} -ge 10 ] && \
+	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
 		append-cppflags -DSUPPORT_SNAPSHOTS
 
 	CCTOOLS_OFLAG=
-	if [ ${CHOST#*-darwin} -le 8 ] ; then
+	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
 		# cctools expect to use UNIX03 struct member names.
 		# This is default on > 10.4. Activate it on <= 10.4 by defining
 		# __DARWIN_UNIX03 explicitly.
diff --git a/sys-devel/binutils-apple/files/ld64-241.9-lto-noremarks.patch b/sys-devel/binutils-apple/files/ld64-241.9-lto-noremarks.patch
new file mode 100644
index 000000000000..d4667ab63b8c
--- /dev/null
+++ b/sys-devel/binutils-apple/files/ld64-241.9-lto-noremarks.patch
@@ -0,0 +1,107 @@
+Shut up ld64 by default when using LTO.
+
+diff -ru ld64-241.9.orig/src/ld/Options.cpp ld64-241.9/src/ld/Options.cpp
+--- ld64-241.9.orig/src/ld/Options.cpp	2015-02-02 22:14:29.000000000 +0100
++++ ld64-241.9/src/ld/Options.cpp	2015-02-02 22:15:41.000000000 +0100
+@@ -183,6 +183,9 @@
+ 	  fDebugInfoStripping(kDebugInfoMinimal), fTraceOutputFile(NULL), 
+ 	  fMacVersionMin(ld::macVersionUnset), fIOSVersionMin(ld::iOSVersionUnset), 
+ 	  fSaveTempFiles(false),
++#ifdef LTO
++	  fVerboseLTORemarks(false),
++#endif
+ #ifdef SUPPORT_SNAPSHOTS
+ 	  fSnapshotRequested(false),
+ #endif
+@@ -3138,6 +3141,11 @@
+ 			else if ( strcmp(arg, "-ignore_optimization_hints") == 0 ) {
+ 				fIgnoreOptimizationHints = true;
+ 			}
++#ifdef LTO
++			else if ( strcmp(arg, "-verbose_lto_remarks") == 0 ) {
++				fVerboseLTORemarks = true;
++			}
++#endif
+ 			else if ( strcmp(arg, "-no_dtrace_dof") == 0 ) {
+ 				fGenerateDtraceDOF = false;
+ 			}
+Only in ld64-241.9/src/ld: Options.cpp~
+diff -ru ld64-241.9.orig/src/ld/Options.h ld64-241.9/src/ld/Options.h
+--- ld64-241.9.orig/src/ld/Options.h	2015-02-02 22:14:29.000000000 +0100
++++ ld64-241.9/src/ld/Options.h	2015-02-02 22:16:36.000000000 +0100
+@@ -381,6 +381,9 @@
+ 	bool						forceWeakNonWildCard(const char* symbolName) const;
+ 	bool						forceNotWeakNonWildcard(const char* symbolName) const;
+ 	bool						forceCoalesce(const char* symbolName) const;
++#ifdef LTO
++	bool						verboseLTORemarks() const { return fVerboseLTORemarks; }
++#endif
+ #ifdef SUPPORT_SNAPSHOTS
+     Snapshot&                   snapshot() const { return fLinkSnapshot; }
+ #endif
+@@ -681,6 +684,9 @@
+ 	std::vector<SymbolsMove>			fSymbolsMovesCode;
+ 	std::vector<SymbolsMove>			fSymbolsMovesZeroFill;
+ 	bool								fSaveTempFiles;
++#ifdef LTO
++	bool								fVerboseLTORemarks;
++#endif
+ #ifdef SUPPORT_SNAPSHOTS
+     mutable Snapshot					fLinkSnapshot;
+     bool								fSnapshotRequested;
+Only in ld64-241.9/src/ld: Options.h~
+diff -ru ld64-241.9.orig/src/ld/Resolver.cpp ld64-241.9/src/ld/Resolver.cpp
+--- ld64-241.9.orig/src/ld/Resolver.cpp	2015-02-02 22:14:29.000000000 +0100
++++ ld64-241.9/src/ld/Resolver.cpp	2015-02-02 22:17:16.000000000 +0100
+@@ -1559,6 +1559,7 @@
+ 	optOpt.mcpu							= _options.mcpuLTO();
+ 	optOpt.llvmOptions					= &_options.llvmOptions();
+ 	optOpt.initialUndefines				= &_options.initialUndefines();
++	optOpt.verboseLTORemarks			= _options.verboseLTORemarks();
+ 	
+ 	std::vector<const ld::Atom*>		newAtoms;
+ 	std::vector<const char*>			additionalUndefines; 
+Only in ld64-241.9/src/ld: Resolver.cpp~
+diff -ru ld64-241.9.orig/src/ld/parsers/lto_file.cpp ld64-241.9/src/ld/parsers/lto_file.cpp
+--- ld64-241.9.orig/src/ld/parsers/lto_file.cpp	2015-02-02 22:14:29.000000000 +0100
++++ ld64-241.9/src/ld/parsers/lto_file.cpp	2015-02-02 22:18:27.000000000 +0100
+@@ -489,13 +489,17 @@
+ 
+ 
+ #if LTO_API_VERSION >= 7
+-void Parser::ltoDiagnosticHandler(lto_codegen_diagnostic_severity_t severity, const char* message, void*) 
++void Parser::ltoDiagnosticHandler(lto_codegen_diagnostic_severity_t severity, const char* message, void* data)
+ {
+ 	switch ( severity ) {
+ #if LTO_API_VERSION >= 10
+ 		case LTO_DS_REMARK:
++		{
++			const OptimizeOptions* options = (const OptimizeOptions*)data;
++			if (options->verboseLTORemarks)
+ 			fprintf(stderr, "ld: LTO remark: %s\n", message);
+ 			break;
++		}
+ #endif
+ 		case LTO_DS_NOTE:
+ 		case LTO_DS_WARNING:
+@@ -530,7 +533,7 @@
+ 	// create optimizer and add each Reader
+ 	lto_code_gen_t generator = ::lto_codegen_create();
+ #if LTO_API_VERSION >= 7
+-	lto_codegen_set_diagnostic_handler(generator, ltoDiagnosticHandler, NULL);
++	lto_codegen_set_diagnostic_handler(generator, ltoDiagnosticHandler, (void*)&options);
+ #endif
+ 
+ 	// <rdar://problem/12379604> The order that files are merged must match command line order
+Only in ld64-241.9/src/ld/parsers: lto_file.cpp~
+diff -ru ld64-241.9.orig/src/ld/parsers/lto_file.h ld64-241.9/src/ld/parsers/lto_file.h
+--- ld64-241.9.orig/src/ld/parsers/lto_file.h	2015-02-02 22:14:29.000000000 +0100
++++ ld64-241.9/src/ld/parsers/lto_file.h	2015-02-02 22:18:57.000000000 +0100
+@@ -61,6 +61,7 @@
+ 	const char*							mcpu;
+ 	const std::vector<const char*>*		llvmOptions;
+ 	const std::vector<const char*>*		initialUndefines;
++	bool								verboseLTORemarks;
+ };
+ 
+ extern bool	optimize(   const std::vector<const ld::Atom*>&	allAtoms,