diff options
| -rw-r--r-- | libctf/ChangeLog | 14 | ||||
| -rw-r--r-- | libctf/Makefile.am | 15 | ||||
| -rw-r--r-- | libctf/Makefile.in | 14 | ||||
| -rw-r--r-- | libctf/testsuite/lib/ctf-lib.exp | 7 | ||||
| -rw-r--r-- | libctf/testsuite/libctf-lookup/lookup.exp | 5 | ||||
| -rw-r--r-- | libctf/testsuite/libctf-regression/regression.exp | 5 |
6 files changed, 57 insertions, 3 deletions
diff --git a/libctf/ChangeLog b/libctf/ChangeLog index 0aaf306..0f5e96a 100644 --- a/libctf/ChangeLog +++ b/libctf/ChangeLog @@ -1,5 +1,19 @@ 2021-01-05 Nick Alcock <nick.alcock@oracle.com> + * Makefile.am (BASEDIR): New. + (BFDDIR): Likewise. + (check-DEJAGNU): Add development.exp to prerequisites. + (development.exp): New. + (CONFIG_STATUS_DEPENDENCIES): New. + (EXTRA_DEJAGNU_SITE_CONFIG): Likewise. + (DISTCLEANFILES): Likewise. + * Makefile.in: Regenerated. + * testsuite/lib/ctf-lib.exp (check_ctf_available): Return boolean. + * testsuite/libctf-lookup/lookup.exp: Call check_ctf_available. + * testsuite/libctf-regression/regression.exp: Likewise. + +2021-01-05 Nick Alcock <nick.alcock@oracle.com> + * ctf-types.c (ctf_type_aname): Print forwards to unions and enums properly. diff --git a/libctf/Makefile.am b/libctf/Makefile.am index 3fe1994..f454334 100644 --- a/libctf/Makefile.am +++ b/libctf/Makefile.am @@ -27,6 +27,8 @@ AUTOMAKE_OPTIONS = dejagnu foreign no-texinfo.tex ZLIB = @zlibdir@ -lz ZLIBINC = @zlibinc@ +BASEDIR = $(srcdir)/.. +BFDDIR = $(BASEDIR)/bfd INCDIR = $(srcdir)/../include AM_CPPFLAGS = -D_GNU_SOURCE -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../bfd -I../bfd @INCINTL@ AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @WERROR@ $(ZLIBINC) @@ -75,7 +77,7 @@ CC_FOR_TARGET = ` \ fi; \ fi` -check-DEJAGNU: site.exp +check-DEJAGNU: site.exp development.exp srcroot=`cd $(srcdir) && pwd`; export srcroot; \ r=`pwd`; export r; \ LC_ALL=C; export LC_ALL; \ @@ -87,3 +89,14 @@ check-DEJAGNU: site.exp CC_FOR_HOST="$(CC)" LIBS="$(LIBS)" $(RUNTESTFLAGS); \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi + +development.exp: $(BFDDIR)/development.sh + $(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh \ + | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@ + +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh + +EXTRA_DEJAGNU_SITE_CONFIG = development.exp + +DISTCLEANFILES = site.exp development.exp diff --git a/libctf/Makefile.in b/libctf/Makefile.in index c86ac7b..d31d017 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in @@ -448,6 +448,8 @@ AUTOMAKE_OPTIONS = dejagnu foreign no-texinfo.tex # case both are empty. ZLIB = @zlibdir@ -lz ZLIBINC = @zlibinc@ +BASEDIR = $(srcdir)/.. +BFDDIR = $(BASEDIR)/bfd INCDIR = $(srcdir)/../include AM_CPPFLAGS = -D_GNU_SOURCE -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../bfd -I../bfd @INCINTL@ AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @WERROR@ $(ZLIBINC) @@ -486,6 +488,11 @@ CC_FOR_TARGET = ` \ fi; \ fi` + +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh +EXTRA_DEJAGNU_SITE_CONFIG = development.exp +DISTCLEANFILES = site.exp development.exp all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1216,6 +1223,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1319,7 +1327,7 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES .PRECIOUS: Makefile -check-DEJAGNU: site.exp +check-DEJAGNU: site.exp development.exp srcroot=`cd $(srcdir) && pwd`; export srcroot; \ r=`pwd`; export r; \ LC_ALL=C; export LC_ALL; \ @@ -1332,6 +1340,10 @@ check-DEJAGNU: site.exp else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi +development.exp: $(BFDDIR)/development.sh + $(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh \ + | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libctf/testsuite/lib/ctf-lib.exp b/libctf/testsuite/lib/ctf-lib.exp index 796342b..fe02812 100644 --- a/libctf/testsuite/lib/ctf-lib.exp +++ b/libctf/testsuite/lib/ctf-lib.exp @@ -399,7 +399,12 @@ proc check_ctf_available { } { set f [open $src "w"] puts $f "int main() { return 0; }" close $f - set ctf_available_saved [compile_one_cc $src $output "-gt -c"] + set comp_output [compile_one_cc $src $output "-gt -c"] + if { $comp_output == ""} { + set ctf_available_saved 1 + } else { + set ctf_available_saved 0 + } remote_file host delete $src remote_file host delete $output file delete $src diff --git a/libctf/testsuite/libctf-lookup/lookup.exp b/libctf/testsuite/libctf-lookup/lookup.exp index 51ad257..84ff46c 100644 --- a/libctf/testsuite/libctf-lookup/lookup.exp +++ b/libctf/testsuite/libctf-lookup/lookup.exp @@ -23,6 +23,11 @@ if ![is_elf_format] { return 0 } +if {![check_ctf_available]} { + unsupported "no CTF format support in the compiler" + return 0 +} + if {[info exists env(LC_ALL)]} { set old_lc_all $env(LC_ALL) } diff --git a/libctf/testsuite/libctf-regression/regression.exp b/libctf/testsuite/libctf-regression/regression.exp index 51ad257..605d96f 100644 --- a/libctf/testsuite/libctf-regression/regression.exp +++ b/libctf/testsuite/libctf-regression/regression.exp @@ -18,6 +18,11 @@ # MA 02110-1301, USA. # +if {![check_ctf_available]} { + unsupported "no CTF format support in the compiler" + return 0 +} + if ![is_elf_format] { unsupported "CTF needs bfd changes to be emitted on non-ELF" return 0 |