From 893729fb788f1af2bfea53e1a58f9b2e9fc4e4fd Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 27 Jan 2015 07:13:39 +0000 Subject: [PATCH] Small fix for nolto patch to exit properly on -v, by Michael Weiser Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386 Manifest-Sign-Key: 0x5F75F607C5C74E89 --- sys-devel/binutils-apple/ChangeLog | 5 +- sys-devel/binutils-apple/Manifest | 10 ++-- .../files/ld64-236.3-nolto.patch | 53 +++++++++---------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog index 7446dd7110fc..58e2a355a894 100644 --- a/sys-devel/binutils-apple/ChangeLog +++ b/sys-devel/binutils-apple/ChangeLog @@ -1,6 +1,9 @@ # 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.36 2015/01/27 06:59:53 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.37 2015/01/27 07:13:36 grobian Exp $ + + 27 Jan 2015; Fabian Groffen files/ld64-236.3-nolto.patch: + Small fix for nolto patch to exit properly on -v, by Michael Weiser *binutils-apple-6.1 (27 Jan 2015) *binutils-apple-5.1 (27 Jan 2015) diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest index 9e334afc3d26..2e71317fe2a0 100644 --- a/sys-devel/binutils-apple/Manifest +++ b/sys-devel/binutils-apple/Manifest @@ -47,7 +47,7 @@ AUX ld64-236.3-crashreporter.patch 1005 SHA256 c7753ea2696a2819df2992a041a3ae6fd AUX ld64-236.3-gcc.patch 41867 SHA256 087585a2749b14399dfeef1d3a349fe785ec261033144c0ab1997b0eea915041 SHA512 4cc83075c9dd9f0e9a32f6f1d4fb7beeed25705da09032113cd62d81936c5d5a8af6cae0b913541e82044274fd5eb0ad2bc9cfe22d2b4c43bbd0261d21408fc4 WHIRLPOOL 3b8ad3f2ba98623430540a0efed0d200c8ca885797c9907bd54f2a1a080b9444da6ed6903078c1ee1c2cca628065a7778b1ab236f5653656319fb5ab5d7ed44e AUX ld64-236.3-missing-cputypes.patch 433 SHA256 be901fd3e73ef9aa923158422d6901a4485e83c08f6604c7beb6fceef646e9a6 SHA512 c1e5d4a61be1547e4c9f3f6d3423f2d3089b501e5510d130636ac3743c53d1d1e5b3d8feb1e76e93a59047586b75eb31404bb982c3a8381f4a0864c21a5a1f8c WHIRLPOOL f7e3874c7e35d5cd7751a7b000ee718643b8d11b3eb7ffe890e08644f4633b0592b83876863471abab020538003ac8dd91ef3c68e528b55fdc826a04803ce630 AUX ld64-236.3-noarm.patch 37310 SHA256 7eea2b973893b10fa925897860146af9a6b69a2bc1bbf6039637e7d50b43ce74 SHA512 adbdf215c24ddfa8cdc986b1cac78c273f9b9d70e92f477227553f84077cd7ac9c6ca4b2cb469c549cab96acb5cf5d894df74d0f356a69d85fdaf55f92d593b3 WHIRLPOOL 1bb7dd478a522fc4c076e93b2999191b43765b2da0df0b354f7d374a17d1d4381ea56ec27e8b09af5368986882f741dead7aa101de11fca51f5692f8b929e1fe -AUX ld64-236.3-nolto.patch 6385 SHA256 c90512afe6a25562a735260916152c64c516a670966a2fe39dd115fd7ca1e8fe SHA512 396f93674699d0fdb9ddfb2a4f0cab1e55fed55ba52fa3a0b750349d0098d69c61fde0114346fa6838d02ddce165e79fde76d2258980dd02425b115e96062ebb WHIRLPOOL 254d99a0d261186850ff90c41698e7490e2b2be53f1b56b3c21ae82f6d498f03cfaa8daae3308b3a448b920f3c0dd478fac9996c1e3708a585d312f32404e442 +AUX ld64-236.3-nolto.patch 5982 SHA256 627b123c9d1dd874fb51df7d8add2905d435ed98655409b71e604c9a585513aa SHA512 a73c2f66129c0523fdd81f9a32949d6dd7c4b19857a7a1093ebd423ce9b1ebdb7cf087392977128a0ea8f1601a366ab16d8b7f2119fcbdf460eb0f740d34d149 WHIRLPOOL 4fca8ba6b979a1d01795f80a35f6d856967ab060fa8eb717122b087b69f693093195b13c0cdd162767ce13a706557a27a23d98d5c3ada18f7a128ffe293aa4a0 AUX ld64-236.3-noppc.patch 789 SHA256 8080125d51ee6061f3444ff6f3227818975cf57ee119f4025ae415c9ebb20a3d SHA512 03ee70f89089295a9587af6e76ca1ddbe8efd2b24484bad2069d4085cf5a85a7f2b19dab6d99f1142f81e413e23421645146fb801ac30038afc66924ffa41c3b WHIRLPOOL 7a328ab2b1bcadc05fe495610661730870140e11f6c9a2d8daf435719d716a8ab7865d7f425bc44a92ac78f522e6a00eee322db4d859848ec1e31dcd6792e528 AUX ld64-236.3-nosnapshots.patch 23030 SHA256 3c281aa98ddc152030125f6c18596d475e5d77b5f2768036d9500f62978e37eb SHA512 cf7cc8fa81f4ab862e21c3e88aa23cac3f0ee58a9f97bcb44302a6d47238f20346cec42f4d1dda042162bcbc47255aededb33ff1440530a0b45aa2290a5388b4 WHIRLPOOL d78d0da0a35377dfb79d1146c6c93815e795fde1792bb4d5deb91698cc08bb96c5137800b072e15db3ffac8c91702a4fa0d6ba39bd83a9364c8106080eea29e0 AUX ld64-241.9-arm64-cputype.patch 776 SHA256 ec897532331b7a6d9c6adef7e1e393bb0c2c95d70a0963feb86885c2a25f030b SHA512 b07ab159f76d27496219a36508516104c8d34f95f3ebd8e44fae30badc8b3f58a7ff0f263742b8256588821505d0c0429ad27e66f9f7bc0339eaaedad3299241 WHIRLPOOL de2dbe11daebd25968996287b45aad720e282f136246741e7766d12bcf86f5ff16d3964b0b1b0e9a397da49d6f270536d015618ca970a6132b1aa116d7d8e51b @@ -90,12 +90,12 @@ EBUILD binutils-apple-4.2.ebuild 8742 SHA256 84d20c94a8e7718cda58c89309aeb189d46 EBUILD binutils-apple-4.3.ebuild 8541 SHA256 57a60263cd8716d20ce1da778572d2cc0c7d9360b3eee5ce6fc2b7fea5a8d4ba SHA512 0332b672f35d39eac39f282485f5f07822153bbd11eb508c33216ef129d77a3caff58cdd778b324afa9ccce15af6ec489921cce4cd8913fe2c567d1dcfa1e1e9 WHIRLPOOL 5a67e1b505423cf51bcfb85646affb64935186f4e2072943aa27c90ae8eef7917e390ece0788821cb7f6552962ace389826c4a9ceac03895efc32a1108957a4a EBUILD binutils-apple-5.1.ebuild 10969 SHA256 18f93456825ada493e580eb259610a7593a82530fc90be3ec693584cdf309db9 SHA512 6c0215e67f76671e54f6cc5902aed9369384da2aed82bbfd0d4b185af381c8f0cce088973130e9aa1485c342c02c6e983d1b8fa754673c7f217e4acafa1f1fe7 WHIRLPOOL 8558805b35c949b16e261064c9c9852b3ed30c2e72f07204a3f504212478ba21697a41b8e19eb1923ee73a3a26a75fc5f81f2c6c261ab6fa78af9cd64269ada0 EBUILD binutils-apple-6.1.ebuild 10873 SHA256 d4bd5540cfc361716c61dc21c91a712b6cf7979b6b6bc6e54a56344d59cca95a SHA512 2b177410036877b7d0475f7d7a26bc91f568f4581a6d88f637a8b18a871a32ecc8001e5d13aa4061685690052c945448e8451f8504880b0f9353c7641cdab683 WHIRLPOOL 7d57d73a427dcfbf920b6cce0c6fb987f39b93997406e8ec2e5e637704881efe897efe4c635610cf412d01b8f977f9bbde606deb7a34fcff54495fdcf3e985cd -MISC ChangeLog 12633 SHA256 51af0169602c4dc6619cd3ad467de471c36adeab9f172e6f01c5c02e56e3c0d2 SHA512 fb329348d842711233f922fa965c1bc1ece68de0e9b154a1379048f467389fdb7fcf2761bad01de9b0678b89e36b178d2068c3716eb4dc0fc63d4c9560f93162 WHIRLPOOL 62cbbaa99af748c2a645552abcef2207b0a27c06518c38f9e35bae629d1336408ae89c750a0d3793f14466741a449b751fbf17a78c06fbbb0cfcf13c243550eb +MISC ChangeLog 12785 SHA256 637a9507fa12011e78143619f31c8eede0196dbe99c8abe5a374eae11fc4bd52 SHA512 fa9082b58e0abca31b1c6cff50d95d4290bcc68fac6fd8dac45b539647849ed6382894581fe16fad54546858ca2cfa279bfe1ab34d213dd06084150c8352c407 WHIRLPOOL 4ba8dd3fbd5953926f0f0c209d147113108fdc5071d4c7e581b79b25b4349a353786222ae42f8502fa314ca8d69b9d0459b3f84f7aca87e73cd5bc3a3f3797f2 MISC metadata.xml 250 SHA256 f783a2767bd8eb2edebc0b1b1391fdcb461dcdb7a7c99dc1b82504c466688e79 SHA512 2bf2f0e337a47129234b62d5dfca7c5c51ebf637ed793296fb7953196c240327aa73e56bd5fcf3eb8e2611c3a18d6bb172e1ca690f8a0f892b9253a49672d1c9 WHIRLPOOL 64c736723231ed792bbf75c3a81a8de295a84d26a791f6d7fa9596d1ee25b039e113184f011d680d966ed27b7e57f30096448932df122a08d5b7912fbb59b62e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlTHN2oACgkQX3X2B8XHTonS9gCgnwSaHHEUDtO1QKXWEUM5V+eL -zUkAnjzl6GLbUGN5XcU41Wp/1Dy++wN4 -=Yo5x +iEYEAREIAAYFAlTHOqEACgkQX3X2B8XHTolLuACgmxO3hm8jMfXA+MCfXT4FIvTY +rzQAnjY59bzEn1XrNJHKqH+JgJ2RujnP +=ISV4 -----END PGP SIGNATURE----- diff --git a/sys-devel/binutils-apple/files/ld64-236.3-nolto.patch b/sys-devel/binutils-apple/files/ld64-236.3-nolto.patch index 85ca347b2b4f..5d68c377ea0e 100644 --- a/sys-devel/binutils-apple/files/ld64-236.3-nolto.patch +++ b/sys-devel/binutils-apple/files/ld64-236.3-nolto.patch @@ -1,7 +1,7 @@ -Allow to fully disable LTO. +Allow to fully disable LTO ---- ./src/ld/InputFiles.cpp.lto 2014-04-05 00:42:29.000000000 +0200 -+++ ./src/ld/InputFiles.cpp 2014-08-29 09:01:04.000000000 +0200 +--- ld64-236.3/src/ld/InputFiles.cpp ++++ ld64-236.3/src/ld/InputFiles.cpp @@ -59,7 +59,9 @@ #include "macho_relocatable_file.h" #include "macho_dylib_file.h" @@ -56,9 +56,9 @@ Allow to fully disable LTO. // error handling if ( ((fat_header*)p)->magic == OSSwapBigToHostInt32(FAT_MAGIC) ) { ---- ./src/ld/ld.cpp.lto 2014-04-05 00:42:29.000000000 +0200 -+++ ./src/ld/ld.cpp 2014-08-29 09:00:29.000000000 +0200 -@@ -83,7 +83,9 @@ +--- ld64-236.3/src/ld/ld.cpp ++++ ld64-236.3/src/ld/ld.cpp +@@ -91,7 +91,9 @@ #include "parsers/archive_file.h" #include "parsers/macho_relocatable_file.h" #include "parsers/macho_dylib_file.h" @@ -68,9 +68,9 @@ Allow to fully disable LTO. #include "parsers/opaque_section_file.h" ---- ./src/ld/Options.cpp.lto 2014-04-05 00:42:29.000000000 +0200 -+++ ./src/ld/Options.cpp 2014-08-29 09:00:29.000000000 +0200 -@@ -42,10 +42,13 @@ +--- ld64-236.3/src/ld/Options.cpp ++++ ld64-236.3/src/ld/Options.cpp +@@ -41,10 +41,13 @@ #include "MachOFileAbstraction.hpp" #include "Snapshot.h" @@ -84,7 +84,7 @@ Allow to fully disable LTO. // magic to place command line in crash reports const int crashreporterBufferSize = 2000; -@@ -3082,10 +3086,12 @@ +@@ -3179,9 +3182,11 @@ fprintf(stderr, "configured to support archs: %s\n", ALL_SUPPORTED_ARCHS); // if only -v specified, exit cleanly if ( argc == 2 ) { @@ -92,14 +92,13 @@ Allow to fully disable LTO. const char* ltoVers = lto::version(); if ( ltoVers != NULL ) fprintf(stderr, "LTO support using: %s\n", ltoVers); - exit(0); +#endif + exit(0); } } - else if ( strcmp(argv[i], "-syslibroot") == 0 ) { ---- ./src/ld/parsers/archive_file.cpp.lto 2014-04-05 00:42:29.000000000 +0200 -+++ ./src/ld/parsers/archive_file.cpp 2014-08-29 09:00:29.000000000 +0200 -@@ -39,7 +39,9 @@ +--- ld64-236.3/src/ld/parsers/archive_file.cpp ++++ ld64-236.3/src/ld/parsers/archive_file.cpp +@@ -45,7 +45,9 @@ #include "Architectures.hpp" #include "macho_relocatable_file.h" @@ -109,7 +108,7 @@ Allow to fully disable LTO. #include "archive_file.h" -@@ -91,8 +93,10 @@ +@@ -97,8 +99,10 @@ private: static bool validMachOFile(const uint8_t* fileContent, uint64_t fileLength, const mach_o::relocatable::ParserOptions& opts); @@ -120,7 +119,7 @@ Allow to fully disable LTO. static cpu_type_t architecture(); class Entry : ar_hdr -@@ -232,11 +236,13 @@ +@@ -242,11 +246,13 @@ return mach_o::relocatable::isObjectFile(fileContent, fileLength, opts); } @@ -134,7 +133,7 @@ Allow to fully disable LTO. -@@ -257,7 +263,11 @@ +@@ -267,7 +273,11 @@ if ( (p==start) && ((strcmp(memberName, SYMDEF_SORTED) == 0) || (strcmp(memberName, SYMDEF) == 0)) ) continue; // archive is valid if first .o file is valid @@ -147,7 +146,7 @@ Allow to fully disable LTO. } // empty archive return true; -@@ -378,6 +388,7 @@ +@@ -388,6 +398,7 @@ _instantiatedEntries[member] = state; return _instantiatedEntries[member]; } @@ -155,7 +154,7 @@ Allow to fully disable LTO. // see if member is llvm bitcode file result = lto::parse(member->content(), member->contentSize(), mPath, member->modificationTime(), ordinal, -@@ -387,6 +398,7 @@ +@@ -397,6 +408,7 @@ _instantiatedEntries[member] = state; return _instantiatedEntries[member]; } @@ -163,8 +162,8 @@ Allow to fully disable LTO. throwf("archive member '%s' with length %d is not mach-o or llvm bitcode", memberName, member->contentSize()); } ---- ./src/ld/Resolver.cpp.lto 2014-04-05 00:42:29.000000000 +0200 -+++ ./src/ld/Resolver.cpp 2014-08-29 09:00:29.000000000 +0200 +--- ld64-236.3/src/ld/Resolver.cpp ++++ ld64-236.3/src/ld/Resolver.cpp @@ -56,7 +56,9 @@ #include "InputFiles.h" #include "SymbolTable.h" @@ -175,7 +174,7 @@ Allow to fully disable LTO. namespace ld { -@@ -1436,6 +1438,7 @@ +@@ -1438,6 +1440,7 @@ void Resolver::linkTimeOptimize() { @@ -183,7 +182,7 @@ Allow to fully disable LTO. // only do work here if some llvm obj files where loaded if ( ! _haveLLVMObjs ) return; -@@ -1533,6 +1536,9 @@ +@@ -1535,6 +1538,9 @@ // check new code does not override some dylib this->checkDylibSymbolCollisions(); } @@ -193,8 +192,8 @@ Allow to fully disable LTO. } ---- ./src/other/ObjectDump.cpp.lto 2014-04-05 00:42:29.000000000 +0200 -+++ ./src/other/ObjectDump.cpp 2014-08-29 09:01:34.000000000 +0200 +--- ld64-236.3/src/other/ObjectDump.cpp ++++ ld64-236.3/src/other/ObjectDump.cpp @@ -33,7 +33,9 @@ #include "MachOFileAbstraction.hpp" @@ -205,7 +204,7 @@ Allow to fully disable LTO. static bool sDumpContent= true; static bool sDumpStabs = false; -@@ -1245,10 +1247,12 @@ +@@ -1249,10 +1251,12 @@ if ( objResult != NULL ) return objResult; -- 2.26.2