From 20ece5977c43da03f0ae99bab2847f4c8d474fbf Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Sat, 14 Sep 1996 00:04:09 +0000 Subject: [PATCH] * Makefile.in (RPATH_ENVVAR): New var, set to @RPATH_ENVVAR@. (just-check): Add shared library paths for libstdc++, tk, tcl, bfd, and opcodes to the environment variable specified in RPATH_ENVVAR. * configure.in: Add support to recognize --enable-shared flag and generate correct value for RPATH_ENVVAR. * configure: Regenerated with autoconf. --- gdb/testsuite/ChangeLog | 50 ++++++++++++++++++ gdb/testsuite/Makefile.in | 126 +++++++++------------------------------------ gdb/testsuite/configure.in | 20 +++++++ 3 files changed, 93 insertions(+), 103 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 275f843..44f7b75 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,53 @@ +Fri Sep 13 12:05:34 1996 Fred Fish + + * Makefile.in (RPATH_ENVVAR): New var, set to @RPATH_ENVVAR@. + (just-check): Add shared library paths for libstdc++, tk, + tcl, bfd, and opcodes to the environment variable specified + in RPATH_ENVVAR. + * configure.in: Add support to recognize --enable-shared flag + and generate correct value for RPATH_ENVVAR. + * configure: Regenerated with autoconf. + +Mon Sep 2 06:36:02 1996 Fred Fish + + * gdb.base/break.exp: Expand "Delete all breakpoints" xfail to + include all osf versions. + * gdb.threads/pthreads.exp: Expand "run to main" xfail to include + all osf versions. Add -D_MIT_POSIX_THREADS to compilation command + when target is linux. When failing to build pthreads test + executable, give more meaningful message. + * gdb.threads/pthreads.c: Hpux also uses old definition of second + arg for pthread_create. + +Mon Aug 19 09:58:59 1996 Fred Fish + + * gdb.threads/pthreads.c (PTHREAD_CREATE_ARG2, + PTHREAD_CREATE_NULL_ARG2): Accomodate old pthreads implementations. + * gdb.threads/pthreads.exp: Try linking with both -lpthread (Solaris) + and -lpthreads (everybody else). + (test_startup): Fail gracefully if threads are not supported. + * gdb.base/nodebug.exp: Add setup_xfail hppa*-*-hpux* for + "p/c array_index("abcdef",2)" when not gcc compiled. + * gdb.base/corefile.exp: Add setup_xfail hppa*-*-hpux* for + "print func2::coremaker_local" when not gcc compiled. + * gdb.base/opaque.exp: Remove setup_xfail hppa*-*-hpux* for + "ptype on opaque struct tagname (statically)", + "ptype on opaque struct tagname (dynamically) 1", and + "ptype on opaque struct tagname (dynamically) 2" + for not compiled with gcc. + * gdb.base/mips_pro.exp: Only do setup_xfail hppa*-*-* for + backtrace when compiled with gcc. + * lib/gdb.exp (runto_main): Return result of "runto main" rather + than always return success. + +Sat Aug 17 13:28:00 1996 Fred Fish + + * gdb.c++/virtfunc.exp: Remove setup_xfail for "mips-*-irix5*". + +Tue Aug 13 10:26:10 1996 Jeffrey A Law (law@cygnus.com) + + * gdb.base/structs.exp: Undo last change. + Mon Aug 12 15:29:08 1996 Fred Fish * gdb.base/a1-selftest.exp (do_steps_and_nexts): New routine to diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index 5d774fd..1e8f2fc 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -17,51 +17,21 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -srcdir = . -prefix = /usr/local -program_transform_name = - -exec_prefix = $(prefix) -bindir = $(exec_prefix)/bin -libdir = $(exec_prefix)/lib -tooldir = $(libdir)/$(target_alias) - -datadir = $(exec_prefix)/lib/dejagnu -mandir = $(prefix)/man -man1dir = $(mandir)/man1 -man2dir = $(mandir)/man2 -man3dir = $(mandir)/man3 -man4dir = $(mandir)/man4 -man5dir = $(mandir)/man5 -man6dir = $(mandir)/man6 -man7dir = $(mandir)/man7 -man8dir = $(mandir)/man8 -man9dir = $(mandir)/man9 -infodir = $(prefix)/info -includedir = $(prefix)/include -gxx_includedir = $(tooldir)/g++-include -docdir = $(datadir)/doc -targetdir = $(datadir)/$(target_alias) +srcdir = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +host_alias = @host_alias@ +target_alias = @target_alias@ +program_transform_name = @program_transform_name@ +build_canonical = @build@ +host_canonical = @host@ +target_canonical = @target@ +target_cpu = @gdb_target_cpu@ SHELL = /bin/sh - -INSTALL = install -c -INSTALL_PROGRAM = $(INSTALL) -INSTALL_DATA = $(INSTALL) - -# Do not use CFLAGS, that is set in the top-level config/mh-hp300 to not -# contain -g. In general, the flags to be used for building the tools and -# the flags to be used to build the testsuite probably don't have much to -# do with each other. -TESTSUITE_CFLAGS = -g -CHILLFLAGS = $(TESTSUITE_CFLAGS) -# This should probably be consistent with the top-level Makefile.in, -# gdb/Makefile.in, and gdb/testsuite/gdb.t2*/Makefile.in, so that "make check" -# has the same effect no matter where it is run. -CXXFLAGS = -g -O - -LINK= ln -s -SUBDIRS= +SUBDIRS = @subdirs@ +RPATH_ENVVAR = @RPATH_ENVVAR@ EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \ echo $${rootme}/../../expect/expect ; \ @@ -82,58 +52,6 @@ RUNTEST_FOR_TARGET = `\ fi; \ fi` -CC_FOR_TARGET = ` \ - if [ -f $${rootme}/../../gcc/xgcc ] ; then \ - if [ -f $${rootme}/../../newlib/Makefile ]; then \ - echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/ -idirafter $${rootme}/../../newlib/targ-include -idirafter $${rootsrc}/../../newlib/libc/include -nostdinc -L$${rootme}/../../newlib -B$${rootme}/../../newlib/; \ - else \ - echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/; \ - fi; \ - else \ - if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ - echo $(CC); \ - else \ - t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ - fi; \ - fi` - -CXX = gcc -CXX_FOR_TARGET = ` \ - if [ -f $${rootme}/../../gcc/xgcc ] ; then \ - if [ -f $${rootme}/../../newlib/Makefile ]; then \ - echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/ -idirafter $${rootme}/../../newlib/targ-include -idirafter $${rootsrc}/../../newlib/libc/include -nostdinc -L$${rootme}/../../newlib -B$${rootme}/../../newlib/; \ - else \ - echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/; \ - fi; \ - else \ - if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ - echo $(CXX); \ - else \ - t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ - fi; \ - fi` - -CHILLFLAGS = $(TESTSUITE_CFLAGS) -CHILL = gcc -CHILL_FOR_TARGET = ` \ - if [ -f $${rootme}/../../gcc/xgcc ] ; then \ - echo $${rootme}/../../gcc/xgcc -B$${rootme}../../gcc/; \ - else \ - if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ - echo $(CHILL); \ - else \ - t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ - fi; \ - fi` - -CHILL_LIB = ` \ - if [ -f $${rootme}/../../gcc/ch/runtime/libchill.a ] ; then \ - echo $${rootme}/../../gcc/ch/runtime/chillrt0.o \ - $${rootme}/../../gcc/ch/runtime/libchill.a; \ - else \ - echo -lchill; \ - fi` - #### host, target, and site specific Makefile frags come in here. # The use of $$(x_FOR_TARGET) reduces the command line length by not @@ -160,10 +78,10 @@ TARGET_FLAGS_TO_PASS = \ "LDFLAGS=$(LDFLAGS)" \ "LIBS=$(LIBS)" \ "RUNTEST=$(RUNTEST)" \ - "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ - "BISON=$(BISON)" + "RUNTESTFLAGS=$(RUNTESTFLAGS)" -all: subdirs +all: + @echo "Nothing to be done for all..." .NOEXPORT: INFODIRS=doc @@ -187,6 +105,7 @@ site.exp: ./config.status Makefile @echo "set host_triplet ${host_canonical}" >> ./tmp0 @echo "set target_alias $(target_alias)" >> ./tmp0 @echo "set target_triplet ${target_canonical}" >> ./tmp0 + @echo "set build_triplet ${build_canonical}" >> ./tmp0 @echo "set srcdir ${srcdir}" >> ./tmp0 @echo "set tool gdb" >> ./tmp0 @echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0 @@ -203,6 +122,8 @@ just-check: rootme=`pwd`; export rootme; \ srcdir=${srcdir} ; export srcdir ; \ EXPECT=${EXPECT} ; export EXPECT ; \ + $(RPATH_ENVVAR)=$$rootme/../../libstdc++:$$rootme/../../tk/unix:$$rootme/../../tcl/unix:$$rootme/../../bfd:$$rootme/../../opcodes:$$$(RPATH_ENVVAR); \ + export $(RPATH_ENVVAR); \ if [ -f $${rootme}/../../expect/expect ] ; then \ TCL_LIBRARY=$${srcdir}/../../tcl/library ; \ export TCL_LIBRARY ; fi ; \ @@ -221,12 +142,11 @@ subdir_do: force force:; - subdirs: - for dir in ${SUBDIRS}; \ + for dir in ${SUBDIRS} ; \ do \ - echo "$$dir:"; \ - if [ -d $$dir ]; then \ + echo "$$dir:" ; \ + if [ -d $$dir ] ; then \ (rootme=`pwd`/ ; export rootme ; \ rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \ cd $$dir; $(MAKE) $(TARGET_FLAGS_TO_PASS)); \ @@ -245,7 +165,7 @@ clean mostlyclean: done ; \ else true; fi -distclean realclean: clean +distclean maintainer-clean realclean: clean -rm -f *~ core *.log *.plog *.sum *.psum site.* -rm -f Makefile config.status *-init.exp -rm -fr *.log summary detail *.plog *.sum *.psum site.* diff --git a/gdb/testsuite/configure.in b/gdb/testsuite/configure.in index 6cbf599..9026b71 100644 --- a/gdb/testsuite/configure.in +++ b/gdb/testsuite/configure.in @@ -34,6 +34,26 @@ case "${target}" in fi ;; esac +# Begin stuff to support --enable-shared +AC_ARG_ENABLE(shared, +[ --enable-shared use shared libraries], +[case "${enableval}" in + yes) shared=true ;; + no) shared=false ;; + *) shared=true ;; +esac])dnl +RPATH_ENVVAR=LD_LIBRARY_PATH +# If we have shared libraries, try to set RPATH_ENVVAR reasonably. +if test "${shared}" = "true"; then + case "${host}" in + *-*-hpux*) + RPATH_ENVVAR=SHLIB_PATH + ;; + esac +fi +AC_SUBST(RPATH_ENVVAR) +# End stuff to support --enable-shared + # configure the subdirectories too AC_CONFIG_SUBDIRS($configdirs) -- 2.7.4