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 77D083858413 for ; Sat, 7 May 2022 00:52:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 77D083858413 Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 246JY5lf013665 for ; Sat, 7 May 2022 00:52:43 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 3frvqsqdj3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 07 May 2022 00:52:43 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 2470po53039630 for ; Sat, 7 May 2022 00:52:42 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam08lp2177.outbound.protection.outlook.com [104.47.73.177]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fusajhtqh-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 07 May 2022 00:52:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MZTc0d27y+t56OjV0EDFV/vEv6XNCbi3ZoNK3hwDQud/YT3XizeO91zJvpAS5EcssmGGHLhbflKor9thjU/yTxaji8edwJkd9uw+9p7hnbizvj2GD0V8jc2dZJLfrvzzfBJ0FXKg28IlmFLk/i1GbSn6ACaYGmg+OIOIFqEPHVP+czl92t3iM7Ex1DK9jmBTaEXTUnE/6M2YT9dEN7RpplQQNq9W0fNp8DEi3Wf9+1yBx25ESLRqHPOi9GSGsE76IWmhByCo17G9315uwydsEjkElXr55ZeoqO6a8C5qdIvYOPPjRMufda2q7fhpHTmXDZzOokC4zBnqZAJuIfdAtQ== 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=GmKTx1yB++w6VSgEB29wJ+RNhSvB9+CmH0H7DFQNKLA=; b=h/4FjIn1HfCXpP3gIxhHZLq1rn2zrZ69PAn7p/kvlJW3dZLILJDXVCQR+60UITdy/1e0ydMSYw3LsxGhedlZfmI+W7Pb/8gAfIITUkQughPV6sKTSi6gpJSn6OmeoUCLQS3fFmcCpz8QzSP+lG3mt/1xfOeeuKMP3hhG91xb/4TTS+0906wS13IWrB61e8efY93JwGdhcST9qH2bC8YPCfteQcyLvMTo7zpiW/Jf1/SYg9o01FKsN+8W2WFLG0T9dLyhVB+EAPRSb7GjhNYqldxBfANBWxs+0pUZfgWGouQIAmkyI4cNhaMKx0lYIvrf775nI2NI8ta2xwgQBnNKWw== 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 MWHPR10MB1517.namprd10.prod.outlook.com (2603:10b6:300:23::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.27; Sat, 7 May 2022 00:52:41 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::c1ba:b4c:fe6f:d171]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::c1ba:b4c:fe6f:d171%7]) with mapi id 15.20.5206.025; Sat, 7 May 2022 00:52:40 +0000 From: Indu Bhagat To: binutils@sourceware.org Subject: [PATCH, RFC 7/7] gdb: sim: buildsystem changes to accommodate libctfframe Date: Fri, 6 May 2022 17:52:23 -0700 Message-Id: <20220507005223.3093035-8-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220507005223.3093035-1-indu.bhagat@oracle.com> References: <20220507005223.3093035-1-indu.bhagat@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MW2PR16CA0066.namprd16.prod.outlook.com (2603:10b6:907:1::43) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 03113926-33ce-4978-49a5-08da2fc3e369 X-MS-TrafficTypeDiagnostic: MWHPR10MB1517:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JnUvuernZhWiRjYVfHoSw8XZyn2+nhkXEyj0l0ocr1DsrHenNVf7Kv/ktFTNgO1N7dqozJAW8QqnStk7K5NmcWCjU+7VZto9b1CYsdQZfcxN7ydpKZtwEnRjc0HP24K5Ch0Qlwt9bbRsXStxzx11aDCzcI0BgnhP3brH9PGaHS5DgBVWc29swN+cXPBvbYo+ighoNBWabcHD2s5/B0/PxVjUyfnI8jQpj6fmteOqoPv+KBU1nLUJpRdfxGBg+sdhWc4PGBYppITrRrm2QLmV6/4a4dfUGCT6fwdgB+HYFBc4gkxG79dooj6wqZqDNtwpVvW7u6WkzJXJP4UOFYTZVd8GF9cyAeqbTl5VM9zrNl6mPL9g/BpIJYg6xcSuPFl9Og3AeihRb0noKsIfXbece9K76y14n4NWDxETC5gyfRUD4qsXlq+U7OlYsn53Xc5fZyqaLvkFBzxHPuDp9Cya1L0FGwLguC3UmiCJFj3fAIq9vUa1FloMBeMBsuszik0AHSkDnfCsEgfhk2I99y2YrckVqor0sCfDje965AYnUzZPj3k+VngfaVXvZWdb3YS155oj4zOpkVRSjgLdwJXAn3wtCR0zdjbsxwRo5W+w9xo2ZKyCPiOe4OZMGKG1ZTYr5zMpPzYH/K8w/rvdIwn+7bTYg7HaethB4OQ4RBRFqjVEC6qnJw2TR08+TUa+DnaOScgM1DPaSdiDZDp/RfAvEg== 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:(13230001)(366004)(186003)(2906002)(316002)(8936002)(38350700002)(2616005)(26005)(1076003)(38100700002)(6486002)(52116002)(6666004)(5660300002)(66946007)(66556008)(6506007)(36756003)(8676002)(83380400001)(44832011)(66476007)(508600001)(86362001)(6916009)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NrwTwvGbucBX2YtR4X1z6sp9XSyMy8jGsHoDdcnYQKxbepGML5Py7BpGN5e6?= =?us-ascii?Q?cCOqkTJH/WxgWZGhpUMMc+O1nFn9iWILbS7cRM6OoIPPbl06pX7FRdHvfy1w?= =?us-ascii?Q?cr09Ooa1kDozIJPbiW9TbSERr6aQgpG8xYzUTlE0WrdKdfa8Yq/EpNJXl8S+?= =?us-ascii?Q?uMmFexaPuhQBLniz1aK1XMJDe5xuvUiH8sLDlpI42WQOCNcGY3s4e3F1C+4g?= =?us-ascii?Q?dAz/XV/lsA7uMFjSZyCli4KW2+q3O9U8AiP0tWAZX7Kiigl14DWReQy+4kl6?= =?us-ascii?Q?LabZ3MdKLcQG5hxTri2/tc5Dr6CamQL6EiteNTEb62Vp42ktHpmeutOMd9li?= =?us-ascii?Q?XN100fBg6DBBDycVjKysMRnnGzX1SknXvsfyS3hLFclHbWIZLrtVtXQRX3WD?= =?us-ascii?Q?C/gdmCeMBoDtO2de82aThrVSNGFTAcT+yJaFwR0zMB8upG+TwHyzrhcqUV39?= =?us-ascii?Q?dcVhaKXbQjTKtHp6kX9mK7nMSiOuKLqq2zG8LriW++Oa3+atAkBoHmuncccf?= =?us-ascii?Q?jD3UpkzfgAYMN83wcVnCCeBmq/M9FuhMt9wtpfuOp3q2vMXQiHL+vLtad60Z?= =?us-ascii?Q?Pi76nUf3p6gLQgytGxG5cvfQ3fd5mEzeg/P/gqGdCLor4U+qBJbYEAF3bowN?= =?us-ascii?Q?mtmqJYblPzUOStYckZfZukbBZ2a801RSnfPb2O4L4gIl/Ko0xItKuo4N3uOv?= =?us-ascii?Q?9VWB9UQdC2sNU+e8GZo44twRqJ2+HiQ0aLf3mpImD4lwfNynkRl5n25ioGG9?= =?us-ascii?Q?WAMd1uNGhU1zSMp/PteqOSO9QTXqYj9ZrT1pHtLePecolAYFg8R5NV6KYfT8?= =?us-ascii?Q?hsPP7hYDbJJR5JA8QYhPfUraB8oeFV/AtYH0gcWjZk8/nQZzwZNMNVabX6J6?= =?us-ascii?Q?2HXLIEyxRlFpemTg3dRkH+C7zGUA6djPpduhKIKcf3vVUE5NCG0EqsSnvi/K?= =?us-ascii?Q?6QVpv5u6LP6TiKL8nwnmobEx3BUs+gz+qvOL7RZ9GFT6wzHpk8O53DOSgg16?= =?us-ascii?Q?FLGkBa6wdjm9JLSAh6R5MOgcRQ4m0jiaM+zeRnxyqmhZReOkais+zPf4caK+?= =?us-ascii?Q?CUeWcPLgWrov1IHXMlzovDTl4m03UV+i9guqkPnHUotAVTOglvlfUb4gBeEn?= =?us-ascii?Q?YJI/fBg+XND1EFW4PSscwwqf1SNedCvYw1/ybpcd6cEXT+M70GSxG99CciaS?= =?us-ascii?Q?gVqEk7ypsM65ekBJhT9htzM9HFZNUzc5dhqUaRPoP9h/cVlDki3Nhn2UQsAd?= =?us-ascii?Q?xl0WJ1Z8FuZZ8yoHp06x1c1VfQ21vgBaD3MI8T+Zc9GCG7J4lwtCOa68Gxb4?= =?us-ascii?Q?eO94aw7Ybu94ukaivkoS/TXXh2DEoKxJ6lXpfGNoZo2FVVHz546UzwY6AKIk?= =?us-ascii?Q?zPuN2YORvsVwtYJkImnLppEeI4i+oqHBtaj8NbhFzDTbYsAEUOKrVKUuHxA4?= =?us-ascii?Q?I/K/l5WqV3rSdhg7aDSWzd8XN070f3CCUojJp4S2IyZa/mT7oZ1J3Q2xAxQi?= =?us-ascii?Q?Wo3C95OEd9V+1/z3vddBU/0F2MkZs+4o8jlsLrAI7LoCUU/oHukJ4E71+XdZ?= =?us-ascii?Q?mItvTGT9Uu/AxJfGpNskr9igrJJVTFJykhytlJSZTgLSsZYuNfQ4MuD5HxKQ?= =?us-ascii?Q?/oY30y1I7T/NoGXRoRanKa9Y7TjGcdEMvHu1D+ZpsAnoZ6NB1DVZ+tS13/K0?= =?us-ascii?Q?ndhHUM1qJruifS7DsCeWLSEfK5/pVV5OnynVyE942WMchlXRkbGkSKdVOpEA?= =?us-ascii?Q?NBMjZ1L52g=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03113926-33ce-4978-49a5-08da2fc3e369 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 00:52:40.8833 (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: y0YAqCV83Bv3DShY/JcQvft0bhKXMIpRoNUtcvEFu5vwbsDYMiCDIGSSCTfhTHOKtXt9A2693J9aRiFY8lClQA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1517 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486, 18.0.858 definitions=2022-05-06_07:2022-05-05, 2022-05-06 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 adultscore=0 bulkscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2205070003 X-Proofpoint-GUID: 0HEOL8w5PumVUgCZKOmXmWfxj4VLxJkm X-Proofpoint-ORIG-GUID: 0HEOL8w5PumVUgCZKOmXmWfxj4VLxJkm X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 May 2022 00:52:47 -0000 Both gdb and sim need buildsystem fixes to now include libctfframe for a successful build. gdb/Changelog: * acinclude.m4: Fix GDB_AC_CHECK_BFD to include libctfframe. * Makefile.in: Bring in libctfframe for linking. * configure.ac: Check for static or shared. * configure: Regenerated. sim/common/Changelog: * sim/common/Make-common.in: Bring in libctfframe.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 418094775a5..9f3eb83ba5e 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 CTF frame library? Typically in ../libctfframe. +LIBCTFFRAME = @LIBCTFFRAME@ +CTFFRAME_DEPS = @CTFFRAME_DEPS@ + # Where is the BFD library? Typically in ../bfd. BFD_DIR = ../bfd BFD = $(BFD_DIR)/libbfd.a @@ -645,7 +649,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) \ +CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(LIBCTFFRAME) $(ZLIB) \ $(LIBSUPPORT) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \ $(XM_CLIBS) $(GDBTKLIBS) $(LIBBACKTRACE_LIB) \ @LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \ @@ -653,7 +657,7 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) \ $(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) $(CTFFRAME_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 95ff2b6f35e..f3a4ebba1be 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -233,9 +233,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../libctfframe/.libs/ $ZLIBDIR $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` - LIBS="-lbfd -liberty -lz $intl $LIBS" + LIBS="-lbfd -liberty -lz -lctfframe $intl $LIBS" AC_CACHE_CHECK( [$1], [$2], diff --git a/gdb/configure b/gdb/configure index 1008cbef28b..e9ac29f1b50 100755 --- a/gdb/configure +++ b/gdb/configure @@ -631,6 +631,8 @@ GDB_NM_FILE LTLIBXXHASH LIBXXHASH HAVE_LIBXXHASH +CTFFRAME_DEPS +LIBCTFFRAME CTF_DEPS LIBCTF LTLIBBABELTRACE @@ -936,6 +938,7 @@ with_libbabeltrace_prefix with_libbabeltrace_type with_xxhash enable_libctf +enable_libctfframe with_libxxhash_prefix with_libxxhash_type enable_unit_tests @@ -1612,6 +1615,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-libctfframe Handle .ctf_frame sections [default=yes] --enable-unit-tests Enable the inclusion of unit tests when compiling GDB @@ -17259,9 +17263,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../libctfframe/.libs/ $ZLIBDIR $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` - LIBS="-lbfd -liberty -lz $intl $LIBS" + LIBS="-lbfd -liberty -lz -lctfframe $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 : @@ -17374,9 +17378,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../libctfframe/.libs/ $ZLIBDIR $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` - LIBS="-lbfd -liberty -lz $intl $LIBS" + LIBS="-lbfd -liberty -lz -lctfframe $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 : @@ -19341,6 +19345,29 @@ fi + # Check whether --enable-libctfframe was given. +if test "${enable_libctfframe+set}" = set; then : + enableval=$enable_libctfframe; + case "$enableval" in + yes|no) ;; + *) as_fn_error $? "Argument to enable/disable libctfframe must be yes or no" "$LINENO" 5 ;; + esac + +else + enable_libctfframe=yes +fi + + +if test x${enable_static} = xno; then + LIBCTFFRAME="-Wl,--rpath,../libctfframe/.libs ../libctfframe/.libs/libctfframe.so" + CTFFRAME_DEPS="../libctfframe/.libs/libctfframe.so" +else + LIBCTFFRAME="../libctfframe/.libs/libctfframe.a" + CTFFRAME_DEPS="$LIBCTFFRAME" +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 e3c19bc8859..a8d9a411004 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -2190,6 +2190,17 @@ fi AC_SUBST(LIBCTF) AC_SUBST(CTF_DEPS) +GCC_ENABLE([libctfframe], [yes], [], [Handle .ctf_frame sections]) +if test x${enable_static} = xno; then + LIBCTFFRAME="-Wl,--rpath,../libctfframe/.libs ../libctfframe/.libs/libctfframe.so" + CTFFRAME_DEPS="../libctfframe/.libs/libctfframe.so" +else + LIBCTFFRAME="../libctfframe/.libs/libctfframe.a" + CTFFRAME_DEPS="$LIBCTFFRAME" +fi +AC_SUBST(LIBCTFFRAME) +AC_SUBST(CTFFRAME_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 74e5dad3049..ac974087798 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 +LIBCTFFRAME_LIB = ../../libctfframe/.libs/libctfframe.a OPCODES_LIB = ../../opcodes/libopcodes.a CONFIG_LIBS = $(COMMON_LIBS) @LIBS@ $(ZLIB) -LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) +LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) \ + $(LIBCTFFRAME_LIB) EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ - $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) + $(LIBCTFFRAME_LIB) $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) \ + $(LIBDL) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) COMMON_OBJS_NAMES = \ callback.o \ -- 2.31.1