Ticket #44607: PR-44607.patch

Portfile

@@ -91 +91 @@
     # XCode 3.2.6
     # 127.2 should work for powerpc, but it will require some build fixes.
     version             97.17
-    revision            2
+    revision            3
     checksums           rmd160  d52df7d7f741c8bedd29cbac73dbb9db992b4795 \
                         sha256  02bd46af0809eaa415d096d7d41c3e8e7d80f7d8d181840866fb87f036b4e089
     supported_archs     x86_64 i386 ppc
@@ -99 +99 @@
     set makefile        "Makefile-97"
 
     patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch ld64-134-missing-include.patch ld64-136-i386-badAddress.patch PR-16935960.patch PR-16936488.patch
-    patchfiles-append   ld64-97-no-LTO.patch ld64-97-ppc-branch-island.patch ld64-97-arm_types_PR38931.patch
+    patchfiles-append   ld64-97-no-LTO.patch ld64-97-ppc-branch-island.patch ld64-97-arm_types_PR38931.patch ld64-97-long-branch-warn.patch
 } elseif {${os.major} < 10} {
     # XCode 4.2
     # This was the last ld64 release that supported linking ppc executables.
     version             127.2
-    revision            6
+    revision            7
     checksums           rmd160  8ee709341549a1944732daef6ebab7ef1acfcc6e \
                         sha256  97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142
     supported_archs     i386 x86_64
@@ -112 +112 @@
     set makefile        "Makefile-127"
 
     patchfiles-delete   ld64-133-no-CrashReporterClient.h.patch ld64-136-i386-badAddress.patch PR-16935960.patch PR-16936488.patch
-    patchfiles-append   ld64-127-any-cctools.patch
+    patchfiles-append   ld64-127-any-cctools.patch ld64-127-long-branch-warn.patch
 } elseif {${os.major} < 11} {
     # XCode 4.6
     # Until we figure out a way to better bootstrap ld64-236 on SnowLeopard or fix its build failure

files/ld64-127-long-branch-warn.patch

@@ +1 @@
+https://trac.macports.org/ticket/44607
+
+--- src/ld/parsers/macho_relocatable_file.cpp   2011-07-26 17:10:35.000000000 -0700
++++ src/ld/parsers/macho_relocatable_file.cpp   2014-08-11 09:55:48.000000000 -0700
+@@ -5811,7 +5811,7 @@ bool Section<A>::addRelocFixup_powerpc(c
+                                // this is from -mlong-branch codegen.  We ignore the jump island and make reference to the real target
+                                if ( nextReloc->r_type() != PPC_RELOC_PAIR ) 
+                                        throw "PPC_RELOC_JBSR missing following pair";
+-                               if ( !parser._hasLongBranchStubs )
++                               if ( !parser._hasLongBranchStubs && !strstr(parser._path, "/usr/lib/crt1.o") )
+                                        warning("object file compiled with -mlong-branch which is no longer needed. "
+                                                        "To remove this warning, recompile without -mlong-branch: %s", parser._path);
+                                parser._hasLongBranchStubs = true;

files/ld64-97-long-branch-warn.patch

@@ +1 @@
+https://trac.macports.org/ticket/44607
+
+--- src/ld/MachOReaderRelocatable.hpp   2010-01-26 10:42:37.000000000 -0800
++++ src/ld/MachOReaderRelocatable.hpp   2014-08-11 09:51:12.000000000 -0700
+@@ -4517,7 +4517,7 @@ bool Reader<A>::addRelocReference_powerp
+                                if ( nextReloc->r_type() != PPC_RELOC_PAIR ) {
+                                        throw "PPC_RELOC_JBSR missing following pair";
+                                }
+-                               if ( !fHasLongBranchStubs )
++                               if ( !fHasLongBranchStubs && !strstr(fPath, "/usr/lib/crt1.o") )
+                                        warning("object file compiled with -mlong-branch which is no longer needed. To remove this warning, recompile without -mlong-branch: %s", fPath);
+                                fHasLongBranchStubs = true;
+                                result = true;