From patchwork Sun Nov 6 13:10:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jose E. Marchesi" X-Patchwork-Id: 60035 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 66B9C385840D for ; Sun, 6 Nov 2022 13:07:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 66B9C385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667740036; bh=b2MMK46xrOafnovBeqEeh7N4SimxIpr0z0jJcM3mQdM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=YVp4CrWGfboeUaxu/fOITe0YX2dx/AUMynnrtTk9HWxYt4D9RhYagQ/2ohRxyCXo4 k+SL+yS0pCQetdR3DaIJyoTFOY6f80RW5i7hVW/mmkxCPxGW4K7GEkQ2Q7f8LP+8bT nja2Q8wluaoywBh+i8jZZ5ZPBjfU/w8L2HjGRoXE= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 02B553858D37 for ; Sun, 6 Nov 2022 13:06:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 02B553858D37 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A6AQBRa018865; Sun, 6 Nov 2022 13:06:44 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 3kngkfsrtb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 06 Nov 2022 13:06:44 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A6CIYpX023087; Sun, 6 Nov 2022 13:06:43 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2170.outbound.protection.outlook.com [104.47.59.170]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcthgjpn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 06 Nov 2022 13:06:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ifl0MWU3JPukvYef2BeW17jjS+8kd8BGFGmI/xrNI/8wpG0pkmtETdMT4Tmy0cAl6XcGHCaqa+Ni6csPIBt4O6bTu5dW1ps6VTlSO00tCTGEjJirMgwERTgkeJpXG5ABhIQZJV2dLXfJ64pNZaI4yTqzgd/RGF4nbEm4rd0QQeF1UBCDdHGqU8FjXh2IKkbAn7UE1Ut1iSEgkqaT4XYuh/8aO9XodYomolPuWFm0A0zwYUkHRCY9kB+zhJEhXsNu3Y5KoenlHOkiERkLR4Mld+5PTa1zWNRxG/662kHnaZIfZsN7t8oNyCWkkZP0ynf53p50PvVoyu/+mCcvSAcwiw== 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=b2MMK46xrOafnovBeqEeh7N4SimxIpr0z0jJcM3mQdM=; b=XPttOnEdyOLMMEMp9TRrlLHR/BfHk5y3Lpu/wGLDCmqYhN8U9ZHOJj1EOsUKPlb32AIoiLLamli59yCyuRLvYVgAVtu3zmNVHK8ajOdhyY5Bnn4WFmuWpq2w19dGbzE6cbAP4fbhbcWg1+26mUyy+EoYK80AsnD6XpWBgQFfktTPXavmBmrYO0NJgrRnG1Mg2UqNBS+/VsG1pzA2ulqrMdgvVjrjBEbidbRPvZawAEtAyeT8kBTJw+WLHDUjrjYyOlW3jI38xrAuhQHTkaV4Hpg+GWiYf082LXdjMXVJttfILwp7pD73HVvS9X2HSHHc0lLGVP9yLIyfnx74lErW5g== 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 BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) by SA0PR10MB6425.namprd10.prod.outlook.com (2603:10b6:806:2c0::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.25; Sun, 6 Nov 2022 13:06:41 +0000 Received: from BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::5095:b148:8def:1049]) by BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::5095:b148:8def:1049%5]) with mapi id 15.20.5791.025; Sun, 6 Nov 2022 13:06:41 +0000 To: gdb-patches@sourceware.org Subject: [PATCH V3] gdb: link executables with libtool Date: Sun, 6 Nov 2022 14:10:41 +0100 Message-Id: <20221106131041.1221924-1-jose.marchesi@oracle.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: FR3P281CA0015.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::13) To BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR10MB2888:EE_|SA0PR10MB6425:EE_ X-MS-Office365-Filtering-Correlation-Id: 2388ec2b-6b0b-44f1-9753-08dabff7bf75 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bI/kn2hEdRzCLhZsxmIUQEcsPvOrTNaMchISvKSOTt1npYv6JfBP7UlUHe/dFv1jYGvweEa0j/LP4bBoTP1e4B8Ql1fBTaEFLjjLtYpMXEdNzA8VfvxO/xDXvAEyB3LBw/MpmUtAYCdlgEGhyKRUQX4oKP8tBoDNi664c8IEHM56/QIb2/f86eOKYmPprwidLGCdwG0m43YrIlwWfGBntGYfVGVt/BuMRJVPnE/gnJTIhBZgv/4+miQpkI7niHDO8KJqOwiYIOgvNETw3wlb5Oe7pPblcZpfeE8EelE8wvRUQJhZwgfZBj97JCGXiSTEDsOZfnDKTc+nBOhyCJlXmQdLvIdBoqOqGT/Ex1fmENNVaDOM/gkKNac3EsJ/pUxvEHKXxY5dAF5x/h6KZA5QRKw9vY91QhqFgO2XQvi6LCezR9FLSHaMlAl7jWbliefXK6LScjurfhWSOoU74g+WZF3p2Rz5UAlZoSQzfbdL1X4fd4SMnHPQSJu+9pDc/B5N1K9euXe8kv5t6R7YfyZxV+I313Ci+Qnfzm/nl9Dgi3bBtRTK6zjAFXRns69ir4WDQwRfow00rGuZvugKIlC90ULZH/QbSG57N5ahy4qS6cDNFBnel+CxA5+wTYlrPFb5nQnCv2ELhgrjh33/DYCWFa2HV/Z5szbLdlWOyg68pv6Py97NeK7u2yZ5SfuOBbqBqQsYPFxsPkgjRL6E8OOL13OtkncF3Yd7P7T2vX1tTyPescRHIB0wpjveuNeU1sr7aUbSocSLkcUTHF+do1sxQs4Ke/QCG48uRAlz3ClgUjOTquVhPXXGUrfdFILRK7ROEH8UYUiC85eA26jN2J/Mc97mfeMYKo9jXHYfR1RWDxs= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR10MB2888.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(376002)(396003)(346002)(39860400002)(136003)(366004)(451199015)(8936002)(5660300002)(38100700002)(84970400001)(41300700001)(83380400001)(6506007)(107886003)(66556008)(66476007)(66946007)(2906002)(4326008)(8676002)(26005)(6916009)(316002)(6512007)(36756003)(86362001)(6486002)(966005)(478600001)(2616005)(1076003)(186003)(21314003)(460985005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lkv3oJeTGaEFVYRX5y5QMkDmP3L3KORXahVsbdvmOLBGeMhmUHTWh9oEHigjc1LzVhiL5+88kx0NdeExQJghqqTrff9sfBlhXNUeq9k8/n6emIbPVXcKUhVgUeqpBlmkeUxnoIFbukMD8IN+/0B4gMRrfmpeT7LMt8iG/l3vQNuhmwiap3XITDdC5AbvnbWDofqVxpkZOPfEiH/mFsB4VX1v3IAL4kJ3YYyj5Jl7JRl59srpq1VpLy8maJSXu3Q9lgWNOrIKJpsEqIdh2L56NM3DAs6FUKGPQbxOtcgQ3wi9AEaQydK96hwSx7Ru0MVBVQPewr3Ld/h6n1jt3pAY4ygZcYd0f06i7mHKh74A0sCPMJgIBSYXEUDupyDr/IP7CBGwr/WwAGO9PmaRnBFilzTIDma0kJP2Bh6OLpDsaA1TqBxfUetWSbUpZECZI2RIUF7Yhk0KnljboIKajS1yTxcqkBshq+1Ei5jo8PAODsZ1uqb90wUVwWAtE3FysOyR22Sjmm7CeiCHZqXMsWP6J+/3i5FVUUetBRy4aOLtRR6uUo4YvMhW2z7SYNGVD8h76CvZ/xGATtqkc4ZToSTbFOKIPpEaKg6L5r4iAM7yoNh3YeorJ8VZAgksgag6tRT7SXa/Ui/+2RUopLVGGuXUspOK0jH4Ej8etpmZQmo+Vh3eGvaEDK6zhbWmTMMRU6eiWkvypmkimFuoIN2ZTsRuFSIF19cbgvPyyiik2Twgq4aemPqW54JWR4rAUiG6Om6cJj9hOgTmzeGqa+C/icGvQe8lLH4ApNnLMIk+L6sqg9EiwBMrTrHpJDb7ZZvWsELyxhtH0skMDAGAalhjYrUyZfdCaxyLnyku+yEf8rmIJS3L8iatNd9IYuCP8YEONnAcs80nQwz7CIdoUzgG6kP2DwMsUMGECDzARiLd32NyS8zDr9L7+cipzqmOu0kT55QO6FEAicHCftqftpZWjffH2xf1hYM2iI46Y0elUNuK3Ar+/FhNXpjzJrSlsnnlH0+tj3NrEKe3Sd6DSn5CxHrZDaSTKIazC/BcEYROEJEKmKigVxmiq+oIoUQeCujV0dbARHAmVbMzM0tTxUWv2Z7Vv2x7AUTAQeIzBX6yv+w/UZPNa9g4g71i/jMmunahg/Y+deLoXWAKjaAPV7LaZI3IXJ1dU5ScE5NDqSuasqFUV2QVn7I3MCfdAw8BNStsPrG858xwuNQs8HAJEb1EB/1p9btrC7pclRhSPSTOixGf54FfNygwE1gPaH7llHlCa/oX0KIOiq4dEQvZ6aE30ouf8hFbuSaMVDht6ljiy9TCgUszpXHHqHOY7PtOZlImzeAJqMSGPjfyj6cn9Ug17+bY7ueLveyq6m7rI7a7tJEu9UXvkK9P5nhZzrEAgiSsgdHzyZGdneqshmfIIHG/D77w+lZ8/7iZzAr6YZeKQhA0VusmMsUZgNvSxP61iObBeVhqgO/dW7A9/RJ2tsbEN8fsPOoXrqLmr0xmUuVHdH/lyskAnV8S0i7fVVYLjEKXlkHXvRzDdlnnI+p7RszEsEs9gbF4Az9t2YDY4Iv0klUvi/WG1SmpBU2QWbLy5bjNqHjFYGOaCQUKtN19ro8MMVui9Q== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2388ec2b-6b0b-44f1-9753-08dabff7bf75 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2888.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2022 13:06:41.8203 (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: zItZrVynfaaxOMSjt1OxFtQedJ0iOaXGLV3ftQQW+cw//JkFOW5wS8s5SO7IhO1mWwooSHDiMCD1JYZZL/3gjE+HhlWS0h5acHeQK+pAdsk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR10MB6425 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-06_08,2022-11-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 adultscore=0 mlxscore=0 suspectscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211060120 X-Proofpoint-ORIG-GUID: WbnM_yY6B-nVkfLWC2clcfIdKaVx-Y-e X-Proofpoint-GUID: WbnM_yY6B-nVkfLWC2clcfIdKaVx-Y-e X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "Jose E. Marchesi via Gdb-patches" From: "Jose E. Marchesi" Reply-To: "Jose E. Marchesi" Cc: indu.bhagat@oracle.com, elena.zannoni@oracle.com Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" [Changes from V2: - Add .. to AC_CONFIG_MACRO_DIRS so autoreconf DTRT. - Refer to libopcode as a libtool library. - Do not use libtool --mode=execute in testsuite/lib/gdb.exp. - Remove spurious entry from top-level ChangeLog. - Remove ChangeLog fragment from commit message. - Add git trailer to commit message. - Typos fixed in commit message.] This patch changes the GDB build system in order to use libtool to link the several built executables. This makes it possible to refer to libtool libraries (.la files) in CLIBS. As an application of the above, BFD now refers to ../libbfd/libbfd.la OPCODES now refers to ../opcodes/libopcodes.la LIBBACKTRACE_LIB now refers to ../libbacktrace/libbacktrace.la LIBCTF now refers to ../libctf/libctf.la NOTE1: The addition of libtool adds a few new configure-time options to GDB. Among these, --enable-shared and --disable-shared, which were previously ignored. Now GDB shall honor these options when linking, picking up the right version of the referred libtool libraries automagically. NOTE2: I have not tested the insight build. NOTE3: For regenerating configure I used an environment with Autoconf 2.69 and Automake 1.15.1. This should match the previously used version as announced in the configure script. NOTE4: Now the installed shared object libbfd.so is used by gdb if binutils is installed with --enable-shared. Testing performed: - --enable-shared and --disable-shared (the default in binutils) work as expected: the linked executables link with the archive or shared libraries transparently. - Makefile.in modified for EXEEXT = .exe. It installs the binaries just fine. The installed gdb.exe runs fine. - Native build regtested in x86_64. The installed gdb runs fine. In the regression testing I'm observing that the following tests doesn't seem to be deterministic: gdb.base/step-over-syscall.exp gdb.threads/process-dies-while-detaching.exp gdb.threads/process-dies-while-handling-bp.exp Sometimes some of the the tests in these files unexpectedly fail, like in: -PASS: gdb.threads/process-dies-while-detaching.exp: single-process: \ continue: detach: continue +FAIL: gdb.threads/process-dies-while-detaching.exp: single-process: \ continue: detach: continue Sometimes they unexpectedly pass: -KFAIL: gdb.base/step-over-syscall.exp: clone: displaced=on: \ check_pc_after_cross_syscall: single step over clone \ final pc (PRMS: gdb/19675) +PASS: gdb.base/step-over-syscall.exp: clone: displaced=on: \ check_pc_after_cross_syscall: single step over clone final pc -KFAIL: gdb.threads/process-dies-while-handling-bp.exp: \ non_stop=on: cond_bp_target=0: inferior 1 exited \ (prompt) (PRMS: gdb/18749) +PASS: gdb.threads/process-dies-while-handling-bp.exp: \ non_stop=on: cond_bp_target=0: inferior 1 exited - Cross build for aarch64-linux-gnu built to exercise program_transform_name and friends. The installed aarch64-linux-gnu-gdb runs fine. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29372 --- gdb/Makefile.in | 14 +- gdb/aclocal.m4 | 5 + gdb/config.in | 4 + gdb/configure | 31544 ++++++++++++++++++++++++++++++--------------- gdb/configure.ac | 17 +- 5 files changed, 21132 insertions(+), 10452 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index c528ee5aa80..522fc20bccd 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -143,10 +143,12 @@ MAKEINFO_CMD = $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFO_EXTRA_FLAGS) MAKEHTML = $(MAKEINFO_CMD) --html MAKEHTMLFLAGS = +LIBTOOL = @LIBTOOL@ + # Set this up with gcc if you have gnu ld and the loader will print out # line numbers for undefined references. #CC_LD = g++ -static -CC_LD = $(CXX) $(CXX_DIALECT) +CC_LD = $(LIBTOOL) --mode=link $(CXX) $(CXX_DIALECT) # Where is our "include" directory? Typically $(srcdir)/../include. # This is essentially the header file directory for the library @@ -163,7 +165,7 @@ CTF_DEPS = @CTF_DEPS@ # Where is the BFD library? Typically in ../bfd. BFD_DIR = ../bfd -BFD = $(BFD_DIR)/libbfd.a +BFD = $(BFD_DIR)/libbfd.la BFD_SRC = $(srcdir)/$(BFD_DIR) BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC) @@ -504,7 +506,7 @@ SUBDIR_TARGET_OBS = $(patsubst %.c,%.o,$(SUBDIR_TARGET_SRCS)) # disassemblers? OPCODES_DIR = ../opcodes OPCODES_SRC = $(srcdir)/$(OPCODES_DIR) -OPCODES = $(OPCODES_DIR)/libopcodes.a +OPCODES = $(OPCODES_DIR)/libopcodes.la # Where are the other opcode tables which only have header file # versions? OP_INCLUDE = $(INCLUDE_DIR)/opcode @@ -2017,7 +2019,8 @@ install-only: $(CONFIG_INSTALL) true ; \ fi ; \ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) ; \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) gdb$(EXEEXT) \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) \ + gdb$(EXEEXT) \ $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(includedir)/gdb ; \ $(INSTALL_DATA) jit-reader.h $(DESTDIR)$(includedir)/gdb/jit-reader.h @@ -2529,7 +2532,8 @@ install-gdbtk: true ; \ fi ; \ $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir); \ - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) insight$(EXEEXT) \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) \ + insight$(EXEEXT) \ $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \ $(SHELL) $(srcdir)/../mkinstalldirs \ $(DESTDIR)$(GDBTK_LIBRARY) ; \ diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index 3ed4a58d39f..4aac87b52ed 100644 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -212,4 +212,9 @@ m4_include([../config/override.m4]) m4_include([../config/pkg.m4]) m4_include([../config/plugins.m4]) m4_include([../config/tcl.m4]) +m4_include([../libtool.m4]) +m4_include([../ltoptions.m4]) +m4_include([../ltsugar.m4]) +m4_include([../ltversion.m4]) +m4_include([../lt~obsolete.m4]) m4_include([acinclude.m4]) diff --git a/gdb/config.in b/gdb/config.in index e13a409ec2d..736e6be1c48 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -614,6 +614,10 @@ moved. */ #undef JIT_READER_DIR_RELOCATABLE +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of this package. */ #undef PACKAGE diff --git a/gdb/configure.ac b/gdb/configure.ac index fceb80e8c9d..12561d4d2de 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -19,7 +19,7 @@ dnl along with this program. If not, see . dnl Process this file with autoconf to produce a configure script. AC_INIT -AC_CONFIG_MACRO_DIRS([../config]) +AC_CONFIG_MACRO_DIRS([.. ../config]) AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_HEADERS(config.h:config.in, [echo > stamp-h]) AM_MAINTAINER_MODE @@ -46,6 +46,10 @@ ACX_NONCANONICAL_TARGET AC_ARG_PROGRAM +# We require libtool to link with the in-tree libtool libraries +# the proper way. +LT_INIT + # We require a C++11 compiler. Check if one is available, and if # necessary, set CXX_DIALECT to some -std=xxx switch. AX_CXX_COMPILE_STDCXX(11, , mandatory) @@ -2092,7 +2096,7 @@ AC_ARG_ENABLE([libbacktrace], if test "${enable_libbacktrace}" = "yes"; then LIBBACKTRACE_INC="-I$srcdir/../libbacktrace/ -I../libbacktrace/" - LIBBACKTRACE_LIB=../libbacktrace/.libs/libbacktrace.a + LIBBACKTRACE_LIB=../libbacktrace/libbacktrace.la AC_DEFINE(HAVE_LIBBACKTRACE, 1, [Define if libbacktrace is being used.]) else LIBBACKTRACE_INC= @@ -2151,15 +2155,10 @@ AC_ARG_WITH(xxhash, [], [with_xxhash=auto]) GCC_ENABLE([libctf], [yes], [], [Handle .ctf type-info sections]) -if test x${enable_static} = xno; then - LIBCTF="-Wl,--rpath,../libctf/.libs ../libctf/.libs/libctf.so" - CTF_DEPS="../libctf/.libs/libctf.so" -else - LIBCTF="../libctf/.libs/libctf.a" - CTF_DEPS="$LIBCTF" -fi if test "${enable_libctf}" = yes; then AC_DEFINE(ENABLE_LIBCTF, 1, [Handle .ctf type-info sections]) + LIBCTF="../libctf/libctf.la" + CTF_DEPS="../libctf/libctf.la" else LIBCTF= CTF_DEPS=