From nobody Mon Jan 23 16:45:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P0wvH6fKbz30w57; Mon, 23 Jan 2023 16:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P0wvH5vQxz3x68; Mon, 23 Jan 2023 16:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674492315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oW9i7TezgYJ2uE8N6HJ6uA4wcyQQWp15PVAUCv7l2Zk=; b=GW722/DepoK5OZg9KiHXtQVEOHJbsk3mFqe82AtWtMWz9Azy+nGheK6gDEWVmanaRLjfwl grO7bTcQFFImiHXqovUyggtZfXZWBdxQ+TvqCa29RB2bXwI40DQUq+j3yv+Eo4mafkfaw/ ero1iLwRYJX3uhQZr2eZZqgRCmrqQNIqsprtiUIdOJ1vsfML5LcyFWzxpWcPFui6OHbaw8 t0k7y6cxNiBMKT9bIudUYL1P/GBkQPHhEg7XPG7/pOc1i1bQJyn5B3uNmnxDbt6IlytNut F7WpkHe+D80+upH8Rr3KI2l2Ev01bsh1HiB5/YOaCQ0NHzeoo4lTXo8nMm9p2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674492315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oW9i7TezgYJ2uE8N6HJ6uA4wcyQQWp15PVAUCv7l2Zk=; b=Ml70A/E1kSPqFGll4+IL9ejGEdZyln1O+f34VKHt7T55Rc2dNckgT6EV5k2mqESIiJ8Idj EvKglKrb3qqXy1r7QTMlS+VEjY7FF9UD8WUnJ1/TdxpHdZCnTxqwnJR353ZAf7+NGCTSJb FAzZhVTUIAdFAu9rszn2n2ZvPL4Q9wIEIDUNN3abS3vCMcJIM0TTC1vEZWsxMtgfDOO6Th Z+e9xe6zy50o1chMCIguA5eHOgoj96zIgMl8LOUj3ts6NcwBiYdFtydlcduufRz7eIwoZ/ vYCfG+1mnmI1c3Z239gZDc0jooqtNdGsSiK0s+VPSgtboQLWgrRGUFP4ScSbhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674492315; a=rsa-sha256; cv=none; b=PteQp49yZo5UcTFGUwtqvaLY9TALsz9XUrtMmbj5AJ6gpnU0mcPkaH7c4H11chDgju5OBo 7TI7rzKYwP4Ij8aDnwSEht4WjQivagd/EIkRY4b6RyrkYnFnvaUk3WsGb0AGD1msdTqx4E uN1EYG0LqCsvlssb+8PM838KYGESWer9OZrnjlv8JQfVNJdZ+Qj30Bu3f3oQXX72f4WTww djnx8JkGrOurTQQ/4dN9CMSNLDzxm6O6ZLK3Cc/otKBuSThKBGZ1kfMKtllzqRKI/JFfkZ Ceja6hZ41CAgBPQRJ9DWo5yfwt4aeCgc7kyKINHAKu/IE+edgeWP/jfdyj/L6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P0wvH4zG1zcCp; Mon, 23 Jan 2023 16:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30NGjFhi044318; Mon, 23 Jan 2023 16:45:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NGjFxQ044317; Mon, 23 Jan 2023 16:45:15 GMT (envelope-from git) Date: Mon, 23 Jan 2023 16:45:15 GMT Message-Id: <202301231645.30NGjFxQ044317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 217c99d12a74 - stable/13 - riscv: always include frame pointer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 217c99d12a743de12dca37ff26d9ab0e8a8c3841 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=217c99d12a743de12dca37ff26d9ab0e8a8c3841 commit 217c99d12a743de12dca37ff26d9ab0e8a8c3841 Author: Mitchell Horne AuthorDate: 2023-01-11 18:04:45 +0000 Commit: Mitchell Horne CommitDate: 2023-01-23 16:39:00 +0000 riscv: always include frame pointer Specifically it is missing in kernel modules, meaning a proper backtrace can't be constructed. Reviewed by: jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37657 (cherry picked from commit b926b6db37f3195e83f9fd2751b7e0c6dcf8aaef) --- sys/conf/Makefile.riscv | 2 +- sys/conf/kmod.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/conf/Makefile.riscv b/sys/conf/Makefile.riscv index d4b1e6934ae8..35b2ca10a717 100644 --- a/sys/conf/Makefile.riscv +++ b/sys/conf/Makefile.riscv @@ -37,7 +37,7 @@ INCLUDES+= -I$S/contrib/libfdt -I$S/contrib/device-tree/include KERNEL_LMA?= 0x80200000 LDFLAGS+= --defsym='kernel_lma=${KERNEL_LMA}' -.if !empty(DDB_ENABLED) +.if !empty(DDB_ENABLED) || !empty(DTRACE_ENABLED) || !empty(HWPMC_ENABLED) CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls .endif diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index a4dafc22b2e4..2a2ab1d02277 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -158,7 +158,8 @@ LDFLAGS+= --build-id=sha1 .endif CFLAGS+= ${DEBUG_FLAGS} -.if ${MACHINE_CPUARCH} == aarch64 || ${MACHINE_CPUARCH} == amd64 +.if ${MACHINE_CPUARCH} == aarch64 || ${MACHINE_CPUARCH} == amd64 || \ + ${MACHINE_CPUARCH} == riscv CFLAGS+= -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer .endif