From: Mark Wielaard <mark@klomp.org>
To: buildbot@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [PATCH] Always use --enable-targets=all for gdb and --disable-sim on 32bit
Date: Sun, 24 Jul 2022 22:41:09 +0200 [thread overview]
Message-ID: <20220724204109.46169-1-mark@klomp.org> (raw)
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
reply other threads:[~2022-07-24 20:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220724204109.46169-1-mark@klomp.org \
--to=mark@klomp.org \
--cc=buildbot@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).