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 BC1563856DDA for ; Tue, 2 Aug 2022 08:07:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BC1563856DDA 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 2726SES0012766; Tue, 2 Aug 2022 08:07:53 GMT Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hmu2c5yjt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 02 Aug 2022 08:07:52 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2727U7Qb031487; Tue, 2 Aug 2022 08:07:52 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2170.outbound.protection.outlook.com [104.47.59.170]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3hmu322w3j-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 02 Aug 2022 08:07:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nA+JiB/GqiAyBubPIK0ffX8W86Ttu9iBsJwgNEem8llr7+Uq2+w5H/eAl4GwFZNjwR7iJWyar6MwRL068ipc23oq/NLp2dIfcb3CNn2HK0dJGdchNVBYL005xVu7HaOKb22gdStQNY5xtN0UTCr8LqrHnDiPw3iX0ac0eRW7GPfPsNrdlFvz6ZE/YDL3u364nLgbDrPNYL3k5DICPWMYarxUZdtqV5mzp1A40PHVhiSW1uS+fyRhuQTGtvHG56MccKiRIPEeqbFlNg16hBQkf6G2SmSPYt3dHoRaO7c4C9IyN8Cis6U7EeYEH5roHOFmQvVTZPBUcgKHcE4kuYzbJQ== 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=ysuNXESf/3aJimolgbn7ZiWgf1hZxEEz02C9uaqru9E=; b=SNMMyIatdChBxMiRBZwm8VNODPEp4HJFNUCIBFKRZJdIFYFkDjhKCGyBT4NSapBeizj8uQbzcuZBiND0Gulpj3Otg5yKhulIV9O9OvkXlMKhtI76G6q7ySDlh8gyqp7q1NOaLKBhnVur7rvrKcKnZjV+DyJ2bCcVLIrNMz0zV876k9GElG1Lg8a6D7TSzr/HfQTJMbhJowbsYkA45h+iEj/b0wi9M0CYDDZoZy1QDMkakRRl7fIYQNocv2cWzeWCwx5K5sh2GyGT/VDDGd+t9G8Euq2cl2LFPDubHZNKFjseKAa0Aee4d3Vzfkf7/tM+oy28MK7SdrKzyPkZlq1/8w== 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 BN8PR10MB3123.namprd10.prod.outlook.com (2603:10b6:408:c7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.15; Tue, 2 Aug 2022 08:07:49 +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.5482.016; Tue, 2 Aug 2022 08:07:49 +0000 From: Indu Bhagat To: binutils@sourceware.org Cc: amodra@gmail.com, weimin.pan@oracle.com, Indu Bhagat Subject: [PATCH, V6 10/10] gdb: sim: buildsystem changes to accommodate libctfframe Date: Tue, 2 Aug 2022 01:04:52 -0700 Message-Id: <20220802080452.1143351-11-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220802080452.1143351-1-indu.bhagat@oracle.com> References: <20220802080452.1143351-1-indu.bhagat@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MW4PR04CA0074.namprd04.prod.outlook.com (2603:10b6:303:6b::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: 2714d10b-752e-44af-38d0-08da745e171e X-MS-TrafficTypeDiagnostic: BN8PR10MB3123:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +K58xpIGHuyfYj/oYHK2Lk/7QNvnfPLTmoJm8lkLpZJep+YjoFYMXNgdtNRUtoTnss037f/Kdgk1zUZrvpHyR39WZbZubRXeBmlgvvfQKXCVWiToLRJkcG3LTWPexBCLyVqvDf6goBnn8WKkorN95i4xJyF70mhUfO5wmF/irsmF27F3pdF6l2dDr6+mQ6SFbA3Pl1klqLkhGYOsZCVzjlxEjl4e/v6XAMSauTOmhCi+Zn/rLQ05CVLT+L1PZviv0T97Z0j2cK1yPKQEE2Z2HDwvlbOA6TCVL/zJpbZg0olJXVH6/wC6SFnceqc773fEeHEIJCHI+LXHsGIeVLugZOSebc6Yqm7RN+S/5ImCZe3umDFN2nKz5yrpuuG81kRetuDlyWRdfjWOlQ7NXemBPTFrZ3f1fYb9zddj/8zAs6MUHdtYhaxr/voeRTi89oisS8z2st897jfNe+GxkrSkCZg4EN2VAKMjW7LXf42+RcAIWgI2+pDhSKU37zMSUZNUOL2YbzGHCIQ8OcrrZtAmU+uC6sz4s6MP7N59uBDClWPr0pAKVOB1E9Zv3xYZNgbldFBk446Nl9l3Kk89cCUJi9wBiMUHiNbtROHa1zHsalPe8iecyjSlyJ7AtzMeHSrsnSDny2juAJKXu3SDEZpNYPGGh1FfPYw2Nf/wmvw+eYOJ8+Y7HPoYxCtAVDkhvNjhDbgjcVtAM/253tyHPC6GFSkFJnoaRCEWX7VEiGzetUzEjL6KOepWL4yt0pzzV5pAHohQQZ8LVUXZ3V0QeF5pdxtDc31DBHMek+S3hRJkvrA= 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)(136003)(39860400002)(346002)(396003)(376002)(366004)(41300700001)(5660300002)(2906002)(36756003)(6666004)(83380400001)(478600001)(6486002)(52116002)(2616005)(6506007)(8936002)(38100700002)(6916009)(44832011)(107886003)(1076003)(38350700002)(186003)(8676002)(316002)(4326008)(66476007)(66556008)(66946007)(26005)(6512007)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?htOero/v85wuXPeGBeqFJMeNqQEosJau/kOZmHkQwvrJVEeMGd03QxxSIwdr?= =?us-ascii?Q?2EAxmuX0+YvzUQ1Or5X/GkQEEUSmpqvTruIjz4/zoZTcxfHKxrgiO3JjAMgc?= =?us-ascii?Q?YhtA6JnTK3BgGxXHpJAl2lgknnsHypj9WiZl6mBkKrjJpfhYuRmRZ841ObNP?= =?us-ascii?Q?N3nMyVe77ZivBwbfy5Pk014aXkmbZ8yHD0pYwO3EFRvaD405amJq8lUQevTG?= =?us-ascii?Q?MqXkTtgRkmW88xKg2vBg8FAyPggQeBMls9cqLz/c8lSaDTgOD3ssLXOb8D+W?= =?us-ascii?Q?SaX9di+thGcbZvMd/PSrwIGCFtf/qpmJJyuWQ0pwE6l81ZQnQLXVhLF2YMwE?= =?us-ascii?Q?KWbAJsWZ2UJffOgZPfzS7bZSrMqv6o1ppEA9nx/MPznovXDxBv9zv9ivW/BP?= =?us-ascii?Q?WWq1md7gck6seeMt6rLTiRx0ZQqxDbdWauU9k3+CPWQ8rOkWGfOV8+L+vQen?= =?us-ascii?Q?2qLGF0ADJ1TBUwa1grOOTeitXnRj0qdXudC4nvqgtLC0AJHTaf7U8RVD8HSj?= =?us-ascii?Q?fZKT2mcYDwH0XjFsNmYBznF5niWGxo8PRNV9uSgbV5zoXJFMAfMb6g9U/PJl?= =?us-ascii?Q?OhOuFsYRvpcS+bDeC+ZKV9vZkNCRIZPACFkjABwTODNSp/DCddnm62xaKChX?= =?us-ascii?Q?ua3qcBokOOvaYKwuM8QVehxlW8ketcDqWzWDVY+6jyeU7P426vTTf2exoN/9?= =?us-ascii?Q?X0Hl8aCHibujzFYuYovMnYvE0c4dL0pL5U/63QnqAS4UG9nnhUzuWNY1XlBh?= =?us-ascii?Q?KYsxgTqcv4pfpTePDfbl7n0fG+QxMMlZr+8vgQTS4oqPZLsb2GH9LfbZ5pGK?= =?us-ascii?Q?TdzpzVF7n3K4pBMRb5txTtGneXTJ4Y0t2Q4w1+4siBQjCO/YngO0+qLNmhXN?= =?us-ascii?Q?BHtJ7pKf+HwaGsENvROUVb2AHRfJPvVVvE/ilXldHDPgXf32Ah1MKceLaYhZ?= =?us-ascii?Q?4g3ch9o8x0y2ZUg7TTz3wWq1rM/h1UxWZ1E1oyd4ZqNYYhmO9dhg1nx9OGw6?= =?us-ascii?Q?mrcTbdbrXF5d7Ird0IAmj/DXY2xM+cO7Rb+C1yT6G5WrSL/LUp/ddGAgx5Bg?= =?us-ascii?Q?h1jhzIaJHextOE2C9m8gmjgec/pK7beZdarCthzuckEgkr2zL9vLxIh2pCtt?= =?us-ascii?Q?8VJT+K0qB9XxMkgw0e5HTNkeOanKibBZeLrLOffbKChItojGEBVAgNhOSll+?= =?us-ascii?Q?1MpvPDS5wOBJI8qETbFZGX3VNxIijY74a+pG6V487yTAK1VM/YyLJJ1TFpPp?= =?us-ascii?Q?vBBSdU1STBY36AfQ1BlUSeqPf9i+c000B2ZvMRXd6YKLi85Gf5/BTneTnArX?= =?us-ascii?Q?Huqt7VAfs+9/zYPVDlPI5UFd2QcmV7++Y8aVu9zP1HnNcDjIzsFu74jXGYJ6?= =?us-ascii?Q?i1bCN7WUbI8ZantwY8HmbOgOedTddoW7Ta6uyoSpsn3YtXfkPzRFjNTC9EL+?= =?us-ascii?Q?7tVze0eFs37IKyNjmGt3UoILRd5Z/J2IB3UTUUZm1BNUUKb6KWGUw3nCpvXj?= =?us-ascii?Q?1nHNMtP45x9MZ7Sjc6B3GbggU/ueNd4KRr4cNB/kf3XpwUyAbM4sSvIMXXt1?= =?us-ascii?Q?D26oiA61o89/Lf96MGUx22ajObkwWty3KIuipbR7?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2714d10b-752e-44af-38d0-08da745e171e X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2022 08:07:49.1982 (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: zLFa8rgB4A8zJJgK1fYbZC7KfiCWEN9BcW7b9kMCzaAGJqcjqo1p7xaVBf9DNgaqDMwAa+hvXzsw3QEhQiSTvQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR10MB3123 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-08-02_04,2022-08-01_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 spamscore=0 suspectscore=0 adultscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2208020038 X-Proofpoint-GUID: TQ4fepRUlPHMDa3RQFQzfc8u5GZicwHR X-Proofpoint-ORIG-GUID: TQ4fepRUlPHMDa3RQFQzfc8u5GZicwHR 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 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: Tue, 02 Aug 2022 08:07:55 -0000 [No changes from V5, 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 2598b81d205..26ed82749eb 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 @@ -647,7 +651,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@ \ @@ -655,7 +659,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 4b5e031bff9..773197fe6d6 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 @@ -17265,9 +17269,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 : @@ -17380,9 +17384,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 : @@ -19347,6 +19351,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 b681988d7a4..40f3dbb658b 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -2191,6 +2191,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.37.1