From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 6E385385840A for ; Sun, 24 Jul 2022 20:41:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6E385385840A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x01.wildebeest.org [172.31.17.131]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 93B18303C3D5; Sun, 24 Jul 2022 22:41:12 +0200 (CEST) Received: by reform (Postfix, from userid 1000) id 66C6F2E821A8; Sun, 24 Jul 2022 22:41:12 +0200 (CEST) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [PATCH] Always use --enable-targets=all for gdb and --disable-sim on 32bit Date: Sun, 24 Jul 2022 22:41:09 +0200 Message-Id: <20220724204109.46169-1-mark@klomp.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, 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: buildbot@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "The https://builder.sourceware.org/ buildbot" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jul 2022 20:41:17 -0000 When using --enable-targets=all gdb will pull in building sim, which is currently broken on 32bit platforms. So use --disable-sim on 32bit. --- builder/master.cfg | 87 ++++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/builder/master.cfg b/builder/master.cfg index e94814f..ed138da 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -2115,13 +2115,16 @@ gdb_rm_step = steps.ShellCommand( haltOnFailure=True) gdb_configure_step = steps.Configure( workdir='gdb-build', - command=['../binutils-gdb/configure'], + command=['../binutils-gdb/configure', + '--enable-targets=all'], name='configure', haltOnFailure=True) -gdb_configure_targets_all_step = steps.Configure( +# Use on 32bit platforms, building sim is broken +gdb_configure_32_step = steps.Configure( workdir='gdb-build', command=['../binutils-gdb/configure', - '--enable-targets=all'], + '--enable-targets=all', + '--disable-sim'], name='configure', haltOnFailure=True) gdb_make_step = steps.Compile( @@ -2205,62 +2208,62 @@ gdb_factory.addSteps(bunsen_logfile_upload_cpio_steps( # only a few tests being tagsuffix='/extended-gdbserver')) gdb_factory.addStep(gdb_make_clean_step) -gdb_targets_all_factory = util.BuildFactory() -gdb_targets_all_factory.addStep(gdb_git_step) -gdb_targets_all_factory.addStep(gdb_rm_step) -gdb_targets_all_factory.addStep(gdb_configure_targets_all_step) -gdb_targets_all_factory.addStep(gdb_make_step) -gdb_targets_all_factory.addStep(make_gdb_check_step()) -gdb_targets_all_factory.addSteps(bunsen_logfile_upload_cpio_steps( +gdb_32_factory = util.BuildFactory() +gdb_32_factory.addStep(gdb_git_step) +gdb_32_factory.addStep(gdb_rm_step) +gdb_32_factory.addStep(gdb_configure_32_step) +gdb_32_factory.addStep(gdb_make_step) +gdb_32_factory.addStep(make_gdb_check_step()) +gdb_32_factory.addSteps(bunsen_logfile_upload_cpio_steps( ["*.sum", "*.log"], workdir='gdb-build', tagsuffix='/native')) -gdb_targets_all_factory.addStep(make_gdb_check_step('--target_board=native-gdbserver')) -gdb_targets_all_factory.addSteps(bunsen_logfile_upload_cpio_steps( +gdb_32_factory.addStep(make_gdb_check_step('--target_board=native-gdbserver')) +gdb_32_factory.addSteps(bunsen_logfile_upload_cpio_steps( ["*.sum", "*.log"], workdir='gdb-build', tagsuffix='/gdbserver')) -gdb_targets_all_factory.addStep(make_gdb_check_step('--target_board=native-extended-gdbserver')) -gdb_targets_all_factory.addSteps(bunsen_logfile_upload_cpio_steps( +gdb_32_factory.addStep(make_gdb_check_step('--target_board=native-extended-gdbserver')) +gdb_32_factory.addSteps(bunsen_logfile_upload_cpio_steps( ["*.sum", "*.log"], workdir='gdb-build', tagsuffix='/extended-gdbserver')) -gdb_targets_all_factory.addStep(gdb_make_clean_step) - -gdb_targets_all_black_factory = util.BuildFactory() -gdb_targets_all_black_factory.addStep(gdb_git_step) -gdb_targets_all_black_factory.addStep(gdb_rm_step) -gdb_targets_all_black_factory.addStep(gdb_configure_targets_all_step) -gdb_targets_all_black_factory.addStep(gdb_make_step) -gdb_targets_all_black_factory.addStep(gdb_black_step) -gdb_targets_all_black_factory.addStep(make_gdb_check_step()) -gdb_targets_all_black_factory.addSteps(bunsen_logfile_upload_cpio_steps( +gdb_32_factory.addStep(gdb_make_clean_step) + +gdb_black_factory = util.BuildFactory() +gdb_black_factory.addStep(gdb_git_step) +gdb_black_factory.addStep(gdb_rm_step) +gdb_black_factory.addStep(gdb_configure_step) +gdb_black_factory.addStep(gdb_make_step) +gdb_black_factory.addStep(gdb_black_step) +gdb_black_factory.addStep(make_gdb_check_step()) +gdb_black_factory.addSteps(bunsen_logfile_upload_cpio_steps( ["*.sum", "*.log"], workdir='gdb-build', tagsuffix='/native')) -gdb_targets_all_black_factory.addStep(make_gdb_check_step('--target_board=native-gdbserver')) -gdb_targets_all_black_factory.addSteps(bunsen_logfile_upload_cpio_steps( +gdb_black_factory.addStep(make_gdb_check_step('--target_board=native-gdbserver')) +gdb_black_factory.addSteps(bunsen_logfile_upload_cpio_steps( ["*.sum", "*.log"], workdir='gdb-build', tagsuffix='/gdbserver')) -gdb_targets_all_black_factory.addStep(make_gdb_check_step('--target_board=native-extended-gdbserver')) -gdb_targets_all_black_factory.addSteps(bunsen_logfile_upload_cpio_steps( +gdb_black_factory.addStep(make_gdb_check_step('--target_board=native-extended-gdbserver')) +gdb_black_factory.addSteps(bunsen_logfile_upload_cpio_steps( ["*.sum", "*.log"], workdir='gdb-build', tagsuffix='/extended-gdbserver')) -gdb_targets_all_black_factory.addStep(gdb_make_clean_step) +gdb_black_factory.addStep(gdb_make_clean_step) # Used for armhf only because of # https://sourceware.org/bugzilla/show_bug.cgi?id=28561 -gdb_factory_make_only = util.BuildFactory() -gdb_factory_make_only.addStep(gdb_git_step) -gdb_factory_make_only.addStep(gdb_rm_step) -gdb_factory_make_only.addStep(gdb_configure_step) -gdb_factory_make_only.addStep(gdb_make_step) +gdb_32_factory_make_only = util.BuildFactory() +gdb_32_factory_make_only.addStep(gdb_git_step) +gdb_32_factory_make_only.addStep(gdb_rm_step) +gdb_32_factory_make_only.addStep(gdb_configure_32_step) +gdb_32_factory_make_only.addStep(gdb_make_step) # NB: no need to fully BUNSEN ME, test suites are not actually being run -gdb_factory_make_only.addSteps(bunsen_logfile_upload_steps([ # no tests being run - but can save the autoconf config.log +gdb_32_factory_make_only.addSteps(bunsen_logfile_upload_steps([ # no tests being run - but can save the autoconf config.log (["../gdb-build/gdb/config.log"],"gdb")])) -gdb_factory_make_only.addStep(gdb_make_clean_step) +gdb_32_factory_make_only.addStep(gdb_make_clean_step) gdb_centos_x86_64_builder = util.BuilderConfig( name="gdb-centos-x86_64", @@ -2283,7 +2286,7 @@ gdb_fedora_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-latest')}, workernames=vm_workers, tags=["gdb", "fedora", "x86_64"], - factory=gdb_targets_all_black_factory) + factory=gdb_black_factory) c['builders'].append(gdb_fedora_x86_64_builder) gdb_try_fedora_x86_64_builder = util.BuilderConfig( @@ -2301,7 +2304,7 @@ gdb_debian_armhf_builder = util.BuilderConfig( workernames=["debian-armhf"], tags=["gdb", "debian", "armhf"], collapseRequests=True, - factory=gdb_factory_make_only) + factory=gdb_32_factory_make_only) c['builders'].append(gdb_debian_armhf_builder) gdb_fedora_arm64_builder = util.BuilderConfig( @@ -2322,7 +2325,7 @@ gdb_debian_i386_builder = util.BuilderConfig( name="gdb-debian-i386", workernames=debian_i386_workers, tags=["gdb", "debian", "i386"], - factory=gdb_factory) + factory=gdb_32_factory) c['builders'].append(gdb_debian_i386_builder) gdb_try_debian_i386_builder = util.BuilderConfig( @@ -2330,7 +2333,7 @@ gdb_try_debian_i386_builder = util.BuilderConfig( collapseRequests=True, workernames=debian_i386_workers, tags=["gdb-try", "debian", "i386"], - factory=gdb_factory) + factory=gdb_32_factory) c['builders'].append(gdb_try_debian_i386_builder) gdb_fedora_s390x_builder = util.BuilderConfig( @@ -2485,14 +2488,14 @@ gdb_armhf_ubuntu20_04_builder = util.BuilderConfig( name="gdb-armhf-ubuntu20_04", workernames=["armhf-ubuntu20_04"], tags=["gdb", "armhf", "ubuntu"], - factory=gdb_factory) + factory=gdb_32_factory) c['builders'].append(gdb_armhf_ubuntu20_04_builder) gdb_armhf_ubuntu22_04_builder = util.BuilderConfig( name="gdb-armhf-ubuntu22_04", workernames=["armhf-ubuntu22_04"], tags=["gdb", "armhf", "ubuntu"], - factory=gdb_factory) + factory=gdb_32_factory) c['builders'].append(gdb_armhf_ubuntu22_04_builder) # binutils-gdb build steps, factory and builders -- 2.30.2