From owner-svn-ports-all@freebsd.org Mon Jan 25 07:50:19 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7F44A45F8D; Mon, 25 Jan 2016 07:50:19 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D7A79B4; Mon, 25 Jan 2016 07:50:19 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0P7oIEI097032; Mon, 25 Jan 2016 07:50:18 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0P7oIoC097030; Mon, 25 Jan 2016 07:50:18 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201601250750.u0P7oIoC097030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 25 Jan 2016 07:50:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r407196 - in branches/2016Q1/emulators/simh: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2016 07:50:19 -0000 Author: dim (src committer) Date: Mon Jan 25 07:50:18 2016 New Revision: 407196 URL: https://svnweb.freebsd.org/changeset/ports/407196 Log: MFH: r407167 During the exp-run in bug 206074, it was found that emulators/simh gives errors with a recent clang 3.8.0 snapshot [1]: /usr/bin/ld: unrecognized option '-plugin' And more of such linking errors. This is because the simh main Makefile attempts to use -flto -fwhole-program with clang, but this support depends on the correctly link time optimization infrastructure being installed (e.g. the LLVMgold.so plugin, and more). Since LTO is not available yet in base, here is a patch to disable the use of these options more thorougly. Approved by: ports-secteam (delphij) PR: 206411 Added: branches/2016Q1/emulators/simh/files/patch-makefile - copied unchanged from r407167, head/emulators/simh/files/patch-makefile Modified: branches/2016Q1/emulators/simh/Makefile Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/emulators/simh/Makefile ============================================================================== --- branches/2016Q1/emulators/simh/Makefile Mon Jan 25 07:13:10 2016 (r407195) +++ branches/2016Q1/emulators/simh/Makefile Mon Jan 25 07:50:18 2016 (r407196) @@ -13,7 +13,7 @@ COMMENT= Emulates classic DEC, HP, GRI, NO_WRKSUBDIR= yes USES= gmake dos2unix zip -DOS2UNIX_FILES= VAX/vax_sysdev.c +DOS2UNIX_FILES= makefile VAX/vax_sysdev.c MAKE_ENV= GCC="${CC}" CFLAGS_O="${CFLAGS}" USE_NETWORK=1 MAKEFILE= makefile Copied: branches/2016Q1/emulators/simh/files/patch-makefile (from r407167, head/emulators/simh/files/patch-makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/emulators/simh/files/patch-makefile Mon Jan 25 07:50:18 2016 (r407196, copy of r407167, head/emulators/simh/files/patch-makefile) @@ -0,0 +1,15 @@ +--- makefile.orig 2012-04-23 16:28:04.000000000 +0200 ++++ makefile 2016-01-19 20:21:21.371550000 +0100 +@@ -332,8 +332,10 @@ + endif + ifeq (,$(NO_LTO)) + ifneq (,$(findstring -flto,$(GCC_OPTIMIZERS))) +- CFLAGS_O += -flto -fwhole-program +- LDFLAGS_O += -flto -fwhole-program ++ ifneq (,$(findstring -fwhole-program,$(GCC_OPTIMIZERS))) ++ CFLAGS_O += -flto -fwhole-program ++ LDFLAGS_O += -flto -fwhole-program ++ endif + endif + endif + BUILD_FEATURES = - compiler optimizations and no debugging support