From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 7F56E385618D for ; Sun, 30 Oct 2022 07:45:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7F56E385618D 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 (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29TKLkQ7024048 for ; Sun, 30 Oct 2022 07:45:53 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=Gr6jvu8tvMOvTjGudJz7Rmn/c6iYqX8YCRZYAuKInB4=; b=TwPVMMZLy3l9wDkS6VJ5bhGQqK2f9+t31H+hvbCPejKRXW0FCPlFWvJxdZ1PTrn/ZMtM KaLw414VOK3eLrbc4ZBZ3jtbwrgcrbASJ3nK2Bnaj94AYvIoMw+1UvBqjZ3T/7S5GOak Cfff+lKzw3xGfv2Sz7G956vnRpDxbTbrNjlwRChszHTFqlJi0SWnVH8Lh1FGcP33R2LO ykqo3KCyYqQqaVDTD9+S7hFjUxDYqksckEO8k0bWOizfK1x7/z7AOzXyeoSBsbfjLtR0 wpUKegvgQaze7RLXL9k4982YDvuKM0OobG9ZL3YgCfee/lmjMLZcscdOr06DNC5SdxSw qA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kgv2a99tv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 30 Oct 2022 07:45:53 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 29U5TulO019443 for ; Sun, 30 Oct 2022 07:45:51 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2170.outbound.protection.outlook.com [104.47.59.170]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kgtm89dcq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 30 Oct 2022 07:45:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PCGrCmsjgb1PG31mHfFOlzXG1khE2txQwjbYiNqAWVJ4VGIxSaERx9dKovWqQijbBE8BOTNJwwBpFusSdjO12DLjrX8kk4YXAqAkdbwgqS3jDYMzxPJIX6wIvmXYvd98TCKmt3KZxoG6LtdScI2LHYsO88nvb25IDJFedQLaa9FFLNWUCyWthzl7R8V0CKtZDKg73OBMTw6N/ajdTdX8m8Hfm80MMR2LNScmMHSlqtMMvcMRyOY+o8sA18UEo5vokI458ISWx6Q+cy/S1GkNFsMKSik4GhBGUDVZMT7dWonjdUWSwPirh3cskp74ji+TTjJOfc1bwmpCsoGbLpmDvA== 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=Gr6jvu8tvMOvTjGudJz7Rmn/c6iYqX8YCRZYAuKInB4=; b=Y6LE2ZD91jsjnKQhjSUkdr417l1unYa+pKg9UfDPHkIQwp+Wus9rkIL7hCZD+GQzHMXPm1gKI3ypql1vQ5vxE+kQ/Qxrzj863Xp9lM9jBFCbaOqjZ1iNcrxodY8GLBPZWbbZLMNseix9MvW7vD0a+x79MYkdoZKLyV4aYI5vXhVmHnZap3eDDTQMGGYGJ0+hYVagk6GjwMt6Yu3G32rCP/HtqP/CDWEKasP1BLF6U82i3HXirVlm4ZGxaQh7KP8KdsiwP/WW+WvDv68PmAMQUM3bmqU1qjGOdPrF/vK14PgQT60kiW19CMq4MHIH5YkK9v2NvfOyZmyxVKYuwNZfNw== 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=Gr6jvu8tvMOvTjGudJz7Rmn/c6iYqX8YCRZYAuKInB4=; b=EZK5pefS8xIUGIEtdr/Lm92XoZY3FfMVR9enioN9BnhICMN2+YC/6M0l6qQ4+/nTZRqGeL77mf6aj6nkUzr4rKtco3YH/W2oj3zBD++aC3LB6n55V63+R6rn3PbmVPx6OFHw0BXeuxyryD2CpmjkpvBFwUJG3pbM401LPdvZQd8= Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by BY5PR10MB4289.namprd10.prod.outlook.com (2603:10b6:a03:20c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19; Sun, 30 Oct 2022 07:45:50 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::a505:15c2:a248:efa2]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::a505:15c2:a248:efa2%7]) with mapi id 15.20.5723.033; Sun, 30 Oct 2022 07:45:50 +0000 From: Indu Bhagat To: binutils@sourceware.org Cc: Indu Bhagat Subject: [PATCH,V3 10/15] gdb: sim: buildsystem changes to accommodate libsframe Date: Sun, 30 Oct 2022 00:44:45 -0700 Message-Id: <20221030074450.1956074-11-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221030074450.1956074-1-indu.bhagat@oracle.com> References: <20221030074450.1956074-1-indu.bhagat@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MW4PR04CA0321.namprd04.prod.outlook.com (2603:10b6:303:82::26) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|BY5PR10MB4289:EE_ X-MS-Office365-Filtering-Correlation-Id: 0eface61-a44a-4130-2039-08daba4ac394 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4mxKVprSmrK1ln07EKntu4YYIWIiq83qAvpIPHqgV9tXXz+aGX3RXunbvS5Vw7g1u+Pcncrsyy7DiRXoluJkVLfmpY+Wyme54DNm47PHN5RaKnTSz2ftUaJKgqYz9iFd6rltSuyJZI6Jh0Um4Bhf4QGu5iG4CJ//RGhOOrJ76HvNj6Zqhp5zyF5DK2xo01GaBSuEKA18Yh023V5GuG7eTGwEonVzk/a2vEGXbIgkhhTX9gPCYKXnd0GpO40bjf5QGHwJhVo5+TghgfQ8erf2aMMSN63cG2n4DhgkZ9hTkW7htLp/4m3J01+SwUbGXsxcNxtZsDxKlzpbgRLL2szilO38jSBWsHh2aXMV11fPb7N4I3M6i3OSjQHGcfjC6IAUGi0QApbaRuo8wEC/tP40x62Hk1SvWwUWgvyDhrhbf1Pc7Hri7rjGTe8uj9z8RxlwWhfJHmd/7/3MsNC0G8FlGuybP92qX1NlJ89wk0GujPDZU5CSc0MJyheFWg1pCoSyhi86K3HimIsZ1P14ha/vYcDBUZxtgunbMBBKK49ERY9k0maSOEab9JRlrctWbxXvn5uJp9LutiEGuC5AJdXOzDelcYFWEpiANhg/HIfwdZ+ydo+V1suzOneBdKhwh1fZPd0x1GcETQeSe41R8WeJYA7mHGC9SrkW+vUC3jAmkU4TRHQELK3GrjJ2YP0eQ3bVmFgCD159zidfqL/CDiGM8w== 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:(13230022)(396003)(366004)(39850400004)(376002)(346002)(136003)(451199015)(316002)(66556008)(4326008)(66476007)(36756003)(6916009)(66946007)(6486002)(38100700002)(6666004)(8936002)(41300700001)(86362001)(107886003)(478600001)(5660300002)(1076003)(186003)(83380400001)(8676002)(2616005)(44832011)(2906002)(6512007)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LGHQCYtxeaWbgDCb/4fVn5jVA/RWet7nfGjwccna+Y2ioRK27Rfgt29veCeJ?= =?us-ascii?Q?giYmpZRDhNq8uJqB4S+U2qNMUozXVnYhdHwrl1vZ/r2lusMDC2hSfBhD/5nN?= =?us-ascii?Q?LGjrpYbYo822vQs1THv/ejewQ/58IzsA8MXmdJu5yA5DyzUWxhJvVmGst7Tn?= =?us-ascii?Q?ysNkXYV7FuXk0h9QReYeMBgUdeYmgrpfIa3ORLCzxtHVkA6FfhiPwTR0oNX5?= =?us-ascii?Q?i3l+4oS/oExQgMyc6imD2cLVB/RQd9YNonKN2QAMec0dDgIAQOq871KwjIBC?= =?us-ascii?Q?hCvZB8Gs7BuLKIFC+CBY6THh5PanEWlveMZ+QlEXCKif0/HowE/oI7eXgePM?= =?us-ascii?Q?z55n/s3gsmM+/TzBe5NjdyuwamosnXPGZ4ztNFe9EF/02IBJTxDHoqGcwFkM?= =?us-ascii?Q?62otpiQ9C5mF5i0qCyv8LbP+A+ylCdWx25RRd51prDyayA25qL/gTSJaplDa?= =?us-ascii?Q?2I30t+K1RoHmVH+TtHgfJTzwHd2/PO4/Gx5W42Bb5Q6MaPiOemfa8uok/kzF?= =?us-ascii?Q?rWRW8iAW8hwF+4T8SuERm5xTaBEAHH5IefNEk5uZj2zkPNfFA28LT+hsV307?= =?us-ascii?Q?tu3MwudkvLV+E1Prrr3/TApSumkt9JzwUefVUrTSSJvgJ6LeH5q4RxBmbtfA?= =?us-ascii?Q?OxIoJUjjToq925AEAjJBPwk6vF6VdJc9wrG8FgVh2QziWiFD7kJ5/L2+8tal?= =?us-ascii?Q?P6vk21EsH4u4SZZaho7KvjheaqxURClQvdtZG1edbuHzi9nkTDriBDT0qwKY?= =?us-ascii?Q?WaPWqL9OVT+1TRiWa29zbffiK5t8TyaPTMdNzzJolI0OlhkUL+jOxM8CBL94?= =?us-ascii?Q?gMdUxXjEhKNZCGM3riB+XUXJmXH9/fmpwwHLAEoorsPVmNWWrgvxN7ncqCXG?= =?us-ascii?Q?9UrsoOpKtmKP2lSDKQQNbCMoZ7UlfdoqJhjNteCKOYKeRO4alctXg4aZA5ev?= =?us-ascii?Q?yWYGtr7u0aMJwaNYS9B7yyiqFDMAyzppjGgwYMS26b5mCgtnaXjeHst4Gghm?= =?us-ascii?Q?HI4nW/WN6Wz93hYp/Ak9FST3ktMePMDvbkCiZIHDbtExkAiWg/s932xKFAqd?= =?us-ascii?Q?/PugDHp0b0HWrwIwY2yBjr6Ghrxk8nRZGdHDia1rXMbbTRe+oX7uHbQSq9GB?= =?us-ascii?Q?mEIWXkCWRSNoC7ZxSozIrhQM5hWhrBghw0XO4R3PnTuDjGYPNvc5BfjLUkzm?= =?us-ascii?Q?5OLA45j2Q95zI7I/9Ykciz7cztMWGyILIpQUMpiBQj5O+0HmYErJNGW/VhOt?= =?us-ascii?Q?/W6meo8ojs+2UkQ0IA/IoGcR8zWQO/u/IP1isZ5gUwHWIVY97nfjn5/XKBDn?= =?us-ascii?Q?Ql0b0Jak+SrmB8vKyLhVjHgwAWky49bZ3N9L2tslnwiFTAkswxpr5s72wx3s?= =?us-ascii?Q?X6JRuvcg6bmaPqit5XSjPOZ8UOvuLhHlE2ZyE3GU5U/E0IYb4PPxG4nTCYJM?= =?us-ascii?Q?btgfQrqPLduR4fJ1ku4dGBUAtNaySlOJY4vLz5Tx0TA8h7YypXhkwqBdHCkd?= =?us-ascii?Q?7uLdKXzr8WRM6/8aiQegam8CVBL6uSyPsYFCKMbTyHeNDHSfM2Khlqih8aJ4?= =?us-ascii?Q?Kh7XELB0V/5lXqcgWnAGlWn1FAyx2h7RVT4gl3Q/FOYISLQewgT54WIkHcu/?= =?us-ascii?Q?zVqMDnugWCJF9ysY5aVa8HY=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0eface61-a44a-4130-2039-08daba4ac394 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2022 07:45:49.9363 (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: UhUyLUpbmjMYTt1Y3y1PHjfon0MItJNUNe3ij7lyjLxnZEzi15/tN+9RILCCntNLnbhUBieOdUXqnov0798uqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4289 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-30_02,2022-10-27_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 suspectscore=0 malwarescore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2210300049 X-Proofpoint-ORIG-GUID: cPGQSrf7i3VErhkviyaTayiGm6oCgIyY X-Proofpoint-GUID: cPGQSrf7i3VErhkviyaTayiGm6oCgIyY 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: [Changes in V3] - Additional diff in sim/ppc/Makefile.in to accommodate libsframe. This is needed to ensure --enable-targets=all continues to build. - Addressed review comments by Mike Frysinger. [End of changes in V3] [No changes in V2] Both gdb and sim need buildsystem fixes to now include libsframe for a successful build. --- gdb/Makefile.in | 7 +++++-- gdb/acinclude.m4 | 4 ++-- gdb/configure | 8 ++++---- sim/common/Make-common.in | 7 +++++-- sim/ppc/Makefile.in | 5 +++-- 5 files changed, 19 insertions(+), 12 deletions(-) mode change 100755 => 100644 gdb/configure diff --git a/gdb/Makefile.in b/gdb/Makefile.in index c528ee5aa80..98157498fdb 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -161,6 +161,9 @@ LIBIBERTY = ../libiberty/libiberty.a LIBCTF = @LIBCTF@ CTF_DEPS = @CTF_DEPS@ +# Where is the SFrame library? Typically in ../libsframe. +LIBSFRAME = ../libsframe/.libs/libsframe.a + # Where is the BFD library? Typically in ../bfd. BFD_DIR = ../bfd BFD = $(BFD_DIR)/libbfd.a @@ -650,7 +653,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 +661,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) $(BFD) $(LIBSFRAME) $(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..71288533efd --- a/gdb/configure +++ b/gdb/configure @@ -17412,9 +17412,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 +17527,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 : 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 \ diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index b0c073b8867..12123d36a66 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -133,6 +133,7 @@ INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDES) $(BFD_INCLUDES) $(GDB_INCLUDES) -I../ LIBIBERTY_LIB = ../../libiberty/libiberty.a BFD_LIB = ../../bfd/libbfd.a +SFRAME_LIB = ../../libsframe/.libs/libsframe.a ZLIB = $(zlibdir) -lz @@ -521,8 +522,8 @@ PACKAGE_SRC = @sim_pk_src@ PACKAGE_OBJ = @sim_pk_obj@ -psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) - $(ECHO_CCLD) $(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(ZLIB) $(ZSTD_LIBS) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) +psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(SFRAME_LIB) $(LIBINTL_DEP) + $(ECHO_CCLD) $(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(SFRAME_LIB) $(ZLIB) $(ZSTD_LIBS) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) run$(EXEEXT): psim$(EXEEXT) $(SILENCE) rm -f $@ -- 2.37.2