From owner-svn-ports-head@freebsd.org Sat Jan 9 11:56:22 2016 Return-Path: Delivered-To: svn-ports-head@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 D066CA69A74; Sat, 9 Jan 2016 11:56:22 +0000 (UTC) (envelope-from andreast@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 8A43D1449; Sat, 9 Jan 2016 11:56:22 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u09BuLn7053582; Sat, 9 Jan 2016 11:56:21 GMT (envelope-from andreast@FreeBSD.org) Received: (from andreast@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u09BuLrg053581; Sat, 9 Jan 2016 11:56:21 GMT (envelope-from andreast@FreeBSD.org) Message-Id: <201601091156.u09BuLrg053581@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andreast set sender to andreast@FreeBSD.org using -f From: Andreas Tobler Date: Sat, 9 Jan 2016 11:56:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405619 - head/lang/gcc5/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2016 11:56:23 -0000 Author: andreast (src committer) Date: Sat Jan 9 11:56:21 2016 New Revision: 405619 URL: https://svnweb.freebsd.org/changeset/ports/405619 Log: Bring the fixes mentioned below from upstream to our gcc-5.3 release port. [1]: https://gcc.gnu.org/ml/gcc-patches/2015-12/msg02057.html [2]: https://gcc.gnu.org/ml/gcc-patches/2015-12/msg00685.html PR: 205394, 205440 Approved by: gerald (maintainer) Modified: head/lang/gcc5/files/patch-gcc-freebsd-powerpc64 Modified: head/lang/gcc5/files/patch-gcc-freebsd-powerpc64 ============================================================================== --- head/lang/gcc5/files/patch-gcc-freebsd-powerpc64 Sat Jan 9 09:09:44 2016 (r405618) +++ head/lang/gcc5/files/patch-gcc-freebsd-powerpc64 Sat Jan 9 11:56:21 2016 (r405619) @@ -1,5 +1,5 @@ ---- gcc/config/rs6000/freebsd64.h 2015-11-28 09:06:13.019999000 -0800 -+++ gcc/config/rs6000/freebsd64.h 2015-11-28 09:16:10.459373000 -0800 +--- gcc/config/rs6000/freebsd64.h.orig 2015-12-23 21:56:41.030016000 +0100 ++++ gcc/config/rs6000/freebsd64.h 2015-12-23 21:56:28.343015000 +0100 @@ -65,6 +65,13 @@ #define INVALID_64BIT "-m%s not supported in this configuration" #define INVALID_32BIT INVALID_64BIT @@ -27,3 +27,53 @@ if (rs6000_isa_flags & OPTION_MASK_EABI) \ { \ rs6000_isa_flags &= ~OPTION_MASK_EABI; \ +@@ -154,22 +167,7 @@ + { "link_os_freebsd_spec32", LINK_OS_FREEBSD_SPEC32 }, \ + { "link_os_freebsd_spec64", LINK_OS_FREEBSD_SPEC64 }, + +-#define FREEBSD_DYNAMIC_LINKER32 "/libexec/ld-elf32.so.1" +-#define FREEBSD_DYNAMIC_LINKER64 "/libexec/ld-elf.so.1" +- +-#define LINK_OS_FREEBSD_SPEC_DEF32 "\ +- %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ +- %{v:-V} \ +- %{assert*} %{R*} %{rpath*} %{defsym*} \ +- %{shared:-Bshareable %{h*} %{soname*}} \ +- %{!shared: \ +- %{!static: \ +- %{rdynamic: -export-dynamic} \ +- %{!dynamic-linker:-dynamic-linker " FREEBSD_DYNAMIC_LINKER32 "}} \ +- %{static:-Bstatic}} \ +- %{symbolic:-Bsymbolic}" +- +-#define LINK_OS_FREEBSD_SPEC_DEF64 "\ ++#define LINK_OS_FREEBSD_SPEC_DEF "\ + %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ + %{v:-V} \ + %{assert*} %{R*} %{rpath*} %{defsym*} \ +@@ -177,13 +175,13 @@ + %{!shared: \ + %{!static: \ + %{rdynamic: -export-dynamic} \ +- %{!dynamic-linker:-dynamic-linker " FREEBSD_DYNAMIC_LINKER64 "}} \ ++ %{!dynamic-linker:-dynamic-linker " FBSD_DYNAMIC_LINKER "}} \ + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic}" + +-#define LINK_OS_FREEBSD_SPEC32 "-melf32ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF32 ++#define LINK_OS_FREEBSD_SPEC32 "-melf32ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF + +-#define LINK_OS_FREEBSD_SPEC64 "-melf64ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF64 ++#define LINK_OS_FREEBSD_SPEC64 "-melf64ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF + + #undef MULTILIB_DEFAULTS + #define MULTILIB_DEFAULTS { "m64" } +@@ -304,7 +302,7 @@ + + /* rs6000.h gets this wrong for FreeBSD. We use the GCC defaults instead. */ + #undef WCHAR_TYPE +-#define WCHAR_TYPE (TARGET_64BIT ? "int" : "long int") ++ + #undef WCHAR_TYPE_SIZE + #define WCHAR_TYPE_SIZE 32 +