From owner-svn-src-head@freebsd.org Sat Oct 22 21:51:59 2016 Return-Path: Delivered-To: svn-src-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 B319CC1DE3C; Sat, 22 Oct 2016 21:51:59 +0000 (UTC) (envelope-from jhibbits@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 8C3FF197E; Sat, 22 Oct 2016 21:51:59 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9MLpwkG036535; Sat, 22 Oct 2016 21:51:58 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9MLpwuv036530; Sat, 22 Oct 2016 21:51:58 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201610222151.u9MLpwuv036530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sat, 22 Oct 2016 21:51:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r307799 - in head/lib/libc: powerpc/gen powerpcspe powerpcspe/gen powerpcspe/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2016 21:51:59 -0000 Author: jhibbits Date: Sat Oct 22 21:51:58 2016 New Revision: 307799 URL: https://svnweb.freebsd.org/changeset/base/307799 Log: Reduce code duplication between powerpc and powerpcspe They're nearly identical except for a few files. Reported by: kib Added: head/lib/libc/powerpc/gen/Makefile.common (contents, props changed) Deleted: head/lib/libc/powerpcspe/SYS.h head/lib/libc/powerpcspe/_fpmath.h head/lib/libc/powerpcspe/arith.h head/lib/libc/powerpcspe/gd_qnan.h head/lib/libc/powerpcspe/gen/_ctx_start.S head/lib/libc/powerpcspe/gen/_set_tp.c head/lib/libc/powerpcspe/gen/eabi.S head/lib/libc/powerpcspe/gen/infinity.c head/lib/libc/powerpcspe/gen/makecontext.c head/lib/libc/powerpcspe/gen/signalcontext.c head/lib/libc/powerpcspe/gen/syncicache.c head/lib/libc/powerpcspe/sys/brk.S head/lib/libc/powerpcspe/sys/cerror.S head/lib/libc/powerpcspe/sys/exect.S head/lib/libc/powerpcspe/sys/sbrk.S head/lib/libc/powerpcspe/sys/setlogin.S Modified: head/lib/libc/powerpc/gen/Makefile.inc head/lib/libc/powerpcspe/Makefile.inc head/lib/libc/powerpcspe/gen/Makefile.inc head/lib/libc/powerpcspe/sys/Makefile.inc Added: head/lib/libc/powerpc/gen/Makefile.common ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/powerpc/gen/Makefile.common Sat Oct 22 21:51:58 2016 (r307799) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +.PATH: ${LIBC_SRCTOP}/powerpc/gen + +SRCS += _ctx_start.S eabi.S infinity.c ldexp.c makecontext.c \ + signalcontext.c syncicache.c _set_tp.c trivial-getcontextx.c Modified: head/lib/libc/powerpc/gen/Makefile.inc ============================================================================== --- head/lib/libc/powerpc/gen/Makefile.inc Sat Oct 22 21:41:28 2016 (r307798) +++ head/lib/libc/powerpc/gen/Makefile.inc Sat Oct 22 21:51:58 2016 (r307799) @@ -1,11 +1,7 @@ # $FreeBSD$ -SRCS += _ctx_start.S eabi.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ - fpgetsticky.c fpsetmask.c fpsetround.c \ - infinity.c ldexp.c makecontext.c _setjmp.S \ - setjmp.S sigsetjmp.S signalcontext.c syncicache.c \ - _set_tp.c \ - trivial-getcontextx.c - - +.include "${LIBC_SRC}/powerpc/gen/Makefile.common" +SRCS += fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ + fpgetsticky.c fpsetmask.c fpsetround.c \ + _setjmp.S setjmp.S sigsetjmp.S Modified: head/lib/libc/powerpcspe/Makefile.inc ============================================================================== --- head/lib/libc/powerpcspe/Makefile.inc Sat Oct 22 21:41:28 2016 (r307798) +++ head/lib/libc/powerpcspe/Makefile.inc Sat Oct 22 21:51:58 2016 (r307799) @@ -1,5 +1,6 @@ # $FreeBSD$ +CFLAGS+= -I${LIBC_SRCTOP}/powerpc SRCS+= trivial-vdso_tc.c # Long double is 64-bits Modified: head/lib/libc/powerpcspe/gen/Makefile.inc ============================================================================== --- head/lib/libc/powerpcspe/gen/Makefile.inc Sat Oct 22 21:41:28 2016 (r307798) +++ head/lib/libc/powerpcspe/gen/Makefile.inc Sat Oct 22 21:51:58 2016 (r307799) @@ -1,11 +1,7 @@ # $FreeBSD$ -SRCS += _ctx_start.S eabi.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ - fpgetsticky.c fpsetmask.c fpsetround.c \ - infinity.c ldexp.c makecontext.c _setjmp.S \ - setjmp.S sigsetjmp.S signalcontext.c syncicache.c \ - _set_tp.c \ - trivial-getcontextx.c - - +.include "${LIBC_SRCTOP}/powerpc/gen/Makefile.common" +SRCS += fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ + fpgetsticky.c fpsetmask.c fpsetround.c \ + _setjmp.S setjmp.S sigsetjmp.S Modified: head/lib/libc/powerpcspe/sys/Makefile.inc ============================================================================== --- head/lib/libc/powerpcspe/sys/Makefile.inc Sat Oct 22 21:41:28 2016 (r307798) +++ head/lib/libc/powerpcspe/sys/Makefile.inc Sat Oct 22 21:51:58 2016 (r307799) @@ -1,8 +1,4 @@ # $FreeBSD$ -MDASM+= brk.S cerror.S exect.S sbrk.S setlogin.S - -# Don't generate default code for these syscalls: -NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o - -PSEUDO= _getlogin.o _exit.o +.PATH: ${LIBC_SRCTOP}/powerpc/sys +.sinclude "${LIBC_SRCTOP}/powerpc/sys/Makefile.inc"