Merge head from 7/28

12 files changed, 26 insertions, 65 deletions

diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 2651eef..373c280 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -14,7 +14,7 @@ SUBDIR+= tests
 
 # libsupc++ uses libstdc++ headers, although 'make includes' should
 # have taken care of that already.
-.if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no"
+.if ${MK_GNUCXX} != "no"
 SUBDIR+= libstdc++ libsupc++
 .endif
 
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index 0a2c7d3..e1b759a 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -28,13 +28,6 @@ MKDEP=		-DCRT_BEGIN
 CFLAGS+=	-DTARGET_ARM_EABI
 .endif
 
-.if ${MACHINE_CPUARCH} == "ia64"
-BEGINSRC=	crtbegin.asm
-ENDSRC=		crtend.asm
-CFLAGS+=	-x assembler-with-cpp	# Ugly hack
-CFLAGS+=	-include osreldate.h
-.undef SRCS				# hack for 'make depend'
-.endif
 .if ${MACHINE_CPUARCH} == "powerpc"
 TGTOBJS=	crtsavres.o
 SRCS+=		crtsavres.asm
@@ -73,7 +66,7 @@ crtendS.o:	${ENDSRC}
 
 CLEANFILES+=	tm.h tconfig.h options.h optionlist cs-tconfig.h cs-tm.h
 tm.h tconfig.h options.h: ${CCDIR}/cc_tools/Makefile
-	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
+	(cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET})
 
 realinstall:
 .for file in ${OBJS} ${SOBJS} ${TGTOBJS}
diff --git a/gnu/lib/csu/Makefile.depend b/gnu/lib/csu/Makefile.depend
index dc4c862..2c6edc6 100644
--- a/gnu/lib/csu/Makefile.depend
+++ b/gnu/lib/csu/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	bin/cat.host \
 	include \
 	include/xlocale \
 
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 11af430..f0e4834 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -137,17 +137,6 @@ LIB2FUNCS_EXTRA+= fixdfdi.c fixunssfsi.c
 .endif
 .endif
 
-.if ${TARGET_CPUARCH} == "ia64"
-#	from config/ia64/t-ia64
-LIB1ASMSRC   = lib1funcs.asm
-LIB1ASMFUNCS = __divxf3 __divdf3 __divsf3 \
-	__divdi3 __moddi3 __udivdi3 __umoddi3 \
-	__divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
-	__nonlocal_goto __restore_stack_nonlocal __trampoline \
-	_fixtfdi _fixunstfdi _floatditf
-LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c
-.endif
-
 .if ${TARGET_ARCH} == "powerpc"
 #	from config/rs6000/t-ppccomm
 LIB2FUNCS_EXTRA = tramp.asm
@@ -317,7 +306,7 @@ ${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS}
 # Generated headers
 #
 ${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
-	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
+	(cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET})
 
 CLEANFILES += ${COMMONHDRS}
 CLEANFILES += cs-*.h option*
diff --git a/gnu/lib/libgcc/Makefile.depend b/gnu/lib/libgcc/Makefile.depend
index 5a788db..bc63138 100644
--- a/gnu/lib/libgcc/Makefile.depend
+++ b/gnu/lib/libgcc/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	bin/cat.host \
 	gnu/lib/csu \
 	include \
 	include/xlocale \
diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile
index 5292f9f..e2b8074 100644
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@@ -46,7 +46,7 @@ COMMONHDRS=	tm.h tconfig.h gcov-iov.h options.h
 CLEANFILES+=	${COMMONHDRS} cs-tm.h cs-tconfig.h options.h optionlist
 
 ${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
-	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
+	(cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET})
 
 ${OBJS} beforedepend: ${COMMONHDRS}
 
diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile
index 637dcc8..c2bfa66 100644
--- a/gnu/lib/libreadline/Makefile
+++ b/gnu/lib/libreadline/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR = history readline
+SUBDIR = readline
 
 .include <bsd.subdir.mk>
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index fab4aa2..ce1fec1 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
-SUBDIR= doc
-
 LIB=    readline
-MAN=    doc/readline.3
-SHLIBDIR?=	/lib
+INTERNALLIB=	yes
+NO_MAN=	yes
 
 TILDESRC= tilde.c
 SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
@@ -15,13 +13,17 @@ SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
 INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
 		   rlstdc.h rlconf.h rltypedefs.h
 
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
-
-INCSDIR=${INCLUDEDIR}/readline
+CFLAGS+=	-I${.OBJDIR}/..
+SRCDIR=	${.CURDIR}/../../../../contrib/libreadline
 
-.for hdr in ${INSTALLED_HEADERS}
-INCS+=	${SRCDIR}/${hdr}
+CLEANFILES+= ${INSTALLED_HEADERS}
+beforebuild: ${INSTALLED_HEADERS}
+.for h in ${INSTALLED_HEADERS}
+$h: ${SRCDIR}/$h
+	ln -sf ${SRCDIR}/$h $h
 .endfor
 
+DPADD=	${LIBTERMCAPW}
+LDADD=	-ltermcapw
+
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libreadline/readline/Makefile.depend b/gnu/lib/libreadline/readline/Makefile.depend
index c234020..bc5416f 100644
--- a/gnu/lib/libreadline/readline/Makefile.depend
+++ b/gnu/lib/libreadline/readline/Makefile.depend
@@ -3,16 +3,9 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-	lib/ncurses/ncurses \
 	lib/ncurses/ncursesw \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libreadline/readline/doc/Makefile b/gnu/lib/libreadline/readline/doc/Makefile
deleted file mode 100644
index 7028971..0000000
--- a/gnu/lib/libreadline/readline/doc/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
-
-INFO = readline rluserman
-
-INFOSECTION= "Programming & development tools."
-INFOENTRY_readline= "* Readline: (readline).		The GNU Readline library"
-INFOENTRY_rluserman= "* Readline: (readline).       The GNU readline library API"
-
-CLEANFILES += readline.texi
-
-readline.info: rlman.texi rluser.texi rltech.texi version.texi fdl.texi
-
-readline.texi: rlman.texi
-	cp -f ${SRCDIR}/rlman.texi ${.TARGET}
-
-rluserman.info: rluserman.texi version.texi rluser.texi fdl.texi
-
-.include <bsd.info.mk>
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index dffb563..fa1d67e 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -632,8 +632,9 @@ ${VERSION_MAP}: ${SRCDIR}/config/abi/pre/gnu.ver
 
 CLEANFILES+=	${VERSION_MAP}
 
-.include <bsd.lib.mk>
-
 CXXFLAGS.clang+= -stdlib=libstdc++
-CXXFLAGS+= -std=gnu++98
 
+.include <bsd.lib.mk>
+
+# Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98.
+CXXFLAGS:=	${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}
diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile
index a172a6e..c7cc30e 100644
--- a/gnu/lib/libsupc++/Makefile
+++ b/gnu/lib/libsupc++/Makefile
@@ -51,8 +51,9 @@ CLEANFILES+=	unwind.h
 
 VERSION_MAP=	${.CURDIR}/Version.map
 
+CXXFLAGS.clang+= -stdlib=libstdc++
 
 .include <bsd.lib.mk>
 
-CXXFLAGS.clang+= -stdlib=libstdc++
-CXXFLAGS+= -std=gnu++98
+# Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98.
+CXXFLAGS:=	${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}