From patchwork Thu Oct 27 18:22:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 59559 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7D5CA3846423 for ; Thu, 27 Oct 2022 18:23:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7D5CA3846423 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666895007; bh=+vgPBRvAQKyVNeoajF0ndvAaHQEaDGX012Qqj4GBueI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=BAz/7uOiYpAD5Ebr94KwsZR4BPLjcWNOIcbBM7Ksz1ntXJs6bB7fr7Wdf0yR3ikHg c9HiaLiZAlYfyP45smP6nEUzEWOObmTbs21gEJg3EwuYx50gBTi0++OMO522RvfjfY ISnElR/racQZpGzaVeuPKQTxnOwNLBP31aEPcQWw= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 690CE384BC3C for ; Thu, 27 Oct 2022 18:22:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 690CE384BC3C Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29RHmunk030275 for ; Thu, 27 Oct 2022 18:22:54 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kfagv3316-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Oct 2022 18:22:53 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 29RGJJP7011574 for ; Thu, 27 Oct 2022 18:22:53 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2046.outbound.protection.outlook.com [104.47.66.46]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kfagr98p0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Oct 2022 18:22:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kCyXxO2QXF7YLhEOhIpC+qVMgm7xuWkoIyd977GjJNEUm9Aztt41g5y24ldulS6XIVzHP+PJRmOKE0SCqLzuysMIENEEg6SPocBaLTDA+YnSYkPIcaTHdDWQGsfU0KJ8qCEZbta9j3K3Qaxyzoo2Qa4Sylr0MO4z1LSYgsoW1UFiiJgZeuKxp17wU9o1vXiJooP9c5VFaMKfpGRATEXsRVcDvTWyTAbh/MZJNoHvnc0he8JcgEX2b0C8L9SA5IK+PPJxe2Zq6MybF+cF6zthtJYGB9y2Lg0ALilT6XihDoxV6NTEhGIi2sNC0XPrulEWiyKsvjPjI3alVlnlVnLcag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+vgPBRvAQKyVNeoajF0ndvAaHQEaDGX012Qqj4GBueI=; b=DCx5rcApYsR3f4bpmn3u1OuLI+0cRCb1inWafgY0I3O0i0QlyVPfhbyw8utw2wAiSXWPr1zsMcd9wRY9XX7AwOImP7DeKwYRcCw4ld/ZYTaPQW23HQSAK8bmiyPaBHCYphvueWlMCoI0y+G0Whkpk0A+/1JScTusC1hP+4vOcaCqMXJQ4BYQKvZZVQuX3zq13DYnHvH3YuAcv86wcrpwvmV1/FMM8d8nitJwuT6RJ/Gx9HGNWJcWzFc8OSoX+u55gRLmsAptwZTKrc3Ilw6u35g7Y/Z1P19iqq7m0/ki5/rDt6ptR+pS7ldHe+F5iLSAQQ7doXLoQ3i4c5vhtFFovw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by IA1PR10MB6244.namprd10.prod.outlook.com (2603:10b6:208:3a0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Thu, 27 Oct 2022 18:22:50 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::a505:15c2:a248:efa2]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::a505:15c2:a248:efa2%7]) with mapi id 15.20.5723.033; Thu, 27 Oct 2022 18:22:50 +0000 To: gdb-patches@sourceware.org Subject: [PATCH,V3] gdb: sim: buildsystem changes to accommodate libsframe Date: Thu, 27 Oct 2022 11:22:41 -0700 Message-Id: <20221027182241.3350381-1-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221027181543.3349840-1-indu.bhagat@oracle.com> References: <20221027181543.3349840-1-indu.bhagat@oracle.com> X-ClientProxiedBy: MW4PR04CA0231.namprd04.prod.outlook.com (2603:10b6:303:87::26) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|IA1PR10MB6244:EE_ X-MS-Office365-Filtering-Correlation-Id: 65bd4dad-6602-4b47-e470-08dab8484190 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DoXjFzJ1iTXcluK3RwPN5zDF1IuDJIXzRSFRtS3eNU0BNzKluVn2JSoo0DNn+5QtMjDjGHqmxUYHqzJRnt6v5JxtVIXqcM6INyxbLNC96iHX83bTWAxW3ZyK9a54KbJA8XUFm6bvSYaf2MvZOEAXzBKnRn5DdaT6BD1FQa4Ko3KbQ3gQzDMq+X1aHClk2624GCQ97yk7Q6Vl6qp+wHYGjzhUXWqlO0DunxolLCuf49bFDdNmS0dnVH8yQtGV6+kMe1qtie2f0zvTxitxs/c5o27+Xe+8HkWAQJV7gTIQqi0EadDNwMdxU6hNF8hjW3Bm2u+Kk8eneSAsa8VjAmIsaNzWg/cNq0rPzBODMRV8/M8uPGsMBpCmfLaHMBvyCWDMGY6eSNrAqzNKvUPqsRTwx23Me9tJV6eLvQcl2LRj++m5yckLTwUfGFSuCC9y1uDIzgCj7Ql82UHdqqpNXV3nL/2zVR7vk6GECDAk8nkA/Pgi5H/zVcQgLDYts+fHAKoPJuLKZ6LFN62/5OsVsPun87HPviQWWRdwdKTLiTWFJiNVwEB55Dci0OWZj1T9G5QJZRxpwLJT9scX6osLo6aVlVGCOShrKa5iwF7eZYajlJletVlVELtWnWyF/2uMY6fxkJnWWOc9a8lpqEN0fFR4Z8HRwSTLK2iFGXgwbt279pYBAmjHm3nfL5xJhbjTjOkqLoecND0W/8BnA6loUcGi2HehpXEXAxU9huwCTp7YrZpWgeHWYT2PtuKkyvVTHy5s5+tWxHh1JcMUByC7GL02uw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR1001MB2158.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(376002)(366004)(39860400002)(346002)(136003)(396003)(451199015)(5660300002)(41300700001)(6512007)(8936002)(38100700002)(36756003)(83380400001)(44832011)(1076003)(2616005)(186003)(2906002)(966005)(6486002)(478600001)(6916009)(6666004)(107886003)(316002)(66476007)(86362001)(4326008)(8676002)(66946007)(66556008)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xWKl+Rgy96g+0HYFZlu0uRwbbwiAmNf64UZ+w7rd+C+BJtRizCTd4C3R4yE1zNRarirE0l4njX1HFFmsIu8SviPGZOe+WuuJ+IdZYcLD9e1K9odqj+DOu4cEbZgjeHny/SmE0+Dd5SHmp5nGSjiqON8QDjLl8FBskhYObVVKpxKflDJyjXeAQzMPUcpZQCd8a31TxywaZsxKxoqltsq+rGrCJEnFM2jsp+CjvNzYuA9f7VZFkrVtqESV9KEhv+gvF/552g4gecImce3vvMslfFudEaXe2cYWMMeaN2AcHSFOnhv1X3pUg/bjbat6d0SSd0agVhY5NBQoLK74ffpmRWTgtES6l7RzgRdpMTzlfAoowa14P9lYFuiCj5LLINViVNw83KT2st91H2BSh81+9mE5myoT10PAi/h/cXtb9DwOmaecWD0tTotT0QLndUD2U7+oRsCvWWDnKn3oRejtElSYwub2fv75+l5GakCaHOaioYT8GfZxt4PTD9tCMj2zwxOp60nXqCUgYJAAGGl39SF/BVS6KItGwh/0a5DA6cbkofVyu+Egdzl0HGLOl1/UV1YSbUnADwZ/q7F56RHsPKAv/ggDB/dJ8rDAWpVfHvyqDSPrrZODFty0VPQMsU54onJlB6IdxThDv4f/SWSp56gS84WVOUaT6s/9vBt6ndmIQR+1Vhg+y+0gXrp46RjPvV/Jv5xoHojQS3Yz+bTI7yALR2q5wmslayPMw4KspXUeiFdS7J4PyWcr2K/+tqWnaAWasoIPSeM2htCjb9ehmZaDz6yU7itVJdOFwMrsceI3OKzuYB709SOQOAok0VTOsUlt8VffmITB46v+4fRZewf1GhdNlTDcRUrrFv3OvfO9ZThfTpofag1laNI6NKh33ntb8j85VquH9f1QGk6+qLqdK/XvUA5ox34lXSk4yLEdf2hVMN7sQh6/2SRuzqjns/GtyZtw4IZBjNFKBhHE/5S+wvE2qemQUeJWR+0VjyZRFOt4DxUwKGIk33edw//pYXrMEErJqPai8tWbLt8S+hv2iPtipY1wb7osGw1W+Q1PD56z4iM2rU6lD8Sgf8zV27XYSvGjJS+OmTzUABsegWM3Tlv3DqKvCVXngjUYGO0c6W9a9+SZY9Xxj1xkM+EpQEprdhJVxK3W4YQpFrbLEXDMYkVbcB2sWSV8TXsyfBn4pR/odSwxRDhZDSCd8qyxX4SyY7r2RDvM/yIjm+3dxASVqmVeFbp/4q2f3P0Qfxbo2YkvrStLgxx+taQMERSFSZKjsi6kOqhPNLyMQOXem9FlVYWHCQ4sTw6R2biyQefv2hMVjtHAl1X5sUvWMEIIrCZkHgqEbOVRML2f0229wjQ2lIkMtU8yTEQHhvnOPmDNRMNSHLkyy0sotousiuX6nVyrVXkfNVbo9PqlXtQASymGxCpwR2ecJ0MH/la34ERauucqhosxn13Zu4Wl00KekUyEH2k2Oq+HO8N5R/ve68TOUxql/r6kYt5X/RTulr+Pgjd6dcE4b0/I3mP0t1H9pcV78nC/x19noiF7b25TWIRQ8g1o69ad5kvWeH1zJvGPDY/+ESo2EHQP+aDJA780RYH33uuDmn42DD0jN140Aw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65bd4dad-6602-4b47-e470-08dab8484190 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 18:22:50.5235 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ACevrA3Rc9aOTC5RN/mN/eTvstPITGwF13UO95VD3xlSKlzPGusYPUgXGLGXDiAcOd+wjQug1Uu9xJmVU8onTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6244 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-27_07,2022-10-27_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 adultscore=0 malwarescore=0 mlxscore=0 suspectscore=0 bulkscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2210270103 X-Proofpoint-ORIG-GUID: 4Oi5Jc2-gUra7qYW2OL9d2ZYdO1rlx1p X-Proofpoint-GUID: 4Oi5Jc2-gUra7qYW2OL9d2ZYdO1rlx1p X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Indu Bhagat via Gdb-patches From: Indu Bhagat Reply-To: Indu Bhagat Cc: Indu Bhagat Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" (Intended to send the complete patch but sent the V3-V2 diff by mistake. Sending the complete V3 patch.) [Changes in V3] - Added buildsystem changes to sim/ppc/Makefile.in to ensure --enable-targets=all does not fail. [End of changes in V3] Both gdb and sim need buildsystem fixes to now include libsframe for a successful build. Version 2 of the SFrame support patches were posted here https://sourceware.org/pipermail/binutils/2022-October/123641.html and approved earlier https://sourceware.org/pipermail/binutils/2022-October/123810.html The gdb/ and sim/common/ bits that were posted earlier are here: https://sourceware.org/pipermail/binutils/2022-October/123650.html and approved here https://sourceware.org/pipermail/binutils/2022-October/123500.html As there is a new diff from V2 (in sim/ppc/Makefile.in), please review it and let me know. Thanks --- gdb/Makefile.in | 8 ++++++-- gdb/acinclude.m4 | 4 ++-- gdb/configure | 35 +++++++++++++++++++++++++++++++---- gdb/configure.ac | 11 +++++++++++ sim/common/Make-common.in | 7 +++++-- sim/ppc/Makefile.in | 5 +++-- 6 files changed, 58 insertions(+), 12 deletions(-) mode change 100755 => 100644 gdb/configure diff --git a/gdb/Makefile.in b/gdb/Makefile.in index c528ee5aa80..492e08d6c63 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -161,6 +161,10 @@ LIBIBERTY = ../libiberty/libiberty.a LIBCTF = @LIBCTF@ CTF_DEPS = @CTF_DEPS@ +# Where is the SFrame library? Typically in ../libsframe. +LIBSFRAME = @LIBSFRAME@ +SFRAME_DEPS = @SFRAME_DEPS@ + # Where is the BFD library? Typically in ../bfd. BFD_DIR = ../bfd BFD = $(BFD_DIR)/libbfd.a @@ -650,7 +654,7 @@ INTERNAL_LDFLAGS = \ # Libraries and corresponding dependencies for compiling gdb. # XM_CLIBS, defined in *config files, have host-dependent libs. # LIBIBERTY appears twice on purpose. -CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) $(ZSTD_LIBS) \ +CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(LIBSFRAME) $(ZLIB) $(ZSTD_LIBS) \ $(LIBSUPPORT) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \ $(XM_CLIBS) $(GDBTKLIBS) $(LIBBACKTRACE_LIB) \ @LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \ @@ -658,7 +662,7 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) $(ZSTD_LIBS) \ $(WIN32LIBS) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) $(LIBICONV) \ $(LIBMPFR) $(LIBGMP) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \ $(DEBUGINFOD_LIBS) $(LIBBABELTRACE_LIB) -CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \ +CDEPS = $(NAT_CDEPS) $(SIM) $(SFRAME_DEPS) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \ $(LIBSUPPORT) diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 62fa66c7af3..8bbc5f0739e 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -234,9 +234,9 @@ AC_DEFUN([GDB_AC_CHECK_BFD], [ # always want our bfd. CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS" ZLIBDIR=`echo $zlibdir | sed 's,\$(top_builddir)/,,g'` - LDFLAGS="-L../bfd -L../libiberty $ZLIBDIR $LDFLAGS" + LDFLAGS="-L../bfd -L../libiberty -L../libsframe/.libs/ $ZLIBDIR $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` - LIBS="-lbfd -liberty -lz $ZSTD_LIBS $intl $LIBS" + LIBS="-lbfd -liberty -lz -lsframe $ZSTD_LIBS $intl $LIBS" AC_CACHE_CHECK( [$1], [$2], diff --git a/gdb/configure b/gdb/configure old mode 100755 new mode 100644 index 33677262783..81afd5edac8 --- a/gdb/configure +++ b/gdb/configure @@ -631,6 +631,8 @@ GDB_NM_FILE LTLIBXXHASH LIBXXHASH HAVE_LIBXXHASH +SFRAME_DEPS +LIBSFRAME CTF_DEPS LIBCTF LTLIBBABELTRACE @@ -939,6 +941,7 @@ with_libbabeltrace_prefix with_libbabeltrace_type with_xxhash enable_libctf +enable_libsframe with_libxxhash_prefix with_libxxhash_type enable_unit_tests @@ -1617,6 +1620,7 @@ Optional Features: --enable-libbacktrace use libbacktrace to write a backtrace after a fatal signal. --enable-libctf Handle .ctf type-info sections [default=yes] + --enable-libsframe Handle .sframe sections [default=yes] --enable-unit-tests Enable the inclusion of unit tests when compiling GDB @@ -17412,9 +17416,9 @@ WIN32LIBS="$WIN32LIBS $WIN32APILIBS" # always want our bfd. CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS" ZLIBDIR=`echo $zlibdir | sed 's,\$(top_builddir)/,,g'` - LDFLAGS="-L../bfd -L../libiberty $ZLIBDIR $LDFLAGS" + LDFLAGS="-L../bfd -L../libiberty -L../libsframe/.libs/ $ZLIBDIR $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` - LIBS="-lbfd -liberty -lz $ZSTD_LIBS $intl $LIBS" + LIBS="-lbfd -liberty -lz -lsframe $ZSTD_LIBS $intl $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF support in BFD" >&5 $as_echo_n "checking for ELF support in BFD... " >&6; } if ${gdb_cv_var_elf+:} false; then : @@ -17527,9 +17531,9 @@ fi # always want our bfd. CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS" ZLIBDIR=`echo $zlibdir | sed 's,\$(top_builddir)/,,g'` - LDFLAGS="-L../bfd -L../libiberty $ZLIBDIR $LDFLAGS" + LDFLAGS="-L../bfd -L../libiberty -L../libsframe/.libs/ $ZLIBDIR $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` - LIBS="-lbfd -liberty -lz $ZSTD_LIBS $intl $LIBS" + LIBS="-lbfd -liberty -lz -lsframe $ZSTD_LIBS $intl $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mach-O support in BFD" >&5 $as_echo_n "checking for Mach-O support in BFD... " >&6; } if ${gdb_cv_var_macho+:} false; then : @@ -19498,6 +19502,29 @@ fi + # Check whether --enable-libsframe was given. +if test "${enable_libsframe+set}" = set; then : + enableval=$enable_libsframe; + case "$enableval" in + yes|no) ;; + *) as_fn_error $? "Argument to enable/disable libsframe must be yes or no" "$LINENO" 5 ;; + esac + +else + enable_libsframe=yes +fi + + +if test x${enable_static} = xno; then + LIBSFRAME="-Wl,--rpath,../libsframe/.libs ../libsframe/.libs/libsframe.so" + SFRAME_DEPS="../libsframe/.libs/libsframe.so" +else + LIBSFRAME="../libsframe/.libs/libsframe.a" + SFRAME_DEPS="$LIBSFRAME" +fi + + + # If nativefile (NAT_FILE) is not set in configure.nat, we link to an # empty version. diff --git a/gdb/configure.ac b/gdb/configure.ac index fceb80e8c9d..c302e58b4bf 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -2167,6 +2167,17 @@ fi AC_SUBST(LIBCTF) AC_SUBST(CTF_DEPS) +GCC_ENABLE([libsframe], [yes], [], [Handle .sframe sections]) +if test x${enable_static} = xno; then + LIBSFRAME="-Wl,--rpath,../libsframe/.libs ../libsframe/.libs/libsframe.so" + SFRAME_DEPS="../libsframe/.libs/libsframe.so" +else + LIBSFRAME="../libsframe/.libs/libsframe.a" + SFRAME_DEPS="$LIBSFRAME" +fi +AC_SUBST(LIBSFRAME) +AC_SUBST(SFRAME_DEPS) + # If nativefile (NAT_FILE) is not set in configure.nat, we link to an # empty version. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index b07ec96e147..8a49e0b4ef2 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -222,11 +222,14 @@ SIM_HW_DEVICES = cfi core pal glue $(SIM_EXTRA_HW_DEVICES) ZLIB = $(zlibdir) -lz LIBIBERTY_LIB = ../../libiberty/libiberty.a BFD_LIB = ../../bfd/libbfd.a +LIBSFRAME_LIB = ../../libsframe/.libs/libsframe.a OPCODES_LIB = ../../opcodes/libopcodes.a CONFIG_LIBS = $(COMMON_LIBS) @LIBS@ $(ZLIB) $(ZSTD_LIBS) -LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) +LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) \ + $(LIBSFRAME_LIB) EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ - $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) + $(LIBSFRAME_LIB) $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) \ + $(LIBDL) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) COMMON_OBJS_NAMES = \ callback.o \ diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index b0c073b8867..12123d36a66 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -133,6 +133,7 @@ INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDES) $(BFD_INCLUDES) $(GDB_INCLUDES) -I../ LIBIBERTY_LIB = ../../libiberty/libiberty.a BFD_LIB = ../../bfd/libbfd.a +SFRAME_LIB = ../../libsframe/.libs/libsframe.a ZLIB = $(zlibdir) -lz @@ -521,8 +522,8 @@ PACKAGE_SRC = @sim_pk_src@ PACKAGE_OBJ = @sim_pk_obj@ -psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) - $(ECHO_CCLD) $(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(ZLIB) $(ZSTD_LIBS) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) +psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(SFRAME_LIB) $(LIBINTL_DEP) + $(ECHO_CCLD) $(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(SFRAME_LIB) $(ZLIB) $(ZSTD_LIBS) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) run$(EXEEXT): psim$(EXEEXT) $(SILENCE) rm -f $@