From owner-svn-src-all@freebsd.org Sun Aug 21 15:14:07 2016 Return-Path: Delivered-To: svn-src-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 6AAD4BC0490; Sun, 21 Aug 2016 15:14:07 +0000 (UTC) (envelope-from ed@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 4898F1A17; Sun, 21 Aug 2016 15:14:07 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7LFE6tt045065; Sun, 21 Aug 2016 15:14:06 GMT (envelope-from ed@FreeBSD.org) Received: (from ed@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7LFE6cL045061; Sun, 21 Aug 2016 15:14:06 GMT (envelope-from ed@FreeBSD.org) Message-Id: <201608211514.u7LFE6cL045061@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org using -f From: Ed Schouten Date: Sun, 21 Aug 2016 15:14:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r304557 - in head/sys: compat/cloudabi compat/cloudabi64 conf modules/cloudabi64 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Aug 2016 15:14:07 -0000 Author: ed Date: Sun Aug 21 15:14:06 2016 New Revision: 304557 URL: https://svnweb.freebsd.org/changeset/base/304557 Log: Move the linker script from cloudabi64/ to cloudabi/. It turns out that it works perfectly fine for generating 32-bits vDSOs as well. While there, get rid of the extraneous .s file extension. Added: head/sys/compat/cloudabi/cloudabi_vdso.lds - copied, changed from r304556, head/sys/compat/cloudabi64/cloudabi64_vdso.lds.s Deleted: head/sys/compat/cloudabi64/cloudabi64_vdso.lds.s Modified: head/sys/conf/files.amd64 head/sys/conf/files.arm64 head/sys/modules/cloudabi64/Makefile Copied and modified: head/sys/compat/cloudabi/cloudabi_vdso.lds (from r304556, head/sys/compat/cloudabi64/cloudabi64_vdso.lds.s) ============================================================================== --- head/sys/compat/cloudabi64/cloudabi64_vdso.lds.s Sun Aug 21 09:32:20 2016 (r304556, copy source) +++ head/sys/compat/cloudabi/cloudabi_vdso.lds Sun Aug 21 15:14:06 2016 (r304557) @@ -1,5 +1,5 @@ /* - * Linker script for 64-bit vDSO for CloudABI. + * Linker script for the vDSO for CloudABI. * Based on sys/amd64/linux/linux_vdso.lds.s * * $FreeBSD$ Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Sun Aug 21 09:32:20 2016 (r304556) +++ head/sys/conf/files.amd64 Sun Aug 21 15:14:06 2016 (r304557) @@ -10,7 +10,7 @@ # cloudabi64_vdso.o optional compat_cloudabi64 \ dependency "$S/contrib/cloudabi/cloudabi_vdso_x86_64.S" \ - compile-with "${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi64/cloudabi64_vdso.lds.s $S/contrib/cloudabi/cloudabi_vdso_x86_64.S -o ${.TARGET}" \ + compile-with "${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi/cloudabi_vdso.lds $S/contrib/cloudabi/cloudabi_vdso_x86_64.S -o ${.TARGET}" \ no-obj no-implicit-rule \ clean "cloudabi64_vdso.o" # Modified: head/sys/conf/files.arm64 ============================================================================== --- head/sys/conf/files.arm64 Sun Aug 21 09:32:20 2016 (r304556) +++ head/sys/conf/files.arm64 Sun Aug 21 15:14:06 2016 (r304557) @@ -1,7 +1,7 @@ # $FreeBSD$ cloudabi64_vdso.o optional compat_cloudabi64 \ dependency "$S/contrib/cloudabi/cloudabi_vdso_aarch64.S" \ - compile-with "${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi64/cloudabi64_vdso.lds.s $S/contrib/cloudabi/cloudabi_vdso_aarch64.S -o ${.TARGET}" \ + compile-with "${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi/cloudabi_vdso.lds $S/contrib/cloudabi/cloudabi_vdso_aarch64.S -o ${.TARGET}" \ no-obj no-implicit-rule \ clean "cloudabi64_vdso.o" # Modified: head/sys/modules/cloudabi64/Makefile ============================================================================== --- head/sys/modules/cloudabi64/Makefile Sun Aug 21 09:32:20 2016 (r304556) +++ head/sys/modules/cloudabi64/Makefile Sun Aug 21 15:14:06 2016 (r304557) @@ -25,7 +25,7 @@ BINARY_ARCHITECTURE=i386 cloudabi64_vdso.o: ${VDSO_SRCS} ${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib \ - -Wl,-T${SYSDIR}/compat/cloudabi64/cloudabi64_vdso.lds.s \ + -Wl,-T${SYSDIR}/compat/cloudabi/cloudabi_vdso.lds \ ${VDSO_SRCS} -o ${.TARGET} cloudabi64_vdso_blob.o: cloudabi64_vdso.o