From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 2CCDC3853802 for ; Mon, 17 Oct 2022 22:17:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2CCDC3853802 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 (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29HLmqOn002365; Mon, 17 Oct 2022 22:17:27 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=jkvHyr2Q9WhF0VhoI46I64wdh9Z57cmUxqMpcIEPEt4=; b=wfOm2Z/j+lFCi5yOB93dlqAF0Ib30KJPOhL1oxcf1IgUxdaE3LCqvZdVPzSHPCZTY6Av 8S0asFci2QIqzlNV+hMoT3/2U3wM341wIlASgFFRA3XZyFswFNMMQh8CeHRqru0KZehi S2G8+gliwgSj+Xdij1wdQktsRgP67Cs5sOLu/Zxpify3AGEE5bgQ53FqhUj1BAI9LcFL HEg6DBhY0bHHGXzV4kOoah442UnT0PXfA+PYasUfGSeOUJm1OvztE0ANDMlLXjgb7/OL fHDuDjYqBfFrDaLL5TzMlvVQ1WMMyuUzksNj1p8aSX42xbxtpJNeEVl/A5YDU2WkJVpu Zg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3k9b7sgp1w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Oct 2022 22:17:27 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 29HKkB6E015943; Mon, 17 Oct 2022 22:17:26 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3k8hqy0x0g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Oct 2022 22:17:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kHli2i9C59zoC7uX1gYLEczUGYo+yWgAItjfcr/nL4Y+tYOlKycolcC00zZxxKaj1HfBrYOA6mab0SMPuJH4vjJAEDts0MKcK0CwrrrYpJzynA2/4EJ9GCJeXiOrYmIgftMBmK0+VR6HlXw6TTopCADKxGDfjcB+WYZUu0ZU+MXiGYVVvQZFIIgDUgkZZHCVLQgBdZz7wtZ5Ej3eRFj3v7hyWhPqWq+tKyX3+elZzPwMgF+Vib8Y77ndAinGTD0ZXR/JlPgx6zBERwkXpN7VnwVYQzQpHMO7ZPvFdIYW2CmF60hRAFfQPY9dBs9Lnq9clYYNhaA/jOOAZ5h4CyKdDg== 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=jkvHyr2Q9WhF0VhoI46I64wdh9Z57cmUxqMpcIEPEt4=; b=Ml84wNwRIpZD8L6KOmqM+gEjMTEi7iisUbiNIICDPE7Sn0bJaSVv44H3rQLOt0W2UP6Csec6YDCrBAYPNl4yh4koP2rjk/MyQmWJb4s2bNmiEEzp4Ve+uAXRQ5k1oJycDVwhUhBeL0az/OscZkoi1G8+uadJLa1wyALphmZqnoeDCiwe+hoYaEHDUJUL+RssWLLr45SNyhYvunkfhF+pcBZb7kNRyY6w+NWL+yaImOgVvL3kOySQ/CKtUhsCkc/QUxkZhzf4pjnfatYijmb+D7VL8lqxlmTcJINTJVhZnGHx0FewY8ZjsxAYK9pA2Nj59CKEZacqEeU5ysmImrH9uA== 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=jkvHyr2Q9WhF0VhoI46I64wdh9Z57cmUxqMpcIEPEt4=; b=a4Jec5LsxGIvtsywJMDP5MCN/aZjsiJ5TDEHGby4QRRhPAo1xcrluUjTLvx+5vkuWCztkdC2UenntO0XLO/N9IGrZTa6EK9ReiTPJKza803XKS8jl3m3OeOBgyR6DcMFPwx+8jk3FI2ihyL+L/q/W9t/BeVpou9NNnvYpX/3iRU= Received: from BN6PR1001MB2147.namprd10.prod.outlook.com (2603:10b6:405:2e::26) by MW4PR10MB5862.namprd10.prod.outlook.com (2603:10b6:303:18f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Mon, 17 Oct 2022 22:17:24 +0000 Received: from BN6PR1001MB2147.namprd10.prod.outlook.com ([fe80::c713:91f4:e197:acd2]) by BN6PR1001MB2147.namprd10.prod.outlook.com ([fe80::c713:91f4:e197:acd2%5]) with mapi id 15.20.5709.028; Mon, 17 Oct 2022 22:17:23 +0000 From: Indu Bhagat To: binutils@sourceware.org Cc: nickc@redhat.com, Indu Bhagat Subject: [PATCH,V2 10/15] gdb: sim: buildsystem changes to accommodate libsframe Date: Mon, 17 Oct 2022 15:16:07 -0700 Message-Id: <20221017221612.495324-11-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221017221612.495324-1-indu.bhagat@oracle.com> References: <20221017221612.495324-1-indu.bhagat@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MW3PR05CA0006.namprd05.prod.outlook.com (2603:10b6:303:2b::11) To BN6PR1001MB2147.namprd10.prod.outlook.com (2603:10b6:405:2e::26) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN6PR1001MB2147:EE_|MW4PR10MB5862:EE_ X-MS-Office365-Filtering-Correlation-Id: 79b369c8-cb08-419e-957f-08dab08d5dcf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zHJRPGFN2h6Bg1HOUY4JfpwGEEMqWC2iVcFKzuV+wlifVczAdT2AsZfSWGuNjnP8oteMGlLOpj92z96tOjuXevq6AZA7zMRW4Y84HCkQ1WMs1ieNzekPjDZbija1/fCI75/vSg+Dv8suJXWErd1l+X6KviJdqrYIxUfkowPTQs3Jf14wl5FIITz3qlMZtkIu+mHeyxk85+3BUkDkf26R5F7WaZPWFE3XUn4GzlH7n9gtT8DqSOo9j15ndeFE73QNaGcOc4FL7JvLNc1DNyBjjg32jBE3MiBAJKj+mQ1ChCj/5lzTNPujsNeSmrDrx67eM8qHSXuLu9j5ofAQPkcBGO83zbbr4J+CPe40sXYVTPabBdpH20yyKj7Z++BirFMlaqBOmbfkNXYIIca6TUDY0oHZi3DAA226UFlMy7/XKWVppRhaBuvwB09fxqJbNulkTvRPH2yaSWqsTY5zrnhIu5zAF9rwYYReWMsXwBWBEsbWCI8h7w+GlLc9xNFKO3JSlonrVl+u65gu2TpPJUJ3cVsp7zlxB3O9sulrUOU6o4PHSBnAkbfjdOKeRZChyXPXtFsjR/VL6vAlgZzOSF0wLWQVN0JdATmUllE7VF2mncrBewX2zXIkcRYDGpq+YYL8lTa0it6WUvAliYWe0+VH3L3QSuoexOQ/mzS/nfinFgYtk+LmaEfmz0pGGZ6fen8Ju49CKd0wRpuEyJxsSG6Ctw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR1001MB2147.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(366004)(39860400002)(136003)(376002)(346002)(451199015)(83380400001)(36756003)(86362001)(38100700002)(107886003)(6666004)(66946007)(66556008)(6916009)(316002)(5660300002)(44832011)(8936002)(186003)(66476007)(6486002)(1076003)(2906002)(2616005)(478600001)(6506007)(6512007)(41300700001)(4326008)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6fJxRCbnqcU1ZwNvKMU5PLfEQsSlb/BUMTCs0bd4lnmTWVko49/YesuG3h7m?= =?us-ascii?Q?fBcBGCa8VMz42JIyBjbJSV0Wudzqev+G1wRhipcq9r7oa31/81ULF3oztfXw?= =?us-ascii?Q?Te1I2K2VLQcraW8FRS/1eQ8YTNAHQEOoKrZ6GQuzP/YU9HkI8WlUC0v4+s3a?= =?us-ascii?Q?enG60KLjD+0Y2206IrjFWRM8idi3q4I74GUXkhz+Km3Van/WQvmhBNAOvBCE?= =?us-ascii?Q?CjBWBYrgBBspFvUxNZSjsfGAWaZF2LYOB8CGQsefoMT2OGmkrwyO1IvhNiHO?= =?us-ascii?Q?w/yZgtV+Pdhu3k5w3ybQwHrR9CsM4U1kUcW0lscCWZTbuHYVMB2K8+CX4EoH?= =?us-ascii?Q?OtFMZTK65R60gQ8LGGybUUlapZ4utj2dM679Puw/HvjELhMLjqcgzXI14uzh?= =?us-ascii?Q?earnB2f+FM5RI1GC6o0NhpIB8eEEVFb+W3vtoJUmHFL5JSDQ/uQsk0MtIExF?= =?us-ascii?Q?8/Oj1K3B2d4gxkJi6+tLsbhzrvMo8e7SP3DC6Nip3z1qPKGKjMqQymRxHVre?= =?us-ascii?Q?5Cn0dHNWSg7oqCUXXefJXSN/rGAvgWes3WvosLxYJEmUvEyW6wHXqe4KI83X?= =?us-ascii?Q?Lh2ICbkCOLdsdNTnrGr4Ot85rHouvp9wIslK6cM9A8FDbDJ41vn5J7hjy4o7?= =?us-ascii?Q?3v4RLfnV3B/kTC6slBavx+pqofimiW+SF/2oqOTH85MmzvKlvxUzYNjKMAKX?= =?us-ascii?Q?V+d/4IQNAJzNHmRvsLqzGrk2fiL0N/X5HQ6g4VMVwJLxq10WPVmz17qWlMOi?= =?us-ascii?Q?0eCDPN/+ADe6FvF0Xo5qa9fgt2VL0/k9lOK2Y+uCV87tWOCFkqi/tccVvyr3?= =?us-ascii?Q?XYBQp6cb14dyxZDfnblG2LVoUVu168PswYVhmNQh+fi1RRAXXla6RACMnLIb?= =?us-ascii?Q?RrkwVOm5fYuiSwC+WZDs6dajp8aG0BZv2c0iwleaa3xivsGGYe9hLyiYmrl3?= =?us-ascii?Q?AwgX6vDagft9Om0UMrXaZpzQ5q+U4QBLkQ3mAj9zpv9x7lD5lSRkScvzoQ3e?= =?us-ascii?Q?r/YGZM+xZ9Iz6HJBUN63Cg2R8YQxLAm9uwCjrIsgqjkjtcPM4CKM7ya8iLxR?= =?us-ascii?Q?jV4cNGPR7ghj4oDJqWb1/WDQypZbvzZ54TuyUaArQjWbFSocpV3joDy3qEj3?= =?us-ascii?Q?1V3Ih16huOAVk/EQmZohr9BjI7WUDdnHlKyMH3MXATXjsRAU+spPAmHvaFLY?= =?us-ascii?Q?c6AAdQKPIItRfKsEsR2ofiTOq4wICPef0NvsGPxgVBDdwpaWccKXXWoKPzw1?= =?us-ascii?Q?pYrNWhIavifsgZ9C3AVuMP5/F7WiwpiuLc7/fK2yyOIk1z/o38sgmCU0t0R6?= =?us-ascii?Q?WH88fg7XxOwlcNRhyKAhuCIEgwwNbslvu5a6w5lMwiZS6veDgWuImBTcRQ6R?= =?us-ascii?Q?RC8TZpDWvRtHMj+PvtI4yRjTH2K60kFyReNGJwKuT60pqNe8OrInGtN6NOJC?= =?us-ascii?Q?gnwG9dX2Pa0KRETVIMvO9L4vIj+R00TYNtVM3tzVSZpz9Zw2U5mWxbiwzYv5?= =?us-ascii?Q?xJ4FjVZhCcFQMYXscrF7FnjD7zV9O3unAuqjfI/HRfnpMyJkDagLFNvmGL3s?= =?us-ascii?Q?6YNuB9PP1is+bTCryofnI2RZxEpG/VRl4uCIyLEZJBfUE73DmrAgXSYsmxn8?= =?us-ascii?Q?qeNKAkgwg6eZo0wqPCe1Wi0=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79b369c8-cb08-419e-957f-08dab08d5dcf X-MS-Exchange-CrossTenant-AuthSource: BN6PR1001MB2147.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 22:17:23.8671 (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: DhBJrqXceu/y8AHJ9WtGU7V7Y0sZXCm2AjGy0Zuoc1phApOcb+OVjFHejN58pvHCSUeFtBAAD7um1eI5xrQp4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5862 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-17_13,2022-10-17_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 bulkscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210170127 X-Proofpoint-GUID: BAu_jrlCcOHm6pgVGu0JZyghcnGWm-HA X-Proofpoint-ORIG-GUID: BAu_jrlCcOHm6pgVGu0JZyghcnGWm-HA 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: [No changes in V2] Both gdb and sim need buildsystem fixes to now include libsframe for a successful build. --- 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(-) 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 \ -- 2.37.2