<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b8a82fd518385869d68c0b4e1e96af73353af5d3">https://github.com/macports/macports-ports/commit/b8a82fd518385869d68c0b4e1e96af73353af5d3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b8a82fd gcc6 / libgcc6: fix build on Tiger Intel
</span>b8a82fd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b8a82fd518385869d68c0b4e1e96af73353af5d3
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Apr 16 12:04:39 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gcc6 / libgcc6: fix build on Tiger Intel
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> same patch as gcc7 / libgcc works here as well
</span><span style='display:block; white-space:pre;color:#404040;'> patch affects no other systems or builds
</span>---
lang/gcc6/Portfile | 5 ++
lang/gcc6/files/patch-gcc7-tiger-intel.diff | 104 ++++++++++++++++++++++++++++
2 files changed, 109 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc6/Portfile b/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf4b2c0..e0eda56 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +56,11 @@ platform darwin {
</span> patchfiles-append patch-float128.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix build on Tiger Intel - same patch as gcc7 / libgcc works
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 8 i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gcc7-tiger-intel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.dir ${workpath}/build
configure.cmd ${worksrcpath}/configure
configure.args --enable-languages=c,c++,objc,obj-c++,lto,fortran \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc6/files/patch-gcc7-tiger-intel.diff b/lang/gcc6/files/patch-gcc7-tiger-intel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d44bf1a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc6/files/patch-gcc7-tiger-intel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,104 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2018-04-15 11:27:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2018-04-15 11:31:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -356,7 +356,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Flags to pass to stage2 and later makes. They are defined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # here so that they can be overridden by Makefile fragments.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BOOT_CFLAGS= -g -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BOOT_CFLAGS= -g -O2 -mmacosx-version-min=10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_LDFLAGS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOT_ADAFLAGS= -gnatpg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -403,7 +403,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNATMAKE = @GNATMAKE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS = @CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS = @LDFLAGS@ -mmacosx-version-min=10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBCFLAGS = $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS = @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -421,7 +421,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Defaults for stage 1; some are overridden below.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-STAGE1_CFLAGS = $(STAGE_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++STAGE1_CFLAGS = $(STAGE_CFLAGS) -mmacosx-version-min=10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STAGE1_CXXFLAGS = $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @if target-libstdc++-v3-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Override the above if we're bootstrapping C++.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -568,8 +568,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@ -mmacosx-version-min=10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@ -mmacosx-version-min=10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libcilkrts/runtime/sysdep-unix.c.orig 2018-04-15 15:19:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libcilkrts/runtime/sysdep-unix.c 2018-04-15 15:58:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,6 +102,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <vxCpuLib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __MAC_OS_X_VERSION_MIN_REQUIRED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif //#ifndef __MAC_OS_X_VERSION_MIN_REQUIRED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _SC_NPROCESSORS_ONLN 58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++long tigersysconf(int name){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (name == _SC_NPROCESSORS_ONLN) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int nm[2];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t len = 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ nm[0] = CTL_HW; nm[1] = HW_AVAILCPU;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sysctl(nm, 2, &count, &len, NULL, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (count < 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ nm[1] = HW_NCPU;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sysctl(nm, 2, &count, &len, NULL, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (count < 1) { count = 1; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (long)count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif //#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif //#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct global_sysdep_state
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pthread_t *threads; ///< Array of pthreads for system workers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -695,7 +735,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __VXWORKS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(fp, "System cores: %d\n", (int)__builtin_popcount(vxCpuEnabledGet()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(fp, "System cores: %d\n", (int)tigersysconf(_SC_NPROCESSORS_ONLN));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(fp, "System cores: %d\n", (int)sysconf(_SC_NPROCESSORS_ONLN));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif //__MAC_OS_X_VERSION_MIN_REQUIRED < 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(fp, "Cilk workers requested: %d\n", n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>