[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Fri Mar 2 15:37:33 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/b8e0795316a9
changeset: 354:b8e0795316a9
user:      ray at terran.dlink.ua
date:      Fri Mar 02 16:52:45 2012 +0200
description:
Update to FreeBSD-HEAD @232391

diffstat:

 head/gnu/usr.bin/cc/c++/Makefile         |  12 ++++++++----
 head/gnu/usr.bin/cc/cc/Makefile          |  13 +++++++++----
 head/gnu/usr.bin/cc/cc_tools/auto-host.h |   4 +---
 head/gnu/usr.bin/cc/cpp/Makefile         |  10 ++++++++--
 4 files changed, 26 insertions(+), 13 deletions(-)

diffs (98 lines):

diff -r 62928dda58c3 -r b8e0795316a9 head/gnu/usr.bin/cc/c++/Makefile

--- a/head/gnu/usr.bin/cc/c++/Makefile	Fri Mar 02 16:52:31 2012 +0200
+++ b/head/gnu/usr.bin/cc/c++/Makefile	Fri Mar 02 16:52:45 2012 +0200
@@ -1,14 +1,18 @@
-# $FreeBSD$
+# $FreeBSD: head/gnu/usr.bin/cc/c++/Makefile 232322 2012-02-29 22:58:51Z dim $
+
+.include <bsd.own.mk>
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
 
 .PATH: ${GCCDIR}/cp
 
-PROG=	c++
+PROG=	g++
 SRCS+=	g++spec.c
-LINKS=	${BINDIR}/c++ ${BINDIR}/g++
-LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
+.if ${MK_CLANG_IS_CC} == "no"
+LINKS=	${BINDIR}/g++ ${BINDIR}/c++
+LINKS+=	${BINDIR}/g++ ${BINDIR}/CC
+.endif
 NO_MAN=
 
 DPADD=	${LIBCPP} ${LIBIBERTY}
diff -r 62928dda58c3 -r b8e0795316a9 head/gnu/usr.bin/cc/cc/Makefile
--- a/head/gnu/usr.bin/cc/cc/Makefile	Fri Mar 02 16:52:31 2012 +0200
+++ b/head/gnu/usr.bin/cc/cc/Makefile	Fri Mar 02 16:52:45 2012 +0200
@@ -1,15 +1,20 @@
-# $FreeBSD$
+# $FreeBSD: head/gnu/usr.bin/cc/cc/Makefile 232322 2012-02-29 22:58:51Z dim $
+
+.include <bsd.own.mk>
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
 
-PROG=	cc
+PROG=	gcc
 MAN=	gcc.1
 SRCS+=  gccspec.c
 
 NO_SHARED?=yes
 
-LINKS=	${BINDIR}/cc ${BINDIR}/gcc
-MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
+MLINKS=	gcc.1 g++.1
+.if ${MK_CLANG_IS_CC} == "no"
+LINKS=	${BINDIR}/gcc ${BINDIR}/cc
+MLINKS+= gcc.1 cc.1 gcc.1 c++.1 gcc.1 CC.1
+.endif
 
 .include <bsd.prog.mk>
diff -r 62928dda58c3 -r b8e0795316a9 head/gnu/usr.bin/cc/cc_tools/auto-host.h
--- a/head/gnu/usr.bin/cc/cc_tools/auto-host.h	Fri Mar 02 16:52:31 2012 +0200
+++ b/head/gnu/usr.bin/cc/cc_tools/auto-host.h	Fri Mar 02 16:52:45 2012 +0200
@@ -1,6 +1,6 @@
 /* auto-host.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
-/* $FreeBSD$ */
+/* $FreeBSD: head/gnu/usr.bin/cc/cc_tools/auto-host.h 231620 2012-02-14 00:18:18Z gonzo $ */
 
 /* Define as the number of bits in a byte, if \`limits.h' doesn't. */
 #ifndef USED_FOR_TARGET
@@ -287,10 +287,8 @@
 
 /* Define if your assembler supports thread-local storage. */
 #ifndef USED_FOR_TARGET
-#if !defined(__arm__)
 #define HAVE_AS_TLS 1
 #endif
-#endif
 
 
 /* Define to 1 if you have the `atoll' function. */
diff -r 62928dda58c3 -r b8e0795316a9 head/gnu/usr.bin/cc/cpp/Makefile
--- a/head/gnu/usr.bin/cc/cpp/Makefile	Fri Mar 02 16:52:31 2012 +0200
+++ b/head/gnu/usr.bin/cc/cpp/Makefile	Fri Mar 02 16:52:45 2012 +0200
@@ -1,10 +1,16 @@
-# $FreeBSD$
+# $FreeBSD: head/gnu/usr.bin/cc/cpp/Makefile 232322 2012-02-29 22:58:51Z dim $
 
+.include <bsd.own.mk>
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
 
-PROG=	cpp
+PROG=	gcpp
 SRCS+=	cppspec.c
 
+.if ${MK_CLANG_IS_CC} == "no"
+LINKS=	${BINDIR}/gcpp ${BINDIR}/cpp
+MLINKS=	gcpp.1 cpp.1
+.endif
+
 .include <bsd.prog.mk>
