From owner-svn-src-projects@freebsd.org Tue Sep 19 18:18:26 2017 Return-Path: Delivered-To: svn-src-projects@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 DEEF6E22BBE for ; Tue, 19 Sep 2017 18:18:26 +0000 (UTC) (envelope-from nwhitehorn@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 AE3D066707; Tue, 19 Sep 2017 18:18:26 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8JIIPDE082017; Tue, 19 Sep 2017 18:18:25 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8JIIPB2082015; Tue, 19 Sep 2017 18:18:25 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201709191818.v8JIIPB2082015@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Tue, 19 Sep 2017 18:18:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323773 - projects/powernv/conf X-SVN-Group: projects X-SVN-Commit-Author: nwhitehorn X-SVN-Commit-Paths: projects/powernv/conf X-SVN-Commit-Revision: 323773 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2017 18:18:27 -0000 Author: nwhitehorn Date: Tue Sep 19 18:18:24 2017 New Revision: 323773 URL: https://svnweb.freebsd.org/changeset/base/323773 Log: Instead of relying on extra linker options present only in post-tree binutils, suppress PT_INTERP using the linker script. Modified: projects/powernv/conf/Makefile.powerpc projects/powernv/conf/ldscript.powerpc64 Modified: projects/powernv/conf/Makefile.powerpc ============================================================================== --- projects/powernv/conf/Makefile.powerpc Tue Sep 19 17:57:04 2017 (r323772) +++ projects/powernv/conf/Makefile.powerpc Tue Sep 19 18:18:24 2017 (r323773) @@ -46,12 +46,6 @@ CFLAGS.gcc+= -Wa,-many CFLAGS+= -fPIC LDFLAGS+= -pie -# Work around assertion in kexec-lite. The GCC version switch is really -# a binutils version switch by correlation. -.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 50000 -LDFLAGS+= --no-dynamic-linker -.endif - .if !empty(DDB_ENABLED) CFLAGS+= -fno-omit-frame-pointer .endif Modified: projects/powernv/conf/ldscript.powerpc64 ============================================================================== --- projects/powernv/conf/ldscript.powerpc64 Tue Sep 19 17:57:04 2017 (r323772) +++ projects/powernv/conf/ldscript.powerpc64 Tue Sep 19 18:18:24 2017 (r323773) @@ -24,7 +24,10 @@ SECTIONS _etext = .; PROVIDE (etext = .); - .interp : { *(.interp) } + /* Do not emit PT_INTERP section, which confuses some loaders (kexec-lite) */ + .interpX : { *(.interp) } : NONE + /DISCARD/ : { *(.interp) } + .hash : { *(.hash) } .dynsym : { *(.dynsym) } .dynstr : { *(.dynstr) }