diff options
| author | Alan Modra <amodra@gmail.com> | 2023-04-26 09:59:40 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2023-04-26 10:32:07 +0930 |
| commit | 4a8635cbecbd4eefa6dafdc4510014ad1755ddc3 (patch) | |
| tree | d8c98a8c902c8bd843b7cf8cf289a07918cf5505 | |
| parent | 5b429b870767e2107bcc7d5d849e04d6901b5912 (diff) | |
| download | gdb-4a8635cbecbd4eefa6dafdc4510014ad1755ddc3.zip gdb-4a8635cbecbd4eefa6dafdc4510014ad1755ddc3.tar.gz gdb-4a8635cbecbd4eefa6dafdc4510014ad1755ddc3.tar.bz2 | |
binutils runtest $CC
I noticed in the binutile Makefile that runtest is being invoked with
CC, CC_FOR_BUILD and other compiler related flags in the environment.
That doesn't work. Those variables ought to be passed on the runtest
command line.
After fixing that I had some fails due to binutils testprog.c now
being compiled with the default "-g -O2" picked up in
CFLAGS_FOR_TARGET. Hack around that by passing -O0.
Also, with the binutils testsuite now taking notice of CC_FOR_TARGET,
I found a couple of debuginfod.exp fails with one of my compilers that
happened to be built without --debug-id being enabled by default.
* Makefile.am (check-DEJAGNU): Pass $CC and other variable on
the runtest command line rather than futilely in the
environment. Add -O0 to CFLAGS_FOR_TARGET.
* Makefile.in: Regenerate.
* testsuite/binutils-all/debuginfod.exp: Compile testprog.c
with -Wl,--build-id.
| -rw-r--r-- | binutils/Makefile.am | 10 | ||||
| -rw-r--r-- | binutils/Makefile.in | 10 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/debuginfod.exp | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 26de6b2..8e51310 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -210,10 +210,12 @@ check-DEJAGNU: site.exp EXPECT=$(EXPECT); export EXPECT; \ runtest=$(RUNTEST); \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ - CC="$(CC)" CC_FOR_BUILD="$(CC_FOR_BUILD)" \ - CC_FOR_TARGET="$(CC_FOR_TARGET)" CFLAGS_FOR_TARGET="$(CFLAGS)" \ - $$runtest --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite \ - $(RUNTESTFLAGS); \ + $$runtest --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite \ + CC="$(CC)" CFLAGS="$(CFLAGS)" \ + CC_FOR_BUILD="$(CC_FOR_BUILD)" \ + CC_FOR_TARGET="$(CC_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET) -O0" \ + $(RUNTESTFLAGS); \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 27315ad..a58c8ae 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -1832,10 +1832,12 @@ check-DEJAGNU: site.exp EXPECT=$(EXPECT); export EXPECT; \ runtest=$(RUNTEST); \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ - CC="$(CC)" CC_FOR_BUILD="$(CC_FOR_BUILD)" \ - CC_FOR_TARGET="$(CC_FOR_TARGET)" CFLAGS_FOR_TARGET="$(CFLAGS)" \ - $$runtest --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite \ - $(RUNTESTFLAGS); \ + $$runtest --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite \ + CC="$(CC)" CFLAGS="$(CFLAGS)" \ + CC_FOR_BUILD="$(CC_FOR_BUILD)" \ + CC_FOR_TARGET="$(CC_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET) -O0" \ + $(RUNTESTFLAGS); \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi diff --git a/binutils/testsuite/binutils-all/debuginfod.exp b/binutils/testsuite/binutils-all/debuginfod.exp index 7212d16..f86d8de 100644 --- a/binutils/testsuite/binutils-all/debuginfod.exp +++ b/binutils/testsuite/binutils-all/debuginfod.exp @@ -44,7 +44,7 @@ if { [which $OBJDUMP] == 0} { } # Compile testprog.c, move the debuginfo to a separate file and add .gnu_debuglink. -if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog executable debug] != ""} { +if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog executable "debug additional_flags=-Wl,--build-id"] != ""} { unsupported "$test (compilation failed)" return } |