From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 9F52F3853542 for ; Fri, 30 Sep 2022 00:12:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9F52F3853542 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28TMieOM010312; Fri, 30 Sep 2022 00:12:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=OHi3wnbC43GP0qjV1iYTdDS9t8XsW/AGGLt+E2npo9Y=; b=1aCaTHZlFISzwvKla3Vub4Il7fy9oYrsJejjxILYO+tHWtchgboNFpxJPjoB5ua5sMwu QReU+SOBRI0CGPgLNpYBGD+AMNGrFZOnkjUrp8lpItb353hPTJRBihpFObbfTO5aSIv/ gPKKjlk/sYrhLovN1tXSOthTSRsS6dFiCcib7rsLZ5Gy40n9JdZSb9dNMKyvK8y62KG4 faM1GsOLCp61m0JYM92zr1MrOkPcZ/58dM3eLqfvia+B8zaLZpM7SQ8GR1rQT2Es/xDX zEtEx2FhRWlro4yJg0lT6nzSN/vDj9328J6ObjQWRWNLSn8c5/tdRMiTHkcXi2LA40uQ 1w== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3jssubpf87-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Sep 2022 00:12:06 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 28TKou0b039373; Fri, 30 Sep 2022 00:12:06 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2042.outbound.protection.outlook.com [104.47.57.42]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3jtpqaw0cm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Sep 2022 00:12:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bZDR5cUmOnKtJnEubzdyF6Qj8zbzdhWBC/vPF7KAACVzun8BnHfi5DDtmTgXnz+SZGNNxc0vdxrci5YggW/21+rxwfqn6N0j32MzZYAGeLofzZkQhE2Rnsj9lX6Z2IMEDAKHZiiNz3rXFd74WwA8sim05VBjGS/PUaFcsPoQVg7QECsq1qVxzrMSy4svdc5lFZ6qZuA7ezHm6G1kNm81xHWV1IX7dpdErNxqm037sD38Q1Iylu78m/7NwqzWPPOrjJpzgnZmXjRtkmYn8MUM2RfXFIWAgdf6nUvxINB6xSV02vyood9aVQOT3r+lCzDSvQ71LRodG/I1QpfhdNEkzg== 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=OHi3wnbC43GP0qjV1iYTdDS9t8XsW/AGGLt+E2npo9Y=; b=GWkjqsF4Lhliwe1SmQfwxmBHXavBBFY56iENmtMU2/9CLCcWcF1PRfErtjsQX4Z0z/A52UAsuNBOMymJcsDB/1uW+u6hVyuktGCrtkOd3nwLB4sZLOlZTrh2e3yfzx0h1hEzz3QhR/ns96tsGqJfh/WxTWlSzYtfrpY9hPphjKUayZv+541xtIxivgOoJj2qVuqfTujW5ENAzMbNcxU5O40bCppJJFI/0tG/bIhM1XNwBXQj/IccOqzzx2Xd9LqsomQc2oM3/AkUghjko29q0j4QKZkEGaU7f12KFvH/VG6AdmLCJvvOpdK7fM6Se45taqd/i5GDP/8nfsfXv1kHxg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OHi3wnbC43GP0qjV1iYTdDS9t8XsW/AGGLt+E2npo9Y=; b=L/zaKNPvdsvd/ivSWSlzvk87AHTsc0fwgMMU7lnDVqh4wyHM5moJQ9sjAy1tmxTwht7wzm7YHN03AZfHOyPcBbQ7IV99qOOqDpLnhv4VjLXyhHAiFHPkQL4qT2OtxT5NP44U1GwUXPCfsvYKROID3qyA7O7QLr1B2LkKs0gVLN8= Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by SJ0PR10MB4495.namprd10.prod.outlook.com (2603:10b6:a03:2d6::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.20; Fri, 30 Sep 2022 00:11:59 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::80a7:f7f3:4303:54e4]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::80a7:f7f3:4303:54e4%5]) with mapi id 15.20.5676.017; Fri, 30 Sep 2022 00:11:58 +0000 From: Indu Bhagat To: binutils@sourceware.org Cc: nickc@redhat.com, weimin.pan@oracle.com, Indu Bhagat Subject: [PATCH,V1 10/14] gdb: sim: buildsystem changes to accommodate libsframe Date: Thu, 29 Sep 2022 17:04:36 -0700 Message-Id: <20220930000440.1672106-11-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220930000440.1672106-1-indu.bhagat@oracle.com> References: <20220930000440.1672106-1-indu.bhagat@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MW2PR16CA0030.namprd16.prod.outlook.com (2603:10b6:907::43) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|SJ0PR10MB4495:EE_ X-MS-Office365-Filtering-Correlation-Id: ab77a35d-b3a0-40c5-9e75-08daa27863ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S46ZKx2tFbe1CTvCNZPLeFiScW9yUiJr29Q4fGBvJWKoBa3X8/q248MiJb9qNjSgTWQIw08m6n1bZxtretI6rbAVdRUpZ8gcw2dd/PjPJRepey8QPOriUlHt7oh6qGlaN9a7P2gc7hA9tK++UOvZb50+3L3CjomzN204Rch6nI2/cQ6dURX3iTvwh/vcArinJkO55SIKsGkOHxRmdRJzOa4Wl2XopnBmANIpWzve/SvKHha92vgn2N0Q9SN4Jn6tZDCai7BxXXEmJRCmNLDVRrtYDhZkLJQYVxKsnch8kUR4qZAk8RuDa9qBqg9Qa8xmDZ6c4rb0xpRMEvAoaWH78pAvz7zxvJRkYAb7qI3BE2vBl3s1UoEA040kMd+h4HcA6Pv4LHHJApa7P0qycTaZQiBGy7PNDkkfiFX+OGj+6f8Me234rsJNCYfy/HOJ3LxS5cWWHUFFWaHZspVzuCToIUgQerppQUxSHB+oQjCbHxFD+ychdtV9LDkTL2xmUEK1PB1gpX1kBj97k0lMlNl7UwhcYEDUZlsYCWut1oiIXd8bOvm7J0Ms2zASfc62bk6fjxGbVwDcVbA1YmudfsEls9IkGLLlxwm1nqVlQ3/Y1W2+zOZ+Z2HRxuZEaG6Ac6Q8pr2ua41Y/vQ3ROCtavyjhnPaQjJ5l1XljodMyMUr8OxxsJRWFHIcUv9mFvpB/9Q+3rISA3al5DClrQkAYTNSkQ== 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)(396003)(366004)(39860400002)(136003)(346002)(376002)(451199015)(6506007)(83380400001)(41300700001)(2616005)(5660300002)(186003)(1076003)(6512007)(86362001)(8936002)(38100700002)(478600001)(6666004)(4326008)(66946007)(66556008)(8676002)(6486002)(66476007)(6916009)(107886003)(36756003)(316002)(26005)(44832011)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4sj83G9/N3CAIrKrCdXQYRu1RKHE04vRyiWqN6Im8BwS/olUFgoXQQMmNNBX?= =?us-ascii?Q?oXr6qV32c+e58YXjcG3yakaFvNcWhOwEkn/nGGv7YQw4BPvw7axWsSCzQTy5?= =?us-ascii?Q?lJ5V8GfuX9qPT3ITPIrz7mNzQS06E+XZvZhOE1X4FF2g66YhHuekjYZBXMxP?= =?us-ascii?Q?8ODDPpZyqZJGduH+IpB/zfK0UjS7OC8vLTB1zsHd00pSwYDTwDrY2olLB8Db?= =?us-ascii?Q?/54SjgxQ8mWVTJOFCvOIXN6jzltCYq5pBaMJRCp9VFnDsTXuI1CBhdxULP7x?= =?us-ascii?Q?xHsu2KjzG8xyIR06FT8Fl2ezzMnZah0/thrF/UMEWZYHZqwC2HFJ0no88vqi?= =?us-ascii?Q?Y1tV4JmuOuHFcIgdVcHJtbMjnThoRzCZWmtY8JxN68/a+yexZsWDghsw2xwf?= =?us-ascii?Q?FjdbsDo30d8PAH7MRPzUuY6D76CSOTNigsc3k03yjIY09KD16WcVNfSjDtS+?= =?us-ascii?Q?uMkGsGKleluYfc/3cG9BVo3dZ7HUjyoLqzJLD/P/3y29qdNg4VZbf8ow067U?= =?us-ascii?Q?hUfr9t5sQiJJdxt5kndhvJrB12YtBZibYe/D0faltxDFJkUsYS3hqJm9bUMw?= =?us-ascii?Q?Sd2ERXwB0k6c6hlKANqPpkisqgj/cxx2hTw8mWVoWZdduKBmaKlyLYNXUwnj?= =?us-ascii?Q?r3YuOS9MYoqxpt5hFdSBqXL34iZyWZ/AoB/86DG0SVeIbESLelg3KKDFfhFD?= =?us-ascii?Q?06OP2wK2fIPUi1af4PT1Vd2GKccd72adDkizKPB5lCFSYMIIk3T2cM0HC+j7?= =?us-ascii?Q?+Vwu5TnNtH+D1gj+Q0Iw6qqGeUVg+LL/jf6HY2Y5xo1fRvuztgl71X6U0Vdj?= =?us-ascii?Q?2VhffPWiob3qvH4SjoqqwI7z1NqwKR+99cingsjVL0T6RokU5a5T2FvmFUr1?= =?us-ascii?Q?pN066EOpmwaOC4tbda3ZlpkZxTd+u6KQeH0BTe+cNwRTK50X/aa/tDXe5Ihu?= =?us-ascii?Q?SM9ae3a+eI9gtfl7q6yMNc/E94GDL/+atutUDLiJsVe6azIceIH3zjuBY6A4?= =?us-ascii?Q?BcnPY99ExqxXgRW7pxbEY3nek2wKnZXm5Hw7tliD0QAMgN6Yp/HD0B2W7Nqg?= =?us-ascii?Q?+DejDAHMP50GtqE6duyzhhvwfCFbxwdOCQB7Yg/cD3wyDj0PhFRgU86uXnuU?= =?us-ascii?Q?77O2TaY/Vf7G02gFE8RMJzeKWw4qteM1oectavj4JLOGS1z43Q+OjTw5LZGI?= =?us-ascii?Q?QvVRAkKrsoBY4rs1OtvyJUhCgPMCZye/pY54JTIM69JuzrdkTOEEIM1HhgnD?= =?us-ascii?Q?LmEVcmEb0k/O2Dq1apuM5O+TRgk8uRWq3VivablaKKapHXn3pwJqHsbtZ3eN?= =?us-ascii?Q?SptWvvHMPoQJWuZjrNxaaD4/993qgPFyHuy6hLfgSMhDVzz0FDQfe8IfIUhY?= =?us-ascii?Q?qxCAhSdNaTdmcJC24zLVnDThDBHKq+/yKlzaHXmfDlgywfhlhRX+pEBG4D0N?= =?us-ascii?Q?umPWb0baUC0nhe257vU/kkv6UeYbALI09gmJGAMwGXoV1uCSUSHr7ivIcfgc?= =?us-ascii?Q?x54cwS666MSkcjJdtxLgGF8DJZfzXXT2ZUwqnx7REMQv64CkYde3Astk7tKM?= =?us-ascii?Q?HWv4JxqwYIcVa7+cAuCbdPY2OgxjXJBLDrHzZmbL?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab77a35d-b3a0-40c5-9e75-08daa27863ea X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 00:11:58.4941 (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: 3KYrALHap5cVYV2BVsxJ/kMvSzZBfos3Mpy3Q+k3uBNV1sWyxztM3IrGvYPQmre8DegoIeaMewVFt3L5clxkgA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4495 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-29_13,2022-09-29_03,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 mlxscore=0 suspectscore=0 malwarescore=0 adultscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2209290150 X-Proofpoint-GUID: Nwzo17m-wildlum15xroCcRWw-2vZGbl X-Proofpoint-ORIG-GUID: Nwzo17m-wildlum15xroCcRWw-2vZGbl 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 List-Id: Both gdb and sim need buildsystem fixes to now include libsframe for a successful build. gdb/ChangeLog: * acinclude.m4: Fix GDB_AC_CHECK_BFD to include libsframe. * Makefile.in: Bring in libsframe for linking. * configure.ac: Check for static or shared. * configure: Regenerated. sim/common/ChangeLog: * sim/common/Make-common.in: Bring in libsframe.a for linking. --- gdb/Makefile.in | 8 ++++++-- gdb/acinclude.m4 | 4 ++-- gdb/configure | 35 +++++++++++++++++++++++++++++++---- gdb/configure.ac | 11 +++++++++++ sim/common/Make-common.in | 7 +++++-- 5 files changed, 55 insertions(+), 10 deletions(-) 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 28846119dcb..a7205e90b0b 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 $ZSTD_LIBS $LDFLAGS" + LDFLAGS="-L../bfd -L../libiberty -L../libsframe/.libs/ $ZLIBDIR $ZSTD_LIBS $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` - LIBS="-lbfd -liberty -lz $intl $LIBS" + LIBS="-lbfd -liberty -lz -lsframe $intl $LIBS" AC_CACHE_CHECK( [$1], [$2], diff --git a/gdb/configure b/gdb/configure index 9c7a37a623e..ec1b3fd8bf4 100755 --- 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 $ZSTD_LIBS $LDFLAGS" + LDFLAGS="-L../bfd -L../libiberty -L../libsframe/.libs/ $ZLIBDIR $ZSTD_LIBS $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` - LIBS="-lbfd -liberty -lz $intl $LIBS" + LIBS="-lbfd -liberty -lz -lsframe $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 $ZSTD_LIBS $LDFLAGS" + LDFLAGS="-L../bfd -L../libiberty -L../libsframe/.libs/ $ZLIBDIR $ZSTD_LIBS $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` - LIBS="-lbfd -liberty -lz $intl $LIBS" + LIBS="-lbfd -liberty -lz -lsframe $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 \ -- 2.37.2