From patchwork Fri May 24 11:10:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "CHIGOT, CLEMENT" X-Patchwork-Id: 1104810 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-501625-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=atos.net Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 459Nw05KQmz9s1c for ; Fri, 24 May 2019 21:10:52 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:content-type:mime-version; q=dns; s=default; b=K8dqS7iSBQmIhB14FZUDKHn8ouCebb97onUWoVchoHbu/IFkcu Dem73YdRlOOn68GaA2jpzwbJW/mY/OxbM0NDQUFNCjBeVvG6NRC4snk2o3/b8W4h sy11jhEluWY2exODQLUYgzlqoFFPZ7CrpeUfF51kmuQOvgr1JmXyytICQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:content-type:mime-version; s= default; bh=+lwmDpo39X76gGXB/7PUd6KpIGk=; b=YAJLls9Ato2NRwZeOang 0mAOUitOrWNK/BmrRuRNmxPi/GX65BlUBMd1ZL5fMKWH0OQQes5uz8AexzeS62P3 qzzY+VNV38ro9fOb39HybhQBhea2plrdR0MjRcs5ESKDxg2mO8UGI13GikL24TiO /PAdrnoRLBtVBcqjgkcaYM4= Received: (qmail 73314 invoked by alias); 24 May 2019 11:10:45 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 73297 invoked by uid 89); 24 May 2019 11:10:45 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-7.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 spammy=ste, blog, 13015, splits X-HELO: smtppost.atos.net Received: from smtppost.atos.net (HELO smtppost.atos.net) (193.56.114.177) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 24 May 2019 11:10:42 +0000 Received: from mail3-ext.my-it-solutions.net (mail3-ext.my-it-solutions.net) by smarthost6.atos.net with smtp (TLS: TLSv1/SSLv3,256bits,ECDHE-RSA-AES256-GCM-SHA384) id 2986_9c0c_1d8af45f_5f39_4bc1_935a_fb6e8d894cde; Fri, 24 May 2019 13:10:39 +0200 Received: from mail1-int.my-it-solutions.net ([10.92.32.11]) by mail3-ext.my-it-solutions.net (8.15.2/8.15.2) with ESMTPS id x4OBAbvi010811 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 May 2019 13:10:37 +0200 Received: from DEFTHW99ETUMSX.ww931.my-it-solutions.net ([10.86.142.49]) by mail1-int.my-it-solutions.net (8.15.2/8.15.2) with ESMTPS id x4OBAaL7008211 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 24 May 2019 13:10:37 +0200 Received: from DEFTHW99ETSMSX.ww931.my-it-solutions.net (10.86.142.100) by DEFTHW99ETUMSX.ww931.my-it-solutions.net (10.86.142.49) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 24 May 2019 13:10:36 +0200 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (10.86.142.137) by hybridsmtp.it-solutions.atos.net (10.86.142.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 24 May 2019 13:10:36 +0200 Received: from AM6PR02MB4950.eurprd02.prod.outlook.com (20.177.199.143) by AM6PR02MB3832.eurprd02.prod.outlook.com (52.134.113.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1922.17; Fri, 24 May 2019 11:10:34 +0000 Received: from AM6PR02MB4950.eurprd02.prod.outlook.com ([fe80::783b:b0c7:e7ed:9b53]) by AM6PR02MB4950.eurprd02.prod.outlook.com ([fe80::783b:b0c7:e7ed:9b53%7]) with mapi id 15.20.1922.013; Fri, 24 May 2019 11:10:34 +0000 From: "CHIGOT, CLEMENT" To: "gcc-patches@gcc.gnu.org" CC: "iant@golang.org" , "tdevries@suse.de" Subject: [PATCH] libbacktrace: split test_elf into 32 and 64 bits version Date: Fri, 24 May 2019 11:10:34 +0000 Message-ID: authentication-results: spf=none (sender IP is ) smtp.mailfrom=clement.chigot@atos.net; x-ms-oob-tlc-oobclassifiers: OLM:372; received-spf: None (protection.outlook.com: atos.net does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 MIME-Version: 1.0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: clement.chigot@atos.net Description: * This patch splits libbacktrace's test_elf into two new tests: test_elf_32 and test_elf_64. Tests: * AIX 7.2: Configure/Build: SUCCESS Changelog: * Makefile.am (BUILDTESTS): Remove test_elf, add test_elf_32 and test_elf_64. * Makefile.in: Regenerate. Index: libbacktrace/Makefile.am =================================================================== --- a/libbacktrace/Makefile.am (revision 271281) +++ b/libbacktrace/Makefile.am (working copy) @@ -130,6 +130,15 @@ elf_for_test.c: elf.c endif HAVE_OBJCOPY_DEBUGLINK endif HAVE_ELF +elf_%.c: elf.c + SEARCH='#error "Unknown BACKTRACE_ELF_SIZE"'; \ + REPLACE='#undef BACKTRACE_ELF_SIZE\ + #define BACKTRACE_ELF_SIZE'; \ + $(SED) "s/^$$SEARCH\$$/$$REPLACE $*/" \ + $< \ + > $@.tmp + mv $@.tmp $@ + xcoff_%.c: xcoff.c SEARCH='#error "Unknown BACKTRACE_XCOFF_SIZE"'; \ REPLACE='#undef BACKTRACE_XCOFF_SIZE\ @@ -139,11 +148,16 @@ xcoff_%.c: xcoff.c > $@.tmp mv $@.tmp $@ -test_elf_SOURCES = test_format.c testlib.c -test_elf_LDADD = libbacktrace_noformat.la elf.lo +test_elf_32_SOURCES = test_format.c testlib.c +test_elf_32_LDADD = libbacktrace_noformat.la elf_32.lo -BUILDTESTS += test_elf +BUILDTESTS += test_elf_32 +test_elf_64_SOURCES = test_format.c testlib.c +test_elf_64_LDADD = libbacktrace_noformat.la elf_64.lo + +BUILDTESTS += test_elf_64 + test_xcoff_32_SOURCES = test_format.c testlib.c test_xcoff_32_LDADD = libbacktrace_noformat.la xcoff_32.lo Index: libbacktrace/Makefile.in =================================================================== --- a/libbacktrace/Makefile.in (revision 271281) +++ b/libbacktrace/Makefile.in (working copy) @@ -126,9 +126,9 @@ TESTS = $(am__append_4) $(am__append_6) $(am__appe $(am__append_11) $(am__append_12) $(am__append_18) \ $(am__EXEEXT_11) @HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_1 = libbacktrace_elf_for_test.la -@NATIVE_TRUE@am__append_2 = test_elf test_xcoff_32 test_xcoff_64 \ -@NATIVE_TRUE@ test_pecoff test_unknown unittest unittest_alloc \ -@NATIVE_TRUE@ btest +@NATIVE_TRUE@am__append_2 = test_elf_32 test_elf_64 test_xcoff_32 \ +@NATIVE_TRUE@ test_xcoff_64 test_pecoff test_unknown unittest \ +@NATIVE_TRUE@ unittest_alloc btest @NATIVE_TRUE@am__append_3 = allocfail @NATIVE_TRUE@am__append_4 = allocfail.sh @HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__append_5 = b2test @@ -206,10 +206,11 @@ libbacktrace_noformat_la_OBJECTS = \ @NATIVE_TRUE@am__EXEEXT_1 = allocfail$(EXEEXT) @HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_2 = b2test$(EXEEXT) @HAVE_DWZ_TRUE@@HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@am__EXEEXT_3 = b3test$(EXEEXT) -@NATIVE_TRUE@am__EXEEXT_4 = test_elf$(EXEEXT) test_xcoff_32$(EXEEXT) \ -@NATIVE_TRUE@ test_xcoff_64$(EXEEXT) test_pecoff$(EXEEXT) \ -@NATIVE_TRUE@ test_unknown$(EXEEXT) unittest$(EXEEXT) \ -@NATIVE_TRUE@ unittest_alloc$(EXEEXT) btest$(EXEEXT) +@NATIVE_TRUE@am__EXEEXT_4 = test_elf_32$(EXEEXT) test_elf_64$(EXEEXT) \ +@NATIVE_TRUE@ test_xcoff_32$(EXEEXT) test_xcoff_64$(EXEEXT) \ +@NATIVE_TRUE@ test_pecoff$(EXEEXT) test_unknown$(EXEEXT) \ +@NATIVE_TRUE@ unittest$(EXEEXT) unittest_alloc$(EXEEXT) \ +@NATIVE_TRUE@ btest$(EXEEXT) @HAVE_ELF_TRUE@@NATIVE_TRUE@am__EXEEXT_5 = btest_lto$(EXEEXT) @NATIVE_TRUE@am__EXEEXT_6 = btest_alloc$(EXEEXT) stest$(EXEEXT) \ @NATIVE_TRUE@ stest_alloc$(EXEEXT) @@ -320,10 +321,16 @@ stest_OBJECTS = $(am_stest_OBJECTS) @NATIVE_TRUE@am_stest_alloc_OBJECTS = $(am__objects_8) stest_alloc_OBJECTS = $(am_stest_alloc_OBJECTS) @NATIVE_TRUE@stest_alloc_DEPENDENCIES = libbacktrace_alloc.la -@NATIVE_TRUE@am_test_elf_OBJECTS = test_format.$(OBJEXT) \ +@NATIVE_TRUE@am_test_elf_32_OBJECTS = test_format.$(OBJEXT) \ @NATIVE_TRUE@ testlib.$(OBJEXT) -test_elf_OBJECTS = $(am_test_elf_OBJECTS) -@NATIVE_TRUE@test_elf_DEPENDENCIES = libbacktrace_noformat.la elf.lo +test_elf_32_OBJECTS = $(am_test_elf_32_OBJECTS) +@NATIVE_TRUE@test_elf_32_DEPENDENCIES = libbacktrace_noformat.la \ +@NATIVE_TRUE@ elf_32.lo +@NATIVE_TRUE@am_test_elf_64_OBJECTS = test_format.$(OBJEXT) \ +@NATIVE_TRUE@ testlib.$(OBJEXT) +test_elf_64_OBJECTS = $(am_test_elf_64_OBJECTS) +@NATIVE_TRUE@test_elf_64_DEPENDENCIES = libbacktrace_noformat.la \ +@NATIVE_TRUE@ elf_64.lo @NATIVE_TRUE@am_test_pecoff_OBJECTS = test_format.$(OBJEXT) \ @NATIVE_TRUE@ testlib.$(OBJEXT) test_pecoff_OBJECTS = $(am_test_pecoff_OBJECTS) @@ -436,10 +443,11 @@ SOURCES = $(libbacktrace_la_SOURCES) $(EXTRA_libba $(ctesta_alloc_SOURCES) $(ctestg_SOURCES) \ $(ctestg_alloc_SOURCES) $(edtest_SOURCES) \ $(edtest_alloc_SOURCES) $(stest_SOURCES) \ - $(stest_alloc_SOURCES) $(test_elf_SOURCES) \ - $(test_pecoff_SOURCES) $(test_unknown_SOURCES) \ - $(test_xcoff_32_SOURCES) $(test_xcoff_64_SOURCES) \ - $(ttest_SOURCES) $(ttest_alloc_SOURCES) $(unittest_SOURCES) \ + $(stest_alloc_SOURCES) $(test_elf_32_SOURCES) \ + $(test_elf_64_SOURCES) $(test_pecoff_SOURCES) \ + $(test_unknown_SOURCES) $(test_xcoff_32_SOURCES) \ + $(test_xcoff_64_SOURCES) $(ttest_SOURCES) \ + $(ttest_alloc_SOURCES) $(unittest_SOURCES) \ $(unittest_alloc_SOURCES) $(ztest_SOURCES) \ $(ztest_alloc_SOURCES) am__can_run_installinfo = \ @@ -870,8 +878,10 @@ BUILDTESTS = $(am__append_2) $(am__append_9) $(am_ @HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@libbacktrace_elf_for_test_la_LIBADD = $(BACKTRACE_FILE) elf_for_test.lo \ @HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ $(VIEW_FILE) $(ALLOC_FILE) -@NATIVE_TRUE@test_elf_SOURCES = test_format.c testlib.c -@NATIVE_TRUE@test_elf_LDADD = libbacktrace_noformat.la elf.lo +@NATIVE_TRUE@test_elf_32_SOURCES = test_format.c testlib.c +@NATIVE_TRUE@test_elf_32_LDADD = libbacktrace_noformat.la elf_32.lo +@NATIVE_TRUE@test_elf_64_SOURCES = test_format.c testlib.c +@NATIVE_TRUE@test_elf_64_LDADD = libbacktrace_noformat.la elf_64.lo @NATIVE_TRUE@test_xcoff_32_SOURCES = test_format.c testlib.c @NATIVE_TRUE@test_xcoff_32_LDADD = libbacktrace_noformat.la xcoff_32.lo @NATIVE_TRUE@test_xcoff_64_SOURCES = test_format.c testlib.c @@ -1130,10 +1140,14 @@ stest_alloc$(EXEEXT): $(stest_alloc_OBJECTS) $(ste @rm -f stest_alloc$(EXEEXT) $(AM_V_CCLD)$(LINK) $(stest_alloc_OBJECTS) $(stest_alloc_LDADD) $(LIBS) -test_elf$(EXEEXT): $(test_elf_OBJECTS) $(test_elf_DEPENDENCIES) $(EXTRA_test_elf_DEPENDENCIES) - @rm -f test_elf$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_elf_OBJECTS) $(test_elf_LDADD) $(LIBS) +test_elf_32$(EXEEXT): $(test_elf_32_OBJECTS) $(test_elf_32_DEPENDENCIES) $(EXTRA_test_elf_32_DEPENDENCIES) + @rm -f test_elf_32$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_elf_32_OBJECTS) $(test_elf_32_LDADD) $(LIBS) +test_elf_64$(EXEEXT): $(test_elf_64_OBJECTS) $(test_elf_64_DEPENDENCIES) $(EXTRA_test_elf_64_DEPENDENCIES) + @rm -f test_elf_64$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_elf_64_OBJECTS) $(test_elf_64_LDADD) $(LIBS) + test_pecoff$(EXEEXT): $(test_pecoff_OBJECTS) $(test_pecoff_DEPENDENCIES) $(EXTRA_test_pecoff_DEPENDENCIES) @rm -f test_pecoff$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_pecoff_OBJECTS) $(test_pecoff_LDADD) $(LIBS) @@ -1596,13 +1610,20 @@ btest_gnudebuglink.log: btest_gnudebuglink --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -test_elf.log: test_elf$(EXEEXT) - @p='test_elf$(EXEEXT)'; \ - b='test_elf'; \ +test_elf_32.log: test_elf_32$(EXEEXT) + @p='test_elf_32$(EXEEXT)'; \ + b='test_elf_32'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test_elf_64.log: test_elf_64$(EXEEXT) + @p='test_elf_64$(EXEEXT)'; \ + b='test_elf_64'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) test_xcoff_32.log: test_xcoff_32$(EXEEXT) @p='test_xcoff_32$(EXEEXT)'; \ b='test_xcoff_32'; \ @@ -1907,6 +1928,15 @@ uninstall-am: @HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ > $@.tmp @HAVE_ELF_TRUE@@HAVE_OBJCOPY_DEBUGLINK_TRUE@@NATIVE_TRUE@ mv $@.tmp $@ +@NATIVE_TRUE@elf_%.c: elf.c +@NATIVE_TRUE@ SEARCH='#error "Unknown BACKTRACE_ELF_SIZE"'; \ +@NATIVE_TRUE@ REPLACE='#undef BACKTRACE_ELF_SIZE\ +@NATIVE_TRUE@ #define BACKTRACE_ELF_SIZE'; \ +@NATIVE_TRUE@ $(SED) "s/^$$SEARCH\$$/$$REPLACE $*/" \ +@NATIVE_TRUE@ $< \ +@NATIVE_TRUE@ > $@.tmp +@NATIVE_TRUE@ mv $@.tmp $@ + @NATIVE_TRUE@xcoff_%.c: xcoff.c @NATIVE_TRUE@ SEARCH='#error "Unknown BACKTRACE_XCOFF_SIZE"'; \ @NATIVE_TRUE@ REPLACE='#undef BACKTRACE_XCOFF_SIZE\