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 234DD385AE75 for ; Mon, 27 Jun 2022 23:47:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 234DD385AE75 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 25RJVZ0h026411 for ; Mon, 27 Jun 2022 23:47:46 GMT Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gwsyscgwa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 27 Jun 2022 23:47:46 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25RNarf3010102 for ; Mon, 27 Jun 2022 23:47:45 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gwrt229c5-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 27 Jun 2022 23:47:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XZrONSYml08hGbV4jMF8Tc0OHHvC7kukB1LjHOmMHJcG7OBxXlrbfBg3ZhUqtx2YkinXcJayA47pj/6qsYfC3p4FpXwe9SkVZwrcblYg7zgH7k5iaIb5m+eE4eGnd5AY1AjKUBz9b/v5iEonFbS+AQd/6XZjeBYHgwoa6CZLz6CSpAovom43SkukUlqHhGepIeyXBGm0s/jJqcp05BmTTkDQATRpfbyunIYK7xdCbxvj95Ubuh2y90qO+9dXmCxUzkTniERH5h9MSdOO+J3vU85dI752GFoSYvYgSCtUVw/RwSH2mZUPLHODqR3+qk+qpzf7+sLqOQIUhLmkcbs0Bg== 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=F6r9oNq9fHuz588QWELJKXM2SOI1tsaocJPXFiPmmIU=; b=ioALHZB2gjrLe4sMMRgQ/mv/3B0OvtkIRWqjS88Gl1ZDqnQfBmWTXT0cEQ3j33e9xaRF3Itlrmk98sWhkDKldY9BT57iCA21IVgjrFpwA6GIL7nLybEynUv7QY4pzaD4CPujDu3TAp64jrN9/zlQJ9HQyAPKXbFgY6tQaBsgSf1npg0cg9g7BeYuMhXPbacIpWxIRuxB1bP4X/43b10CDrOPMsSRQ7pBiUSHCOUEtBGOvsJs5CqrpKDRTrYu2RhAp9VA4TUVxP+frdwplXL5ORJUPKjLMQZtZU5+QK431H0z9QT+0ytCU/i5IlJJZTBpIv18awcH9p7fQFyWCaM8rg== 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 MN2PR10MB4399.namprd10.prod.outlook.com (2603:10b6:208:1d9::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Mon, 27 Jun 2022 23:47:43 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::cc2a:4481:ace5:26ca]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::cc2a:4481:ace5:26ca%3]) with mapi id 15.20.5373.018; Mon, 27 Jun 2022 23:47:43 +0000 From: Indu Bhagat To: binutils@sourceware.org Subject: [PATCH, RFC, V4 8/8] gdb: sim: buildsystem changes to accommodate libctfframe Date: Mon, 27 Jun 2022 16:47:19 -0700 Message-Id: <20220627234719.718083-9-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220627234719.718083-1-indu.bhagat@oracle.com> References: <20220627234719.718083-1-indu.bhagat@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MWHPR01CA0033.prod.exchangelabs.com (2603:10b6:300:101::19) 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: 1c6ea357-5cc0-4279-cbf9-08da58976cc8 X-MS-TrafficTypeDiagnostic: MN2PR10MB4399:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lgVVmTgJEnoxIvMo+QODwWyfDDwaYLwHjLjvE4KIHP46ms+NY/Bzr5T++xdI0lJ+hrn8QgT0JiZ01Vx6Jr48zptCkHD/4fSQB4O/JQzrY58/rBGy8ooE7NHYtEnRN7+sB5/9ADzfIZiWfZWRWPGNWKeVaTi/rE9HsAamD/1ufIdlqz68yo0C7s9rqylGRKceibfcraWpKH0gCVUBF5fvnd1nQf17tq3Kq1dMXrkPrWnX68iTK/78ihDsEO4lpCVWIQW6nAvUgH5iH0sZgGiqung6MyewzPrfrh1izr1wEdbPolnzZjXRJMCSK6U9UrlkdL3XFXN/HvCbIrgqIGRVZSpvWF+vAM6zjUms7Z5vIraMqG3ayRac6jbK4mNkik8aMD7uukwZhwiP9TymmJhFqtr8kkpiUjK5cDrGp9JLfwfddgMLLgE7X2WwpzsbYC4ImNufeavGJ5USwbX5vBtqKAcE8pkoaGM5emKm4WwA/1LwCTuCj/xykAqxHS8NiGKpjUEUqc5iG2tSGGq6ONKCKe/5nBlVpY5U4rckH3GOaZpN0MelCEWIQWs0D2483CbkwiaLBoU5ZMcq4a2LzA3VTd4QDtxf3oEdhxh1wj4Zq3wivDQK6w9Qyxvvi2FBMzr0W54KGaVzFEq//oPs7UsoxagV5UTj2bN/jQO4xJZIZTLeEo0V6bXQ2Q4uy8WKJpnuSnZ00seb93/3vvJRi16ROFTaZaV7Zw3kAKjXPzG85ot7s5bMtLCEPKRyAnrZ6X1GRxwuKo6PfdBAmFZOt8YnQjb65Kq8bHV2aowv0ZcUQvg= 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:(13230016)(366004)(39860400002)(396003)(136003)(376002)(346002)(186003)(2616005)(6916009)(86362001)(8936002)(41300700001)(6486002)(1076003)(52116002)(316002)(36756003)(6666004)(2906002)(8676002)(6506007)(44832011)(83380400001)(38100700002)(66556008)(26005)(66946007)(66476007)(478600001)(38350700002)(5660300002)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/UnoLMESKQs/ZQABl+eJSM35DkEHtIXdJfDV7reArkGqsA1xCzyhKzqILsk3?= =?us-ascii?Q?V9x8zILsDVCT4Q77badrKXvh4+cc3YdFBTz4LP2tX8khPgNGzBd6Z6R57BQc?= =?us-ascii?Q?122u2oEtIvOj3++pllYZq8V2gO77RlyY3MRySbljWzxor+r0LD8wmMYVyORN?= =?us-ascii?Q?OiIC1WysWJsZlmy6YBwQwvtsWt+HKMDfnJOMI/3xlBzhbOHSh2dmRmrIl6BU?= =?us-ascii?Q?9mbTxkWFmLZ98Yt32HvrpE4CtAMZgwuer3jrSuEvuQV6l4bENcS67QKd5/dx?= =?us-ascii?Q?ykY5j4cF+QXmeOHHxF5+hqrW74xKjNt3bBJrRQt5daPp07ituZIO6uhKSnRU?= =?us-ascii?Q?ya/hVQZefp3GSbVSzlzeUptCE/O0+fEhZGr0OCAc6BFcVgV9z1Wzqo4edMoF?= =?us-ascii?Q?0lcLRxaQyU2BAigwf+cLLKbU6+mz29u3yNcSNlsfE6nObf+nzoqg8q6PKo9t?= =?us-ascii?Q?P+RqtkcGhEtsOVfsv+CCaZaBhwPuG5fFJSAP7mzM34NSH/y211l0APOsvc/8?= =?us-ascii?Q?UJbtNRELZDF8oo41QK8SV2GBzH4qTawXW6/mQLoVxAqEWZ3k4nqeZOzFBQPk?= =?us-ascii?Q?KxX34IZFzConiPMwbmDhlIIlcLE3WNwG2deNB1otgySqasrciWUviTIlJqW9?= =?us-ascii?Q?MawU88+YbD/p6op5GAmxuAuFmd24YDGFPIKWFZ4VAA2z2DipSwO4NF2wyqZA?= =?us-ascii?Q?vPFlq/i2Kd4lEVh/80vyh2609WwgsWs+dj8kiOeJJnsMDrTjeKSgsZyCcxT/?= =?us-ascii?Q?VCBy3/1U1NHeVo5P7vdqChvQf8OnjMnD28cF8W8rBqA5a7mViogM+OsSDFVQ?= =?us-ascii?Q?rPKQTrXR76HPXkWsWJ+C6CvbY3sPNzRIjaR75ceYxD5ZKlkll22AriWhMbe5?= =?us-ascii?Q?aKA+cD9kfkYYPjz4LSUq38TkAhN6HOFhiVddq8A6KY9yOkx0T3nEDIIBOXuy?= =?us-ascii?Q?nq8b4DAint2LzM41Wlcux44OLoWa2eCRUgCYogeDJFycY8OaFHpEbOecQ866?= =?us-ascii?Q?hYh4QDm3TwFrF6AgKqWOfS3pIDn/AKhp13nyhzdIvPFumUfAXsk/59Db1Bk7?= =?us-ascii?Q?B8kmNB21wllYvm/TdNYZY1x9XHoosbMgEqMdpVDSJu9ML5UGM+PElB3WCPfi?= =?us-ascii?Q?wQv04/IMKIfc8mAplKlVj2IA5llz+3GAsxMetB5U0n7qY9NWFSTU9jXFcZ4s?= =?us-ascii?Q?Kb9VEyO9fmGM1c4r1HpbejjoSogREPPsBJNgjW8PG1KqdaY/Ygt/t/+/6XGf?= =?us-ascii?Q?2yblSCUprBzNYJM78Po5ZrzC/ASedNz1+SLcN/OSqbcZHd2q/ME3l8lJNaEj?= =?us-ascii?Q?cb+nEpwdxnpY3eBu0ITLAU0KVwK1KMlCR0FU7mkYkdGaftCNFjabRsquAhsg?= =?us-ascii?Q?tfkMvKjYpHzt5i+zIAlq0cIbma5EUPp5p5lIXPFm8PSku2Q+omi8KY/5I85N?= =?us-ascii?Q?/Jn1+jL5WPAgZqxkZch2Sa2DA38LN7ndYxxu9hf/WOvKq8eBLy9uGtaUIB52?= =?us-ascii?Q?M0/U3SwJor4QD/but0/nx7WAykTDYMwlSvh+/fKkZml8D5zpWgnQ/qSkvK8g?= =?us-ascii?Q?IZiNDD00+efv7EDYk+POJwdb42omETRcjtiCYbr1?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c6ea357-5cc0-4279-cbf9-08da58976cc8 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2022 23:47:41.6157 (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: uI3LBhg9HfgAM6YbDc1/ckrFbqGYDV+h+omDzWmAzTTXBdslaiQSBNNrb8BNMjMm4y1wSW2r7c24fLvpFHd5Yw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4399 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517, 18.0.883 definitions=2022-06-27_06:2022-06-24, 2022-06-27 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 phishscore=0 adultscore=0 malwarescore=0 bulkscore=0 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206270096 X-Proofpoint-ORIG-GUID: dTkvWs24utcLdOgibkWbkqzO8Szs0j7m X-Proofpoint-GUID: dTkvWs24utcLdOgibkWbkqzO8Szs0j7m 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, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: 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: Mon, 27 Jun 2022 23:47:48 -0000 [No changes from V3, V2, V1] 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 911daa2607b..6d221fd0d02 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 @@ -646,7 +650,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@ \ @@ -654,7 +658,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 1b821390801..64b636b6b12 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 bf03b875dfe..b653c20bf23 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