NetBSD-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: toolchain/57146: COPY_SYMTAB is broken by MKCTF=yes



The following reply was made to PR toolchain/57146; it has been noted by GNATS.

From: Martin Husemann <martin%duskware.de@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: toolchain/57146: COPY_SYMTAB is broken by MKCTF=yes
Date: Mon, 2 Jan 2023 20:01:28 +0100

 We have 116 affected kernel configs in the tree, so I thought it would be
 better to handle this as centralized as possible (which is slightly tricky
 due to CTF usage in sys.mk).
 
 The patch below seems to work for shark at least (no more .CTF_* section
 and dbsym -P shows the expected small values).
 
 Martin
 
 
 Index: sys/conf/Makefile.kern.inc
 ===================================================================
 RCS file: /cvsroot/src/sys/conf/Makefile.kern.inc,v
 retrieving revision 1.295
 diff -u -r1.295 Makefile.kern.inc
 --- sys/conf/Makefile.kern.inc	27 Aug 2022 20:37:49 -0000	1.295
 +++ sys/conf/Makefile.kern.inc	2 Jan 2023 18:56:21 -0000
 @@ -137,6 +137,12 @@
  #
  COPTS.debugsyms.c+=	-g
  
 +# Can not combine COPY_SYMTAB nad MKCTF - let the former win
 +.if defined(COPY_SYMTAB)
 +.undef CTFCONVERT
 +.undef CTFMERGE
 +.endif
 +
  # Add CTF sections for DTrace
  .if defined(CTFCONVERT)
  COMPILE_CTFCONVERT=	${_MKSHECHO}\
 Index: sys/lib/libkern/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/sys/lib/libkern/Makefile.inc,v
 retrieving revision 1.48
 diff -u -r1.48 Makefile.inc
 --- sys/lib/libkern/Makefile.inc	19 Jun 2022 18:28:16 -0000	1.48
 +++ sys/lib/libkern/Makefile.inc	2 Jan 2023 18:56:29 -0000
 @@ -40,6 +40,10 @@
  
  LIBKERN_MD_FLAGS?=	none
  
 +.if defined(COPY_SYMTAB)
 +KERNMISCMAKEFLAGS+=	MKCTF=no
 +.endif
 +
  KERNMAKE= \
  	cd ${KERNDST} && ${MAKE} -f ${KERNDIR:Q}/Makefile \
  	    KERNDIR=${KERNDIR:q} \
 


Home | Main Index | Thread Index | Old Index