diff options
| author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /gnu | |
| parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
| parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
| download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz | |
Merge head from 7/28
Diffstat (limited to 'gnu')
105 files changed, 157 insertions, 1314 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]} diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 7633069..7b1482d 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -14,7 +14,6 @@ SUBDIR= ${_binutils} \ ${_groff} \ ${_rcs} \ sdiff \ - send-pr \ ${_tests} \ ${_texinfo} diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile index 2380738..37649fa 100644 --- a/gnu/usr.bin/binutils/addr2line/Makefile +++ b/gnu/usr.bin/binutils/addr2line/Makefile @@ -14,4 +14,6 @@ DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a LDADD= ${DPADD} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h deleted file mode 100644 index a0a6360..0000000 --- a/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $FreeBSD$ */ - -#include "tc-ia64.h" diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile index 81a46d5..6c59945 100644 --- a/gnu/usr.bin/binutils/ld/Makefile +++ b/gnu/usr.bin/binutils/ld/Makefile @@ -5,10 +5,6 @@ .PATH: ${SRCDIR}/ld -.if ${TARGET_ARCH} == "ia64" -CFLAGS+= -O1 -.endif - PROG= ld SCRIPTDIR= /usr/libdata/ldscripts SRCS+= ldcref.c \ diff --git a/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 b/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 index 9a0d071..65ee0ab 100644 --- a/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 +++ b/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/usr.bin/binutils/libbfd \ gnu/usr.bin/binutils/libiberty \ diff --git a/gnu/usr.bin/binutils/ld/Makefile.ia64 b/gnu/usr.bin/binutils/ld/Makefile.ia64 deleted file mode 100644 index 50a7bb6..0000000 --- a/gnu/usr.bin/binutils/ld/Makefile.ia64 +++ /dev/null @@ -1,24 +0,0 @@ -# $FreeBSD$ - -NATIVE_EMULATION= elf64_ia64_fbsd - -SRCS+= e${NATIVE_EMULATION}.c -CLEANFILES+= e${NATIVE_EMULATION}.c -e${NATIVE_EMULATION}.c: ${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \ - scripttempl/elf.sc genscripts.sh stringify.sed - sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSEARCHPATH} \ - ${TOOLS_PREFIX}/usr \ - ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} \ - ${.CURDIR}/${NATIVE_EMULATION}.sh - -#XXX EMS+= eelf64_ia64 - -SRCS+= eelf64_ia64.c -CLEANFILES+= eelf64_ia64.c -eelf64_ia64.c: emulparams/elf64_ia64.sh emultempl/elf32.em \ - scripttempl/elf.sc genscripts.sh stringify.sed - sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSEARCHPATH} \ - ${TOOLS_PREFIX}/usr \ - ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - elf64_ia64 "" no elf64_ia64 ${TARGET_TUPLE} diff --git a/gnu/usr.bin/binutils/ld/elf64_ia64_fbsd.sh b/gnu/usr.bin/binutils/ld/elf64_ia64_fbsd.sh deleted file mode 100644 index 213b494..0000000 --- a/gnu/usr.bin/binutils/ld/elf64_ia64_fbsd.sh +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ -. ${srcdir}/emulparams/elf64_ia64.sh -TEXT_START_ADDR="0x0000000100000000" -unset DATA_ADDR -unset SMALL_DATA_CTOR -unset SMALL_DATA_DTOR -. ${srcdir}/emulparams/elf_fbsd.sh -OUTPUT_FORMAT="elf64-ia64-freebsd" diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile index 1493ccf..a24dd04 100644 --- a/gnu/usr.bin/binutils/libbfd/Makefile +++ b/gnu/usr.bin/binutils/libbfd/Makefile @@ -42,7 +42,7 @@ SRCS+= archive.c \ targets.c \ targmatch.h \ tekhex.c -.if (${TARGET_ARCH} == "ia64" || ${TARGET_ARCH} == "sparc64") +.if ${TARGET_ARCH} == "sparc64" WARNS?= 2 .endif CFLAGS+= -D_GNU_SOURCE @@ -84,7 +84,7 @@ bfdver.h: Makefile echo '#define BFD_VERSION 217500000' > ${.TARGET} echo '#define BFD_VERSION_DATE 20070703' >> ${.TARGET} echo '#define BFD_VERSION_STRING ${VERSION}' >> ${.TARGET} - echo '#define REPORT_BUGS_TO "<http://www.freebsd.org/send-pr.html>"' >> ${.TARGET} + echo '#define REPORT_BUGS_TO "<http://www.freebsd.org/support.html>"' >> ${.TARGET} targmatch.h: targmatch.sed config.bfd sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET} diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.ia64 b/gnu/usr.bin/binutils/libbfd/Makefile.ia64 deleted file mode 100644 index 2e489bc..0000000 --- a/gnu/usr.bin/binutils/libbfd/Makefile.ia64 +++ /dev/null @@ -1,35 +0,0 @@ -# $FreeBSD$ - -DEFAULT_VECTOR= bfd_elf64_ia64_freebsd_vec - -SRCS+= cofflink.c \ - cpu-ia64.c \ - efi-app-ia64.c \ - elf32.c \ - elf32-gen.c \ - elf32-target.h \ - elf64.c \ - elf64-gen.c \ - elf64-ia64.c \ - elf64-target.h \ - elflink.c \ - pepigen.c \ - pex64igen.c - -VECS+= ${DEFAULT_VECTOR} \ - bfd_efi_app_ia64_vec \ - bfd_elf64_ia64_little_vec \ - bfd_elf64_ia64_big_vec \ - bfd_elf64_little_generic_vec bfd_elf64_big_generic_vec \ - bfd_elf32_little_generic_vec bfd_elf32_big_generic_vec - -CLEANFILES+= elf64-ia64.c pepigen.c pex64igen.c - -elf64-ia64.c: elfxx-ia64.c - sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} - -pepigen.c: peXXigen.c - sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET} - -pex64igen.c: peXXigen.c - sed -e s/XX/pex64/g ${.ALLSRC} > ${.TARGET} diff --git a/gnu/usr.bin/binutils/libbfd/bfd.h b/gnu/usr.bin/binutils/libbfd/bfd.h index c9dfef5..f651233 100644 --- a/gnu/usr.bin/binutils/libbfd/bfd.h +++ b/gnu/usr.bin/binutils/libbfd/bfd.h @@ -85,7 +85,7 @@ extern "C" { #define BFD_HOST_64BIT_LONG 0 #define BFD_HOST_64_BIT long long #define BFD_HOST_U_64_BIT unsigned long long -#elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__ia64__) +#elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) #define BFD_HOST_64BIT_LONG 1 #define BFD_HOST_64_BIT long #define BFD_HOST_U_64_BIT unsigned long diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.ia64 b/gnu/usr.bin/binutils/libopcodes/Makefile.ia64 deleted file mode 100644 index 98198cd..0000000 --- a/gnu/usr.bin/binutils/libopcodes/Makefile.ia64 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD$ - -SRCS+= ia64-dis.c ia64-opc.c -CFLAGS+= -DARCH_ia64 diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile index 4ef2b8f..5945d25 100644 --- a/gnu/usr.bin/binutils/nm/Makefile +++ b/gnu/usr.bin/binutils/nm/Makefile @@ -15,4 +15,6 @@ DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a LDADD= ${DPADD} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile index 66d99f4..c23e1e8 100644 --- a/gnu/usr.bin/binutils/objcopy/Makefile +++ b/gnu/usr.bin/binutils/objcopy/Makefile @@ -14,4 +14,6 @@ DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a LDADD= ${DPADD} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile index 1a0d046..fb275ac 100644 --- a/gnu/usr.bin/binutils/objdump/Makefile +++ b/gnu/usr.bin/binutils/objdump/Makefile @@ -16,4 +16,6 @@ DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a LDADD= ${DPADD} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/binutils/readelf/Makefile b/gnu/usr.bin/binutils/readelf/Makefile index d90c3bc..fd3110d 100644 --- a/gnu/usr.bin/binutils/readelf/Makefile +++ b/gnu/usr.bin/binutils/readelf/Makefile @@ -17,4 +17,6 @@ DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a LDADD= ${DPADD} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile index c5c19c1..a22e67f 100644 --- a/gnu/usr.bin/binutils/size/Makefile +++ b/gnu/usr.bin/binutils/size/Makefile @@ -14,4 +14,6 @@ DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a LDADD= ${DPADD} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile index a432d51..0ff82eb 100644 --- a/gnu/usr.bin/binutils/strings/Makefile +++ b/gnu/usr.bin/binutils/strings/Makefile @@ -14,4 +14,6 @@ DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libiberty/libiberty.a LDADD= ${DPADD} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile index d3cf8c4..6d17067 100644 --- a/gnu/usr.bin/binutils/strip/Makefile +++ b/gnu/usr.bin/binutils/strip/Makefile @@ -15,4 +15,6 @@ DPADD+= ${RELTOP}/libiberty/libiberty.a LDADD= ${DPADD} INSTALLFLAGS= -S +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile index 313aaf2..8191ea4 100644 --- a/gnu/usr.bin/cc/Makefile +++ b/gnu/usr.bin/cc/Makefile @@ -12,12 +12,7 @@ SUBDIR+= cpp .endif .if ${MK_CXX} != "no" -.if ${MK_GNUCXX} != "no" -SUBDIR+= cc1plus c++ -.endif -# This should be moved into the above block once c++filt from elftoolchain or -# similar is provided. -SUBDIR+= c++filt +SUBDIR+= cc1plus c++ c++filt .endif .if ${MK_GCOV} != "no" diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt index 48cc774..ee5a794 100644 --- a/gnu/usr.bin/cc/Makefile.tgt +++ b/gnu/usr.bin/cc/Makefile.tgt @@ -11,9 +11,6 @@ TARGET_CPUARCH=${MACHINE_CPUARCH} TARGET_ARCH?= ${MACHINE_ARCH} GCC_CPU=${TARGET_CPUARCH:C/amd64/i386/:C/powerpc/rs6000/:C/sparc64/sparc/} -.if ${TARGET_ARCH} == "ia64" -TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD -.endif .if ${TARGET_ARCH} == "sparc64" TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc .endif diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile index c48975e..48060ec 100644 --- a/gnu/usr.bin/cc/include/Makefile +++ b/gnu/usr.bin/cc/include/Makefile @@ -12,8 +12,6 @@ INCSDIR=${INCLUDEDIR}/gcc/${GCCVER} INCS= ammintrin.h emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h \ tmmintrin.h xmmintrin.h mm_malloc.h INCS+= wmmintrin.h __wmmintrin_aes.h __wmmintrin_pclmul.h -.elif ${TARGET_ARCH} == "ia64" -INCS= ia64intrin.h .elif ${TARGET_ARCH} == "arm" INCS= mmintrin.h .elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64" diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile index a7e0a57..f9281c8 100644 --- a/gnu/usr.bin/dialog/Makefile +++ b/gnu/usr.bin/dialog/Makefile @@ -3,21 +3,11 @@ DIALOG= ${.CURDIR}/../../../contrib/dialog PROG= dialog -DPADD= ${LIBDIALOG} ${LIBM} -LDADD= -ldialog -lm +DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM} +LDADD= -ldialog -lncursesw -lm CFLAGS+= -I${.CURDIR} -I${DIALOG} .PATH: ${DIALOG} WARNS?= 6 -.include <src.opts.mk> - -.if ${MK_NCURSESW} == "no" -DPADD+= ${LIBNCURSES} -LDADD+= -lncurses -.else -DPADD+= ${LIBNCURSESW} -LDADD+= -lncursesw -.endif - .include <bsd.prog.mk> diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc index 6679022..4912e0c6 100644 --- a/gnu/usr.bin/gdb/Makefile.inc +++ b/gnu/usr.bin/gdb/Makefile.inc @@ -15,6 +15,8 @@ CNTRB_RL= ${CNTRB_ROOT}/libreadline OBJ_ROOT= ${.OBJDIR}/../.. OBJ_BU= ${OBJ_ROOT}/binutils OBJ_GDB= ${OBJ_ROOT}/gdb +OBJ_RL= ${OBJ_ROOT}/../lib/libreadline/readline +LIBREADLINE= ${OBJ_ROOT}/../lib/libreadline/readline/libreadline.a # These assignments duplicate much of the functionality of # MACHINE_CPUARCH, but there's no easy way to export make functions... @@ -46,6 +48,7 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config CFLAGS+= -I${CNTRB_BU}/include CFLAGS+= -I${CNTRB_GDB}/include CFLAGS+= -I${CNTRB_BU}/bfd +CFLAGS+= -I${OBJ_RL}/.. GENSRCS+= nm.h tm.h diff --git a/gnu/usr.bin/gdb/arch/ia64/Makefile b/gnu/usr.bin/gdb/arch/ia64/Makefile deleted file mode 100644 index 2fe4899..0000000 --- a/gnu/usr.bin/gdb/arch/ia64/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $FreeBSD$ - -.if !defined(GDB_CROSS_DEBUGGER) -LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c -LIBSRCS+= ia64-fbsd-nat.c -.endif -LIBSRCS+= solib.c solib-svr4.c -LIBSRCS+= ia64-fbsd-tdep.c ia64-tdep.c - -nm.h: - echo '#include "ia64/nm-fbsd.h"' > ${.TARGET} - -tm.h: - echo '#include "ia64/tm-fbsd.h"' > ${.TARGET} diff --git a/gnu/usr.bin/gdb/arch/ia64/config.h b/gnu/usr.bin/gdb/arch/ia64/config.h deleted file mode 100644 index 4cc29f9..0000000 --- a/gnu/usr.bin/gdb/arch/ia64/config.h +++ /dev/null @@ -1,550 +0,0 @@ -/* $FreeBSD$ */ - -/* config.h. Generated automatically by configure. */ -/* config.in. Generated automatically from configure.in by autoheader. */ - -/* Define if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -/* #undef _ALL_SOURCE */ -#endif - -/* Define if using alloca.c. */ -/* #undef C_ALLOCA */ - -/* Define to empty if the keyword does not work. */ -/* #undef const */ - -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -/* #undef CRAY_STACKSEG_END */ - -/* Define if you have alloca, as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define if you have <alloca.h> and it should be used (not on Ultrix). */ -/* #undef HAVE_ALLOCA_H */ - -/* Define if the `long double' type works. */ -#define HAVE_LONG_DOUBLE 1 - -/* Define if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 - -/* Define if you have <vfork.h>. */ -/* #undef HAVE_VFORK_H */ - -/* Define as __inline if that's what the C compiler calls it. */ -/* #undef inline */ - -/* Define to `long' if <sys/types.h> doesn't define. */ -/* #undef off_t */ - -/* Define to `int' if <sys/types.h> doesn't define. */ -/* #undef pid_t */ - -/* Define if you need to in order for stat and other things to work. */ -/* #undef _POSIX_SOURCE */ - -/* Define as the return type of signal handlers (int or void). */ -#define RETSIGTYPE void - -/* Define if the `setpgrp' function takes no argument. */ -/* #undef SETPGRP_VOID */ - -/* Define to `unsigned' if <sys/types.h> doesn't define. */ -/* #undef size_t */ - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -/* #undef STACK_DIRECTION */ - -/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */ -/* #undef STAT_MACROS_BROKEN */ - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define vfork as fork if vfork does not work. */ -/* #undef vfork */ - -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -/* Define if your struct reg has r_fs. */ -/* #undef HAVE_STRUCT_REG_R_FS */ - -/* Define if your struct stat has st_blocks. */ -#define HAVE_STRUCT_STAT_ST_BLOCKS 1 - -/* Define if your struct reg has r_gs. */ -/* #undef HAVE_STRUCT_REG_R_GS */ - -/* Define if <link.h> exists and defines struct link_map which has - members with an ``l_'' prefix. (For Solaris, SVR4, and - SVR4-like systems.) */ -#define HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS 1 - -/* Define if <link.h> exists and defines struct link_map which has - members with an ``lm_'' prefix. (For SunOS.) */ -/* #undef HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS */ - -/* Define if <link.h> exists and defines a struct so_map which has - members with an ``som_'' prefix. (Found on older *BSD systems.) */ -/* #undef HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS */ - -/* Define if <sys/link.h> has struct link_map32 */ -/* #undef HAVE_STRUCT_LINK_MAP32 */ - -/* Define if <sys/link.h> has link_map32 (solaris sparc-64 target) */ -/* #undef _SYSCALL32 */ - -/* Define if the prfpregset_t type is broken. */ -/* #undef PRFPREGSET_T_BROKEN */ - -/* Define if you want to use new multi-fd /proc interface - (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros). */ -/* #undef NEW_PROC_API */ - -/* Define if ioctl argument PIOCSET is available. */ -/* #undef HAVE_PROCFS_PIOCSET */ - -/* Define if the `long long' type works. */ -#define CC_HAS_LONG_LONG 1 - -/* Define if the "ll" format works to print long long ints. */ -#define PRINTF_HAS_LONG_LONG 1 - -/* Define if the "%Lg" format works to print long doubles. */ -#define PRINTF_HAS_LONG_DOUBLE 1 - -/* Define if the "%Lg" format works to scan long doubles. */ -#define SCANF_HAS_LONG_DOUBLE 1 - -/* Define if using Solaris thread debugging. */ -/* #undef HAVE_THREAD_DB_LIB */ - -/* Define on a GNU/Linux system to work around problems in sys/procfs.h. */ -/* #undef START_INFERIOR_TRAPS_EXPECTED */ -/* #undef sys_quotactl */ - -/* Define if you have HPUX threads */ -/* #undef HAVE_HPUX_THREAD_SUPPORT */ - -/* Define if <proc_service.h> on solaris uses int instead of - size_t, and assorted other type changes. */ -/* #undef PROC_SERVICE_IS_OLD */ - -/* Define if the simulator is being linked in. */ -#define WITH_SIM 1 - -/* Set to true if the save_state_t structure is present */ -/* #undef HAVE_STRUCT_SAVE_STATE_T */ - -/* Set to true if the save_state_t structure has the ss_wide member */ -/* #undef HAVE_STRUCT_MEMBER_SS_WIDE */ - -/* Define if <sys/ptrace.h> defines the PTRACE_GETREGS request. */ -/* #undef HAVE_PTRACE_GETREGS */ - -/* Define if <sys/ptrace.h> defines the PTRACE_GETFPXREGS request. */ -/* #undef HAVE_PTRACE_GETFPXREGS */ - -/* Define if <sys/ptrace.h> defines the PT_GETDBREGS request. */ -#define HAVE_PT_GETDBREGS 1 - -/* Define if <sys/ptrace.h> defines the PT_GETXMMREGS request. */ -/* #undef HAVE_PT_GETXMMREGS */ - -/* Define if libunwind library is being used. */ -/* #undef HAVE_LIBUNWIND */ - -/* hostfile */ -/* #undef GDB_XM_FILE */ - -/* targetfile */ -#define GDB_TM_FILE config/ia64/tm-fbsd.h - -/* nativefile */ -#ifndef CROSS_DEBUGGER -#define GDB_NM_FILE config/ia64/nm-fbsd.h -#endif - -/* Define to 1 so <sys/proc.h> gets a definition of anon_hdl. Works - around a <sys/proc.h> problem on IRIX 5. */ -#ifndef _KMEMUSER -/* #undef _KMEMUSER */ -#endif - -/* Define if you have the __argz_count function. */ -/* #undef HAVE___ARGZ_COUNT */ - -/* Define if you have the __argz_next function. */ -/* #undef HAVE___ARGZ_NEXT */ - -/* Define if you have the __argz_stringify function. */ -/* #undef HAVE___ARGZ_STRINGIFY */ - -/* Define if you have the _mcleanup function. */ -#define HAVE__MCLEANUP 1 - -/* Define if you have the canonicalize_file_name function. */ -/* #undef HAVE_CANONICALIZE_FILE_NAME */ - -/* Define if you have the dcgettext function. */ -/* #undef HAVE_DCGETTEXT */ - -/* Define if you have the getcwd function. */ -#define HAVE_GETCWD 1 - -/* Define if you have the getpagesize function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define if you have the monstartup function. */ -#define HAVE_MONSTARTUP 1 - -/* Define if you have the munmap function. */ -#define HAVE_MUNMAP 1 - -/* Define if you have the poll function. */ -#define HAVE_POLL 1 - -/* Define if you have the pread64 function. */ -/* #undef HAVE_PREAD64 */ - -/* Define if you have the putenv function. */ -#define HAVE_PUTENV 1 - -/* Define if you have the realpath function. */ -#define HAVE_REALPATH 1 - -/* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 - -/* Define if you have the setenv function. */ -#define HAVE_SETENV 1 - -/* Define if you have the setlocale function. */ -#define HAVE_SETLOCALE 1 - -/* Define if you have the setpgid function. */ -#define HAVE_SETPGID 1 - -/* Define if you have the setpgrp function. */ -#define HAVE_SETPGRP 1 - -/* Define if you have the sigaction function. */ -#define HAVE_SIGACTION 1 - -/* Define if you have the sigprocmask function. */ -#define HAVE_SIGPROCMASK 1 - -/* Define if you have the sigsetmask function. */ -#define HAVE_SIGSETMASK 1 - -/* Define if you have the socketpair function. */ -#define HAVE_SOCKETPAIR 1 - -/* Define if you have the stpcpy function. */ -#define HAVE_STPCPY 1 - -/* Define if you have the strcasecmp function. */ -#define HAVE_STRCASECMP 1 - -/* Define if you have the strchr function. */ -#define HAVE_STRCHR 1 - -/* Define if you have the syscall function. */ -#define HAVE_SYSCALL 1 - -/* Define if you have the <argz.h> header file. */ -/* #undef HAVE_ARGZ_H */ - -/* Define if you have the <ctype.h> header file. */ -#define HAVE_CTYPE_H 1 - -/* Define if you have the <curses.h> header file. */ -#define HAVE_CURSES_H 1 - -/* Define if you have the <dirent.h> header file. */ -#define HAVE_DIRENT_H 1 - -/* Define if you have the <libunwind-ia64.h> header file. */ -/* #undef HAVE_LIBUNWIND_IA64_H */ - -/* Define if you have the <libunwind.h> header file. */ -/* #undef HAVE_LIBUNWIND_H */ - -/* Define if you have the <limits.h> header file. */ -#define HAVE_LIMITS_H 1 - -/* Define if you have the <link.h> header file. */ -#define HAVE_LINK_H 1 - -/* Define if you have the <locale.h> header file. */ -#define HAVE_LOCALE_H 1 - -/* Define if you have the <machine/reg.h> header file. */ -#define HAVE_MACHINE_REG_H 1 - -/* Define if you have the <malloc.h> header file. */ -/* #undef HAVE_MALLOC_H */ - -/* Define if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define if you have the <ncurses.h> header file. */ -#define HAVE_NCURSES_H 1 - -/* Define if you have the <ndir.h> header file. */ -/* #undef HAVE_NDIR_H */ - -/* Define if you have the <nl_types.h> header file. */ -#define HAVE_NL_TYPES_H 1 - -/* Define if you have the <nlist.h> header file. */ -#define HAVE_NLIST_H 1 - -/* Define if you have the <poll.h> header file. */ -#define HAVE_POLL_H 1 - -/* Define if you have the <proc_service.h> header file. */ -/* #undef HAVE_PROC_SERVICE_H */ - -/* Define if you have the <ptrace.h> header file. */ -/* #undef HAVE_PTRACE_H */ - -/* Define if you have the <sgtty.h> header file. */ -#define HAVE_SGTTY_H 1 - -/* Define if you have the <stddef.h> header file. */ -#define HAVE_STDDEF_H 1 - -/* Define if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -/* Define if you have the <sys/debugreg.h> header file. */ -/* #undef HAVE_SYS_DEBUGREG_H */ - -/* Define if you have the <sys/dir.h> header file. */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define if you have the <sys/fault.h> header file. */ -/* #undef HAVE_SYS_FAULT_H */ - -/* Define if you have the <sys/file.h> header file. */ -#define HAVE_SYS_FILE_H 1 - -/* Define if you have the <sys/filio.h> header file. */ -#define HAVE_SYS_FILIO_H 1 - -/* Define if you have the <sys/ioctl.h> header file. */ -#define HAVE_SYS_IOCTL_H 1 - -/* Define if you have the <sys/ndir.h> header file. */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define if you have the <sys/param.h> header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define if you have the <sys/poll.h> header file. */ -#define HAVE_SYS_POLL_H 1 - -/* Define if you have the <sys/proc.h> header file. */ -#define HAVE_SYS_PROC_H 1 - -/* Define if you have the <sys/procfs.h> header file. */ -#define HAVE_SYS_PROCFS_H 1 - -/* Define if you have the <sys/ptrace.h> header file. */ -#define HAVE_SYS_PTRACE_H 1 - -/* Define if you have the <sys/reg.h> header file. */ -/* #undef HAVE_SYS_REG_H */ - -/* Define if you have the <sys/select.h> header file. */ -#define HAVE_SYS_SELECT_H 1 - -/* Define if you have the <sys/syscall.h> header file. */ -#define HAVE_SYS_SYSCALL_H 1 - -/* Define if you have the <sys/user.h> header file. */ -#define HAVE_SYS_USER_H 1 - -/* Define if you have the <sys/wait.h> header file. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define if you have the <term.h> header file. */ -#define HAVE_TERM_H 1 - -/* Define if you have the <termio.h> header file. */ -/* #undef HAVE_TERMIO_H */ - -/* Define if you have the <termios.h> header file. */ -#define HAVE_TERMIOS_H 1 - -/* Define if you have the <thread_db.h> header file. */ -/* #undef HAVE_THREAD_DB_H */ - -/* Define if you have the <time.h> header file. */ -#define HAVE_TIME_H 1 - -/* Define if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 - -/* Define if you have the <values.h> header file. */ -/* #undef HAVE_VALUES_H */ - -/* Define if you have the <wait.h> header file. */ -/* #undef HAVE_WAIT_H */ - -/* Define if you have the dl library (-ldl). */ -/* #undef HAVE_LIBDL */ - -/* Define if you have the m library (-lm). */ -#define HAVE_LIBM 1 - -/* Define if you have the w library (-lw). */ -/* #undef HAVE_LIBW */ - -/* Define if you have the stpcpy function */ -#define HAVE_STPCPY 1 - -/* Define if your locale.h file contains LC_MESSAGES. */ -#define HAVE_LC_MESSAGES 1 - -/* Define to 1 if NLS is requested */ -/* #undef ENABLE_NLS */ - -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -/* #undef HAVE_GETTEXT */ - -/* Name of this package. */ -#define PACKAGE "gdb" - -/* Define to BFD's default architecture. */ -#define DEFAULT_BFD_ARCH bfd_ia64_arch - -/* Define to BFD's default target vector. */ -#define DEFAULT_BFD_VEC bfd_elf64_ia64_little_vec - -/* Define to 1 if your system has the _etext variable. */ -#define HAVE__ETEXT 1 - -/* Define to 1 to avoid a clash between <widec.h> and <wchar.h> on - Solaris 2.[78] when using GCC. */ -/* #undef _MSE_INT_H */ - -/* Define to 1 if we found this declaration otherwise define to 0. */ -#define HAVE_DECL_GETOPT 0 - -/* Define if sigsetjmp is available. */ -#define HAVE_SIGSETJMP 1 - -/* Define to 1 if the regex included in libiberty should be used. */ -#define USE_INCLUDED_REGEX 1 - -/* Define to 1 if your system has struct reg in <machine/reg.h>. */ -#define HAVE_STRUCT_REG 1 - -/* Define if <stdint.h> provides the uintptr_t type. */ -#define HAVE_UINTPTR_T 1 - -/* Define if malloc is not declared in system header files. */ -/* #undef NEED_DECLARATION_MALLOC */ - -/* Define if realloc is not declared in system header files. */ -/* #undef NEED_DECLARATION_REALLOC */ - -/* Define if free is not declared in system header files. */ -/* #undef NEED_DECLARATION_FREE */ - -/* Define if strerror is not declared in system header files. */ -/* #undef NEED_DECLARATION_STRERROR */ - -/* Define if strdup is not declared in system header files. */ -/* #undef NEED_DECLARATION_STRDUP */ - -/* Define if strstr is not declared in system header files. */ -/* #undef NEED_DECLARATION_STRSTR */ - -/* Define if canonicalize_file_name is not declared in system header files. */ -#define NEED_DECLARATION_CANONICALIZE_FILE_NAME 1 - -/* Define if <sys/procfs.h> has pstatus_t. */ -/* #undef HAVE_PSTATUS_T */ - -/* Define if <sys/procfs.h> has prrun_t. */ -/* #undef HAVE_PRRUN_T */ - -/* Define if <sys/procfs.h> has gregset_t. */ -#define HAVE_GREGSET_T 1 - -/* Define if <sys/procfs.h> has fpregset_t. */ -#define HAVE_FPREGSET_T 1 - -/* Define if <sys/procfs.h> has prgregset_t. */ -#define HAVE_PRGREGSET_T 1 - -/* Define if <sys/procfs.h> has prfpregset_t. */ -#define HAVE_PRFPREGSET_T 1 - -/* Define if <sys/procfs.h> has prgregset32_t. */ -/* #undef HAVE_PRGREGSET32_T */ - -/* Define if <sys/procfs.h> has prfpregset32_t. */ -/* #undef HAVE_PRFPREGSET32_T */ - -/* Define if <sys/procfs.h> has lwpid_t. */ -#define HAVE_LWPID_T 1 - -/* Define if <sys/procfs.h> has psaddr_t. */ -#define HAVE_PSADDR_T 1 - -/* Define if <sys/procfs.h> has prsysent_t. */ -/* #undef HAVE_PRSYSENT_T */ - -/* Define if <sys/procfs.h> has pr_sigset_t. */ -/* #undef HAVE_PR_SIGSET_T */ - -/* Define if <sys/procfs.h> has pr_sigaction64_t. */ -/* #undef HAVE_PR_SIGACTION64_T */ - -/* Define if <sys/procfs.h> has pr_siginfo64_t. */ -/* #undef HAVE_PR_SIGINFO64_T */ - -/* Define if <thread_db.h> has the TD_NOTALLOC error code. */ -/* #undef THREAD_DB_HAS_TD_NOTALLOC */ - -/* Define if we can use the tkill syscall. */ -/* #undef HAVE_TKILL_SYSCALL */ - -/* Define to the default OS ABI for this configuration. */ -/* #undef GDB_OSABI_DEFAULT */ - -/* Define to be a string naming the default host character set. */ -#define GDB_DEFAULT_HOST_CHARSET "ISO-8859-1" - -/* Define if you have the iconv() function. */ -/* #undef HAVE_ICONV */ - -/* Define as const if the declaration of iconv() needs const. */ -/* #undef ICONV_CONST */ - diff --git a/gnu/usr.bin/gdb/arch/ia64/init.c b/gnu/usr.bin/gdb/arch/ia64/init.c deleted file mode 100644 index ee383e9..0000000 --- a/gnu/usr.bin/gdb/arch/ia64/init.c +++ /dev/null @@ -1,230 +0,0 @@ -/* $FreeBSD$ */ - -/* Do not modify this file. */ -/* It is created automatically by the Makefile. */ -#include "defs.h" /* For initialize_file_ftype. */ -#include "call-cmds.h" /* For initialize_all_files. */ -extern initialize_file_ftype _initialize_gdbtypes; -extern initialize_file_ftype _initialize_corelow; -extern initialize_file_ftype _initialize_ia64_fbsd_tdep; -extern initialize_file_ftype _initialize_ia64_tdep; -extern initialize_file_ftype _initialize_solib; -extern initialize_file_ftype _initialize_svr4_solib; -extern initialize_file_ftype _initialize_ser_hardwire; -extern initialize_file_ftype _initialize_ser_pipe; -extern initialize_file_ftype _initialize_ser_tcp; -extern initialize_file_ftype _initialize_fbsd_proc; -extern initialize_file_ftype _initialize_gcore; -extern initialize_file_ftype _initialize_thread_db; -extern initialize_file_ftype _initialize_ia64_fbsd_nat; -extern initialize_file_ftype _initialize_kernel_u_addr; -extern initialize_file_ftype _initialize_infptrace; -extern initialize_file_ftype _initialize_inftarg; -extern initialize_file_ftype _initialize_remote; -extern initialize_file_ftype _initialize_dcache; -extern initialize_file_ftype _initialize_sr_support; -extern initialize_file_ftype _initialize_tracepoint; -extern initialize_file_ftype _initialize_ax_gdb; -extern initialize_file_ftype _initialize_annotate; -extern initialize_file_ftype _initialize_auxv; -extern initialize_file_ftype _initialize_breakpoint; -extern initialize_file_ftype _initialize_regcache; -extern initialize_file_ftype _initialize_charset; -extern initialize_file_ftype _initialize_dummy_frame; -extern initialize_file_ftype _initialize_source; -extern initialize_file_ftype _initialize_values; -extern initialize_file_ftype _initialize_valops; -extern initialize_file_ftype _initialize_valarith; -extern initialize_file_ftype _initialize_valprint; -extern initialize_file_ftype _initialize_printcmd; -extern initialize_file_ftype _initialize_symtab; -extern initialize_file_ftype _initialize_symfile; -extern initialize_file_ftype _initialize_symmisc; -extern initialize_file_ftype _initialize_infcall; -extern initialize_file_ftype _initialize_infcmd; -extern initialize_file_ftype _initialize_infrun; -extern initialize_file_ftype _initialize_stack; -extern initialize_file_ftype _initialize_thread; -extern initialize_file_ftype _initialize_interpreter; -extern initialize_file_ftype _initialize_macrocmd; -extern initialize_file_ftype _initialize_gdbarch; -extern initialize_file_ftype _initialize_gdbarch_utils; -extern initialize_file_ftype _initialize_gdb_osabi; -extern initialize_file_ftype _initialize_copying; -extern initialize_file_ftype _initialize_mem; -extern initialize_file_ftype _initialize_parse; -extern initialize_file_ftype _initialize_language; -extern initialize_file_ftype _initialize_frame_reg; -extern initialize_file_ftype _initialize_signals; -extern initialize_file_ftype _initialize_kod; -extern initialize_file_ftype _initialize_gdb_events; -extern initialize_file_ftype _initialize_exec; -extern initialize_file_ftype _initialize_maint_cmds; -extern initialize_file_ftype _initialize_demangler; -extern initialize_file_ftype _initialize_dbxread; -extern initialize_file_ftype _initialize_coffread; -extern initialize_file_ftype _initialize_elfread; -extern initialize_file_ftype _initialize_mipsread; -extern initialize_file_ftype _initialize_stabsread; -extern initialize_file_ftype _initialize_core; -extern initialize_file_ftype _initialize_dwarf2_frame; -extern initialize_file_ftype _initialize_c_language; -extern initialize_file_ftype _initialize_f_language; -extern initialize_file_ftype _initialize_objc_language; -extern initialize_file_ftype _initialize_ui_out; -extern initialize_file_ftype _initialize_cli_out; -extern initialize_file_ftype _initialize_varobj; -extern initialize_file_ftype _initialize_java_language; -extern initialize_file_ftype _initialize_m2_language; -extern initialize_file_ftype _initialize_pascal_language; -extern initialize_file_ftype _initialize_pascal_valprint; -extern initialize_file_ftype _initialize_scheme_language; -extern initialize_file_ftype _initialize_complaints; -extern initialize_file_ftype _initialize_typeprint; -extern initialize_file_ftype _initialize_cp_valprint; -extern initialize_file_ftype _initialize_f_valprint; -extern initialize_file_ftype _initialize_nlmread; -extern initialize_file_ftype _initialize_serial; -extern initialize_file_ftype _initialize_mdebugread; -extern initialize_file_ftype _initialize_user_regs; -extern initialize_file_ftype _initialize_frame; -extern initialize_file_ftype _initialize_frame_unwind; -extern initialize_file_ftype _initialize_frame_base; -extern initialize_file_ftype _initialize_gnu_v2_abi; -extern initialize_file_ftype _initialize_gnu_v3_abi; -extern initialize_file_ftype _initialize_hpacc_abi; -extern initialize_file_ftype _initialize_cp_abi; -extern initialize_file_ftype _initialize_cp_support; -extern initialize_file_ftype _initialize_cp_namespace; -extern initialize_file_ftype _initialize_reggroup; -extern initialize_file_ftype _initialize_inflow; -extern initialize_file_ftype _initialize_cli_dump; -extern initialize_file_ftype _initialize_cli_logging; -extern initialize_file_ftype _initialize_cli_interp; -extern initialize_file_ftype _initialize_mi_out; -extern initialize_file_ftype _initialize_mi_cmds; -extern initialize_file_ftype _initialize_mi_cmd_env; -extern initialize_file_ftype _initialize_mi_interp; -extern initialize_file_ftype _initialize_mi_main; -extern initialize_file_ftype _initialize_tui_hooks; -extern initialize_file_ftype _initialize_tui_interp; -extern initialize_file_ftype _initialize_tui_layout; -extern initialize_file_ftype _initialize_tui_out; -extern initialize_file_ftype _initialize_tui_regs; -extern initialize_file_ftype _initialize_tui_stack; -extern initialize_file_ftype _initialize_tui_win; -void -initialize_all_files (void) -{ - _initialize_gdbtypes (); - _initialize_corelow (); - _initialize_ia64_fbsd_tdep (); - _initialize_ia64_tdep (); - _initialize_solib (); - _initialize_svr4_solib (); - _initialize_ser_hardwire (); - _initialize_ser_pipe (); - _initialize_ser_tcp (); -#ifndef CROSS_DEBUGGER - _initialize_fbsd_proc (); - _initialize_gcore (); - _initialize_thread_db (); - _initialize_ia64_fbsd_nat (); - _initialize_kernel_u_addr (); - _initialize_infptrace (); - _initialize_inftarg (); -#endif - _initialize_remote (); - _initialize_dcache (); - _initialize_sr_support (); - _initialize_tracepoint (); - _initialize_ax_gdb (); - _initialize_annotate (); - _initialize_auxv (); - _initialize_breakpoint (); - _initialize_regcache (); - _initialize_charset (); - _initialize_dummy_frame (); - _initialize_source (); - _initialize_values (); - _initialize_valops (); - _initialize_valarith (); - _initialize_valprint (); - _initialize_printcmd (); - _initialize_symtab (); - _initialize_symfile (); - _initialize_symmisc (); - _initialize_infcall (); - _initialize_infcmd (); - _initialize_infrun (); - _initialize_stack (); - _initialize_thread (); - _initialize_interpreter (); - _initialize_macrocmd (); - _initialize_gdbarch (); - _initialize_gdbarch_utils (); - _initialize_gdb_osabi (); - _initialize_copying (); - _initialize_mem (); - _initialize_parse (); - _initialize_language (); - _initialize_frame_reg (); - _initialize_signals (); - _initialize_kod (); - _initialize_gdb_events (); - _initialize_exec (); - _initialize_maint_cmds (); - _initialize_demangler (); - _initialize_dbxread (); - _initialize_coffread (); - _initialize_elfread (); - _initialize_mipsread (); - _initialize_stabsread (); - _initialize_core (); - _initialize_dwarf2_frame (); - _initialize_c_language (); - _initialize_f_language (); - _initialize_objc_language (); - _initialize_ui_out (); - _initialize_cli_out (); - _initialize_varobj (); - _initialize_java_language (); - _initialize_m2_language (); - _initialize_pascal_language (); - _initialize_pascal_valprint (); - _initialize_scheme_language (); - _initialize_complaints (); - _initialize_typeprint (); - _initialize_cp_valprint (); - _initialize_f_valprint (); - _initialize_nlmread (); - _initialize_serial (); - _initialize_mdebugread (); - _initialize_user_regs (); - _initialize_frame (); - _initialize_frame_unwind (); - _initialize_frame_base (); - _initialize_gnu_v2_abi (); - _initialize_gnu_v3_abi (); - _initialize_hpacc_abi (); - _initialize_cp_abi (); - _initialize_cp_support (); - _initialize_cp_namespace (); - _initialize_reggroup (); - _initialize_inflow (); - _initialize_cli_dump (); - _initialize_cli_logging (); - _initialize_cli_interp (); - _initialize_mi_out (); - _initialize_mi_cmds (); - _initialize_mi_cmd_env (); - _initialize_mi_interp (); - _initialize_mi_main (); - _initialize_tui_hooks (); - _initialize_tui_interp (); - _initialize_tui_layout (); - _initialize_tui_out (); - _initialize_tui_regs (); - _initialize_tui_stack (); - _initialize_tui_win (); -} diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile index 15eb2eb..9da4da1 100644 --- a/gnu/usr.bin/gdb/gdb/Makefile +++ b/gnu/usr.bin/gdb/gdb/Makefile @@ -11,8 +11,10 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcapw -lgnuregex + +NO_PIE= yes .include <bsd.prog.mk> CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\" diff --git a/gnu/usr.bin/gdb/gdb/Makefile.depend b/gnu/usr.bin/gdb/gdb/Makefile.depend index 4572bc1..595475a 100644 --- a/gnu/usr.bin/gdb/gdb/Makefile.depend +++ b/gnu/usr.bin/gdb/gdb/Makefile.depend @@ -17,7 +17,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/msun \ - lib/ncurses/ncurses \ + lib/ncurses/ncursesw \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile index 94dbb4b..8369b7f 100644 --- a/gnu/usr.bin/gdb/gdbtui/Makefile +++ b/gnu/usr.bin/gdb/gdbtui/Makefile @@ -12,7 +12,9 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcapw -lgnuregex + +NO_PIE= yes .include <bsd.prog.mk> diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile.depend b/gnu/usr.bin/gdb/gdbtui/Makefile.depend index 1d50aca..7ed5830 100644 --- a/gnu/usr.bin/gdb/gdbtui/Makefile.depend +++ b/gnu/usr.bin/gdb/gdbtui/Makefile.depend @@ -17,7 +17,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/msun \ - lib/ncurses/ncurses \ + lib/ncurses/ncursesw \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile index 30cbf3c..bbc886b 100644 --- a/gnu/usr.bin/gdb/kgdb/Makefile +++ b/gnu/usr.bin/gdb/kgdb/Makefile @@ -8,13 +8,15 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a -DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} \ +DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \ ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm -lreadline -ltermcap \ +LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LIBREADLINE} -ltermcapw \ -lgnuregex .if defined(GDB_CROSS_DEBUGGER) CFLAGS+= -Wl,-export-dynamic .endif +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 b/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 index 165f4f0..9a4e405 100644 --- a/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 +++ b/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 @@ -18,7 +18,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libkvm \ lib/msun \ - lib/ncurses/ncurses \ + lib/ncurses/ncursesw \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/gdb/kgdb/trgt_ia64.c b/gnu/usr.bin/gdb/kgdb/trgt_ia64.c deleted file mode 100644 index 6ba800b..0000000 --- a/gnu/usr.bin/gdb/kgdb/trgt_ia64.c +++ /dev/null @@ -1,338 +0,0 @@ -/* - * Copyright (c) 2004 Marcel Moolenaar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/types.h> -#ifdef CROSS_DEBUGGER -#include <sys/ia64/include/_regset.h> -#include <sys/ia64/include/frame.h> -#include <sys/ia64/include/md_var.h> -#include <sys/ia64/include/pcb.h> -#else -#include <machine/frame.h> -#include <machine/md_var.h> -#include <machine/pcb.h> -#endif -#include <err.h> -#include <kvm.h> -#include <string.h> - -#include <defs.h> -#include <target.h> -#include <gdbthread.h> -#include <inferior.h> -#include <regcache.h> -#include <frame-unwind.h> -#include <ia64-tdep.h> - -#include "kgdb.h" - -CORE_ADDR -kgdb_trgt_core_pcb(u_int cpuid) -{ - CORE_ADDR addr; - char *expr; - - asprintf(&expr, "&cpuid_to_pcpu[%d]->pc_md.pcb", cpuid); - addr = kgdb_parse(expr); - free(expr); - return (addr); -} - -void -kgdb_trgt_fetch_registers(int regno __unused) -{ - struct kthr *kt; - struct pcb pcb; - uint64_t r; - - kt = kgdb_thr_lookup_tid(ptid_get_pid(inferior_ptid)); - if (kt == NULL) - return; - if (kvm_read(kvm, kt->pcb, &pcb, sizeof(pcb)) != sizeof(pcb)) { - warnx("kvm_read: %s", kvm_geterr(kvm)); - memset(&pcb, 0, sizeof(pcb)); - } - - /* Registers 0-127: general registers. */ - supply_register(IA64_GR1_REGNUM, (char *)&pcb.pcb_special.gp); - supply_register(IA64_GR4_REGNUM, (char *)&pcb.pcb_preserved.gr4); - supply_register(IA64_GR5_REGNUM, (char *)&pcb.pcb_preserved.gr5); - supply_register(IA64_GR6_REGNUM, (char *)&pcb.pcb_preserved.gr6); - supply_register(IA64_GR7_REGNUM, (char *)&pcb.pcb_preserved.gr7); - supply_register(IA64_GR12_REGNUM, (char *)&pcb.pcb_special.sp); - supply_register(IA64_GR12_REGNUM+1, (char *)&pcb.pcb_special.tp); - - /* Registers 128-255: floating-point registers. */ - supply_register(IA64_FR2_REGNUM, (char *)&pcb.pcb_preserved_fp.fr2); - supply_register(IA64_FR2_REGNUM+1, (char *)&pcb.pcb_preserved_fp.fr3); - supply_register(IA64_FR2_REGNUM+2, (char *)&pcb.pcb_preserved_fp.fr4); - supply_register(IA64_FR2_REGNUM+3, (char *)&pcb.pcb_preserved_fp.fr5); - supply_register(IA64_FR16_REGNUM, (char *)&pcb.pcb_preserved_fp.fr16); - supply_register(IA64_FR16_REGNUM+1, (char*)&pcb.pcb_preserved_fp.fr17); - supply_register(IA64_FR16_REGNUM+2, (char*)&pcb.pcb_preserved_fp.fr18); - supply_register(IA64_FR16_REGNUM+3, (char*)&pcb.pcb_preserved_fp.fr19); - supply_register(IA64_FR16_REGNUM+4, (char*)&pcb.pcb_preserved_fp.fr20); - supply_register(IA64_FR16_REGNUM+5, (char*)&pcb.pcb_preserved_fp.fr21); - supply_register(IA64_FR16_REGNUM+6, (char*)&pcb.pcb_preserved_fp.fr22); - supply_register(IA64_FR16_REGNUM+7, (char*)&pcb.pcb_preserved_fp.fr23); - supply_register(IA64_FR16_REGNUM+8, (char*)&pcb.pcb_preserved_fp.fr24); - supply_register(IA64_FR16_REGNUM+9, (char*)&pcb.pcb_preserved_fp.fr25); - supply_register(IA64_FR16_REGNUM+10,(char*)&pcb.pcb_preserved_fp.fr26); - supply_register(IA64_FR16_REGNUM+11,(char*)&pcb.pcb_preserved_fp.fr27); - supply_register(IA64_FR16_REGNUM+12,(char*)&pcb.pcb_preserved_fp.fr28); - supply_register(IA64_FR16_REGNUM+13,(char*)&pcb.pcb_preserved_fp.fr29); - supply_register(IA64_FR16_REGNUM+14,(char*)&pcb.pcb_preserved_fp.fr30); - supply_register(IA64_FR16_REGNUM+15,(char*)&pcb.pcb_preserved_fp.fr31); - - /* Registers 320-327: branch registers. */ - if (pcb.pcb_special.__spare == ~0UL) - supply_register(IA64_BR0_REGNUM, (char *)&pcb.pcb_special.rp); - supply_register(IA64_BR1_REGNUM, (char *)&pcb.pcb_preserved.br1); - supply_register(IA64_BR2_REGNUM, (char *)&pcb.pcb_preserved.br2); - supply_register(IA64_BR3_REGNUM, (char *)&pcb.pcb_preserved.br3); - supply_register(IA64_BR4_REGNUM, (char *)&pcb.pcb_preserved.br4); - supply_register(IA64_BR5_REGNUM, (char *)&pcb.pcb_preserved.br5); - - /* Registers 328-333: misc. other registers. */ - supply_register(IA64_PR_REGNUM, (char *)&pcb.pcb_special.pr); - if (pcb.pcb_special.__spare == ~0UL) { - r = pcb.pcb_special.iip + ((pcb.pcb_special.psr >> 41) & 3); - supply_register(IA64_IP_REGNUM, (char *)&r); - supply_register(IA64_CFM_REGNUM, (char *)&pcb.pcb_special.cfm); - } else { - supply_register(IA64_IP_REGNUM, (char *)&pcb.pcb_special.rp); - supply_register(IA64_CFM_REGNUM, (char *)&pcb.pcb_special.pfs); - } - - /* Registers 334-461: application registers. */ - supply_register(IA64_RSC_REGNUM, (char *)&pcb.pcb_special.rsc); - r = pcb.pcb_special.bspstore; - if (pcb.pcb_special.__spare == ~0UL) - r += pcb.pcb_special.ndirty; - else - r = ia64_bsp_adjust(r, IA64_CFM_SOF(pcb.pcb_special.pfs) - - IA64_CFM_SOL(pcb.pcb_special.pfs)); - supply_register(IA64_BSP_REGNUM, (char *)&r); - supply_register(IA64_BSPSTORE_REGNUM, (char *)&r); - supply_register(IA64_RNAT_REGNUM, (char *)&pcb.pcb_special.rnat); - supply_register(IA64_UNAT_REGNUM, (char *)&pcb.pcb_special.unat); - supply_register(IA64_FPSR_REGNUM, (char *)&pcb.pcb_special.fpsr); - if (pcb.pcb_special.__spare == ~0UL) - supply_register(IA64_PFS_REGNUM, (char *)&pcb.pcb_special.pfs); - supply_register(IA64_LC_REGNUM, (char *)&pcb.pcb_preserved.lc); -} - -void -kgdb_trgt_store_registers(int regno __unused) -{ - fprintf_unfiltered(gdb_stderr, "XXX: %s\n", __func__); -} - -void -kgdb_trgt_new_objfile(struct objfile *objfile) -{ -} - -struct kgdb_frame_cache { - CORE_ADDR bsp; - CORE_ADDR ip; - CORE_ADDR sp; - CORE_ADDR saved_bsp; -}; - -#define SPECIAL(x) offsetof(struct trapframe, tf_special) \ - + offsetof(struct _special, x) -#define SCRATCH(x) offsetof(struct trapframe, tf_scratch) \ - + offsetof(struct _caller_saved, x) -#define SCRATCH_FP(x) offsetof(struct trapframe, tf_scratch_fp) \ - + offsetof(struct _caller_saved_fp, x) - -static int kgdb_trgt_frame_ofs_gr[32] = { - -1, /* gr0 */ - SPECIAL(gp), - SCRATCH(gr2), SCRATCH(gr3), - -1, -1, -1, -1, /* gr4-gr7 */ - SCRATCH(gr8), SCRATCH(gr9), SCRATCH(gr10), SCRATCH(gr11), - SPECIAL(sp), SPECIAL(tp), - SCRATCH(gr14), SCRATCH(gr15), SCRATCH(gr16), SCRATCH(gr17), - SCRATCH(gr18), SCRATCH(gr19), SCRATCH(gr20), SCRATCH(gr21), - SCRATCH(gr22), SCRATCH(gr23), SCRATCH(gr24), SCRATCH(gr25), - SCRATCH(gr26), SCRATCH(gr27), SCRATCH(gr28), SCRATCH(gr29), - SCRATCH(gr30), SCRATCH(gr31) -}; - -static int kgdb_trgt_frame_ofs_fr[32] = { - -1, /* fr0: constant 0.0 */ - -1, /* fr1: constant 1.0 */ - -1, -1, -1, -1, /* fr2-fr5 */ - SCRATCH_FP(fr6), SCRATCH_FP(fr7), SCRATCH_FP(fr8), SCRATCH_FP(fr9), - SCRATCH_FP(fr10), SCRATCH_FP(fr11), SCRATCH_FP(fr12), SCRATCH_FP(fr13), - SCRATCH_FP(fr14), SCRATCH_FP(fr15) -}; - -static int kgdb_trgt_frame_ofs_br[8] = { - SPECIAL(rp), - -1, -1, -1, -1, -1, /* br1-br5 */ - SCRATCH(br6), SCRATCH(br7) -}; - -static int kgdb_trgt_frame_ofs_ar[49] = { - /* ar0-ar15 */ - SPECIAL(rsc), - -1, /* ar.bsp */ - SPECIAL(bspstore), SPECIAL(rnat), - -1, -1, -1, -1, -1, /* ar20-ar24 */ - SCRATCH(csd), SCRATCH(ssd), - -1, -1, -1, -1, -1, /* ar27-ar31 */ - SCRATCH(ccv), - -1, -1, -1, /* ar33-ar35 */ - SPECIAL(unat), - -1, -1, -1, /* ar37-ar39 */ - SPECIAL(fpsr), - -1, -1, -1, -1, -1, -1, -1, /* ar41-ar47 */ - -1, -1, -1, -1, -1, -1, -1, -1, /* ar48-ar55 */ - -1, -1, -1, -1, -1, -1, -1, -1, /* ar56-ar63 */ - SPECIAL(pfs) -}; - -static struct kgdb_frame_cache * -kgdb_trgt_frame_cache(struct frame_info *next_frame, void **this_cache) -{ - char buf[MAX_REGISTER_SIZE]; - struct kgdb_frame_cache *cache; - - cache = *this_cache; - if (cache == NULL) { - cache = FRAME_OBSTACK_ZALLOC(struct kgdb_frame_cache); - *this_cache = cache; - frame_unwind_register(next_frame, IA64_BSP_REGNUM, buf); - cache->bsp = extract_unsigned_integer(buf, - register_size(current_gdbarch, IA64_BSP_REGNUM)); - cache->ip = frame_func_unwind(next_frame); - frame_unwind_register(next_frame, SP_REGNUM, buf); - cache->sp = extract_unsigned_integer(buf, - register_size(current_gdbarch, SP_REGNUM)); - } - return (cache); -} - -static void -kgdb_trgt_trapframe_this_id(struct frame_info *next_frame, void **this_cache, - struct frame_id *this_id) -{ - struct kgdb_frame_cache *cache; - - cache = kgdb_trgt_frame_cache(next_frame, this_cache); - *this_id = frame_id_build_special(cache->sp, cache->ip, cache->bsp); -} - -static void -kgdb_trgt_trapframe_prev_register(struct frame_info *next_frame, - void **this_cache, int regnum, int *optimizedp, enum lval_type *lvalp, - CORE_ADDR *addrp, int *realnump, void *valuep) -{ - char buf[MAX_REGISTER_SIZE]; - char dummy_valuep[MAX_REGISTER_SIZE]; - struct kgdb_frame_cache *cache; - CORE_ADDR bsp; - int ofs, regsz; - - regsz = register_size(current_gdbarch, regnum); - - if (valuep == NULL) - valuep = dummy_valuep; - memset(valuep, 0, regsz); - *optimizedp = 0; - *addrp = 0; - *lvalp = not_lval; - *realnump = -1; - - cache = kgdb_trgt_frame_cache(next_frame, this_cache); - - if (regnum == IA64_BSP_REGNUM) { - if (cache->saved_bsp == 0) { - target_read_memory(cache->sp + 16 + SPECIAL(bspstore), - buf, regsz); - bsp = extract_unsigned_integer(buf, regsz); - target_read_memory(cache->sp + 16 + SPECIAL(ndirty), - buf, regsz); - bsp += extract_unsigned_integer(buf, regsz); - cache->saved_bsp = bsp; - } - store_unsigned_integer(valuep, regsz, cache->saved_bsp); - return; - } - if (regnum == IA64_PR_REGNUM) - ofs = SPECIAL(pr); - else if (regnum == IA64_IP_REGNUM) - ofs = SPECIAL(iip); - else if (regnum == IA64_PSR_REGNUM) - ofs = SPECIAL(psr); - else if (regnum == IA64_CFM_REGNUM) - ofs = SPECIAL(cfm); - else if (regnum >= IA64_GR0_REGNUM && regnum <= IA64_GR31_REGNUM) - ofs = kgdb_trgt_frame_ofs_gr[regnum - IA64_GR0_REGNUM]; - else if (regnum >= IA64_FR0_REGNUM && regnum <= IA64_FR15_REGNUM) - ofs = kgdb_trgt_frame_ofs_fr[regnum - IA64_FR0_REGNUM]; - else if (regnum >= IA64_BR0_REGNUM && regnum <= IA64_BR7_REGNUM) - ofs = kgdb_trgt_frame_ofs_br[regnum - IA64_BR0_REGNUM]; - else if (regnum >= IA64_RSC_REGNUM && regnum <= IA64_PFS_REGNUM) - ofs = kgdb_trgt_frame_ofs_ar[regnum - IA64_RSC_REGNUM]; - else - ofs = -1; - if (ofs == -1) - return; - - *addrp = cache->sp + 16 + ofs; - *lvalp = lval_memory; - target_read_memory(*addrp, valuep, regsz); -} - -static const struct frame_unwind kgdb_trgt_trapframe_unwind = { - UNKNOWN_FRAME, - &kgdb_trgt_trapframe_this_id, - &kgdb_trgt_trapframe_prev_register -}; - -const struct frame_unwind * -kgdb_trgt_trapframe_sniffer(struct frame_info *next_frame) -{ - char *pname; - CORE_ADDR ip; - - ip = frame_func_unwind(next_frame); - pname = NULL; - find_pc_partial_function(ip, &pname, NULL, NULL); - if (pname == NULL) - return (NULL); - if (strncmp(pname, "ivt_", 4) == 0) - return (&kgdb_trgt_trapframe_unwind); - /* printf("%s: %lx =%s\n", __func__, ip, pname); */ - return (NULL); -} diff --git a/gnu/usr.bin/groff/contrib/mm/Makefile.depend b/gnu/usr.bin/groff/contrib/mm/Makefile.depend index 57b7e10..18f420a 100644 --- a/gnu/usr.bin/groff/contrib/mm/Makefile.depend +++ b/gnu/usr.bin/groff/contrib/mm/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/groff/font/devdvi/Makefile.depend b/gnu/usr.bin/groff/font/devdvi/Makefile.depend index 57b7e10..18f420a 100644 --- a/gnu/usr.bin/groff/font/devdvi/Makefile.depend +++ b/gnu/usr.bin/groff/font/devdvi/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/groff/font/devlbp/Makefile.depend b/gnu/usr.bin/groff/font/devlbp/Makefile.depend index 57b7e10..18f420a 100644 --- a/gnu/usr.bin/groff/font/devlbp/Makefile.depend +++ b/gnu/usr.bin/groff/font/devlbp/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/groff/font/devlj4/Makefile.depend b/gnu/usr.bin/groff/font/devlj4/Makefile.depend index 57b7e10..18f420a 100644 --- a/gnu/usr.bin/groff/font/devlj4/Makefile.depend +++ b/gnu/usr.bin/groff/font/devlj4/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/groff/font/devps/Makefile.depend b/gnu/usr.bin/groff/font/devps/Makefile.depend index 57b7e10..18f420a 100644 --- a/gnu/usr.bin/groff/font/devps/Makefile.depend +++ b/gnu/usr.bin/groff/font/devps/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/groff/man/Makefile.depend b/gnu/usr.bin/groff/man/Makefile.depend index 57b7e10..18f420a 100644 --- a/gnu/usr.bin/groff/man/Makefile.depend +++ b/gnu/usr.bin/groff/man/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile index 3745440..7c88f04 100644 --- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile +++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend b/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend index b5a6296..e3872b6 100644 --- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend +++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libdriver \ diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile index 321f1c8..4d30338 100644 --- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile +++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm MAN= +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile index 85a41c1..69511e0 100644 --- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile +++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend b/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend index b5a6296..e3872b6 100644 --- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend +++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libdriver \ diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile index bb3f9e4..51a003f 100644 --- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile +++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile @@ -7,4 +7,6 @@ DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend b/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend index b5a6296..e3872b6 100644 --- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend +++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libdriver \ diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile index 4511f69..4933dbb 100644 --- a/gnu/usr.bin/groff/src/devices/grops/Makefile +++ b/gnu/usr.bin/groff/src/devices/grops/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile.depend b/gnu/usr.bin/groff/src/devices/grops/Makefile.depend index b5a6296..e3872b6 100644 --- a/gnu/usr.bin/groff/src/devices/grops/Makefile.depend +++ b/gnu/usr.bin/groff/src/devices/grops/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libdriver \ diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile index d15ee8b..78d6498 100644 --- a/gnu/usr.bin/groff/src/devices/grotty/Makefile +++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend b/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend index b5a6296..e3872b6 100644 --- a/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend +++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libdriver \ diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend b/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend index e507cd0..d0592e7 100644 --- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend +++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ include \ include/xlocale \ lib/msun \ diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile index 80871fe..9e53be6 100644 --- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile +++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile @@ -11,6 +11,8 @@ SCRIPTS= neqn MAN= eqn.1 neqn.1 CLEANFILES= eqn.cpp eqn_tab.h ${SCRIPTS} ${MAN} y.tab.c y.tab.h +NO_PIE= yes + eqn_tab.h: eqn.cpp .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend b/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend index 78b43b7..2991404 100644 --- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend +++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libgroff \ diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile index 58309d2..d859270 100644 --- a/gnu/usr.bin/groff/src/preproc/grn/Makefile +++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend b/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend index df023f1..0c56806 100644 --- a/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend +++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libgroff \ diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile index d46626b..4e82fd1 100644 --- a/gnu/usr.bin/groff/src/preproc/html/Makefile +++ b/gnu/usr.bin/groff/src/preproc/html/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBGROFF} LDADD= ${LIBGROFF} MAN= +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile index 3b5939c..2d14d0a 100644 --- a/gnu/usr.bin/groff/src/preproc/pic/Makefile +++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile @@ -8,6 +8,8 @@ DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} pic.cpp pic_tab.h y.tab.c y.tab.h +NO_PIE= yes + pic_tab.h: pic.cpp .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend b/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend index dd0bc4c..436466d 100644 --- a/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend +++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libgroff \ diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile index 8a18f6f..ce82c70 100644 --- a/gnu/usr.bin/groff/src/preproc/refer/Makefile +++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile @@ -7,4 +7,6 @@ DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} LDADD= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= label.cpp label_tab.h ${MAN} y.tab.c y.tab.h +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend b/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend index 661e26a..0eb0288 100644 --- a/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend +++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libbib \ diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile b/gnu/usr.bin/groff/src/preproc/soelim/Makefile index 2c68b80..8567a44 100644 --- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile +++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBGROFF} LDADD= ${LIBGROFF} CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend b/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend index df023f1..0c56806 100644 --- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend +++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libgroff \ diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile index 29e7ac2..83bde82 100644 --- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile +++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend b/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend index df023f1..0c56806 100644 --- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend +++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libgroff \ diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile index 2ae541b..576507c 100644 --- a/gnu/usr.bin/groff/src/roff/groff/Makefile +++ b/gnu/usr.bin/groff/src/roff/groff/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile.depend b/gnu/usr.bin/groff/src/roff/groff/Makefile.depend index df023f1..0c56806 100644 --- a/gnu/usr.bin/groff/src/roff/groff/Makefile.depend +++ b/gnu/usr.bin/groff/src/roff/groff/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libgroff \ diff --git a/gnu/usr.bin/groff/src/roff/grog/Makefile.depend b/gnu/usr.bin/groff/src/roff/grog/Makefile.depend index 57b7e10..18f420a 100644 --- a/gnu/usr.bin/groff/src/roff/grog/Makefile.depend +++ b/gnu/usr.bin/groff/src/roff/grog/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend b/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend index 57b7e10..18f420a 100644 --- a/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend +++ b/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile index 802af2b..5c3b837 100644 --- a/gnu/usr.bin/groff/src/roff/troff/Makefile +++ b/gnu/usr.bin/groff/src/roff/troff/Makefile @@ -7,6 +7,8 @@ DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= majorminor.cpp ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> majorminor.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile.depend b/gnu/usr.bin/groff/src/roff/troff/Makefile.depend index 093a8ee..00efcdb 100644 --- a/gnu/usr.bin/groff/src/roff/troff/Makefile.depend +++ b/gnu/usr.bin/groff/src/roff/troff/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libgroff \ diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile index 26fbb57..ea3b7a2 100644 --- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile +++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBGROFF} LDADD= ${LIBGROFF} CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend index df023f1..0c56806 100644 --- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend +++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libgroff \ diff --git a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend index 57b7e10..18f420a 100644 --- a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend +++ b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile index 1376702..512ca1b 100644 --- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile +++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend index df023f1..0c56806 100644 --- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend +++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libgroff \ diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile index b2c59a2..86eb4fb 100644 --- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile @@ -6,6 +6,8 @@ DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} LDADD= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + beforeinstall: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${DIST_DIR}/eign ${DESTDIR}${SHAREDIR}/dict/ diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend b/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend index 48d8209..d9e7bc1 100644 --- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend +++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libbib \ diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile index f30dc56..42fbd63 100644 --- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} LDADD= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend b/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend index 48d8209..d9e7bc1 100644 --- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend +++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libbib \ diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile index 18834a7..e2ea17d 100644 --- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} LDADD= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend b/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend index 48d8209..d9e7bc1 100644 --- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend +++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libbib \ diff --git a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend index fd3efc3..21bca0b 100644 --- a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend +++ b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libgroff \ diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile index ba3bbc5..1b0434f 100644 --- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile +++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile @@ -6,4 +6,6 @@ DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend index df023f1..0c56806 100644 --- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend +++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ gnu/usr.bin/groff/src/libs/libgroff \ diff --git a/gnu/usr.bin/groff/tmac/Makefile.depend b/gnu/usr.bin/groff/tmac/Makefile.depend index 57b7e10..18f420a 100644 --- a/gnu/usr.bin/groff/tmac/Makefile.depend +++ b/gnu/usr.bin/groff/tmac/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + bin/cat.host \ .include <dirdeps.mk> diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local index bbab704..e7ec4cf 100644 --- a/gnu/usr.bin/groff/tmac/mdoc.local +++ b/gnu/usr.bin/groff/tmac/mdoc.local @@ -35,6 +35,7 @@ .ds doc-str-Lb-libarchive Streaming Archive Library (libarchive, \-larchive) .ds doc-str-Lb-libbluetooth Bluetooth User Library (libbluetooth, \-lbluetooth) .ds doc-str-Lb-libcapsicum Capsicum Library (libcapsicum, \-lcapsicum) +.ds doc-str-Lb-libcuse Userland Character Device Library (libcuse, \-lcuse) .ds doc-str-Lb-libedit Line Editor and History Library (libedit, \-ledit) .ds doc-str-Lb-libefi EFI Runtime Services Library (libefi, \-lefi) .ds doc-str-Lb-libelf ELF Parsing Library (libelf, \-lelf) @@ -58,9 +59,12 @@ .ds doc-operating-system-FreeBSD-8.4 8.4 .ds doc-operating-system-FreeBSD-9.1 9.1 .ds doc-operating-system-FreeBSD-9.2 9.2 +.ds doc-operating-system-FreeBSD-9.3 9.3 .ds doc-operating-system-FreeBSD-10.0 10.0 .ds doc-operating-system-FreeBSD-10.1 10.1 .ds doc-operating-system-FreeBSD-11.0 11.0 +. +.\" Definitions for other *BSDs not (yet) in doc-common .ds doc-operating-system-NetBSD-7.0 7.0 . .\" Definitions not (yet) in doc-syms diff --git a/gnu/usr.bin/rcs/Makefile.inc b/gnu/usr.bin/rcs/Makefile.inc index a46437a..912ae7b 100644 --- a/gnu/usr.bin/rcs/Makefile.inc +++ b/gnu/usr.bin/rcs/Makefile.inc @@ -1,3 +1,4 @@ # $FreeBSD$ LIBRCS= ${.OBJDIR}/../lib/librcs.a +NO_PIE= yes diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile index b4e44ac..de95af6 100644 --- a/gnu/usr.bin/texinfo/info/Makefile +++ b/gnu/usr.bin/texinfo/info/Makefile @@ -10,8 +10,10 @@ SRCS= dir.c display.c doc.c dribble.c echo-area.c filesys.c \ CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\" -DPADD= ${LIBTERMCAP} ${LIBTXI} -LDADD= -ltermcap ${LIBTXI} +DPADD= ${LIBTERMCAPW} ${LIBTXI} +LDADD= -ltermcapw ${LIBTXI} + +NO_PIE= yes .include <bsd.prog.mk> diff --git a/gnu/usr.bin/texinfo/info/Makefile.depend b/gnu/usr.bin/texinfo/info/Makefile.depend index 1afa811..5f2bf77 100644 --- a/gnu/usr.bin/texinfo/info/Makefile.depend +++ b/gnu/usr.bin/texinfo/info/Makefile.depend @@ -11,7 +11,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/ncurses/ncurses \ lib/ncurses/ncursesw \ diff --git a/gnu/usr.bin/texinfo/infokey/Makefile b/gnu/usr.bin/texinfo/infokey/Makefile index 50be00d..d42406f 100644 --- a/gnu/usr.bin/texinfo/infokey/Makefile +++ b/gnu/usr.bin/texinfo/infokey/Makefile @@ -6,6 +6,8 @@ SRCS= infokey.c key.c DPADD= ${LIBTXI} LDADD= ${LIBTXI} +NO_PIE= yes + .include <bsd.prog.mk> .PATH: ${TXIDIR}/info ${TXIDIR}/doc diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile index 325c909..21ab9ea 100644 --- a/gnu/usr.bin/texinfo/install-info/Makefile +++ b/gnu/usr.bin/texinfo/install-info/Makefile @@ -5,6 +5,8 @@ PROG= install-info DPADD= ${LIBTXI} LDADD= ${LIBTXI} +NO_PIE= yes + .include <bsd.prog.mk> .PATH: ${TXIDIR}/util ${TXIDIR}/doc diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile index 373c326..1c3b77d 100644 --- a/gnu/usr.bin/texinfo/makeinfo/Makefile +++ b/gnu/usr.bin/texinfo/makeinfo/Makefile @@ -8,6 +8,8 @@ SRCS= cmds.c defun.c files.c float.c footnote.c html.c \ DPADD= ${LIBTXI} LDADD= ${LIBTXI} +NO_PIE= yes + .include <bsd.prog.mk> .PATH: $(TXIDIR)/makeinfo $(TXIDIR)/doc diff --git a/gnu/usr.bin/texinfo/texindex/Makefile b/gnu/usr.bin/texinfo/texindex/Makefile index 91c2dfc..796d627 100644 --- a/gnu/usr.bin/texinfo/texindex/Makefile +++ b/gnu/usr.bin/texinfo/texindex/Makefile @@ -5,6 +5,8 @@ PROG= texindex DPADD= ${LIBTXI} LDADD= ${LIBTXI} +NO_PIE= yes + .include <bsd.prog.mk> .PATH: ${TXIDIR}/util ${TXIDIR}/doc |
