svn commit: r313582 - in stable/10/lib/csu: amd64 arm i386-elf mips powerpc powerpc64 sparc64

[Ngie Cooper]

Author: ngie
Date: Sat Feb 11 05:47:56 2017
New Revision: 313582
URL: https://svnweb.freebsd.org/changeset/base/313582

Log:
  MFC r312455:
  
  Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths
  
  This implifies pathing in make/displayed output

Modified:
  stable/10/lib/csu/amd64/Makefile
  stable/10/lib/csu/arm/Makefile
  stable/10/lib/csu/i386-elf/Makefile
  stable/10/lib/csu/mips/Makefile
  stable/10/lib/csu/powerpc/Makefile
  stable/10/lib/csu/powerpc64/Makefile
  stable/10/lib/csu/sparc64/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/csu/amd64/Makefile
==============================================================================
--- stable/10/lib/csu/amd64/Makefile	Sat Feb 11 05:45:00 2017	(r313581)
+++ stable/10/lib/csu/amd64/Makefile	Sat Feb 11 05:47:56 2017	(r313582)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include
 CFLAGS+=	-fno-omit-frame-pointer
 
 all: ${OBJS}

Modified: stable/10/lib/csu/arm/Makefile
==============================================================================
--- stable/10/lib/csu/arm/Makefile	Sat Feb 11 05:45:00 2017	(r313581)
+++ stable/10/lib/csu/arm/Makefile	Sat Feb 11 05:47:56 2017	(r313582)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include
 
 all: ${OBJS}
 

Modified: stable/10/lib/csu/i386-elf/Makefile
==============================================================================
--- stable/10/lib/csu/i386-elf/Makefile	Sat Feb 11 05:45:00 2017	(r313581)
+++ stable/10/lib/csu/i386-elf/Makefile	Sat Feb 11 05:47:56 2017	(r313582)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=		crti.S crtn.S
 FILES=		${SRCS:N*.h:R:S/$/.o/g} gcrt1.o crt1.o Scrt1.o
@@ -8,8 +8,8 @@ FILESOWN=	${LIBOWN}
 FILESGRP=	${LIBGRP}
 FILESMODE=	${LIBMODE}
 FILESDIR=	${LIBDIR}
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/libc/include
 CLEANFILES=	${FILES} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
 CLEANFILES+=	crt1_c.s gcrt1_c.s Scrt1_c.s
 

Modified: stable/10/lib/csu/mips/Makefile
==============================================================================
--- stable/10/lib/csu/mips/Makefile	Sat Feb 11 05:45:00 2017	(r313581)
+++ stable/10/lib/csu/mips/Makefile	Sat Feb 11 05:47:56 2017	(r313582)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include
 
 all: ${OBJS}
 

Modified: stable/10/lib/csu/powerpc/Makefile
==============================================================================
--- stable/10/lib/csu/powerpc/Makefile	Sat Feb 11 05:45:00 2017	(r313581)
+++ stable/10/lib/csu/powerpc/Makefile	Sat Feb 11 05:47:56 2017	(r313582)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include
 
 all: ${OBJS}
 

Modified: stable/10/lib/csu/powerpc64/Makefile
==============================================================================
--- stable/10/lib/csu/powerpc64/Makefile	Sat Feb 11 05:45:00 2017	(r313581)
+++ stable/10/lib/csu/powerpc64/Makefile	Sat Feb 11 05:47:56 2017	(r313582)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include \
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include \
 		-mlongcall
 
 all: ${OBJS}

Modified: stable/10/lib/csu/sparc64/Makefile
==============================================================================
--- stable/10/lib/csu/sparc64/Makefile	Sat Feb 11 05:45:00 2017	(r313581)
+++ stable/10/lib/csu/sparc64/Makefile	Sat Feb 11 05:47:56 2017	(r313582)
@@ -1,11 +1,12 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
 
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR}/../common -I${.CURDIR}/../../libc/include
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include
 
 all: ${OBJS}