d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gprof: disable building of a.out components

Browse Source 
On arm64, riscv, and s390x disable building of aout components.
This allows gprof to build on these architectures which never supported
the legacy a.out binary format.

Obtained from:		s390x branch
MFC after:		3 months
This commit is contained in:
bz 2019-08-21 10:54:52 +00:00
parent 6afcaa6dcb
commit 2a588ce73c
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/gprof/Makefile
View File

@ -2,8 +2,14 @@
# $FreeBSD$ # $FreeBSD$
PROG= gprof PROG= gprof
SRCS= gprof.c aout.c arcs.c dfn.c elf.c lookup.c hertz.c \ SRCS= gprof.c arcs.c dfn.c elf.c lookup.c hertz.c \
printgprof.c printlist.c kernel.c printgprof.c printlist.c kernel.c
.if ${MACHINE_ARCH} != "aarch64" && ${MACHINE_ARCH} != "riscv" && \
${MACHINE_ARCH} != "s390x"
SRCS+= aout.c
CFLAGS+= -DWITH_AOUT
.endif
FILES= gprof.flat gprof.callg FILES= gprof.flat gprof.callg
FILESDIR= ${SHAREDIR}/misc FILESDIR= ${SHAREDIR}/misc

7
usr.bin/gprof/gprof.c
View File

@ -160,8 +160,11 @@ main(int argc, char **argv)
* get information from the executable file. * get information from the executable file.
*/ */
if ((Kflag && kernel_getnfile(a_outname, &defaultEs) == -1) || if ((Kflag && kernel_getnfile(a_outname, &defaultEs) == -1) ||
(!Kflag && elf_getnfile(a_outname, &defaultEs) == -1 && (!Kflag && elf_getnfile(a_outname, &defaultEs) == -1
aout_getnfile(a_outname, &defaultEs) == -1)) #ifdef WITH_AOUT
&& aout_getnfile(a_outname, &defaultEs) == -1
#endif
))
errx(1, "%s: bad format", a_outname); errx(1, "%s: bad format", a_outname);
/* /*
* sort symbol table. * sort symbol table.

2
usr.bin/gprof/gprof.h
View File

@ -256,7 +256,9 @@ void addarc(nltype *, nltype *, long);
bool addcycle(arctype **, arctype **); bool addcycle(arctype **, arctype **);
void addlist(struct stringlist *, char *); void addlist(struct stringlist *, char *);
void alignentries(void); void alignentries(void);
#ifdef WITH_AOUT
int aout_getnfile(const char *, char ***); int aout_getnfile(const char *, char ***);
#endif
int arccmp(arctype *, arctype *); int arccmp(arctype *, arctype *);
arctype *arclookup(nltype *, nltype *); arctype *arclookup(nltype *, nltype *);
void asgnsamples(void); void asgnsamples(void);