From d962c5274eccd0f8cb50c3e74f2016a0e1aec2b7 Mon Sep 17 00:00:00 2001
From: Aurelien Larcher <aurelien.larcher@gmail.com>
Date: Tue, 31 Oct 2017 08:20:11 -0700
Subject: [PATCH] gcc-7: fix missing crtp.o and crtpg.o

---
 components/developer/gcc-7/Makefile                |  1 +
 components/developer/gcc-7/gcc-7.p5m               |  4 +++
 .../developer/gcc-7/manifests/sample-manifest.p5m  | 29 ++++++++++++----------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/components/developer/gcc-7/Makefile b/components/developer/gcc-7/Makefile
index bf932621f..752a8457a 100644
--- a/components/developer/gcc-7/Makefile
+++ b/components/developer/gcc-7/Makefile
@@ -18,6 +18,7 @@ include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME= gcc
 COMPONENT_VERSION= 7.2.0
+COMPONENT_REVISION= 2
 COMPONENT_MAJOR_VERSION=	$(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\([0-9]\+\)\.[0-9]\+.*/\1/')
 THIS_GCC_PKGVERSION= $(COMPONENT_VERSION)-OI-$(COMPONENT_REVISION)
 COMPONENT_FMRI= developer/gcc-$(COMPONENT_MAJOR_VERSION)
diff --git a/components/developer/gcc-7/gcc-7.p5m b/components/developer/gcc-7/gcc-7.p5m
index 4f27c5818..f68a72d92 100644
--- a/components/developer/gcc-7/gcc-7.p5m
+++ b/components/developer/gcc-7/gcc-7.p5m
@@ -932,6 +932,8 @@ file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crtbeginS
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crtend.o
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crtendS.o
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crtfastmath.o
+file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crtp.o
+file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crtpg.o
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crtprec32.o
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crtprec64.o
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crtprec80.o
@@ -960,6 +962,8 @@ file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/crtbeginS.o
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/crtend.o
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/crtendS.o
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/crtfastmath.o
+file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/crtp.o
+file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/crtpg.o
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/crtprec32.o
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/crtprec64.o
 file path=usr/gcc/7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/crtprec80.o
diff --git a/components/developer/gcc-7/manifests/sample-manifest.p5m b/components/developer/gcc-7/manifests/sample-manifest.p5m
index 249662454..59b6944b7 100644
--- a/components/developer/gcc-7/manifests/sample-manifest.p5m
+++ b/components/developer/gcc-7/manifests/sample-manifest.p5m
@@ -26,23 +26,22 @@ file path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-c++
 hardlink path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-g++ \
     target=i386-pc-solaris2.11-c++
 hardlink path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-gcc \
-    target=gcc
-hardlink \
-    path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-gcc-$(COMPONENT_VERSION) \
-    target=gcc
-file path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-gcc-ar
-file path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-gcc-nm
-hardlink \
-    path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-gcc-ranlib \
-    target=gcc-ranlib
+    target=i386-pc-solaris2.11-gcc-$(COMPONENT_VERSION)
+file path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-gcc-$(COMPONENT_VERSION)
+hardlink path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-gcc-ar \
+    target=gcc-ar
+hardlink path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-gcc-nm \
+    target=gcc-nm
+file path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-gcc-ranlib
 file path=usr/gcc/7/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)-gfortran
 hardlink path=usr/gcc/7/bin/c++ target=i386-pc-solaris2.11-c++
 file path=usr/gcc/7/bin/cpp
 hardlink path=usr/gcc/7/bin/g++ target=i386-pc-solaris2.11-c++
-file path=usr/gcc/7/bin/gcc
-hardlink path=usr/gcc/7/bin/gcc-ar target=i386-pc-solaris2.11-gcc-ar
-hardlink path=usr/gcc/7/bin/gcc-nm target=i386-pc-solaris2.11-gcc-nm
-file path=usr/gcc/7/bin/gcc-ranlib
+hardlink path=usr/gcc/7/bin/gcc \
+    target=i386-pc-solaris2.11-gcc-$(COMPONENT_VERSION)
+file path=usr/gcc/7/bin/gcc-ar
+file path=usr/gcc/7/bin/gcc-nm
+hardlink path=usr/gcc/7/bin/gcc-ranlib target=i386-pc-solaris2.11-gcc-ranlib
 file path=usr/gcc/7/bin/gcov
 file path=usr/gcc/7/bin/gcov-dump
 file path=usr/gcc/7/bin/gcov-tool
@@ -869,6 +868,8 @@ file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONEN
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/$(MACH64)/crtend.o
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/$(MACH64)/crtendS.o
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/$(MACH64)/crtfastmath.o
+file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/$(MACH64)/crtp.o
+file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/$(MACH64)/crtpg.o
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/$(MACH64)/crtprec32.o
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/$(MACH64)/crtprec64.o
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/$(MACH64)/crtprec80.o
@@ -897,6 +898,8 @@ file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONEN
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/crtend.o
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/crtendS.o
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/crtfastmath.o
+file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/crtp.o
+file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/crtpg.o
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/crtprec32.o
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/crtprec64.o
 file path=usr/gcc/7/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_RELEASE)/$(COMPONENT_VERSION)/crtprec80.o
-- 
2.11.4.GIT