From 0fdf3cc4c211baf8e393c7772efc348a5ebdf270 Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Sun, 20 Nov 2016 16:06:25 +0200
Subject: [PATCH] binutils227: Symlink liblto_plugin.so from default base gcc
 compiler too.

Now that alternative binutils are updated, further work towards making
binutils 2.27 as default can continue.
Also documment bfd-plugins/ directory in hier(7).
---
 gnu/usr.bin/cc50/support-libs/liblto_plugin/Makefile |  8 ++++++--
 share/man/man7/hier.7                                | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/gnu/usr.bin/cc50/support-libs/liblto_plugin/Makefile b/gnu/usr.bin/cc50/support-libs/liblto_plugin/Makefile
index 59b99f77bb..e956e8bb9e 100644
--- a/gnu/usr.bin/cc50/support-libs/liblto_plugin/Makefile
+++ b/gnu/usr.bin/cc50/support-libs/liblto_plugin/Makefile
@@ -50,13 +50,17 @@ LVL2_3_=	${PLUGIN_HEADERS_OBJC}
 LVL2_4_=	${PLUGIN_HEADERS_CONFIG}
 LVL3_=		${PLUGIN_HEADERS_CONFIG_I386}
 
-# SYMLINK lto plugin to primary binutils bfd-plugin dir
+# SYMLINK lto plugin to primary/backup binutils bfd-plugin dirs
 .if ${CC_PRIMARY} == "gcc50" # we are default gcc compiler
-.if exists(${DESTDIR}/usr/libexec/${BU_PRIMARY}/bfd-plugins)
 LTOPLUGIN=	liblto_plugin.so
+.if exists(${DESTDIR}/usr/libexec/${BU_PRIMARY}/bfd-plugins)
 BFDPLUGINS=	/usr/libexec/${BU_PRIMARY}/bfd-plugins
 SYMLINKS+=	../../${CC_PRIMARY}/${LTOPLUGIN} ${BFDPLUGINS}/${LTOPLUGIN}
 .endif
+.if exists(${DESTDIR}/usr/libexec/${BU_BACKUP}/bfd-plugins)
+BFDPLUGINSB=	/usr/libexec/${BU_BACKUP}/bfd-plugins
+SYMLINKS+=	../../${CC_PRIMARY}/${LTOPLUGIN} ${BFDPLUGINSB}/${LTOPLUGIN}
+.endif
 .endif
 
 .include <bsd.lib.mk>
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 3cd61148c5..83a799fa60 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -28,7 +28,7 @@
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man7/hier.7,v 1.29.2.17 2003/01/13 21:43:50 ceri Exp $
 .\"
-.Dd November 6, 2016
+.Dd November 24, 2016
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -304,7 +304,9 @@ system daemons & system utilities (executed by other programs)
 .Bl -tag -width ".Pa binutils225/" -compact
 .It Pa binutils225/
 .Pp
-.Bl -tag -width ".Pa ldscripts/" -compact
+.Bl -tag -width ".Pa bfd-plugins/" -compact
+.It Pa bfd-plugins/
+linker plugins
 .It Pa ldscripts/
 linker scripts;
 see
@@ -313,7 +315,9 @@ see
 .Pp
 .It Pa binutils227/
 .Pp
-.Bl -tag -width ".Pa ldscripts/" -compact
+.Bl -tag -width ".Pa bfd-plugins/" -compact
+.It Pa bfd-plugins/
+linker plugins
 .It Pa ldscripts/
 linker scripts;
 see
-- 
2.11.4.GIT