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 DB4613858032 for ; Sun, 17 Jul 2022 08:21:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DB4613858032 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 26H8Bte5009610 for ; Sun, 17 Jul 2022 08:21:02 GMT Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbkrc1a0y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 17 Jul 2022 08:21:02 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26H7tNxu021817 for ; Sun, 17 Jul 2022 08:21:01 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2107.outbound.protection.outlook.com [104.47.58.107]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1k1rr5p-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 17 Jul 2022 08:21:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=maR0B/1R4fl2N9FGfA8q4L2Swlb/YxK9MFoR0TwGHG4vF3I81UYjcLOzhXR3hkslxokA+Lhzs5tT9QVzAVEzVsoj6ObL+4utDmcrN9e8Z8yL5FA4xMg1IG7b0K+UC5YxWQOh6ptS3VocNFMqGqdJy00FTfvsTM6qhFm3M9NpF4Y0BMKEdTUJdluIdlzS7Qlk+fm6h7lFeVO0RHNVYKHDkKlRkcPIBDS7dJadR+d42cn27/tFLi7JAzGhznjIItzKUS0IW58Mf/QVlZAn1IWgy1yu/KwZ7AUQFr5LpZefcQM/xZQc9TQh1vWXhYaWjXduI9NPOwGAjUfxQHulN44inA== 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=uvrUsRu9jo+mNKgFlecX4UO2rJhlQX6aQXgrKdKCp+A=; b=Nal0LtLZDiXl8FQXnBoXycdkE3/mQKMKM3XjlOYUJR3DQJ6qyWJgznPH9SHDTKqFa5zgjenU+g54C+Dw86L5rBsxNIvDfP0b5R2xRgcd2mcMAr/+vbMT1NgHXsc7l/YC1SV+jM9D1EB5mGISVzsPdvwmzv0QmIyCrlijbs1pWgULWfRb/VMcyr4G/fuuA4BkBav9PZlvhHK/F4p7eqleBTKvbWQWKuZobkmK+eUaT8SQ2r9+ujyo6Y/F5JRsBCnK0KShsl94R1dpwzRaP/CmGWdu2PlekE4I0UBySOFrMxv7eaqvGXcfHOj0gLq4dCQ1u31kpH6HfeC+zu3fxCgAKQ== 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 MWHPR10MB1469.namprd10.prod.outlook.com (2603:10b6:300:1f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14; Sun, 17 Jul 2022 08:20:55 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::65fb:fa92:9a15:f89b]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::65fb:fa92:9a15:f89b%6]) with mapi id 15.20.5438.022; Sun, 17 Jul 2022 08:20:54 +0000 From: Indu Bhagat To: binutils@sourceware.org Subject: [PATCH, V5 10/10] gdb: sim: buildsystem changes to accommodate libctfframe Date: Sun, 17 Jul 2022 01:20:11 -0700 Message-Id: <20220717082011.1284067-11-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220717082011.1284067-1-indu.bhagat@oracle.com> References: <20220717082011.1284067-1-indu.bhagat@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MW3PR05CA0025.namprd05.prod.outlook.com (2603:10b6:303:2b::30) 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: f50f04e0-3c6d-4505-0b7a-08da67cd44d6 X-MS-TrafficTypeDiagnostic: MWHPR10MB1469:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: foR5vx0Xmslq3a27wANwO3qc2VN9SNnja4+KoBMwQGZfnV3HOjZ/j/jhfwIcvIrE/VJE4ocgTocRts0tEvUx8NKLWQZm2qfvTxbUPtBvDIPk6L8JtNDJH0OnXidPPTVGM0syXzwwu2AYbnereDbon2mtSF1H6g385N+FLCi7174ZWbWH1MzpSF2jzPRGspxN0I98Olu9DsNJQOSPIBZ1NsUD9O3gR4Hyn19y4oArDUcKarghD9/NlNA49AfWATT/pwXvYI05gRa5BlV3ivXrG/sNR7JGL+xsS3bdydejazMYyaD0NvhWQ2nJaj2JS5jn9SbHOTpL4T1z21qrGoOMQqkOljBBh8vTeBuMxhagEitlAqpeAeawXbXHRvoTo/VeRasw63ni/qXi0eIeV2X9/aEL/oa7zDdXHJVgkPhhWZh5gtiuZ32RLWBgcD2C2TqfNM47ez1w94lNLoHMl1bIr8qk5IKREkZoSxXk10PvlB95l+CRfPfd/YnH6xU7ZNjFEErhZQTN7Nl/aCIs+Wv4TcoYVpO9b/MLhy8c88IwnBGoLVid0+rBkAQGqFlq+t5J0BGKQLnP6GqyM/EcQ3z8w6RxkjQCUDh05gP2rl49GwRoKRYe3rdJTx74SqvB+I/dWTefai0YH+tot8mbYL4lYbPKm3Pyi1lXSHRgGLmt7ms0YFIch17y4U+++/aQ5XgeS7z9085QilRhCyvxPXCwg32KXkWqP2cDg2DAiaoiBBEP8xHcl8w4eyb7zUyOVWzTrI8Yq47nCfYVzxQiGdhcVlg2DMVhiGaFHVrWp0pkNh3oheRRKygmollUyKhyZ+lK 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)(396003)(39860400002)(346002)(376002)(136003)(366004)(5660300002)(6506007)(52116002)(478600001)(8676002)(316002)(6916009)(44832011)(6486002)(8936002)(86362001)(38100700002)(38350700002)(66556008)(66476007)(6666004)(66946007)(41300700001)(36756003)(2616005)(1076003)(83380400001)(186003)(2906002)(6512007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LfCrchdT26FIqu+nv18vaij4QyWtK1QrOY+b9HKcynxF+dVbDYSZw3irhNKU?= =?us-ascii?Q?il2xlHTh3YybKBmkE/blxLBA3UO25LGUEZlJ1r6UBSdDZMSjdoeKmAsA9wG/?= =?us-ascii?Q?3WTz0D1kZmOhC4urPSgcaunLwXDqKe0FS+jvMosvQrmEBSpnR2TQGIMCSYx5?= =?us-ascii?Q?yQYvkhP1UHayD2ZhDC0wUl9mevHPxsD0nZZWWg8jez67iO3aEvbInXsHVHo6?= =?us-ascii?Q?YO+5weoYf8xkbp+8dl7LxEcD5xwIt/YKz61y65aZ2+WuySbDcdiDVM+t+dQy?= =?us-ascii?Q?g8WENAtYTs5gZCXAPdBmJYogzJS/xdv2bi7PvAcChLinxAQ9919vKaA0vxz2?= =?us-ascii?Q?7OXQRKIEoqAB9aGPbPX9g5DViEVV+S3Q79OWbeGEZ4WaceD2ilAvrvjFg1ZT?= =?us-ascii?Q?nk5M3PZVZDNkXn79cbD9ciZ4ctz2pmtgN6JjzTUp2jKvR8wa+DGNjGxX9Cd7?= =?us-ascii?Q?QsdKwvn+XkNcdHuSqcisu+/Bq4rBeU0jW5oGop7Xi+nHobmjQWsL3Szrq3En?= =?us-ascii?Q?OnQqtZlTLOxPaf9qQrpUSKxDugZVxwqWz1LvwwSg3QD+s2sjezi6N1Wa2Al2?= =?us-ascii?Q?097vFALJc3TSuPR5rwmetQv1ZP7uAI3u71ubg8cCKIItqCio6KcH1n7oV5fD?= =?us-ascii?Q?cFHDzytROV227NhS1nfLGq/2C2WMbXCl60bVXjDkJIyQQS3KerK30NG4rOKY?= =?us-ascii?Q?3+BpnQyRWBGfjQTDNj2dKimdWdE1HJdjtNJq6V/BcTWwXZfIF1kzcbUPZV81?= =?us-ascii?Q?z/T/gHYliDHD6C2NBUpjzCIXZVnXNPjVw4YEHGH9+9zg5/uwuXNoCVCKD8nN?= =?us-ascii?Q?jsoN2V+y9R1YxtSZ2R/MSqQfS3CdryS4m4LmUWuxssXT5c8IY91lyQO3diIe?= =?us-ascii?Q?MRHOFRs1QkN3nKYlq1mVz1vpPu9fTSHeTaQxGv1ttocrrtYEIuGGNhjUhzs+?= =?us-ascii?Q?OJdGaTsIo+5kFM8zDYmxWM0u1Z7e2ff9vpJJHvrVSwaVGA8PBHT4+XLW7SH1?= =?us-ascii?Q?FpafwGoZbFiVN6yuZhZSNO/XYkUDSf5dI5kiaeYHPMIc0yP+ZHlgiEjjkrXv?= =?us-ascii?Q?tbiJwK4OdZQRSS7sRSZRMyEd1mpmiqIlfyP+Kcw/g498959gbRMUkHhkfKlz?= =?us-ascii?Q?UzeDryzCa91CLfBqVrvUJqBRsynmLKs6IwF89cqgOPNLRqIBK7gviN/dzxb1?= =?us-ascii?Q?qnVv/fjqNojpCmtdfQOEam2FIsbrlxutIBIodOXXEJf7z2tByKR3GQ6a9PW8?= =?us-ascii?Q?A3bbb0ns0wob2QbifayAzIRIYxE3SCfrgFDfAJo8iCkxBYNGtDFFd0oA8oPh?= =?us-ascii?Q?/GyNslws0385ZjjNc8ezzTIBQoSbfgUfMSad2xOnEU8w7pTKeA7jaC398ax6?= =?us-ascii?Q?Hhm0rDSZNk7Fb7HNWLTCxp1OK0o0vjxJWtowhnpRJ7ZlbFIrcp8vCVS6hL84?= =?us-ascii?Q?MuHOhC5siDUuev4aoihOoTQbYlw6Jm+hIeVB80l0SmpFaZtno1AWpDIgrrZH?= =?us-ascii?Q?hrWplfbOf4aGVyiGD2nW2EmJ6YQ3nDH1Liy7gaCv+Oj9XlkF+WnIgywiLZcd?= =?us-ascii?Q?zz9tvjpoI+ed0cADsOcpwlwQBrobiHhiZMf9rgUq?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f50f04e0-3c6d-4505-0b7a-08da67cd44d6 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2022 08:20:54.8587 (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: C1RHb2BOccay0X5NQPP0Zes6ftaFOu8+xmFllJPolPe4CG9oiJ0UutrN6ImmiIw+W7W08mGtQPsJZzcoCkirig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1469 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-17_05,2022-07-15_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207170040 X-Proofpoint-GUID: GXHzaIHveB9WXBlB-imeiqoMs95UX9Ab X-Proofpoint-ORIG-GUID: GXHzaIHveB9WXBlB-imeiqoMs95UX9Ab X-Spam-Status: No, score=-13.2 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: 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: Sun, 17 Jul 2022 08:21:04 -0000 [No changes from V4, 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